Merge remote-tracking branch 'openstreetmap/pull/1040'

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index 0e98854ef76268cf11d473db635f1d2abecec678..e7a968a09449408b3d61d79a9bf9bfd3bdff6aa0 100644 (file)
--- 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 @user
+    render :text => way.id.to_s, :content_type => "text/plain"
   end
 
   def read
@@ -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
+      fail OSM::APIBadUserInput.new("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, @user)
+    render :text => way.version.to_s, :content_type => "text/plain"
   end
 
   # This is the API call to delete a way