tweak lat lon decision logic for the edit tab. made it more similar to logic in index...

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 20f5372a6cc1ed0e40d64c37ece71f6a1b7bc738..93573b95f88f943e5e2b2b36b48a1aeb3ec3928b 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -8,24 +8,23 @@ class RelationController < ApplicationController
   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create

-    if request.put?
-      relation = Relation.from_xml(request.raw_post, true)
-
-      if relation
-        if !relation.preconditions_ok?
-          render :text => "", :status => :precondition_failed
-        else
-         relation.version = 0
-          relation.user_id = @user.id
-          relation.save_with_history!
-
-         render :text => relation.id.to_s, :content_type => "text/plain"
-        end
+    begin
+      if request.put?
+        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
+          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

       else
       else

-        render :nothing => true, :status => :bad_request
+        render :nothing => true, :status => :method_not_allowed

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -46,38 +45,38 @@ class RelationController < ApplicationController
   end
 
   def update
   end
 
   def update

+    logger.debug request.raw_post

     begin
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       if new_relation and new_relation.id == relation.id
     begin
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       if new_relation and new_relation.id == relation.id

-       relation.update_from new_relation, user
+        relation.update_from new_relation, @user

         render :text => relation.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
         render :text => relation.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
   def delete
     end
   end
 
   def delete

-#XXX check if member somewhere!

     begin
       relation = Relation.find(params[:id])
     begin
       relation = Relation.find(params[:id])

-      relation.delete_with_history(@user)
-    rescue OSM::APIAlreadyDeletedError
-      render :text => "", :status => :gone
-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
+      new_relation = Relation.from_xml(request.raw_post)
+      if new_relation and new_relation.id == relation.id
+        relation.delete_with_history!(new_relation, @user)
+        render :text => relation.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts

     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 
     end
   end
 


@@ -143,8 +142,7 @@ class RelationController < ApplicationController
         render :text => doc.to_s, :content_type => "text/xml"
 
       else
         render :text => doc.to_s, :content_type => "text/xml"
 
       else

-
-        render :text => "", :status => :gone
+        render :nothing => true, :status => :gone

       end
 
     rescue ActiveRecord::RecordNotFound
       end
 
     rescue ActiveRecord::RecordNotFound


@@ -167,8 +165,10 @@ class RelationController < ApplicationController
 
       render :text => doc.to_s, :content_type => "text/xml"
     else
 
       render :text => doc.to_s, :content_type => "text/xml"
     else

-      render :nothing => true, :status => :bad_request
+      render :text => "You need to supply a comma separated list of ids.", :status => :bad_request

     end
     end

+  rescue ActiveRecord::RecordNotFound
+    render :text => "Could not find one of the relations", :status => :not_found

   end
 
   def relations_for_way
   end
 
   def relations_for_way


@@ -182,12 +182,12 @@ class RelationController < ApplicationController
   end
 
   def relations_for_object(objtype)
   end
 
   def relations_for_object(objtype)

-    relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
+    relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id[0] }.uniq

 
     doc = OSM::API.new.get_xml_doc
 
     Relation.find(relationids).each do |relation|
 
     doc = OSM::API.new.get_xml_doc
 
     Relation.find(relationids).each do |relation|

-      doc.root << relation.to_xml_node
+      doc.root << relation.to_xml_node if relation.visible

     end
 
     render :text => doc.to_s, :content_type => "text/xml"
     end
 
     render :text => doc.to_s, :content_type => "text/xml"