cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused parameter

Browse source
This commit is contained in:
John Firebaugh 2012-11-25 15:14:47 -04:00
parent 3d1df30f65
commit ee6e0d5c0b
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api_controller.rb
View file

@ -203,7 +203,7 @@ class ApiController < ApplicationController
# this "uniq" may be slightly inefficient; it may be better to first collect and output # 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. # all node-related relations, then find the *not yet covered* way-related ones etc.
relations.uniq.each do |relation| 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 end
response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""

8
app/controllers/relation_controller.rb
View file

@ -97,7 +97,6 @@ class RelationController < ApplicationController
# create XML. # create XML.
doc = OSM::API.new.get_xml_doc doc = OSM::API.new.get_xml_doc
visible_nodes = {} visible_nodes = {}
visible_members = { "Node" => {}, "Way" => {}, "Relation" => {} }
changeset_cache = {} changeset_cache = {}
user_display_name_cache = {} user_display_name_cache = {}
@ -105,23 +104,20 @@ class RelationController < ApplicationController
if node.visible? # should be unnecessary if data is consistent. if node.visible? # should be unnecessary if data is consistent.
doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
visible_nodes[node.id] = node visible_nodes[node.id] = node
visible_members["Node"][node.id] = true
end end
end end
ways.each do |way| ways.each do |way|
if way.visible? # should be unnecessary if data is consistent. if way.visible? # should be unnecessary if data is consistent.
doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
visible_members["Way"][way.id] = true
end end
end end
relations.each do |rel| relations.each do |rel|
if rel.visible? # should be unnecessary if data is consistent. if rel.visible? # should be unnecessary if data is consistent.
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)
visible_members["Relation"][rel.id] = true
end end
end end
# finally add self and output # 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" render :text => doc.to_s, :content_type => "text/xml"
else else

2
app/controllers/search_controller.rb
View file

@ -90,7 +90,7 @@ class SearchController < ApplicationController
end end
relations.each do |rel| 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 end
render :text => doc.to_s, :content_type => "text/xml" render :text => doc.to_s, :content_type => "text/xml"

2
app/models/relation.rb
View file

@ -105,7 +105,7 @@ class Relation < ActiveRecord::Base
return doc return doc
end 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 = XML::Node.new 'relation'
el1['id'] = self.id.to_s el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s el1['visible'] = self.visible.to_s