X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1..d104736809d9e36b0bc955f3425c4d47a370e78b:/app/models/concerns/geo_record.rb diff --git a/app/models/concerns/geo_record.rb b/app/models/concerns/geo_record.rb index 06049c295..bd96e0ff3 100644 --- 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 @@ -7,12 +5,12 @@ module GeoRecord # and not e.g. 4.0e-05 # Unfortunately you can't extend Numeric classes directly (e.g. `Coord < Float`). class Coord < DelegateClass(Float) - def initialize(obj) - super(obj) + def to_s + format("%.7f", :coord => self) end - def to_s - format("%.7f", self) + def as_json(*) + format("%.7f", :coord => self).to_f end end @@ -22,7 +20,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