Quote default when used as a key in a hash as it is a keyword...

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index c67b4ddf1c0f159d6ba86d10c58dc35dc3df814b..2b1ba6c753c70df6579d381facebc7bd451be754 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -13,7 +13,7 @@ class RelationController < ApplicationController
 
       if relation
         if !relation.preconditions_ok?
-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed
         else
           relation.user_id = @user.id
           relation.save_with_history!
@@ -31,11 +31,11 @@ class RelationController < ApplicationController
   def read
     begin
       relation = Relation.find(params[:id])
-
+      response.headers['Last-Modified'] = relation.timestamp.rfc822
       if relation.visible
         render :text => relation.to_xml.to_s, :content_type => "text/xml"
       else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
@@ -47,27 +47,22 @@ class RelationController < ApplicationController
   def update
     begin
       relation = Relation.find(params[:id])
+      new_relation = Relation.from_xml(request.raw_post)
 
-      if relation.visible
-        new_relation = Relation.from_xml(request.raw_post)
-
-        if new_relation and new_relation.id == relation.id
-          if !new_relation.preconditions_ok?
-            render :nothing => true, :status => :precondition_failed
-          else
-            relation.user_id = @user.id
-            relation.tags = new_relation.tags
-            relation.members = new_relation.members
-            relation.visible = true
-            relation.save_with_history!
-
-            render :nothing => true
-          end
+      if new_relation and new_relation.id == relation.id
+        if !new_relation.preconditions_ok?
+          render :text => "", :status => :precondition_failed
         else
-          render :nothing => true, :status => :bad_request
+          relation.user_id = @user.id
+          relation.tags = new_relation.tags
+          relation.members = new_relation.members
+          relation.visible = true
+          relation.save_with_history!
+
+          render :nothing => true
         end
       else
-        render :nothing => true, :status => :gone
+        render :nothing => true, :status => :bad_request
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
@@ -83,7 +78,7 @@ class RelationController < ApplicationController
 
       if relation.visible
         if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
-          render :nothing => true, :status => :precondition_failed
+          render :text => "", :status => :precondition_failed
         else
           relation.user_id = @user.id
           relation.tags = []
@@ -94,7 +89,7 @@ class RelationController < ApplicationController
           render :nothing => true
         end
       else
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
@@ -141,16 +136,18 @@ class RelationController < ApplicationController
     
         # create XML.
         doc = OSM::API.new.get_xml_doc
+        visible_nodes = {}
         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)
+            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(user_display_name_cache)
+            doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
           end
         end
         relations.each do |rel|
@@ -164,7 +161,7 @@ class RelationController < ApplicationController
 
       else
 
-        render :nothing => true, :status => :gone
+        render :text => "", :status => :gone
       end
 
     rescue ActiveRecord::RecordNotFound
@@ -204,16 +201,12 @@ class RelationController < ApplicationController
   def relations_for_object(objtype)
     relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
 
-    if relationids.length > 0
-      doc = OSM::API.new.get_xml_doc
-
-      Relation.find(relationids).each do |relation|
-        doc.root << relation.to_xml_node
-      end
+    doc = OSM::API.new.get_xml_doc
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
+    Relation.find(relationids).each do |relation|
+      doc.root << relation.to_xml_node
     end
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end