Allow iD to connect to nominatim

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 78becc24b485f7be4bc000fd9ce7fdd05145d9b0..0d40b6691ab4e69e6fac431004d61a9327522e64 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,43 +2,44 @@ class SearchController < ApplicationController
   # Support searching for nodes, ways, or all
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)
   # Support searching for nodes, ways, or all
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)

-  skip_before_filter :verify_authenticity_token
-  after_filter :compress_output
+  skip_before_action :verify_authenticity_token

 
   def search_all
 
   def search_all

-    do_search(true,true,true)
+    do_search(true, true, true)

   end
 
   def search_ways
   end
 
   def search_ways

-    do_search(true,false,false)
+    do_search(true, false, false)

   end
   end

+

   def search_nodes
   def search_nodes

-    do_search(false,true,false)
+    do_search(false, true, false)

   end
   end

+

   def search_relations
   def search_relations

-    do_search(false,false,true)
+    do_search(false, false, true)

   end
 
   end
 

-  def do_search(do_ways,do_nodes,do_relations)
-    type = params['type']
-    value = params['value']
-    unless type or value
-      name = params['name']
+  def do_search(do_ways, do_nodes, do_relations)
+    type = params["type"]
+    value = params["value"]
+    unless type || value
+      name = params["name"]

       if name
       if name

-        type = 'name'
+        type = "name"

         value = name
       end
     end
 
     if do_nodes
         value = name
       end
     end
 
     if do_nodes

-      response.headers['Error'] = "Searching of nodes is currently unavailable"
-      render :nothing => true, :status => :service_unavailable
+      response.headers["Error"] = "Searching of nodes is currently unavailable"
+      head :service_unavailable

       return false
     end
 
     unless value
       return false
     end
 
     unless value

-      response.headers['Error'] = "Searching for a key without value is currently unavailable"
-      render :nothing => true, :status => :service_unavailable
+      response.headers["Error"] = "Searching for a key without value is currently unavailable"
+      head :service_unavailable

       return false
     end
 
       return false
     end
 


@@ -49,7 +50,7 @@ class SearchController < ApplicationController
       nodes = nodes.where(:current_node_tags => { :v => value }) if value
       nodes = nodes.limit(100)
     else
       nodes = nodes.where(:current_node_tags => { :v => value }) if value
       nodes = nodes.limit(100)
     else

-      nodes = Array.new
+      nodes = []

     end
 
     # Matching for way tags table
     end
 
     # Matching for way tags table


@@ -59,7 +60,7 @@ class SearchController < ApplicationController
       ways = ways.where(:current_way_tags => { :v => value }) if value
       ways = ways.limit(100)
     else
       ways = ways.where(:current_way_tags => { :v => value }) if value
       ways = ways.limit(100)
     else

-      ways = Array.new
+      ways = []

     end
 
     # Matching for relation tags table
     end
 
     # Matching for relation tags table


@@ -69,11 +70,11 @@ class SearchController < ApplicationController
       relations = relations.where(:current_relation_tags => { :v => value }) if value
       relations = relations.limit(2000)
     else
       relations = relations.where(:current_relation_tags => { :v => value }) if value
       relations = relations.limit(2000)
     else

-      relations = Array.new
+      relations = []

     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)
     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 = {}
 
     # Print
     visible_nodes = {}


@@ -93,6 +94,6 @@ class SearchController < ApplicationController
       doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
     end
 
       doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
     end
 

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

   end
 end
   end
 end