X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb5f6bb4a206d9a41fda40ac83e71fe425947a45..cf24a5a3ee68905c5f55cf6f17c5d2ea983cb34f:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index cb49ba62c..10e867bad 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -58,18 +58,16 @@ class Trace < ActiveRecord::Base
     data
   end
   
-  # FIXME change to permanent filestore area
   def large_picture_name
-    "/home/osm/icons/#{id}.gif"
+    "#{GPX_IMAGE_DIR}/#{id}.gif"
   end
 
-  # FIXME change to permanent filestore area
   def icon_picture_name
-    "/home/osm/icons/#{id}_icon.gif"
+    "#{GPX_IMAGE_DIR}/#{id}_icon.gif"
   end
 
   def trace_name
-    "/home/osm/gpx/#{id}.gpx"
+    "#{GPX_TRACE_DIR}/#{id}.gpx"
   end
 
   def mime_type
@@ -158,7 +156,7 @@ class Trace < ActiveRecord::Base
       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