Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 846d623f29dc7dd2ed0531280cba4dbc1abc2fb2..25532a95c72c0dc965f0ddeb1757099a7755773f 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -15,7 +15,7 @@ class RelationController < ApplicationController
     relation = Relation.from_xml(request.raw_post, true)
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     relation = Relation.from_xml(request.raw_post, true)
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml

-    relation.create_with_history @user
+    relation.create_with_history current_user

     render :plain => relation.id.to_s
   end
 
     render :plain => relation.id.to_s
   end
 


@@ -36,10 +36,10 @@ class RelationController < ApplicationController
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id

-      raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
+      raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})"

     end
 
     end
 

-    relation.update_from new_relation, @user
+    relation.update_from new_relation, current_user

     render :plain => relation.version.to_s
   end
 
     render :plain => relation.version.to_s
   end
 


@@ -47,7 +47,7 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id

-      relation.delete_with_history!(new_relation, @user)
+      relation.delete_with_history!(new_relation, current_user)

       render :plain => relation.version.to_s
     else
       head :bad_request
       render :plain => relation.version.to_s
     else
       head :bad_request


@@ -91,7 +91,6 @@ class RelationController < ApplicationController
       # create XML.
       doc = OSM::API.new.get_xml_doc
       visible_nodes = {}
       # create XML.
       doc = OSM::API.new.get_xml_doc
       visible_nodes = {}

-      visible_members = { "Node" => {}, "Way" => {}, "Relation" => {} }

       changeset_cache = {}
       user_display_name_cache = {}
 
       changeset_cache = {}
       user_display_name_cache = {}
 


@@ -100,25 +99,22 @@ class RelationController < ApplicationController
 
         doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
         visible_nodes[node.id] = node
 
         doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
         visible_nodes[node.id] = node

-        visible_members["Node"][node.id] = true

       end
 
       ways.each do |way|
         next unless way.visible? # should be unnecessary if data is consistent.
 
         doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
       end
 
       ways.each do |way|
         next unless way.visible? # should be unnecessary if data is consistent.
 
         doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)

-        visible_members["Way"][way.id] = true

       end
 
       relations.each do |rel|
         next unless rel.visible? # should be unnecessary if data is consistent.
 
       end
 
       relations.each do |rel|
         next unless rel.visible? # should be unnecessary if data is consistent.
 

-        doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
-        visible_members["Relation"][rel.id] = true
+        doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)

       end
 
       # finally add self and output
       end
 
       # finally add self and output

-      doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
+      doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)

       render :xml => doc.to_s
 
     else
       render :xml => doc.to_s
 
     else


@@ -128,13 +124,13 @@ class RelationController < ApplicationController
 
   def relations
     unless params["relations"]
 
   def relations
     unless params["relations"]

-      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]"

     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 
     if ids.empty?
     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 
     if ids.empty?

-      raise OSM::APIBadUserInput.new("No relations were given to search for")
+      raise OSM::APIBadUserInput, "No relations were given to search for"

     end
 
     doc = OSM::API.new.get_xml_doc
     end
 
     doc = OSM::API.new.get_xml_doc