Support getting a way, and all the segments and nodes it depends on, via /way/:id...

[rails.git] / lib / daemons / gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 427edd121db40741d5f434b5078e2464dc720972..42e642b8bc30831c87bde9b3765a31eb6e27b3f9 100755 (executable)
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -23,8 +23,9 @@ while($running) do
       begin
 
         logger.info("GPX Import importing #{trace.name} from #{trace.user.email}")
-
-        gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/
+\r
+        # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
+        gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/\r
 
         if gzipped
           logger.info("gzipped")
@@ -60,7 +61,7 @@ while($running) do
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])
 
           trace.latitude = f_lat
-          trace.longitude = f_lat
+          trace.longitude = f_lon
           trace.large_picture = gpx.get_picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
           trace.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
           trace.size = gpx.actual_points