X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86b4d1bc2c05a68053c7485217144a7fcf8ef4e8..fb5f39f19ae00dad9ec896e216e8e813de42c151:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index b027f2fd4..d6a5143db 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,28 +1,36 @@ -class Node < GeoRecord +class Node < ActiveRecord::Base require 'xml/libxml' + include GeoRecord + include ConsistencyValidations + set_table_name 'current_nodes' - - validates_presence_of :user_id, :timestamp + + validates_presence_of :changeset_id, :timestamp validates_inclusion_of :visible, :in => [ true, false ] validates_numericality_of :latitude, :longitude validate :validate_position + belongs_to :changeset + has_many :old_nodes, :foreign_key => :id + has_many :way_nodes + has_many :ways, :through => :way_nodes + has_many :node_tags, :foreign_key => :id - belongs_to :user - + + has_many :old_way_nodes + has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way + + has_many :containing_relation_members, :class_name => "RelationMember", :as => :member + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + + # Sanity check the latitude and longitude and add an error if it's broken def validate_position errors.add_to_base("Node is not in the world") unless in_world? end - 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 # @@ -57,7 +65,7 @@ class Node < GeoRecord doc = p.parse doc.find('//osm/node').each do |pt| - return Node.from_xml_node(pt, create) + return Node.from_xml_node(pt, create) end rescue return nil @@ -70,12 +78,13 @@ class Node < GeoRecord node.version = pt['version'] node.lat = pt['lat'].to_f node.lon = pt['lon'].to_f + node.changeset_id = pt['changeset'].to_i return nil unless node.in_world? unless create if pt['id'] != '0' - node.id = pt['id'].to_i + node.id = pt['id'].to_i end end @@ -85,7 +94,7 @@ class Node < GeoRecord node.timestamp = Time.now else if pt['timestamp'] - node.timestamp = Time.parse(pt['timestamp']) + node.timestamp = Time.parse(pt['timestamp']) end end @@ -109,11 +118,11 @@ class Node < GeoRecord tags = self.tags NodeTag.delete_all(['id = ?', self.id]) tags.each do |k,v| - tag = NodeTag.new - tag.k = k - tag.v = v - tag.id = self.id - tag.save! + tag = NodeTag.new + tag.k = k + tag.v = v + tag.id = self.id + tag.save! end # Create an OldNode @@ -123,16 +132,18 @@ class Node < GeoRecord end end - def delete_with_history(user) + # Should probably be renamed delete_from to come in line with update + def delete_with_history(new_node, user) if self.visible + check_consistency(self, new_node, user) if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", self.id ]) - raise OSM::APIPreconditionFailedError.new + raise OSM::APIPreconditionFailedError.new elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", self.id]) - raise OSM::APIPreconditionFailedError.new + raise OSM::APIPreconditionFailedError.new else - self.user_id = user.id - self.visible = 0 - save_with_history! + self.changeset_id = new_node.changeset_id + self.visible = 0 + save_with_history! end else raise OSM::APIAlreadyDeletedError.new @@ -140,17 +151,23 @@ class Node < GeoRecord end def update_from(new_node, user) - if new_node.version != version - raise OSM::APIVersionMismatchError.new(new_node.version, version) - end + check_consistency(self, new_node, user) - self.user_id = user.id + # FIXME logic needs to be double checked + self.changeset_id = new_node.changeset_id self.latitude = new_node.latitude self.longitude = new_node.longitude self.tags = new_node.tags self.visible = true save_with_history! end + + def create_with_history(user) + check_create_consistency(self, user) + self.version = 0 + self.visible = true + save_with_history! + end def to_xml doc = OSM::API.new.get_xml_doc @@ -163,18 +180,20 @@ class Node < GeoRecord el1['id'] = self.id.to_s el1['lat'] = self.lat.to_s el1['lon'] = self.lon.to_s - + el1['version'] = self.version.to_s + el1['changeset'] = self.changeset_id.to_s + user_display_name_cache = {} if user_display_name_cache.nil? - if user_display_name_cache and user_display_name_cache.key?(self.user_id) + if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id) # use the cache if available - elsif self.user.data_public? - user_display_name_cache[self.user_id] = self.user.display_name + elsif self.changeset.user.data_public? + user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name else - user_display_name_cache[self.user_id] = nil + user_display_name_cache[self.changeset.user_id] = nil end - el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil? + el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil? self.tags.each do |k,v| el2 = XML::Node.new('tag') @@ -185,7 +204,6 @@ class Node < GeoRecord el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s return el1 end @@ -212,6 +230,4 @@ class Node < GeoRecord @tags[k] = v end - - end