X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d07277efba0c0069705bbefa68f2624a9c6c9ff0..c166d030335e3070a865113b3b0cb0aa72cd8301:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index b0e6a1782..ba76d60f0 100755
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -1,83 +1,42 @@
 #!/usr/bin/env ruby
 
 #You might want to change this
-ENV["RAILS_ENV"] ||= "development"
+#ENV["RAILS_ENV"] ||= "development"
 
 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} from #{trace.user.email}")
-
-        # 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/
-
-        if gzipped
-          logger.info("gzipped")
-        else
-          logger.info("not gzipped")
-        end
-        gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
-
-        f_lat = 0
-        l_lon = 0
-        first = true
-
-        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.altitude = point['altitude']
-          tp.user_id = trace.user.id
-          tp.gpx_id = trace.id
-          tp.trackid = point['segment']
-          tp.save!
-        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])
+  Trace.find(:all, :conditions => ['inserted = ?', false]).each do |trace|
+    Signal.trap("TERM") do 
+      terminated = true
+    end
 
-          trace.latitude = f_lat
-          trace.longitude = f_lat
-          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
-          Notifier::deliver_gpx_success(trace, gpx.possible_points)
-        else
-          #trace.destroy
-          Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
-        end
+    begin
+      gpx = trace.import
 
-      rescue Exception => ex
-        #trace.destroy
-        Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
+      if gpx.actual_points > 0
+        Notifier::deliver_gpx_success(trace, gpx.actual_points)
+      else
+        trace.destroy
+        Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
       end
+    rescue Exception => ex
+      logger.info ex.to_s
+      ex.backtrace.each {|l| logger.info l }
+      trace.destroy
+      Notifier::deliver_gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n"))
     end
+
+    Signal.trap("TERM", "DEFAULT")
+
+    exit if terminated
   end
-  sleep 15.minutes
+
+  sleep 5.minutes
 end