]> git.openstreetmap.org Git - rails.git/blobdiff - app/models/trace.rb
Cleaned up some unreachable code. Added first test on the 'old' node controller.
[rails.git] / app / models / trace.rb
index cb49ba62cbc8a8e38878aa5fce76b4422c389799..10e867badc71381fc42ba6c93b4a7071f53ea827 100644 (file)
@@ -58,18 +58,16 @@ class Trace < ActiveRecord::Base
     data
   end
   
     data
   end
   
-  # FIXME change to permanent filestore area
   def large_picture_name
   def large_picture_name
-    "/home/osm/icons/#{id}.gif"
+    "#{GPX_IMAGE_DIR}/#{id}.gif"
   end
 
   end
 
-  # FIXME change to permanent filestore area
   def icon_picture_name
   def icon_picture_name
-    "/home/osm/icons/#{id}_icon.gif"
+    "#{GPX_IMAGE_DIR}/#{id}_icon.gif"
   end
 
   def trace_name
   end
 
   def trace_name
-    "/home/osm/gpx/#{id}.gpx"
+    "#{GPX_TRACE_DIR}/#{id}.gpx"
   end
 
   def mime_type
   end
 
   def mime_type
@@ -158,7 +156,7 @@ class Trace < ActiveRecord::Base
       elsif bzipped
         system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
       elsif zipped
       elsif bzipped
         system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
       elsif zipped
-        system("unzip -p #{trace_name} > #{tmpfile.path}")
+        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path}")
       end
 
       tmpfile.unlink
       end
 
       tmpfile.unlink