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

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

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index c4fce48d07d7badcfa86f797336ee05ed3099416..632fdb9a629637d1112831012e803e3f145605ba 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -1,17 +1,13 @@
 module Api
   class WaysController < ApiController
 module Api
   class WaysController < ApiController

-    require "xml/libxml"
-

     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_writable, :only => [:create, :update, :delete]

-    before_action :check_api_readable, :except => [: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]

-    around_action :api_call_handle_error, :api_call_timeout
-

     before_action :set_request_formats, :except => [:create, :update, :delete]
     before_action :set_request_formats, :except => [:create, :update, :delete]

+    before_action :check_rate_limit, :only => [:create, :update, :delete]

 
     def index
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]
 
     def index
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]


@@ -46,8 +42,6 @@ module Api
     end
 
     def create
     end
 
     def create

-      assert_method :put
-

       way = Way.from_xml(request.raw_post, :create => true)
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
       way = Way.from_xml(request.raw_post, :create => true)
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml


@@ -82,15 +76,10 @@ module Api
       @way = Way.includes(:nodes => :node_tags).find(params[:id])
 
       if @way.visible
       @way = Way.includes(:nodes => :node_tags).find(params[:id])
 
       if @way.visible

-        visible_nodes = {}
-

         @nodes = []
 
         @way.nodes.uniq.each do |node|
         @nodes = []
 
         @way.nodes.uniq.each do |node|

-          if node.visible
-            @nodes << node
-            visible_nodes[node.id] = node
-          end
+          @nodes << node if node.visible

         end
 
         # Render the result
         end
 
         # Render the result