Remove unused parameter

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 602b79d69c5462e6f9a0cdae3d2e1c55b343c306..455c05491abff31b1379a14fd971c2ae531d7ad4 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -203,7 +203,7 @@ class ApiController < ApplicationController
     # this "uniq" may be slightly inefficient; it may be better to first collect and output
     # all node-related relations, then find the *not yet covered* way-related ones etc.
     relations.uniq.each do |relation|
     # this "uniq" may be slightly inefficient; it may be better to first collect and output
     # all node-related relations, then find the *not yet covered* way-related ones etc.
     relations.uniq.each do |relation|

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

     end
 
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
     end
 
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 0b989d11e5fc21b8ba5dff32c55f3e6262698c04..af3c0753eacafb02705ac9dae04515cc778831dd 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -97,7 +97,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 = {}
       


@@ -105,23 +104,20 @@ class RelationController < ApplicationController
         if node.visible? # should be unnecessary if data is consistent.
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
           visible_nodes[node.id] = node
         if node.visible? # should be unnecessary if data is consistent.
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
           visible_nodes[node.id] = node

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

         end
       end
       ways.each do |way|
         if way.visible? # should be unnecessary if data is consistent.
           doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
         end
       end
       ways.each do |way|
         if 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
       end
       relations.each do |rel|
         if rel.visible? # should be unnecessary if data is consistent.
         end
       end
       relations.each do |rel|
         if 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
       end
       # finally add self and output
         end
       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 :text => doc.to_s, :content_type => "text/xml"
       
     else
       render :text => doc.to_s, :content_type => "text/xml"
       
     else

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 622ebb1ce3736521a9d243cae0cb9bc0c18f0569..78becc24b485f7be4bc000fd9ce7fdd05145d9b0 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -90,7 +90,7 @@ class SearchController < ApplicationController
     end
 
     relations.each do |rel|
     end
 
     relations.each do |rel|

-      doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+      doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)

     end
 
     render :text => doc.to_s, :content_type => "text/xml"
     end
 
     render :text => doc.to_s, :content_type => "text/xml"

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 028d6024cc4ab95ac89d402b6624b55d0de350e3..abe014311e61b07d29a4b12865a9f2c70f1d09f5 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -105,7 +105,7 @@ class Relation < ActiveRecord::Base
     return doc
   end
 
     return doc
   end
 

-  def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {})
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

     el1 = XML::Node.new 'relation'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1 = XML::Node.new 'relation'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s