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

[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 0871384a7289030397ee3eddff3d97d87ccdf297..a0feabff3a82a504b9a31f5dfd397601e99d8e27 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -11,6 +11,8 @@ module Api
     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]
+
     def create
       assert_method :put
 
@@ -30,6 +32,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -40,9 +43,7 @@ module Api
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 
-      unless new_way && new_way.id == way.id
-        raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})"
-      end
+      raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})" unless new_way && new_way.id == way.id
 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s
@@ -79,6 +80,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       else
         head :gone
@@ -86,9 +88,7 @@ module Api
     end
 
     def index
-      unless params["ways"]
-        raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
-      end
+      raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]
 
       ids = params["ways"].split(",").collect(&:to_i)
 
@@ -99,6 +99,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
 
@@ -114,6 +115,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end