fixes for search

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index d1c48cfcec2bc6c874c6d96ffbc7f9a508523e3b..bfe26f542515decaafb710d94dfae5ee76183930 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,10 @@
 class ApiController < ApplicationController
 
 class ApiController < ApplicationController
 

+  before_filter :authorize
+  after_filter :compress_output
+

   def map
   def map

+    response.headers["Content-Type"] = 'application/xml'

     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3
     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3


@@ -19,11 +23,12 @@ class ApiController < ApplicationController
     nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon])
 
     node_ids = nodes.collect {|node| node.id }
     nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon])
 
     node_ids = nodes.collect {|node| node.id }

-    node_ids_sql = "(#{node_ids.join(',')})"
-
-    # get the referenced segments
-    segments = Segment.find_by_sql "select * from segments where node_a in #{node_ids_sql} or node_b in #{node_ids_sql}"
-
+    segments = Array.new
+    if node_ids.length > 0
+      node_ids_sql = "(#{node_ids.join(',')})"
+      # get the referenced segments
+      segments = Segment.find_by_sql "select * from current_segments where visible = 1 and (node_a in #{node_ids_sql} or node_b in #{node_ids_sql})"
+    end

     # see if we have nay missing nodes
     segments_nodes = segments.collect {|segment| segment.node_a }
     segments_nodes += segments.collect {|segment| segment.node_b }
     # see if we have nay missing nodes
     segments_nodes = segments.collect {|segment| segment.node_a }
     segments_nodes += segments.collect {|segment| segment.node_b }


@@ -35,19 +40,28 @@ class ApiController < ApplicationController
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 

-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
- 
+    doc = OSM::API.get_xml_doc
+
+    # get ways
+    # find which ways are needed
+    segment_ids = segments.collect {|segment| segment.id }
+    ways = Array.new
+    if segment_ids.length > 0
+      way_segments = WaySegment.find_all_by_segment_id(segment_ids)
+      way_ids = way_segments.collect {|way_segment| way_segment.id }
+      ways = Way.find(way_ids) # NB: doesn't pick up segments, tags from db until accessed via way.way_segments etc.
+    end
+

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

-      root << node.to_xml_node()
+      doc.root << node.to_xml_node()

     end
 
     segments.each do |segment|
     end
 
     segments.each do |segment|

-      root << segment.to_xml_node()
+      doc.root << segment.to_xml_node()
+    end 
+
+    ways.each do |way|
+      doc.root << way.to_xml_node()

     end 
 
     render :text => doc.to_s
     end 
 
     render :text => doc.to_s