X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6559db51dfcdc10187d3e8f845474729dbb9faa6..40c7e0f9aa2fc0d1353818e5316da2203d114cf0:/lib/daemons/gpx_import.rb?ds=sidebyside

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 427edd121..acf215300 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #You might want to change this
-ENV["RAILS_ENV"] ||= "development"
+#ENV["RAILS_ENV"] ||= "development"
 
 require File.dirname(__FILE__) + "/../../config/environment"
 
@@ -13,7 +13,7 @@ end
 logger = ActiveRecord::Base.logger
 
 while($running) do
-  
+
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
   traces = Trace.find(:all, :conditions => ['inserted = ?', false])
@@ -22,19 +22,30 @@ while($running) do
     traces.each do |trace|
       begin
 
-        logger.info("GPX Import importing #{trace.name} from #{trace.user.email}")
+        logger.info("GPX Import importing #{trace.name} (#{trace.id}) from #{trace.user.email}")
 
-        gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/
+        # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz'
+        filetype = `file -b /home/osm/gpx/#{trace.id}.gpx`.chomp
+        gzipped = filetype =~ /^gzip/
+        zipped = filetype =~ /^Zip/
 
         if gzipped
           logger.info("gzipped")
+          filename = "/tmp/#{rand}"
+          system("gunzip -c /home/osm/gpx/#{trace.id}.gpx > #{filename}")
+        elsif zipped
+          logger.info("zipped")
+          filename = "/tmp/#{rand}"
+          system("unzip -p /home/osm/gpx/#{trace.id}.gpx > #{filename}")
         else
           logger.info("not gzipped")
+          filename = "/home/osm/gpx/#{trace.id}.gpx"
         end
-        gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
+
+        gpx = OSM::GPXImporter.new(filename)
 
         f_lat = 0
-        l_lon = 0
+        f_lon = 0
         first = true
 
         gpx.points do |point|
@@ -44,12 +55,12 @@ while($running) do
           end
 
           tp = Tracepoint.new
-          tp.latitude = point['latitude']
-          tp.longitude = point['longitude']
-          tp.altitude = point['altitude']
+          tp.lat = point['latitude'].to_f
+          tp.lng = point['longitude'].to_f
+          tp.altitude = point['altitude'].to_f
           tp.user_id = trace.user.id
           tp.gpx_id = trace.id
-          tp.trackid = point['segment']
+          tp.trackid = point['segment'].to_i
           tp.save!
         end
 
@@ -59,24 +70,45 @@ while($running) do
           max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', trace.id])
           min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', trace.id])
 
+          max_lat = max_lat.to_f / 1000000
+          min_lat = min_lat.to_f / 1000000
+          max_lon = max_lon.to_f / 1000000
+          min_lon = min_lon.to_f / 1000000
+
           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
           trace.inserted = true
           trace.save
+
+          if gzipped || zipped
+            FileUtils.rm_f(filename)
+          end
+
+          logger.info "done trace #{trace.id}"
           Notifier::deliver_gpx_success(trace, gpx.possible_points)
         else
-          #trace.destroy
+          FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx", filename)
+          trace.destroy
           Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
         end
 
       rescue Exception => ex
-        #trace.destroy
-        Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
+        logger.info ex
+        ex.backtrace.each {|l| logger.info l }
+          FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx", filename)
+          trace.destroy
+          Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
       end
     end
   end
+
+  Trace.find(:all, :conditions => ['inserted = ?', false]).each do |trace|
+     FileUtils.rm_f("/home/osm/gpx/#{trace.id}.gpx")
+     trace.destroy
+  end
+  exit
   sleep 15.minutes
 end