From: Tom Hughes Date: Sun, 3 Feb 2008 15:38:44 +0000 (+0000) Subject: Move in_world? to GeoRecord model and correct comment. X-Git-Tag: live~7938 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/962573431e55f928abb0bb27ec8c5225c94eaed9 Move in_world? to GeoRecord model and correct comment. --- diff --git a/app/models/geo_record.rb b/app/models/geo_record.rb index 08808d352..ddd029aec 100644 --- a/app/models/geo_record.rb +++ b/app/models/geo_record.rb @@ -1,6 +1,14 @@ class GeoRecord < ActiveRecord::Base before_save :update_tile + # 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) diff --git a/app/models/node.rb b/app/models/node.rb index ecaa3f45a..cc646b768 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -20,14 +20,6 @@ class Node < GeoRecord errors.add_to_base("Node is not in the world") unless in_world? end - # Is this node withing -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 - # # Search for nodes matching tags within bounding_box #