X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8980da4381923d8099a11a1334baf3c3e625a484..e0028d8639a280f453282eb337ecdf043a519ac6:/lib/diff_reader.rb?ds=inline

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 0f0492f44..de2da3c6b 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -20,6 +20,10 @@ class DiffReader
   def initialize(data, changeset)
     @reader = XML::Reader.string(data)
     @changeset = changeset
+    # document that's (re-)used to handle elements expanded out of the
+    # diff processing stream.
+    @doc = XML::Document.new
+    @doc.root = XML::Node.new("osm")
   end
 
   ##
@@ -85,8 +89,21 @@ class DiffReader
       model = MODELS[model_name]
       raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
                                      "expected node, way or relation.") if model.nil?
-      yield model, @reader.expand
+      # new in libxml-ruby >= 2, expand returns an element not associated 
+      # with a document. this means that there's no encoding parameter,
+      # which means basically nothing works.
+      expanded = @reader.expand
+
+      # create a new, empty document to hold this expanded node
+      new_node = @doc.import(expanded)
+      @doc.root << new_node
+
+      yield model, new_node
       @reader.next
+
+      # remove element from doc - it will be garbage collected and the
+      # rest of the document is re-used in the next iteration.
+      @doc.root.child.remove!
     end
   end