Replace respond_to with render xml format

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index e8a27042d0f0e0a88fa46875d53bfc1c48dbe01d..c783759bc6aef0ef625721ea0dee02e24ea1d5bc 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -90,9 +90,7 @@ module Api
 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
   end
 end

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index dafb19ebd618a38c773eab92fa7cce26d1ac5a16..8a8068e7eeea2e6c131604374bcb285a83e49ba5 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -32,9 +32,7 @@ module Api
 
       if @node.visible
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -75,9 +73,7 @@ module Api
       @nodes = Node.find(ids)
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
   end
 end

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 49fdcf1a3b4c13f13f8427e5336620753b95ed4d..984534b065178e825e997eda86fe63d7f6ca253c 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -30,9 +30,7 @@ module Api
                end
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
 
     def version
@@ -43,9 +41,7 @@ module Api
         response.last_modified = @old_element.timestamp
 
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       end
     end
 

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 2f2cb8503217970f21ede6477e7ae9cca08524a3..fbc9580982bbd4345d5dc6828f5b7ed9b7c60cf2 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -26,9 +26,7 @@ module Api
       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
@@ -119,9 +117,7 @@ module Api
         @relations << relation
 
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -137,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
@@ -166,9 +160,7 @@ module Api
       end
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
   end
 end

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index 0871384a7289030397ee3eddff3d97d87ccdf297..e5841e2ad8943fb93551e6cb41c512c66ff28e0c 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -28,9 +28,7 @@ module Api
 
       if @way.visible
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -77,9 +75,7 @@ module Api
         end
 
         # Render the result
-        respond_to do |format|
-          format.xml
-        end
+        render formats: [:xml]
       else
         head :gone
       end
@@ -97,9 +93,7 @@ module Api
       @ways = Way.find(ids)
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
 
     ##
@@ -112,9 +106,7 @@ module Api
       @ways = Way.where(:id => wayids, :visible => true)
 
       # Render the result
-      respond_to do |format|
-        format.xml
-      end
+      render formats: [:xml]
     end
   end
 end