fix import bug, make points commify

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

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 70764dd38c8a3f9b23979f6e1ba77aec0a30573a..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}")
       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")
 
         if gzipped
           logger.info("gzipped")


@@ -33,7 +34,16 @@ while($running) do
         end
         gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
 
         end
         gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
 

+        f_lat = 0
+        l_lon = 0
+        first = true
+

         gpx.points do |point|
         gpx.points do |point|

+          if first
+            f_lat = point['latitude']
+            f_lon = point['longitude']
+          end
+

           tp = Tracepoint.new
           tp.latitude = point['latitude']
           tp.longitude = point['longitude']
           tp = Tracepoint.new
           tp.latitude = point['latitude']
           tp.longitude = point['longitude']


@@ -49,7 +59,9 @@ while($running) do
           min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', trace.id])
           max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', trace.id])
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])
           min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', trace.id])
           max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', trace.id])
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])

-          #logger.info("bbox: #{min_lat} #{max_lat} #{min_lon} #{max_lon}")
+
+          trace.latitude = 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
           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