Merge remote-tracking branch 'upstream/pull/1788'

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eaf1c58948b3333e18a18675e79cf86a3ce68bfa..0d40b6691ab4e69e6fac431004d61a9327522e64 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,127 +1,99 @@
 class SearchController < ApplicationController
 class SearchController < ApplicationController

-  # Support searching for nodes, segments, ways, or all
+  # 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=....)
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)

-
-  before_filter :authorize
-  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)
-  end
-  def search_segments
-    do_search(false,true,false)
+    do_search(true, false, false)

   end
   end

+

   def search_nodes
   def search_nodes

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

   end
 
   end
 

+  def search_relations
+    do_search(false, false, true)
+  end

 
 

-  def do_search(do_ways,do_segments,do_nodes)
-    response.headers["Content-Type"] = 'application/xml'
-
-    type = params['type']
-    value = params['value']
-       unless type or value
-               name = params['name']
-               if name
-                       type = 'name'
-                       value = name
-               end
-       end
-
-    way_ids = Array.new
-    ways = Array.new
-    segments = Array.new
-    nodes = Array.new
-
-    # Matching for tags table
-    cond_tbl = Array.new
-    sql = '1=1'
-    if type
-          sql += ' AND k=?'
-          cond_tbl += [type]
-    end
-    if value
-          sql += ' AND v=?'
-          cond_tbl += [value]
-    end
-    cond_tbl = [sql] + cond_tbl
-
-    # Matching for tags column
-    if type and value
-       cond_tags = ['tags LIKE ? OR tags LIKE ? OR tags LIKE ? OR tags LIKE ?', 
-                      ''+type+'='+value+'',
-                      ''+type+'='+value+';%',
-                      '%;'+type+'='+value+';%',
-                      '%;'+type+'='+value+'' ]
-       elsif type
-       cond_tags = ['tags LIKE ? OR tags LIKE ?',
-                      ''+type+'=%',
-                      '%;'+type+'=%' ]
-       elsif value
-       cond_tags = ['tags LIKE ? OR tags LIKE ?',
-                      '%='+value+';%',
-                      '%='+value+'' ]
-    else
-       cond_tags = ['1=1']
+  def do_search(do_ways, do_nodes, do_relations)
+    type = params["type"]
+    value = params["value"]
+    unless type || value
+      name = params["name"]
+      if name
+        type = "name"
+        value = name
+      end

     end
     end

-    

 
 

-       # First up, look for the ids of the ways we want
-       if do_ways
-       ways_tmp = WayTag.find(:all, :conditions => cond_tbl)
-       way_ids = ways_tmp.collect {|way| way.id }
+    if do_nodes
+      response.headers["Error"] = "Searching of nodes is currently unavailable"
+      head :service_unavailable
+      return false

     end
 
     end
 

-    # Now, segments matching
-       if do_segments
-       segs = Segment.find(:all, :conditions => cond_tags)
+    unless value
+      response.headers["Error"] = "Searching for a key without value is currently unavailable"
+      head :service_unavailable
+      return false

     end
 
     end
 

-    # Now, nodes
-       if do_nodes
-       nodes = Node.find(:all, :conditions => cond_tags)
+    # Matching for node tags table
+    if do_nodes
+      nodes = Node.joins(:node_tags)
+      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
 
     end
 

-    # Get the remaining objects:
-    # Fetch the ways (until now only had their ids)
-    ways = Way.find(way_ids)
-
-    # Fetch any segments needed for our ways (only have matching segments so far)
-       seg_ids = Array.new
-    ways.each do |way|
-           seg_ids += way.segments
+    # Matching for way tags table
+    if do_ways
+      ways = Way.joins(:way_tags)
+      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
     end

-    segments += Segment.find(seg_ids)

 
 

-    # Fetch any nodes needed for our segments (only have matching nodes so far)
-    node_ids = Array.new
-    segments.each do |seg|
-        node_ids += seg.node_a
-        node_ids += seg.node_b
+    # Matching for relation tags table
+    if do_relations
+      relations = Relation.joins(:relation_tags)
+      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
     end

-    nodes += Node.find(node_ids)

 
 

+    # Fetch any node needed for our ways (only have matching nodes so far)
+    nodes += Node.find(ways.collect(&:nds).uniq)

 
 

-       # Print
-    doc = OSM::API.get_xml_doc
+    # Print
+    visible_nodes = {}
+    changeset_cache = {}
+    user_display_name_cache = {}
+    doc = OSM::API.new.get_xml_doc

     nodes.each do |node|
     nodes.each do |node|

-      doc.root << node.to_xml_node()
+      doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+      visible_nodes[node.id] = node

     end
 
     end
 

-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end 
-

     ways.each do |way|
     ways.each do |way|

-      doc.root << way.to_xml_node()
-    end 
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+    end
+
+    relations.each do |rel|
+      doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
+    end

 
 

-    render :text => doc.to_s
+    render :xml => doc.to_s

   end
 end
   end
 end