X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d69a518b9e69107503b332728dfa583594293ea1..b2e490e6fa6c9da7f328019e45407ec3a572ea0c:/lib/geo_record.rb?ds=sidebyside diff --git a/lib/geo_record.rb b/lib/geo_record.rb index d5604d4d3..2740eab0c 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -1,4 +1,13 @@ module GeoRecord + # 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 end @@ -11,48 +20,40 @@ module GeoRecord 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 - end - def update_tile self.tile = QuadTile.tile_for_point(lat, lon) 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 + return self.latitude.to_f / SCALE end # Return WGS84 longitude def lon - return self.longitude.to_f / 10000000 + return self.longitude.to_f / SCALE end - # Potlatch projections - def lon_potlatch(baselong,masterscale) - (self.lon-baselong)*masterscale - end - - def lat_potlatch(basey,masterscale) - -(lat2y(self.lat)-basey)*masterscale - end - - private +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 + end end