X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1733e8990a242d7d4b3834b7cec2118597d685bd..ec328801e9c5b0d83d646dbbaf6a10c79223019a:/app/controllers/api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 976c8bd03..820a5cb66 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,15 +3,23 @@ class ApiController < ApplicationController
   before_filter :authorize
   after_filter :compress_output
 
+  helper :user
+  model :user
+
+  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
 
   def map
-    response.headers["Content-Type"] = 'application/xml'
+    GC.start
+    response.headers["Content-Type"] = 'text/xml'
     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3
-       report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
+      report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")
       return
     end
 
@@ -24,22 +32,22 @@ class ApiController < ApplicationController
 
     # check the bbox is sane
     unless min_lon <= max_lon
-       report_error("The minimum longitude must be less than the maximum longitude, but it wasn't")
+      report_error("The minimum longitude must be less than the maximum longitude, but it wasn't")
       return
     end
     unless min_lat <= max_lat
-       report_error("The minimum latitude must be less than the maximum latitude, but it wasn't")
+      report_error("The minimum latitude must be less than the maximum latitude, but it wasn't")
       return
     end
-	unless min_lon >= -180 && min_lat >= -90 && max_lon <= 180 && max_lat <= 90
-       report_error("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
+    unless min_lon >= -180 && min_lat >= -90 && max_lon <= 180 && max_lat <= 90
+      report_error("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
       return
-	end
+    end
 
     # check the bbox isn't too large
     requested_area = (max_lat-min_lat)*(max_lon-min_lon)
     if requested_area > MAX_REQUEST_AREA
-       report_error("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm")
+      report_error("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm")
       return
     end
 
@@ -48,7 +56,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></osm>'
+      return
+    end
 
     # grab the segments
     segments = Array.new
@@ -68,7 +83,7 @@ class ApiController < ApplicationController
     # get missing nodes if there are any
     nodes += Node.find(missing_nodes) if missing_nodes.length > 0
 
-    doc = OSM::API.get_xml_doc
+    doc = OSM::API.new.get_xml_doc
 
     # get ways
     # find which ways are needed
@@ -78,18 +93,54 @@ 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 }
+
     end
 
+    segments_to_fetch = list_of_way_segments.uniq - segment_ids
+
+    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