]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/changeset_controller.rb
api06: remove debugging output.
[rails.git] / app / controllers / changeset_controller.rb
index 322ce79f7552f024a382061df1e22554650911e0..8668611eb0417251c4bd227427bfd8ce42e5cd78 100644 (file)
@@ -76,15 +76,13 @@ class ChangesetController < ApplicationController
       return
     end
 
-    # FIXME: this should really be done without loading the whole XML file
-    # into memory.
-    p = XML::Parser.new
-    p.string  = request.raw_post
-    doc = p.parse
+    p = XML::Reader.new request.raw_post
 
     node_ids, way_ids, rel_ids = {}, {}, {}
     ids = {"node"=>node_ids, "way"=>way_ids, "relation"=>rel_ids}
 
+    models = {"node"=>Node, "way"=>Way, "relation"=>Relation}
+
     res = XML::Document.new
     res.encoding = 'UTF-8'
     root = XML::Node.new 'osm'
@@ -96,90 +94,70 @@ class ChangesetController < ApplicationController
       "not a normal OSM file. ")
 
     Changeset.transaction do
-      doc.find('//osm/create/node').each do |nd|
-       elem = XML::Node.new 'node'
-       node = Node.from_xml_node(nd, true)
-       elem['old_id'] = nd['id']
-       create_prim node_ids, node, nd
-       elem['new_id'] = node.id.to_s
-       elem['new_version'] = node.version.to_s
-       root << elem
-      end
-      doc.find('//osm/create/way').each do |nd|
-       elem = XML::Node.new 'way'
-       way = Way.from_xml_node(nd, true)
-       elem['old_id'] = nd['id']
-       fix_way(way, node_ids)
-       raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok?
-       create_prim way_ids, way, nd
-       elem['new_id'] = way.id.to_s
-       elem['new_version'] = way.version.to_s
-       root << elem
-      end
-      doc.find('//osm/create/relation').each do |nd|
-       elem = XML::Node.new 'relation'
-       relation = Relation.from_xml_node(nd, true)
-       elem['old_id'] = nd['id']
-       fix_rel(relation, ids)
-       raise OSM::APIPreconditionFailedError.new if !relation.preconditions_ok?
-       create_prim rel_ids, relation, nd
-       elem['new_id'] = relation.id.to_s
-       elem['new_version'] = relation.version.to_s
-       root << elem
-      end
-
-      doc.find('//osm/modify/relation').each do |nd|
-       elem = XML::Node.new 'relation'
-       new_relation = Relation.from_xml_node(nd)
-       relation = Relation.find(new_relation.id)
-       relation.update_from new_relation, @user
-       elem['old_id'] = elem['new_id'] = relation.id.to_s
-       elem['new_version'] = relation.version.to_s
-       root << elem
-      end
-      doc.find('//osm/modify/way').each do |nd|
-       elem = XML::Node.new 'way'
-       new_way = Way.from_xml_node(nd)
-       way = Way.find(new_way.id)
-       way.update_from new_way, @user
-       elem['old_id'] = elem['new_id'] = way.id.to_s
-       elem['new_version'] = way.version.to_s
-       root << elem
-      end
-      doc.find('//osm/modify/node').each do |nd|
-       elem = XML::Node.new 'node'
-       new_node = Node.from_xml_node(nd)
-       node = Node.find(new_node.id)
-       node.update_from new_node, @user
-       elem['old_id'] = elem['new_id'] = node.id.to_s
-       elem['new_version'] = node.version.to_s
-       root << elem
-      end
-
-      doc.find('//osm/delete/relation').each do |nd|
-       elem = XML::Node.new 'relation'
-       relation = Relation.find(nd['id'])
-       relation.delete_with_history(@user)
-       elem['old_id'] = elem['new_id'] = relation.id.to_s
-       elem['new_version'] = relation.version.to_s
-       root << elem
-      end
-      doc.find('//osm/delete/way').each do |nd|
-       elem = XML::Node.new 'way'
-       way = Way.find(nd['id'])
-       way.delete_with_history(@user)
-       elem['old_id'] = elem['new_id'] = way.id.to_s
-       elem['new_version'] = way.version.to_s
-       root << elem
-      end
-      doc.find('//osm/delete/node').each do |nd|
-       elem = XML::Node.new 'node'
-       new_node = Node.from_xml_node(nd)
-       node = Node.find(nd['id'])
-       node.delete_with_history(@user)
-       elem['old_id'] = elem['new_id'] = node.id.to_s
-       elem['new_version'] = node.version.to_s
-       root << elem
+      while p.read == 1
+       break if p.node_type == 15 # end element
+       next unless p.node_type == 1 # element
+
+       case p.name
+       when 'create':
+         while p.read == 1
+           break if p.node_type == 15 # end element
+           next unless p.node_type == 1 # element
+
+           model = models[p.name]
+           next if model.nil?
+
+           elem = XML::Node.new p.name
+           nd = p.expand; p.next
+           osm = model.from_xml_node(nd, true)
+           elem['old_id'] = nd['id']
+
+           case nd.name
+           when 'way':
+             fix_way(osm, node_ids)
+             raise OSM::APIPreconditionFailedError.new if !osm.preconditions_ok?
+           when 'relation':
+             fix_rel(osm, ids)
+             raise OSM::APIPreconditionFailedError.new if !osm.preconditions_ok?
+           end
+
+           create_prim ids[nd.name], osm, nd
+           elem['new_id'] = osm.id.to_s
+           elem['new_version'] = osm.version.to_s
+           root << elem
+         end
+       when 'modify':
+         while p.read == 1
+           break if p.node_type == 15 # end element
+           next unless p.node_type == 1 # element
+
+           model = models[p.name]
+           next if model.nil?
+
+           elem = XML::Node.new p.name
+           new_osm = model.from_xml_node(p.expand); p.next
+           osm = model.find(new_osm.id)
+           osm.update_from new_osm, @user
+           elem['old_id'] = elem['new_id'] = osm.id.to_s
+           elem['new_version'] = osm.version.to_s
+           root << elem
+         end
+       when 'delete':
+         while p.read == 1
+           break if p.node_type == 15 # end element
+           next unless p.node_type == 1 # element
+
+           model = models[p.name]
+           next if model.nil?
+
+           elem = XML::Node.new p.name
+           osm = model.find(p.expand['id']); p.next
+           osm.delete_with_history(@user)
+           elem['old_id'] = elem['new_id'] = osm.id.to_s
+           elem['new_version'] = osm.version.to_s
+           root << elem
+         end
+       end
       end
     end