X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca30b879f6eba3f513bcfa53545dba43d09b2023..821a22c6073d4b50ae7038e9c1aacbb5e68cd55a:/app/models/trace.rb?ds=inline

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 5394ca01d..bf8d3731b 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -7,7 +7,7 @@ class Trace < ActiveRecord::Base
 
   scope :visible, -> { where(:visible => true) }
   scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
-  scope :public, -> { where(:visibility => ["public", "identifiable"]) }
+  scope :visible_to_all, -> { where(:visibility => ["public", "identifiable"]) }
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
 
   validates_presence_of :user_id, :name, :timestamp
@@ -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