X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbe165bbb3d6eda37d9579f1ac767599f9055607..a1853204faefd8270e3db4a988ef373ea1ab342d:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 0e98854ef..e48073e10 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -7,7 +7,6 @@ class WayController < ApplicationController
   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]
-  after_action :compress_output
   around_action :api_call_handle_error, :api_call_timeout
 
   def create
@@ -15,12 +14,9 @@ class WayController < ApplicationController
 
     way = Way.from_xml(request.raw_post, true)
 
-    if way
-      way.create_with_history @user
-      render :text => way.id.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
-    end
+    # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
+    way.create_with_history current_user
+    render :plain => way.id.to_s
   end
 
   def read
@@ -29,9 +25,9 @@ class WayController < ApplicationController
     response.last_modified = way.timestamp
 
     if way.visible
-      render :text => way.to_xml.to_s, :content_type => "text/xml"
+      render :xml => way.to_xml.to_s
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
@@ -39,12 +35,12 @@ class WayController < ApplicationController
     way = Way.find(params[:id])
     new_way = Way.from_xml(request.raw_post)
 
-    if new_way && new_way.id == way.id
-      way.update_from(new_way, @user)
-      render :text => way.version.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
+    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
+
+    way.update_from(new_way, current_user)
+    render :plain => way.version.to_s
   end
 
   # This is the API call to delete a way
@@ -53,10 +49,10 @@ class WayController < ApplicationController
     new_way = Way.from_xml(request.raw_post)
 
     if new_way && new_way.id == way.id
-      way.delete_with_history!(new_way, @user)
-      render :text => way.version.to_s, :content_type => "text/plain"
+      way.delete_with_history!(new_way, current_user)
+      render :plain => way.version.to_s
     else
-      render :text => "", :status => :bad_request
+      head :bad_request
     end
   end
 
@@ -77,22 +73,20 @@ class WayController < ApplicationController
       end
       doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
 
-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
   def ways
     unless params["ways"]
-      fail OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]")
+      raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
     end
 
     ids = params["ways"].split(",").collect(&:to_i)
 
-    if ids.length == 0
-      fail OSM::APIBadUserInput.new("No ways were given to search for")
-    end
+    raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty?
 
     doc = OSM::API.new.get_xml_doc
 
@@ -100,7 +94,7 @@ class WayController < ApplicationController
       doc.root << way.to_xml_node
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 
   ##
@@ -116,6 +110,6 @@ class WayController < ApplicationController
       doc.root << way.to_xml_node if way.visible
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 end