X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e2a66e8de55b3719bd307261058b7f898598994..cfefe11187fcd23ce5e8d1ac7f038beeb1de1d36:/lib/diff_reader.rb?ds=sidebyside diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb index 5d98ef874..d1987a936 100644 --- a/lib/diff_reader.rb +++ b/lib/diff_reader.rb @@ -85,7 +85,7 @@ class DiffReader model = MODELS[model_name] if model.nil? raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \ - "expected node, way or relation." + "expected node, way or relation." end # new in libxml-ruby >= 2, expand returns an element not associated # with a document. this means that there's no encoding parameter, @@ -128,7 +128,7 @@ class DiffReader @reader.read raise OSM::APIBadUserInput, "Document element should be 'osmChange'." if @reader.name != "osmChange" - result = OSM::API.new.get_xml_doc + result = OSM::API.new.xml_doc result.root.name = "diffResult" # loop at the top level, within the element @@ -138,7 +138,7 @@ class DiffReader # 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| - new = model.from_xml_node(xml, true) + new = model.from_xml_node(xml, :create => true) check(model, xml, new) # when this element is saved it will get a new ID, so we save it @@ -174,7 +174,7 @@ class DiffReader # with types, but uses duck typing to handle them transparently. with_model do |model, xml| # get the new element from the XML payload - new = model.from_xml_node(xml, false) + new = model.from_xml_node(xml, :create => false) check(model, xml, new) # if the ID is a placeholder then map it to the real ID