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

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index acf215300..8250a67f5 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -5,110 +5,55 @@
 
 require File.dirname(__FILE__) + "/../../config/environment"
 
-$running = true;
-Signal.trap("TERM") do 
-  $running = false
-end
+terminated = false
 
 logger = ActiveRecord::Base.logger
 
-while($running) do
-
+while(true) do
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  traces = Trace.find(:all, :conditions => ['inserted = ?', false])
-
-  if traces and traces.length > 0
-    traces.each do |trace|
-      begin
-
-        logger.info("GPX Import importing #{trace.name} (#{trace.id}) from #{trace.user.email}")
-
-        # 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(filename)
-
-        f_lat = 0
-        f_lon = 0
-        first = true
+  Trace.find(:all, :conditions => { :inserted => false, :visible => true }, :order => "id").each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
 
-        gpx.points do |point|
-          if first
-            f_lat = point['latitude']
-            f_lon = point['longitude']
-          end
+    begin
+      gpx = trace.import
 
-          tp = Tracepoint.new
-          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'].to_i
-          tp.save!
-        end
+      if gpx.actual_points > 0
+        Notifier::deliver_gpx_success(trace, gpx.actual_points)
+      else
+        Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
+        trace.destroy
+      end
+    rescue Exception => ex
+      logger.info ex.to_s
+      ex.backtrace.each {|l| logger.info l }
+      Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
+      trace.destroy
+    end
 
-        if gpx.actual_points > 0
-          max_lat = Tracepoint.maximum('latitude', :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])
+    Signal.trap("TERM", "DEFAULT")
 
-          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
+    exit if terminated
+  end
 
-          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.inserted = true
-          trace.save
+  Trace.find(:all, :conditions => { :visible => false }, :order => "id").each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
 
-          if gzipped || zipped
-            FileUtils.rm_f(filename)
-          end
+    begin
+      trace.destroy
+    rescue Exception => ex
+      logger.info ex.to_s
+      ex.backtrace.each {|l| logger.info l }
+    end
 
-          logger.info "done trace #{trace.id}"
-          Notifier::deliver_gpx_success(trace, gpx.possible_points)
-        else
-          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
+    Signal.trap("TERM", "DEFAULT")
 
-      rescue Exception => ex
-        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
+    exit if terminated
   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
+  sleep 5.minutes.value
 end