X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/24b21e4a29d28a3174965d449d36465ecda9ead7..b54362d4581075308ad277fd7023ee11f530e0a0:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 273419757..e02734ec9 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -1,23 +1,36 @@ +require "delegate" + module GeoRecord - # This scaling factor is used to convert between the float lat/lon that is + # Ensure that when coordinates are printed that they are always in decimal degrees, + # 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) + end + + def to_s + format("%.7f", self) + end + end + + # This scaling factor is used to convert between the float lat/lon that is # returned by the API, and the integer lat/lon equivalent that is stored in # the database. SCALE = 10000000 - - def self.included(base) - base.extend(ClassMethods) - end - def before_save - self.update_tile + def self.included(base) + base.scope :bbox, ->(bbox) { base.where(OSM.sql_for_area(bbox)) } + base.before_save :update_tile end # Is this node within -90 >= latitude >= 90 and -180 >= longitude >= 180 # * returns true/false def in_world? - return false if self.lat < -90 or self.lat > 90 - return false if self.lon < -180 or self.lon > 180 - return true + return false if lat < -90 || lat > 90 + return false if lon < -180 || lon > 180 + + true end def update_tile @@ -34,45 +47,11 @@ module GeoRecord # Return WGS84 latitude def lat - return self.latitude.to_f / SCALE + Coord.new(latitude.to_f / SCALE) end # Return WGS84 longitude def lon - return self.longitude.to_f / SCALE - end - - # Generic checks that are run for the updates and deletes of - # node, ways and relations. This code is here to avoid duplication, - # and allow the extention of the checks without having to modify the - # code in 6 places for all the updates and deletes. Some of these tests are - # needed for creates, but are currently not run :-( - # This will throw an exception if there is an inconsistency - def check_consistency(old, new, user) - if new.version != old.version - raise OSM::APIVersionMismatchError.new(new.version, old.version) - elsif new.changeset.nil? - raise OSM::APIChangesetMissingError.new - elsif new.changeset.empty? - raise OSM::APIChangesetMissingError.new - elsif new.changeset.user_id != user.id - raise OSM::APIUserChangesetMismatchError.new - elsif not new.changeset.is_open? - raise OSM::APIChangesetAlreadyClosedError.new - end - end -private - - def lat2y(a) - 180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2)) - end - - module ClassMethods - def find_by_area(minlat, minlon, maxlat, maxlon, options) - self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do - return self.find(:all, options) - end - end + Coord.new(longitude.to_f / SCALE) end end -