X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dc2a95903722644f6109244cec9a2d1e195fef0e..299b6715221fe2e6d31af5f5711656c8f6e40da0:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index 67efeca2c..e1ad818dd 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -6,11 +6,6 @@ class Node < ActiveRecord::Base set_table_name 'current_nodes' - 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 @@ -26,6 +21,15 @@ class Node < ActiveRecord::Base 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 + validates_presence_of :id, :on => :update + validates_presence_of :timestamp,:version, :changeset_id + validates_uniqueness_of :id + validates_inclusion_of :visible, :in => [ true, false ] + validates_numericality_of :latitude, :longitude, :changeset_id, :version, :integer_only => true + validates_numericality_of :id, :on => :update, :integer_only => true + validate :validate_position + validates_associated :changeset + # 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? @@ -53,7 +57,7 @@ class Node < ActiveRecord::Base #conditions = keys.join(' AND ') find_by_area(min_lat, min_lon, max_lat, max_lon, - :conditions => 'visible = 1', + :conditions => {:visible => true}, :limit => APP_CONFIG['max_number_of_nodes']+1) end @@ -83,7 +87,7 @@ class Node < ActiveRecord::Base # version must be present unless creating return nil unless create or not pt['version'].nil? - node.version = pt['version'].to_i + node.version = create ? 0 : pt['version'].to_i unless create if pt['id'] != '0' @@ -112,6 +116,12 @@ class Node < ActiveRecord::Base return node end + ## + # the bounding box around a node + def bbox + [ longitude, latitude, longitude, latitude ] + end + def save_with_history! t = Time.now Node.transaction do @@ -134,36 +144,58 @@ class Node < ActiveRecord::Base old_node = OldNode.from_node(self) old_node.timestamp = t old_node.save_with_dependencies! + + # tell the changeset we updated one element only + changeset.add_changes! 1 + + # save the changeset in case of bounding box updates + changeset.save! end end # Should probably be renamed delete_from to come in line with update def delete_with_history!(new_node, user) - if self.visible + unless self.visible + raise OSM::APIAlreadyDeletedError.new + end + + # need to start the transaction here, so that the database can + # provide repeatable reads for the used-by checks. this means it + # shouldn't be possible to get race conditions. + Node.transaction do 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 ]) + if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ]) 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]) + elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='node' and member_id=? ", true, self.id]) raise OSM::APIPreconditionFailedError.new else self.changeset_id = new_node.changeset_id - self.visible = 0 + self.visible = false + + # update the changeset with the deleted position + changeset.update_bbox!(bbox) + save_with_history! end - else - raise OSM::APIAlreadyDeletedError.new end end def update_from(new_node, user) check_consistency(self, new_node, user) + # update changeset with *old* position first + changeset.update_bbox!(bbox); + # 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 + + # update changeset with *new* position + changeset.update_bbox!(bbox); + save_with_history! end @@ -171,6 +203,10 @@ class Node < ActiveRecord::Base check_create_consistency(self, user) self.version = 0 self.visible = true + + # update the changeset to include the new location + changeset.update_bbox!(bbox) + save_with_history! end @@ -198,7 +234,10 @@ class Node < ActiveRecord::Base user_display_name_cache[self.changeset.user_id] = nil end - el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil? + if not user_display_name_cache[self.changeset.user_id].nil? + el1['user'] = user_display_name_cache[self.changeset.user_id] + el1['uid'] = self.changeset.user_id.to_s + end self.tags.each do |k,v| el2 = XML::Node.new('tag') @@ -240,6 +279,13 @@ class Node < ActiveRecord::Base @tags[k] = v end + ## + # are the preconditions OK? this is mainly here to keep the duck + # typing interface the same between nodes, ways and relations. + def preconditions_ok? + in_world? + end + ## # dummy method to make the interfaces of node, way and relation # more consistent.