after_filter :compress_output
def search_all
- do_search(true,true,true)
+ do_search(true, true, true)
end
def search_ways
- do_search(true,false,false)
+ do_search(true, false, false)
end
+
def search_nodes
- do_search(false,true,false)
+ do_search(false, true, false)
end
+
def search_relations
- do_search(false,false,true)
+ do_search(false, false, true)
end
- def do_search(do_ways,do_nodes,do_relations)
+ def do_search(do_ways, do_nodes, do_relations)
type = params['type']
value = params['value']
- unless type or value
+ unless type || value
name = params['name']
if name
type = 'name'
if do_nodes
response.headers['Error'] = "Searching of nodes is currently unavailable"
- render :nothing => true, :status => :service_unavailable
+ render :text => "", :status => :service_unavailable
return false
end
unless value
response.headers['Error'] = "Searching for a key without value is currently unavailable"
- render :nothing => true, :status => :service_unavailable
+ render :text => "", :status => :service_unavailable
return false
end
nodes = nodes.where(:current_node_tags => { :k => type }) if type
nodes = nodes.where(:current_node_tags => { :v => value }) if value
nodes = nodes.limit(100)
+ else
+ nodes = []
end
# Matching for way tags table
ways = ways.where(:current_way_tags => { :k => type }) if type
ways = ways.where(:current_way_tags => { :v => value }) if value
ways = ways.limit(100)
+ else
+ ways = []
end
# Matching for relation tags table
relations = relations.where(:current_relation_tags => { :k => type }) if type
relations = relations.where(:current_relation_tags => { :v => value }) if value
relations = relations.limit(2000)
+ else
+ relations = []
end
# Fetch any node needed for our ways (only have matching nodes so far)
- nodes += Node.find(ways.collect { |w| w.nds }.uniq)
+ nodes += Node.find(ways.collect(&:nds).uniq)
# Print
visible_nodes = {}