Change direction string ids to force retranslation

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 63fdafbde355b386a6ad740c65e0eb87504a4957..2f8a477d9e4da06030d2a835b5ccb9318fa2651b 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -7,7 +7,6 @@ class RelationController < 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]
   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
   around_action :api_call_handle_error, :api_call_timeout
 
   def create


@@ -15,14 +14,9 @@ class RelationController < ApplicationController
 
     relation = Relation.from_xml(request.raw_post, true)
 
 
     relation = Relation.from_xml(request.raw_post, true)
 

-    # We assume that an exception has been thrown if there was an error
-    # generating the relation
-    # if relation
+    # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml

     relation.create_with_history @user
     render :text => relation.id.to_s, :content_type => "text/plain"
     relation.create_with_history @user
     render :text => relation.id.to_s, :content_type => "text/plain"

-    # else
-    # render :text => "Couldn't get turn the input into a relation.", :status => :bad_request
-    # end

   end
 
   def read
   end
 
   def read


@@ -41,12 +35,12 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
 

-    if new_relation && new_relation.id == relation.id
-      relation.update_from new_relation, @user
-      render :text => relation.version.to_s, :content_type => "text/plain"
-    else
-      render :text => "", :status => :bad_request
+    unless new_relation && new_relation.id == relation.id
+      fail OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")

     end
     end

+
+    relation.update_from new_relation, @user
+    render :text => relation.version.to_s, :content_type => "text/plain"

   end
 
   def delete
   end
 
   def delete