Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 5394ca01dca73934fb727d0a20426d47031c1beb..df66496a2601381bc103a4fdd6f3c6e9ed82691b 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -289,10 +289,10 @@ class Trace < ActiveRecord::Base
     end
 
     if gpx.actual_points > 0
-      max_lat = Tracepoint.maximum('latitude', :conditions => ['gpx_id = ?', id])
-      min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', id])
-      max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
-      min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id])
+      max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
+      min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)
+      max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude)
+      min_lon = Tracepoint.where(:gpx_id => id).minimum(:longitude)
 
       max_lat = max_lat.to_f / 10000000
       min_lat = min_lat.to_f / 10000000