X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67224fe8284cbe402d6ddb0c89cc601c01af577a..8c2a873aa0080f88a152ffc90c15e738b528de02:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index fc45f315a..53569dd5b 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,5 +1,5 @@
 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=....)
 
@@ -12,15 +12,14 @@ 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)
+  def do_search(do_ways,do_nodes,do_relations)
     type = params['type']
     value = params['value']
     unless type or value
@@ -33,21 +32,36 @@ class SearchController < ApplicationController
 
     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]
+      cond_rel += [type]
     end
     if value
       sql += ' AND v=?'
-      cond_tbl += [value]
+      cond_rel += [value]
     end
-    cond_tbl = [sql] + cond_tbl
+    sql += ')'
+    cond_rel = [sql] + cond_rel
 
     # Matching for tags column
     if type and value
@@ -68,56 +82,38 @@ class SearchController < ApplicationController
       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)
+      nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
     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.segs
-    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, 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
+    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 
 
+    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