Merge remote-tracking branch 'upstream/pull/5377'

[rails.git] / app / controllers / api / map_controller.rb

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index ba3ca7cc3e71b1f5ae93a04f48b16168df18cb41..da8138597ae7b269fbb983a7eda8a4347c8a9ae7 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -2,8 +2,7 @@ module Api
   class MapController < ApiController
     authorize_resource :class => false
 
   class MapController < ApiController
     authorize_resource :class => false
 

-    before_action :check_api_readable
-    around_action :api_call_handle_error, :api_call_timeout
+    before_action :set_request_formats

 
     # 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
 
     # 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


@@ -19,15 +18,17 @@ module Api
       # check boundary is sane and area within defined
       # see /config/application.yml
       begin
       # 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)
+        raise OSM::APIBadUserInput, "The parameter bbox is required" unless params[:bbox]
+
+        @bounds = BoundingBox.from_bbox_params(params)
+        @bounds.check_boundaries
+        @bounds.check_size
+      rescue StandardError => e
+        report_error(e.message)

         return
       end
 
         return
       end
 

-      nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1)
+      nodes = Node.bbox(@bounds).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1)

 
       node_ids = nodes.collect(&:id)
       if node_ids.length > Settings.max_number_of_nodes
 
       node_ids = nodes.collect(&:id)
       if node_ids.length > Settings.max_number_of_nodes


@@ -35,9 +36,6 @@ module Api
         return
       end
 
         return
       end
 

-      # add bounds
-      @bounds = bbox
-

       # get ways
       # find which ways are needed
       ways = []
       # get ways
       # find which ways are needed
       ways = []


@@ -60,8 +58,6 @@ module Api
       nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty?
 
       visible_nodes = {}
       nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty?
 
       visible_nodes = {}

-      # changeset_cache = {}
-      # user_display_name_cache = {}

       @nodes = []
       nodes.each do |node|
         if node.visible?
       @nodes = []
       nodes.each do |node|
         if node.visible?


@@ -79,27 +75,25 @@ module Api
         end
       end
 
         end
       end
 

-      relations = Relation.nodes(visible_nodes.keys).visible +
-                  Relation.ways(way_ids).visible
+      @relations = Relation.nodes(visible_nodes.keys).visible +
+                   Relation.ways(way_ids).visible

 
       # 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)
 
       # 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
+      @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.
 
       # 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 = []
-      relations.uniq.each do |relation|
-        @relations << relation
-      end
+      @relations.uniq!

 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result
       respond_to do |format|
         format.xml
 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result
       respond_to do |format|
         format.xml

+        format.json

       end
     end
   end
       end
     end
   end