X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..862f46cd500ec211a6154095f7acb3b25abd8d95:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 96422a8f6..9877b8bb8 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -1,5 +1,5 @@ class Way < ActiveRecord::Base - require 'xml/libxml' + require "xml/libxml" include ConsistencyValidations include NotRedactable @@ -19,26 +19,28 @@ 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 - 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 + validates :id, :uniqueness => true, :presence => { :on => :update }, + :numericality => { :on => :update, :integer_only => true } + validates :version, :presence => true, + :numericality => { :integer_only => true } + validates :changeset_id, :presence => true, + :numericality => { :integer_only => true } + validates :timestamp, :presence => true + validates :changeset, :associated => true + validates :visible, :inclusion => [true, false] scope :visible, -> { where(:visible => true) } scope :invisible, -> { where(:visible => false) } # Read in xml as text and return it's Way object representation def self.from_xml(xml, create = false) - p = XML::Parser.string(xml) + p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR) doc = p.parse - doc.find('//osm/way').each do |pt| + doc.find("//osm/way").each do |pt| return Way.from_xml_node(pt, create) end - fail OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("way", xml, ex.message) end @@ -46,17 +48,17 @@ class Way < ActiveRecord::Base def self.from_xml_node(pt, create = false) way = Way.new - fail OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt['version'].nil? - way.version = pt['version'] - fail OSM::APIBadXMLError.new("way", pt, "Changeset id is missing") if pt['changeset'].nil? - way.changeset_id = pt['changeset'] + raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil? + way.version = pt["version"] + raise OSM::APIBadXMLError.new("way", pt, "Changeset id is missing") if pt["changeset"].nil? + way.changeset_id = pt["changeset"] unless create - fail OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt['id'].nil? - way.id = pt['id'].to_i + raise OSM::APIBadXMLError.new("way", pt, "ID is required when updating") if pt["id"].nil? + way.id = pt["id"].to_i # .to_i will return 0 if there is no number that can be parsed. # We want to make sure that there is no id with zero anyway - fail OSM::APIBadUserInput.new("ID of way cannot be zero when updating.") if way.id == 0 + raise OSM::APIBadUserInput.new("ID of way cannot be zero when updating.") if way.id.zero? end # We don't care about the timestamp nor the visibility as these are either @@ -68,29 +70,19 @@ class Way < ActiveRecord::Base way.tags = {} # Add in any tags from the XML - pt.find('tag').each do |tag| - fail OSM::APIBadXMLError.new("way", pt, "tag is missing key") if tag['k'].nil? - fail OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag['v'].nil? - way.add_tag_keyval(tag['k'], tag['v']) + pt.find("tag").each do |tag| + raise OSM::APIBadXMLError.new("way", pt, "tag is missing key") if tag["k"].nil? + raise OSM::APIBadXMLError.new("way", pt, "tag is missing value") if tag["v"].nil? + way.add_tag_keyval(tag["k"], tag["v"]) end - pt.find('nd').each do |nd| - way.add_nd_num(nd['ref']) + pt.find("nd").each do |nd| + way.add_nd_num(nd["ref"]) end way end - # Find a way given it's ID, and in a single SQL call also grab its nodes - # - - # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key - def self.find_eager(id) - way = Way.find(id, :include => { :way_nodes => :node }) - # If waytag had a multipart key that was real, you could do this: - # way = Way.find(id, :include => [:way_tags, {:way_nodes => :node}]) - end - # Find a way given it's ID, and in a single SQL call also grab its nodes and tags def to_xml doc = OSM::API.new.get_xml_doc @@ -99,8 +91,8 @@ class Way < ActiveRecord::Base end def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new 'way' - el['id'] = id.to_s + el = XML::Node.new "way" + el["id"] = id.to_s add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) @@ -121,11 +113,11 @@ class Way < ActiveRecord::Base end ordered_nodes.each do |nd_id| - if nd_id && nd_id != '0' - node_el = XML::Node.new 'nd' - node_el['ref'] = nd_id - el << node_el - end + next unless nd_id && nd_id != "0" + + node_el = XML::Node.new "nd" + node_el["ref"] = nd_id + el << node_el end add_tags_to_xml_node(el, way_tags) @@ -155,7 +147,7 @@ class Way < ActiveRecord::Base # duplicate tags are now forbidden, so we can't allow values # in the hash to be overwritten. - fail OSM::APIDuplicateTagsError.new("way", id, k) if @tags.include? k + raise OSM::APIDuplicateTagsError.new("way", id, k) if @tags.include? k @tags[k] = v end @@ -171,10 +163,10 @@ class Way < ActiveRecord::Base def update_from(new_way, user) Way.transaction do - self.lock! + lock! check_consistency(self, new_way, user) unless new_way.preconditions_ok?(nds) - fail OSM::APIPreconditionFailedError.new("Cannot update way #{id}: data is invalid.") + raise OSM::APIPreconditionFailedError.new("Cannot update way #{id}: data is invalid.") end self.changeset_id = new_way.changeset_id @@ -188,8 +180,8 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless self.preconditions_ok? - fail OSM::APIPreconditionFailedError.new("Cannot create way: data is invalid.") + unless preconditions_ok? + raise OSM::APIPreconditionFailedError.new("Cannot create way: data is invalid.") end self.version = 0 self.visible = true @@ -199,7 +191,7 @@ class Way < ActiveRecord::Base def preconditions_ok?(old_nodes = []) return false if nds.empty? if nds.length > MAX_NUMBER_OF_WAY_NODES - fail OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) + raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) end # check only the new nodes, for efficiency - old nodes having been checked last time and can't @@ -207,11 +199,13 @@ class Way < ActiveRecord::Base new_nds = (nds - old_nodes).sort.uniq unless new_nds.empty? - db_nds = Node.where(:id => new_nds, :visible => true) + # NOTE: nodes are locked here to ensure they can't be deleted before + # the current transaction commits. + db_nds = Node.where(:id => new_nds, :visible => true).lock("for share") if db_nds.length < new_nds.length missing = new_nds - db_nds.collect(&:id) - fail OSM::APIPreconditionFailedError.new("Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.") + raise OSM::APIPreconditionFailedError.new("Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.") end end @@ -219,18 +213,16 @@ class Way < ActiveRecord::Base end def delete_with_history!(new_way, user) - unless visible - fail OSM::APIAlreadyDeletedError.new("way", new_way.id) - end + raise OSM::APIAlreadyDeletedError.new("way", new_way.id) unless visible # 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 - self.lock! + lock! check_consistency(self, new_way, user) rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id) - fail OSM::APIPreconditionFailedError.new("Way #{id} is still used by relations #{rels.collect(&:id).join(",")}.") unless rels.empty? + raise OSM::APIPreconditionFailedError.new("Way #{id} is still used by relations #{rels.collect(&:id).join(',')}.") unless rels.empty? self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset @@ -242,11 +234,6 @@ class Way < ActiveRecord::Base end end - # Temporary method to match interface to nodes - def tags_as_hash - tags - end - ## # if any referenced nodes are placeholder IDs (i.e: are negative) then # this calling this method will fix them using the map from placeholders @@ -255,7 +242,7 @@ class Way < ActiveRecord::Base nds.map! do |node_id| if node_id < 0 new_id = id_map[:node][node_id] - fail OSM::APIBadUserInput.new("Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}") if new_id.nil? + raise OSM::APIBadUserInput.new("Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}") if new_id.nil? new_id else node_id @@ -268,6 +255,9 @@ class Way < ActiveRecord::Base def save_with_history! t = Time.now.getutc + self.version += 1 + self.timestamp = t + # update the bounding box, note that this has to be done both before # and after the save, so that nodes from both versions are included in the # bbox. we use a copy of the changeset so that it isn't reloaded @@ -276,9 +266,9 @@ class Way < ActiveRecord::Base cs.update_bbox!(bbox) unless nodes.empty? Way.transaction do - self.version += 1 - self.timestamp = t - self.save! + # clone the object before saving it so that the original is + # still marked as dirty if we retry the transaction + clone.save! tags = self.tags WayTag.delete_all(:way_id => id)