X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c11d961f624cb610c4b8184d24e522b2c093d1ea..dd33fc633c1bcd2ab4ecfc412ffe5edf43491cec:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index d7a52c336..464849157 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,4 +1,4 @@ -class OldNode < ActiveRecord::Base +class OldNode < GeoRecord set_table_name 'nodes' validates_presence_of :user_id, :timestamp @@ -7,14 +7,14 @@ class OldNode < ActiveRecord::Base validate :validate_position belongs_to :user - + 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 +33,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