"node" => Node,
"way" => Way,
"relation" => Relation
- }
+ }.freeze
##
# Construct a diff reader by giving it a bunch of XML +data+ to parse
def read_or_die
# NOTE: XML::Reader#read returns false for EOF and raises an
# exception if an error occurs.
- begin
- @reader.read
- rescue LibXML::XML::Error => ex
- raise OSM::APIBadXMLError.new("changeset", xml, ex.message)
- end
+ @reader.read
+ rescue LibXML::XML::Error => ex
+ raise OSM::APIBadXMLError.new("changeset", xml, ex.message)
end
##
# read the first element
read_or_die
- while @reader.node_type != 15 do # end element
+ while @reader.node_type != 15 # end element
# because we read elements in DOM-style to reuse their DOM
# parsing code, we don't always read an element on each pass
# as the call to @reader.next in the innermost loop will take
# care of that for us.
if @reader.node_type == 1 # element
name = @reader.name
- attributes = {}
+ attributes = {}
if @reader.has_attributes?
while @reader.move_to_next_attribute == 1
# elements, it would be better to DRY and do this in a block. This
# could also help with error handling...?
def with_model
- with_element do |model_name,model_attributes|
+ with_element do |model_name, _model_attributes|
model = MODELS[model_name]
raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
"expected node, way or relation.") if model.nil?
# On a failure to meet preconditions (e.g: optimistic locking fails)
# an exception subclassing OSM::APIError will be thrown.
def commit
-
# data structure used for mapping placeholder IDs to real IDs
- node_ids, way_ids, rel_ids = {}, {}, {}
- ids = { :node => node_ids, :way => way_ids, :relation => rel_ids}
+ ids = { :node => {}, :way => {}, :relation => {} }
# take the first element and check that it is an osmChange element
@reader.read
- raise OSM::APIBadUserInput.new("Document element should be 'osmChange'.") if @reader.name != 'osmChange'
+ raise OSM::APIBadUserInput.new("Document element should be 'osmChange'.") if @reader.name != "osmChange"
result = OSM::API.new.get_xml_doc
result.root.name = "diffResult"
# loop at the top level, within the <osmChange> element
- with_element do |action_name,action_attributes|
- if action_name == 'create'
+ with_element do |action_name, action_attributes|
+ if action_name == "create"
# create a new element. this code is agnostic of the element type
# because all the elements support the methods that we're using.
with_model do |model, xml|
# when this element is saved it will get a new ID, so we save it
# to produce the mapping which is sent to other elements.
- placeholder_id = xml['id'].to_i
+ placeholder_id = xml["id"].to_i
raise OSM::APIBadXMLError.new(model, xml) if placeholder_id.nil?
# check if the placeholder ID has been given before and throw
result.root << xml_result
end
- elsif action_name == 'modify'
+ elsif action_name == "modify"
# modify an existing element. again, this code doesn't directly deal
# with types, but uses duck typing to handle them transparently.
with_model do |model, xml|
result.root << xml_result
end
- elsif action_name == 'delete'
+ elsif action_name == "delete"
# delete action. this takes a payload in API 0.6, so we need to do
# most of the same checks that are done for the modify.
with_model do |model, xml|
# delete doesn't have to contain a full payload, according to
# the wiki docs, so we just extract the things we need.
- new_id = xml['id'].to_i
+ new_id = xml["id"].to_i
raise OSM::APIBadXMLError.new(model, xml, "ID attribute is required") if new_id.nil?
# if the ID is a placeholder then map it to the real ID
# build the "new" element by modifying the existing one
new = model.find(id)
- new.changeset_id = xml['changeset'].to_i
- new.version = xml['version'].to_i
+ new.changeset_id = xml["changeset"].to_i
+ new.version = xml["version"].to_i
check(model, xml, new)
# fetch the matching old element from the DB
if action_attributes["if-unused"]
begin
old.delete_with_history!(new, @changeset.user)
- rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError => ex
+ rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError
xml_result["new_id"] = old.id.to_s
xml_result["new_version"] = old.version.to_s
end
end
# return the XML document to be rendered back to the client
- return result
+ result
end
-
end
projects / rails.git / blobdiff