X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14b8e7619f284aa2e95ffdea605783384d202822..325aa7ecdf75b0995efebedb7bc288ede910894d:/app/controllers/api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 15e4f1c40..4b785f8bc 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -9,10 +9,6 @@ class ApiController < ApplicationController
   #COUNT is the number of map requests to allow before exiting and starting a new process
   @@count = COUNT
 
-  def authorize_web
-    @current_user = User.find_by_token(session[:token])
-  end
-
   # The maximum area you're allowed to request, in square degrees
   MAX_REQUEST_AREA = 0.25
 
@@ -110,6 +106,7 @@ class ApiController < ApplicationController
   end
 
   def map
+    GC.start
     @@count+=1
 
     response.headers["Content-Type"] = 'text/xml'
@@ -153,7 +150,14 @@ class ApiController < ApplicationController
 
     node_ids = nodes.collect {|node| node.id }
 
-    # (in the future, we may wish to abort here if we found too many nodes)
+    if node_ids.length > 50_000
+      report_error("You requested too many nodes (limit is 50,000). Either request a smaller area, or use planet.osm")
+    end
+
+    if node_ids.length == 0
+      render :text => "<osm version='0.4'></osm>"
+      return
+    end
 
     # grab the segments
     segments = Array.new
@@ -183,26 +187,65 @@ class ApiController < ApplicationController
       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.
+
+      # seg_ids = way_segments.collect {|way_segment| way_segment.segment_id }
+
+      list_of_way_segs = ways.collect {|way| way.way_segments}
+      list_of_way_segs.flatten!
+
+      list_of_way_segments = list_of_way_segs.collect { |way_seg| way_seg.segment_id }
+
+	else
+	  list_of_way_segments = Array.new
+    end
+
+    # - [0] in case some thing links to segment 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this
+    segments_to_fetch = (list_of_way_segments.uniq - segment_ids) - [0]
+
+    if segments_to_fetch.length > 0
+      segments += Segment.find(segments_to_fetch)
     end
 
+    # get more nodes
+    #
+
+    segments_nodes = segments.collect {|segment| segment.node_a }
+    segments_nodes += segments.collect {|segment| segment.node_b }
+
+    node_ids_a = nodes.collect {|node| node.id }
+
+    nodes_to_get = segments_nodes - node_ids_a
+    nodes += Node.find(nodes_to_get) if nodes_to_get.length > 0
+
+    visible_nodes = {}
+    user_display_name_cache = {}
+
     nodes.each do |node|
-      doc.root << node.to_xml_node()
+      if node.visible?
+        doc.root << node.to_xml_node(user_display_name_cache)
+        visible_nodes[node.id] = node
+      end
     end
 
+    visible_segments = {}
+
     segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end 
+      if visible_nodes[segment.node_a] and visible_nodes[segment.node_b] and segment.visible?
+        doc.root << segment.to_xml_node(user_display_name_cache) 
+        visible_segments[segment.id] = segment
+      end
+    end
 
     ways.each do |way|
-      doc.root << way.to_xml_node()
+      doc.root << way.to_xml_node(visible_segments, user_display_name_cache) if way.visible?
     end 
 
     render :text => doc.to_s
     
     #exit when we have too many requests
     if @@count > MAX_COUNT
-      render :text => doc.to_s
       @@count = COUNT
+      
       exit!
     end