X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/182dd045f797c46994c7f9b2e717101752cbb52b..c3424e9cfb2542dedbf545a76d4ddb591c59df3d:/app/controllers/search_controller.rb?ds=sidebyside

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eaf1c5894..53569dd5b 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,9 +1,8 @@
 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=....)
 
-  before_filter :authorize
   after_filter :compress_output
 
   def search_all
@@ -13,115 +12,108 @@ class SearchController < ApplicationController
   def search_ways
     do_search(true,false,false)
   end
-  def search_segments
+  def search_nodes
     do_search(false,true,false)
   end
-  def search_nodes
+  def search_relations
     do_search(false,false,true)
   end
 
-
-  def do_search(do_ways,do_segments,do_nodes)
-    response.headers["Content-Type"] = 'application/xml'
-
+  def do_search(do_ways,do_nodes,do_relations)
     type = params['type']
     value = params['value']
-	unless type or value
-		name = params['name']
-		if name
-			type = 'name'
-			value = name
-		end
-	end
+    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
+    relations = Array.new
+
+    # Matching for tags table
+    cond_way = Array.new
+    sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
+    if type
+      sql += ' AND k=?'
+      cond_way += [type]
+    end
+    if value
+      sql += ' AND v=?'
+      cond_way += [value]
+    end
+    sql += ')'
+    cond_way = [sql] + cond_way
 
     # Matching for tags table
-    cond_tbl = Array.new
-    sql = '1=1'
+    cond_rel = Array.new
+    sql = 'id IN (SELECT id FROM current_relation_tags WHERE 1=1'
     if type
-	   sql += ' AND k=?'
-	   cond_tbl += [type]
+      sql += ' AND k=?'
+      cond_rel += [type]
     end
     if value
-	   sql += ' AND v=?'
-	   cond_tbl += [value]
+      sql += ' AND v=?'
+      cond_rel += [value]
     end
-    cond_tbl = [sql] + cond_tbl
+    sql += ')'
+    cond_rel = [sql] + cond_rel
 
     # 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+'' ]
+      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']
+      cond_tags = ['1=1']
     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 }
+    # First up, look for the relations we want
+    if do_relations
+      relations = Relation.find(:all, :conditions => cond_rel, :limit => 100)
     end
 
-    # Now, segments matching
-	if do_segments
-       segs = Segment.find(:all, :conditions => cond_tags)
+    # then ways
+    if do_ways
+      ways = Way.find(:all, :conditions => cond_way, :limit => 100)
     end
 
     # Now, nodes
-	if do_nodes
-       nodes = Node.find(:all, :conditions => cond_tags)
-    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
+    if do_nodes
+      nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
     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
-    end
-    nodes += Node.find(node_ids)
 
+    # Fetch any node needed for our ways (only have matching nodes so far)
+    nodes += Node.find(ways.collect { |w| w.nds }.uniq)
 
-	# Print
-    doc = OSM::API.get_xml_doc
+    # Print
+    user_display_name_cache = {}
+    doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
-      doc.root << node.to_xml_node()
+      doc.root << node.to_xml_node(user_display_name_cache)
     end
 
-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end 
-
     ways.each do |way|
-      doc.root << way.to_xml_node()
+      doc.root << way.to_xml_node(user_display_name_cache)
     end 
 
-    render :text => doc.to_s
+    relations.each do |rel|
+      doc.root << rel.to_xml_node(user_display_name_cache)
+    end 
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end