Fixed 'raw' raises by converting them to the appropriate OSM::APIError type. Made...

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index da5129467ff1e72caba2f35da5815804eb285008..440c69550afb309d89dada9c78163b47ec9c225f 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -3,8 +3,9 @@ class RelationController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]

-  before_filter :check_write_availability, :only => [:create, :update, :delete]
-  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  before_filter :require_public_data, :only => [:create, :update, :delete]
+  before_filter :check_api_writable, :only => [:create, :update, :delete]
+  before_filter :check_api_readable, :except => [:create, :update, :delete]

   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create


@@ -12,12 +13,14 @@ class RelationController < ApplicationController
       if request.put?
         relation = Relation.from_xml(request.raw_post, true)
 
       if request.put?
         relation = Relation.from_xml(request.raw_post, true)
 

-        if relation
+        # 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"
           relation.create_with_history @user
           render :text => relation.id.to_s, :content_type => "text/plain"

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

       else
         render :nothing => true, :status => :method_not_allowed
       end
       else
         render :nothing => true, :status => :method_not_allowed
       end


@@ -62,7 +65,6 @@ class RelationController < ApplicationController
   end
 
   def delete
   end
 
   def delete

-#XXX check if member somewhere!

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


@@ -96,12 +98,12 @@ class RelationController < ApplicationController
         # first collect nodes, ways, and relations referenced by this relation.
         
         ways = Way.find_by_sql("select w.* from current_ways w,current_relation_members rm where "+
         # first collect nodes, ways, and relations referenced by this relation.
         
         ways = Way.find_by_sql("select w.* from current_ways w,current_relation_members rm where "+

-            "rm.member_type='way' and rm.member_id=w.id and rm.id=#{relation.id}");
+            "rm.member_type='Way' and rm.member_id=w.id and rm.id=#{relation.id}");

         nodes = Node.find_by_sql("select n.* from current_nodes n,current_relation_members rm where "+
         nodes = Node.find_by_sql("select n.* from current_nodes n,current_relation_members rm where "+

-            "rm.member_type='node' and rm.member_id=n.id and rm.id=#{relation.id}");
+            "rm.member_type='Node' and rm.member_id=n.id and rm.id=#{relation.id}");

         # note query is built to exclude self just in case.
         relations = Relation.find_by_sql("select r.* from current_relations r,current_relation_members rm where "+
         # note query is built to exclude self just in case.
         relations = Relation.find_by_sql("select r.* from current_relations r,current_relation_members rm where "+

-            "rm.member_type='relation' and rm.member_id=r.id and rm.id=#{relation.id} and r.id<>rm.id");
+            "rm.member_type='Relation' and rm.member_id=r.id and rm.id=#{relation.id} and r.id<>rm.id");

 
         # now additionally collect nodes referenced by ways. Note how we recursively 
         # evaluate ways but NOT relations.
 
         # now additionally collect nodes referenced by ways. Note how we recursively 
         # evaluate ways but NOT relations.


@@ -118,31 +120,31 @@ class RelationController < ApplicationController
         # create XML.
         doc = OSM::API.new.get_xml_doc
         visible_nodes = {}
         # create XML.
         doc = OSM::API.new.get_xml_doc
         visible_nodes = {}

+        changeset_cache = {}

         user_display_name_cache = {}
 
         nodes.each do |node|
           if node.visible? # should be unnecessary if data is consistent.
         user_display_name_cache = {}
 
         nodes.each do |node|
           if node.visible? # should be unnecessary if data is consistent.

-            doc.root << node.to_xml_node(user_display_name_cache)
+            doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)

             visible_nodes[node.id] = node
           end
         end
         ways.each do |way|
           if way.visible? # should be unnecessary if data is consistent.
             visible_nodes[node.id] = node
           end
         end
         ways.each do |way|
           if way.visible? # should be unnecessary if data is consistent.

-            doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
+            doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)

           end
         end
         relations.each do |rel|
           if rel.visible? # should be unnecessary if data is consistent.
           end
         end
         relations.each do |rel|
           if rel.visible? # should be unnecessary if data is consistent.

-            doc.root << rel.to_xml_node(user_display_name_cache)
+            doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)

           end
         end
         # finally add self and output
           end
         end
         # finally add self and output

-        doc.root << relation.to_xml_node(user_display_name_cache)
+        doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache)

         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


@@ -165,22 +167,24 @@ 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

-    relations_for_object("way")
+    relations_for_object("Way")

   end
   def relations_for_node
   end
   def relations_for_node

-    relations_for_object("node")
+    relations_for_object("Node")

   end
   def relations_for_relation
   end
   def relations_for_relation

-    relations_for_object("relation")
+    relations_for_object("Relation")

   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
 
 
     doc = OSM::API.new.get_xml_doc