X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e98e324e58f67b62c6abf343d60ae5e6f22f9eb..9b4271ed8c0577d23c6d77c4be0ed8a8082dc86c:/app/models/way.rb?ds=inline diff --git a/app/models/way.rb b/app/models/way.rb index d4bca19aa..97f44c117 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -27,15 +27,14 @@ class Way < ActiveRecord::Base def self.from_xml(xml, create=false) begin - p = XML::Parser.new - p.string = xml + p = XML::Parser.string(xml) doc = p.parse doc.find('//osm/way').each do |pt| return Way.from_xml_node(pt, create) end - rescue LibXML::XML::Error => ex - raise OSM::APIBadXMLError.new("relation", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => ex + raise OSM::APIBadXMLError.new("way", xml, ex.message) end end @@ -47,10 +46,12 @@ 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.timestamp = Time.now.getutc way.visible = true else if pt['timestamp'] @@ -196,62 +197,14 @@ 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? - - # tell the changeset we updated one element only - changeset.add_changes! 1 - - changeset.save! - end - end - def update_from(new_way, user) check_consistency(self, new_way, user) - if !new_way.preconditions_ok? - raise OSM::APIPreconditionFailedError.new + unless new_way.preconditions_ok? + raise OSM::APIPreconditionFailedError("Cannot update way #{self.id}: data is invalid.") end + self.changeset_id = new_way.changeset_id + self.changeset = new_way.changeset self.tags = new_way.tags self.nds = new_way.nds self.visible = true @@ -260,8 +213,8 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - if !self.preconditions_ok? - raise OSM::APIPreconditionFailedError.new + unless self.preconditions_ok? + raise OSM::APIPreconditionFailedError("Cannot create way: data is invalid.") end self.version = 0 self.visible = true @@ -271,12 +224,12 @@ class Way < ActiveRecord::Base def preconditions_ok? return false if self.nds.empty? if self.nds.length > APP_CONFIG['max_number_of_way_nodes'] - raise OSM::APITooManyWayNodesError.new(self.nds.count, APP_CONFIG['max_number_of_way_nodes']) + raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes']) end 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 @@ -293,38 +246,20 @@ class Way < ActiveRecord::Base 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 + :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id]) + 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.changeset = new_way.changeset + self.tags = [] self.nds = [] self.visible = false - self.save_with_history! + save_with_history! end end end - # delete a way and its nodes that aren't part of other ways, with history - - # FIXME: merge the potlatch code to delete the relations - # and refactor to use delete_with_history! - def delete_with_relations_and_nodes_and_history(changeset_id) - # delete the nodes not used by other ways - self.unshared_node_ids.each do |node_id| - n = Node.find(node_id) - n.changeset_id = changeset_id - n.visible = false - n.save_with_history! - end - - self.changeset_id = changeset_id - self.tags = [] - self.nds = [] - self.visible = false - self.save_with_history! - end - # Find nodes that belong to this way only def unshared_node_ids node_ids = self.nodes.collect { |node| node.id } @@ -358,4 +293,61 @@ class Way < ActiveRecord::Base end end + private + + def save_with_history! + t = Time.now.getutc + + # 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 + # later in the save. + cs = self.changeset + cs.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! + + # reload the way so that the nodes array points to the correct + # new set of nodes. + self.reload + + # update and commit the bounding box, now that way nodes + # have been updated and we're in a transaction. + cs.update_bbox!(bbox) unless nodes.empty? + + # tell the changeset we updated one element only + cs.add_changes! 1 + + cs.save! + end + end + end