X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9f8952b6ef681a544b9f817483ac21edda0961c7..89e976c6e57c9aa8afae00437aaf4399ea5fc58f:/lib/daemons/gpx_import.rb

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index 42e642b8b..9e7e906c8 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"
 
@@ -16,13 +16,13 @@ while($running) do
   
   ActiveRecord::Base.logger.info("GPX Import daemon wake @ #{Time.now}.")
 
-  traces = Trace.find(:all, :conditions => ['inserted = ?', false])
+  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}")
+        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'
         gzipped = `file -b /tmp/#{trace.id}.gpx`.chomp =~/^gzip/
@@ -32,10 +32,11 @@ while($running) do
         else
           logger.info("not gzipped")
         end
-        gpx = OSM::GPXImporter.new("/tmp/#{trace.id}.gpx")
+
+        gpx = OSM::GPXImporter.new("/home/osm/gpx/#{trace.id}.gpx")
 
         f_lat = 0
-        l_lon = 0
+        f_lon = 0
         first = true
 
         gpx.points do |point|
@@ -45,12 +46,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,7 +60,12 @@ 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])
-
+          
+          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_lon
           trace.large_picture = gpx.get_picture(min_lat, min_lon, max_lat, max_lon, gpx.actual_points)
@@ -67,15 +73,19 @@ while($running) do
           trace.size = gpx.actual_points
           trace.inserted = true
           trace.save
-          Notifier::deliver_gpx_success(trace, gpx.possible_points)
+
+          logger.info "done trace #{trace.id} -------------------------------------------------------------------------------"
+    #      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?')
+#          Notifier::deliver_gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')
         end
 
       rescue Exception => ex
+        logger.info ex
+        ex.backtrace.each {|l| logger.info l }
         #trace.destroy
-        Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
+ #       Notifier::deliver_gpx_failure(trace, ex.to_s + ex.backtrace.join("\n") )
       end
     end
   end