X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cd05017a39fe1e161e7db5387d465324f25dde5..df31fe13a535a9b36206c035a48f1e4cdec913f4:/app/models/old_node.rb?ds=inline diff --git a/app/models/old_node.rb b/app/models/old_node.rb index d7a52c336..c63738fc4 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -7,14 +7,42 @@ class OldNode < ActiveRecord::Base validate :validate_position belongs_to :user + + before_save :update_tile + + 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 + end + + def lon=(l) + self.longitude = (l * 10000000).round + end + + def lat + return self.latitude.to_f / 10000000 + end + + def lon + return self.longitude.to_f / 10000000 + end def validate_position errors.add_to_base("Node is not in the world") unless in_world? end def in_world? - return false if self.latitude < -90 or self.latitude > 90 - return false if self.longitude < -180 or self.longitude > 180 + return false if self.lat < -90 or self.lat > 90 + return false if self.lon < -180 or self.lon > 180 return true end @@ -33,8 +61,8 @@ class OldNode < ActiveRecord::Base def to_xml_node el1 = XML::Node.new 'node' el1['id'] = self.id.to_s - el1['lat'] = self.latitude.to_s - el1['lon'] = self.longitude.to_s + el1['lat'] = self.lat.to_s + el1['lon'] = self.lon.to_s el1['user'] = self.user.display_name if self.user.data_public? Node.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s