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

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

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 2f2cb8503217970f21ede6477e7ae9cca08524a3..a9b85de7dc3f68d40fa84cab7b782b0766fda9e9 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,24 +1,28 @@
 module Api
   class RelationsController < ApiController
 module Api
   class RelationsController < ApiController

-    require "xml/libxml"
-
+    before_action :check_api_writable, :only => [:create, :update, :delete]

     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]

-    before_action :check_api_writable, :only => [:create, :update, :delete]
-    before_action :check_api_readable, :except => [:create, :update, :delete]
-    around_action :api_call_handle_error, :api_call_timeout
+    before_action :set_request_formats, :except => [:create, :update, :delete]
+    before_action :check_rate_limit, :only => [:create, :update, :delete]

 
 

-    def create
-      assert_method :put
+    def index
+      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]

 
 

-      relation = Relation.from_xml(request.raw_post, true)
+      ids = params["relations"].split(",").collect(&:to_i)

 
 

-      # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
-      relation.create_with_history current_user
-      render :plain => relation.id.to_s
+      raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
+
+      @relations = Relation.find(ids)
+
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     def show
     end
 
     def show


@@ -28,15 +32,22 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
         # Render the result
         respond_to do |format|
           format.xml

+          format.json

         end
       else
         head :gone
       end
     end
 
         end
       else
         head :gone
       end
     end
 

-    def update
-      logger.debug request.raw_post
+    def create
+      relation = Relation.from_xml(request.raw_post, :create => true)

 
 

+      # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
+      relation.create_with_history current_user
+      render :plain => relation.id.to_s
+    end
+
+    def update

       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 


@@ -73,9 +84,9 @@ module Api
         # first find the ids of nodes, ways and relations referenced by this
         # relation - note that we exclude this relation just in case.
 
         # first find the ids of nodes, ways and relations referenced by this
         # relation - note that we exclude this relation just in case.
 

-        node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
-        way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
-        relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }
+        node_ids = relation.members.select { |m| m[0] == "Node" }.pluck(1)
+        way_ids = relation.members.select { |m| m[0] == "Way" }.pluck(1)
+        relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.pluck(1)

 
         # next load the relations and the ways.
 
 
         # next load the relations and the ways.
 


@@ -121,27 +132,13 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
         # Render the result
         respond_to do |format|
           format.xml

+          format.json

         end
       else
         head :gone
       end
     end
 
         end
       else
         head :gone
       end
     end
 

-    def index
-      raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"]
-
-      ids = params["relations"].split(",").collect(&:to_i)
-
-      raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty?
-
-      @relations = Relation.find(ids)
-
-      # Render the result
-      respond_to do |format|
-        format.xml
-      end
-    end
-

     def relations_for_way
       relations_for_object("Way")
     end
     def relations_for_way
       relations_for_object("Way")
     end


@@ -168,6 +165,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
       # Render the result
       respond_to do |format|
         format.xml

+        format.json

       end
     end
   end
       end
     end
   end