Add geoip_database key to example configuration

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 587cfce8292b6e962d3362d2eac8f18b425bbdb8..97e83204939c7061f68dd8d877d1cda294fa4283 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -15,17 +15,17 @@ class RelationController < ApplicationController
     relation = Relation.from_xml(request.raw_post, true)
 
     # 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 current_user
+    render :plain => relation.id.to_s
   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible
-      render :text => relation.to_xml.to_s, :content_type => "text/xml"
+      render :xml => relation.to_xml.to_s
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
@@ -39,18 +39,18 @@ class RelationController < ApplicationController
       raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
     end
 
-    relation.update_from new_relation, @user
-    render :text => relation.version.to_s, :content_type => "text/plain"
+    relation.update_from new_relation, current_user
+    render :plain => relation.version.to_s
   end
 
   def delete
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
-      relation.delete_with_history!(new_relation, @user)
-      render :text => relation.version.to_s, :content_type => "text/plain"
+      relation.delete_with_history!(new_relation, current_user)
+      render :plain => relation.version.to_s
     else
-      render :text => "", :status => :bad_request
+      head :bad_request
     end
   end
 
@@ -119,10 +119,10 @@ class RelationController < ApplicationController
 
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s
 
     else
-      render :text => "", :status => :gone
+      head :gone
     end
   end
 
@@ -143,7 +143,7 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 
   def relations_for_way
@@ -167,6 +167,6 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node if relation.visible
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 end