X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d69a518b9e69107503b332728dfa583594293ea1..f412c80d3f3fbb496fcd0baa09c464fa179dd839:/lib/geo_record.rb?ds=sidebyside diff --git a/lib/geo_record.rb b/lib/geo_record.rb index d5604d4d3..09ced9729 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -1,20 +1,20 @@ module GeoRecord - def before_save - self.update_tile + # 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.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 - end - - def self.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 + return false if lat < -90 || lat > 90 + return false if lon < -180 || lon > 180 + true end def update_tile @@ -22,37 +22,20 @@ module GeoRecord end def lat=(l) - self.latitude = (l * 10000000).round + self.latitude = (l * SCALE).round end def lon=(l) - self.longitude = (l * 10000000).round + self.longitude = (l * SCALE).round end # Return WGS84 latitude def lat - return self.latitude.to_f / 10000000 + latitude.to_f / SCALE end # Return WGS84 longitude def lon - return self.longitude.to_f / 10000000 - end - - # Potlatch projections - def lon_potlatch(baselong,masterscale) - (self.lon-baselong)*masterscale + longitude.to_f / SCALE end - - def lat_potlatch(basey,masterscale) - -(lat2y(self.lat)-basey)*masterscale - end - - private - - def lat2y(a) - 180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2)) - end - end -