Merge remote-tracking branch 'upstream/pull/2667'

[rails.git] / app / models / concerns / geo_record.rb

diff --git a/app/models/concerns/geo_record.rb b/app/models/concerns/geo_record.rb
index 06049c2951b25876999cc7e3ee0fc070bacd97e6..a5635c1729b2610442df10a8019f30f2ad614029 100644 (file)
--- a/app/models/concerns/geo_record.rb
+++ b/app/models/concerns/geo_record.rb
@@ -1,5 +1,3 @@
-require "delegate"
-
 module GeoRecord
   extend ActiveSupport::Concern
 
@@ -12,7 +10,11 @@ module GeoRecord
     end
 
     def to_s
-      format("%.7f", self)
+      format("%<coord>.7f", :coord => self)
+    end
+
+    def as_json(_)
+      format("%<coord>.7f", :coord => self).to_f
     end
   end
 
@@ -22,7 +24,7 @@ module GeoRecord
   SCALE = 10000000
 
   included do
-    scope :bbox, ->(bbox) { where(OSM.sql_for_area(bbox)) }
+    scope :bbox, ->(bbox) { where(OSM.sql_for_area(bbox, "#{table_name}.")) }
     before_save :update_tile
   end