Group elements of node icon

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 19e0b8afc6bb8f7033c385153fc13834a3b49189..2784646afecbcf6fbcca3c02141bbd6671a3b75f 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -4,8 +4,6 @@
 # Uses the streaming LibXML "Reader" interface to cut down on memory
 # usage, so hopefully we can process fairly large diffs.
 class DiffReader
 # Uses the streaming LibXML "Reader" interface to cut down on memory
 # usage, so hopefully we can process fairly large diffs.
 class DiffReader

-  include ConsistencyValidations
-

   # maps each element type to the model class which handles it
   MODELS = {
     "node" => Node,
   # maps each element type to the model class which handles it
   MODELS = {
     "node" => Node,


@@ -85,7 +83,7 @@ class DiffReader
       model = MODELS[model_name]
       if model.nil?
         raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \
       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,
       end
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,


@@ -128,16 +126,17 @@ class DiffReader
     @reader.read
     raise OSM::APIBadUserInput, "Document element should be 'osmChange'." if @reader.name != "osmChange"
 
     @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 <osmChange> element
     with_element do |action_name, action_attributes|
     result.root.name = "diffResult"
 
     # loop at the top level, within the <osmChange> element
     with_element do |action_name, action_attributes|

-      if action_name == "create"
+      case action_name
+      when "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|
         # 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
           check(model, xml, new)
 
           # when this element is saved it will get a new ID, so we save it


@@ -168,12 +167,12 @@ class DiffReader
           result.root << xml_result
         end
 
           result.root << xml_result
         end
 

-      elsif action_name == "modify"
+      when "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|
           # get the new element from the XML payload
         # 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|
           # 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
           check(model, xml, new)
 
           # if the ID is a placeholder then map it to the real ID


@@ -200,7 +199,7 @@ class DiffReader
           result.root << xml_result
         end
 
           result.root << xml_result
         end
 

-      elsif action_name == "delete"
+      when "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 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|