# Read in xml as text and return it's Node 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/node").each do |pt|
return Node.from_xml_node(pt, create)
end
- fail OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
+ raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
rescue LibXML::XML::Error, ArgumentError => ex
raise OSM::APIBadXMLError.new("node", xml, ex.message)
end
def self.from_xml_node(pt, create = false)
node = Node.new
- fail OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?
- fail OSM::APIBadXMLError.new("node", pt, "lon missing") if pt["lon"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt["lon"].nil?
node.lat = OSM.parse_float(pt["lat"], OSM::APIBadXMLError, "node", pt, "lat not a number")
node.lon = OSM.parse_float(pt["lon"], OSM::APIBadXMLError, "node", pt, "lon not a number")
- fail OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt["changeset"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt["changeset"].nil?
node.changeset_id = pt["changeset"].to_i
- fail OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
+ raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
# version must be present unless creating
- fail OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create || !pt["version"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create || !pt["version"].nil?
node.version = create ? 0 : pt["version"].to_i
unless create
- fail OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt["id"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt["id"].nil?
node.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 node cannot be zero when updating.") if node.id == 0
+ raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id.zero?
end
# We don't care about the time, as it is explicitly set on create/update/delete
# Add in any tags from the XML
pt.find("tag").each do |tag|
- fail OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag["k"].nil?
- fail OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag["v"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag["k"].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag["v"].nil?
node.add_tag_key_val(tag["k"], tag["v"])
end
# Should probably be renamed delete_from to come in line with update
def delete_with_history!(new_node, user)
- fail OSM::APIAlreadyDeletedError.new("node", new_node.id) unless visible
+ raise OSM::APIAlreadyDeletedError.new("node", new_node.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.
Node.transaction do
- self.lock!
+ lock!
check_consistency(self, new_node, user)
ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
- fail OSM::APIPreconditionFailedError.new("Node #{id} is still used by ways #{ways.collect(&:id).join(",")}.") unless ways.empty?
+ raise OSM::APIPreconditionFailedError.new("Node #{id} is still used by ways #{ways.collect(&:id).join(',')}.") unless ways.empty?
rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Node", :member_id => id }).order(:id)
- fail OSM::APIPreconditionFailedError.new("Node #{id} is still used by relations #{rels.collect(&:id).join(",")}.") unless rels.empty?
+ raise OSM::APIPreconditionFailedError.new("Node #{id} is still used by relations #{rels.collect(&:id).join(',')}.") unless rels.empty?
self.changeset_id = new_node.changeset_id
self.tags = {}
def update_from(new_node, user)
Node.transaction do
- self.lock!
+ lock!
check_consistency(self, new_node, user)
# update changeset first
add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
- if self.visible?
- el["lat"] = lat.to_s
- el["lon"] = lon.to_s
+ if visible?
+ el["lat"] = format("%.7f", lat)
+ el["lon"] = format("%.7f", lon)
end
add_tags_to_xml_node(el, node_tags)
# duplicate tags are now forbidden, so we can't allow values
# in the hash to be overwritten.
- fail OSM::APIDuplicateTagsError.new("node", id, k) if @tags.include? k
+ raise OSM::APIDuplicateTagsError.new("node", id, k) if @tags.include? k
@tags[k] = v
end
def save_with_history!
t = Time.now.getutc
+
+ self.version += 1
+ self.timestamp = t
+
Node.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!
# Create a NodeTag
tags = self.tags
- NodeTag.delete_all(:node_id => id)
+ NodeTag.where(:node_id => id).delete_all
tags.each do |k, v|
tag = NodeTag.new
tag.node_id = id
projects / rails.git / blobdiff