X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9861ca8001769b7cced2c8b5bcc0a87896f5439e..8181cb4bf77548088f959562f24be17f8ec053a3:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index c189c035e..baf2ea7d2 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -175,7 +175,12 @@ class Trace < ActiveRecord::Base
       f_lon = 0
       first = true
 
-      Tracepoint.delete_all(['gpx_id = ?', self.id])
+      # If there are any existing points for this trace then delete
+      # them - we check for existing points first to avoid locking
+      # the table in the common case where there aren't any.
+      if Tracepoint.exists?(['gpx_id = ?', self.id])
+        Tracepoint.delete_all(['gpx_id = ?', self.id])
+      end
 
       gpx.points do |point|
         if first
@@ -185,7 +190,7 @@ class Trace < ActiveRecord::Base
 
         tp = Tracepoint.new
         tp.lat = point['latitude'].to_f
-        tp.lng = point['longitude'].to_f
+        tp.lon = point['longitude'].to_f
         tp.altitude = point['altitude'].to_f
         tp.timestamp = point['timestamp']
         tp.gpx_id = id
@@ -199,10 +204,10 @@ class Trace < ActiveRecord::Base
         max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
         min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', 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
+        max_lat = max_lat.to_f / 10000000
+        min_lat = min_lat.to_f / 10000000
+        max_lon = max_lon.to_f / 10000000
+        min_lon = min_lon.to_f / 10000000
 
         self.latitude = f_lat
         self.longitude = f_lon