X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..62b6d159672ad29344c7b7074a37d23b16dbb5d9:/app/models/way.rb?ds=sidebyside diff --git a/app/models/way.rb b/app/models/way.rb index c9e695b32..86b25e08e 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -4,9 +4,6 @@ class Way < ActiveRecord::Base include ConsistencyValidations set_table_name 'current_ways' - - validates_presence_of :changeset_id, :timestamp - validates_inclusion_of :visible, :in => [ true, false ] belongs_to :changeset @@ -20,6 +17,14 @@ class Way < 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 :changeset_id,:version, :timestamp + validates_uniqueness_of :id + validates_inclusion_of :visible, :in => [ true, false ] + validates_numericality_of :changeset_id, :version, :integer_only => true + validates_numericality_of :id, :on => :update, :integer_only => true + validates_associated :changeset + def self.from_xml(xml, create=false) begin p = XML::Parser.new @@ -27,10 +32,10 @@ class Way < ActiveRecord::Base doc = p.parse doc.find('//osm/way').each do |pt| - return Way.from_xml_node(pt, create) + return Way.from_xml_node(pt, create) end - rescue - return nil + rescue LibXML::XML::Error => ex + raise OSM::APIBadXMLError.new("way", xml, ex.message) end end @@ -42,8 +47,10 @@ class Way < ActiveRecord::Base end way.version = pt['version'] + raise OSM::APIBadXMLError.new("node", pt, "Changeset is required") if pt['changeset'].nil? way.changeset_id = pt['changeset'] + # This next section isn't required for the create, update, or delete of ways if create way.timestamp = Time.now way.visible = true @@ -101,7 +108,10 @@ class Way < 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 # make sure nodes are output in sequence_id order ordered_nodes = [] @@ -113,7 +123,7 @@ class Way < ActiveRecord::Base end else # otherwise, manually go to the db to check things - if nd.node.visible? and nd.node.visible? + if nd.node and nd.node.visible? ordered_nodes[nd.sequence_id] = nd.node_id.to_s end end @@ -174,7 +184,7 @@ class Way < ActiveRecord::Base # duplicate tags are now forbidden, so we can't allow values # in the hash to be overwritten. - raise OSM::APIDuplicateTagsError.new if @tags.include? k + raise OSM::APIDuplicateTagsError.new("way", self.id, k) if @tags.include? k @tags[k] = v end @@ -188,52 +198,6 @@ class Way < ActiveRecord::Base [ lons.min, lats.min, lons.max, lats.max ] end - def save_with_history! - t = Time.now - - # update the bounding box, but don't save it as the controller knows the - # lifetime of the change better. note that this has to be done both before - # and after the save, so that nodes from both versions are included in the - # bbox. - changeset.update_bbox!(bbox) unless nodes.empty? - - Way.transaction do - self.version += 1 - self.timestamp = t - self.save! - - tags = self.tags - WayTag.delete_all(['id = ?', self.id]) - tags.each do |k,v| - tag = WayTag.new - tag.k = k - tag.v = v - tag.id = self.id - tag.save! - end - - nds = self.nds - WayNode.delete_all(['id = ?', self.id]) - sequence = 1 - nds.each do |n| - nd = WayNode.new - nd.id = [self.id, sequence] - nd.node_id = n - nd.save! - sequence += 1 - end - - old_way = OldWay.from_way(self) - old_way.timestamp = t - old_way.save_with_dependencies! - - # update and commit the bounding box, now that way nodes - # have been updated and we're in a transaction. - changeset.update_bbox!(bbox) unless nodes.empty? - changeset.save! - end - end - def update_from(new_way, user) check_consistency(self, new_way, user) if !new_way.preconditions_ok? @@ -264,48 +228,35 @@ class Way < ActiveRecord::Base self.nds.each do |n| node = Node.find(:first, :conditions => ["id = ?", n]) unless node and node.visible - return false + raise OSM::APIPreconditionFailedError.new("The node with id #{n} either does not exist, or is not visible") end end return true end def delete_with_history!(new_way, user) - check_consistency(self, new_way, user) - if self.visible + unless self.visible + raise OSM::APIAlreadyDeletedError + 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. + Way.transaction do + check_consistency(self, new_way, user) if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id]) - raise OSM::APIPreconditionFailedError + raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.") else self.changeset_id = new_way.changeset_id self.tags = [] self.nds = [] self.visible = false - self.save_with_history! + save_with_history! end - else - raise OSM::APIAlreadyDeletedError end end - # delete a way and it's nodes that aren't part of other ways, with history - - # FIXME: merge the potlatch code to delete the relations - def delete_with_relations_and_nodes_and_history(user) - # delete the nodes not used by other ways - self.unshared_node_ids.each do |node_id| - n = Node.find(node_id) - n.user_id = user.id - n.visible = false - n.save_with_history! - end - - # FIXME needs more information passed in so that the changeset can be updated - self.user_id = user.id - - self.delete_with_history(user) - end - # Find nodes that belong to this way only def unshared_node_ids node_ids = self.nodes.collect { |node| node.id } @@ -339,4 +290,56 @@ class Way < ActiveRecord::Base end end + private + + def save_with_history! + t = Time.now + + # update the bounding box, but don't save it as the controller knows the + # lifetime of the change better. note that this has to be done both before + # and after the save, so that nodes from both versions are included in the + # bbox. + changeset.update_bbox!(bbox) unless nodes.empty? + + Way.transaction do + self.version += 1 + self.timestamp = t + self.save! + + tags = self.tags + WayTag.delete_all(['id = ?', self.id]) + tags.each do |k,v| + tag = WayTag.new + tag.k = k + tag.v = v + tag.id = self.id + tag.save! + end + + nds = self.nds + WayNode.delete_all(['id = ?', self.id]) + sequence = 1 + nds.each do |n| + nd = WayNode.new + nd.id = [self.id, sequence] + nd.node_id = n + nd.save! + sequence += 1 + end + + old_way = OldWay.from_way(self) + old_way.timestamp = t + old_way.save_with_dependencies! + + # update and commit the bounding box, now that way nodes + # have been updated and we're in a transaction. + changeset.update_bbox!(bbox) unless nodes.empty? + + # tell the changeset we updated one element only + changeset.add_changes! 1 + + changeset.save! + end + end + end