Replace respond_to with render xml format

[rails.git] / app / controllers / api / relations_controller.rb

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 9f125cfd3d83365e4e10b9155822d1f9b438d1cb..fbc9580982bbd4345d5dc6828f5b7ed9b7c60cf2 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -22,15 +22,11 @@ module Api
     end
 
     def show
-      relation = Relation.find(params[:id])
-      response.last_modified = relation.timestamp
-      if relation.visible
-        @relations = [relation]
-
+      @relation = Relation.find(params[:id])
+      response.last_modified = @relation.timestamp
+      if @relation.visible
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -94,8 +90,6 @@ module Api
         nodes = Node.where(:id => node_ids.uniq).includes(:node_tags)
 
         visible_nodes = {}
-        # changeset_cache = {}
-        # user_display_name_cache = {}
 
         @nodes = []
         nodes.each do |node|
@@ -123,9 +117,7 @@ module Api
         @relations << relation
 
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -141,9 +133,7 @@ module Api
       @relations = Relation.find(ids)
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
 
     def relations_for_way
@@ -170,9 +160,7 @@ module Api
       end
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
   end
 end