Update to iD v2.0.1

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 42b8c7036ee1d81f808572c1760fce1aeff2e4b3..587cfce8292b6e962d3362d2eac8f18b425bbdb8 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -14,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


@@ -40,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
+      raise 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


@@ -133,13 +128,13 @@ class RelationController < ApplicationController
 
   def relations
     unless params["relations"]
 
   def relations
     unless params["relations"]

-      fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+      raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")

     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 
     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 

-    if ids.length == 0
-      fail OSM::APIBadUserInput.new("No relations were given to search for")
+    if ids.empty?
+      raise OSM::APIBadUserInput.new("No relations were given to search for")

     end
 
     doc = OSM::API.new.get_xml_doc
     end
 
     doc = OSM::API.new.get_xml_doc