Move the changes api to its own controller

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 7451a91b9b347bc113731f553eb437fcac380196..735e1bd59bdfba8811931498257076452d04eaf1 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,105 +1,105 @@
 class ApiController < ApplicationController
 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
-
+  skip_before_action :verify_authenticity_token
+  before_action :api_deny_access_handler
+
+  authorize_resource :class => false
+
+  before_action :check_api_readable
+  around_action :api_call_handle_error, :api_call_timeout
+
+  # This is probably the most common call of all. It is used for getting the
+  # OSM data for a specified bounding box, usually for editing. First the
+  # bounding box (bbox) is checked to make sure that it is sane. All nodes
+  # are searched, then all the ways that reference those nodes are found.
+  # All Nodes that are referenced by those ways are fetched and added to the list
+  # of nodes.
+  # Then all the relations that reference the already found nodes and ways are
+  # fetched. All the nodes and ways that are referenced by those ways are then
+  # fetched. Finally all the xml is returned.

   def map
   def map

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

     # Figure out the bbox
     # 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")
+    # check boundary is sane and area within defined
+    # see /config/application.yml
+    begin
+      bbox = BoundingBox.from_bbox_params(params)
+      bbox.check_boundaries
+      bbox.check_size
+    rescue StandardError => err
+      report_error(err.message)

       return
     end
 
       return
     end
 

-    bbox = bbox.split(',')
-
-    min_lon = bbox[0].to_f
-    min_lat = bbox[1].to_f
-    max_lon = bbox[2].to_f
-    max_lat = bbox[3].to_f
+    nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES + 1)

 
 

-    # 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")
+    node_ids = nodes.collect(&:id)
+    if node_ids.length > MAX_NUMBER_OF_NODES
+      report_error("You requested too many nodes (limit is #{MAX_NUMBER_OF_NODES}). Either request a smaller area, or use planet.osm")

       return
     end
       return
     end

-    unless min_lat <= max_lat
-       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")
-      return
-       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")
-      return
-    end
-
-    # get all the nodes
-    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 }
+    doc = OSM::API.new.get_xml_doc

 
 

-    # (in the future, we may wish to abort here if we found too many nodes)
+    # add bounds
+    doc.root << bbox.add_bounds_to(XML::Node.new("bounds"))

 
 

-    # grab the segments
-    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})"
+    # get ways
+    # find which ways are needed
+    ways = []
+    if node_ids.empty?
+      list_of_way_nodes = []
+    else
+      way_nodes = WayNode.where(:node_id => node_ids)
+      way_ids = way_nodes.collect { |way_node| way_node.id[0] }
+      ways = Way.preload(:way_nodes, :way_tags).find(way_ids)
+
+      list_of_way_nodes = ways.collect do |way|
+        way.way_nodes.collect(&:node_id)
+      end
+      list_of_way_nodes.flatten!

     end
     end

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

 
 

-    segments_nodes.uniq!
+    # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this
+    nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0]

 
 

-    missing_nodes = segments_nodes - node_ids
+    nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty?

 
 

-    # get missing nodes if there are any
-    nodes += Node.find(missing_nodes) if missing_nodes.length > 0
+    visible_nodes = {}
+    changeset_cache = {}
+    user_display_name_cache = {}

 
 

-    doc = OSM::API.new.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.
+    nodes.each do |node|
+      if node.visible?
+        doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+        visible_nodes[node.id] = node
+      end

     end
 
     end
 

-    nodes.each do |node|
-      doc.root << node.to_xml_node()
+    way_ids = []
+    ways.each do |way|
+      if way.visible?
+        doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+        way_ids << way.id
+      end

     end
 
     end
 

-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end 
+    relations = Relation.nodes(visible_nodes.keys).visible +
+                Relation.ways(way_ids).visible

 
 

-    ways.each do |way|
-      doc.root << way.to_xml_node()
-    end 
+    # we do not normally return the "other" partners referenced by an relation,
+    # e.g. if we return a way A that is referenced by relation X, and there's
+    # another way B also referenced, that is not returned. But we do make
+    # an exception for cases where an relation references another *relation*;
+    # in that case we return that as well (but we don't go recursive here)
+    relations += Relation.relations(relations.collect(&:id)).visible
+
+    # this "uniq" may be slightly inefficient; it may be better to first collect and output
+    # all node-related relations, then find the *not yet covered* way-related ones etc.
+    relations.uniq.each do |relation|
+      doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)
+    end

 
 

-    render :text => doc.to_s
+    response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""

 
 

+    render :xml => doc.to_s

   end
 end
   end
 end