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

[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 9af087d83a31fb06de92ce0a5718f9aa10225cd7..f88f3a1d011d7609c0c0eb8a3704ee2c31746fe1 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -11,10 +11,12 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
     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
 
     def create
       assert_method :put
 

-      way = Way.from_xml(request.raw_post, true)
+      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.create_with_history current_user
 
       # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
       way.create_with_history current_user


@@ -28,7 +30,10 @@ module Api
 
       if @way.visible
         # Render the result
 
       if @way.visible
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
       else
         head :gone
       end


@@ -38,9 +43,7 @@ module Api
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 
       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
 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s


@@ -75,16 +78,17 @@ module Api
         end
 
         # Render the result
         end
 
         # Render the result

-        render :formats => [:xml]
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
     end
 
     def index
       else
         head :gone
       end
     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)
 
 
       ids = params["ways"].split(",").collect(&:to_i)
 


@@ -93,7 +97,10 @@ module Api
       @ways = Way.find(ids)
 
       # Render the result
       @ways = Way.find(ids)
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     ##
     end
 
     ##


@@ -106,7 +113,10 @@ module Api
       @ways = Way.where(:id => wayids, :visible => true)
 
       # Render the result
       @ways = Way.where(:id => wayids, :visible => true)
 
       # Render the result

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end