Move default_format_xml to api_controller

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index 34257fc991308736056b47fca30691a28b02768b..4b233c99584e9924e86217e164ddca08a78c14e4 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -7,11 +7,6 @@ module Api
 
     before_action :default_format_xml
 
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
-
     # This is probably the most common call of all. It is used for getting the
     # OSM data for a specified bounding box, usually for editing. First the
     # bounding box (bbox) is checked to make sure that it is sane. All nodes

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 1827603a70ce0e9de23e3567085b058ed79eb870..08f19008f730dc931e251b421ba2ca4dca134ca3 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -15,11 +15,6 @@ module Api
 
     before_action :default_format_xml
 
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
-
     # Create a node from XML.
     def create
       assert_method :put

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 92c6d929575241e6ded45b30dd98301a77995e98..b68fde6b55bd5a72e9c101e6d11a5f385d48ea4e 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -18,11 +18,6 @@ module Api
 
     before_action :default_format_xml
 
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
-
     def history
       # the .where() method used in the lookup_old_element_versions
       # call won't throw an error if no records are found, so we have

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index c3384097869b56fc518476dd49eeb3e25ebbccdf..566efe0eba88b2f3e289f1cbcfd44d0de17b4b5f 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -13,11 +13,6 @@ module Api
 
     before_action :default_format_xml
 
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
-
     def create
       assert_method :put
 

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index a721f82f7ade94e92d51a76a2586cc64a9a96197..95f36df532a9ac1e69688459dd0b8a8850690c5c 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -13,11 +13,6 @@ module Api
 
     before_action :default_format_xml
 
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
-
     def create
       assert_method :put
 

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 44efdc0711f2cb39d53e8b59d33d58e8583dca5b..ca09e580751b3752e1922ea65712a2b63efe9b57 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,6 +3,11 @@ class ApiController < ApplicationController
 
   private
 
+  # Set format to xml unless client requires a specific format
+  def default_format_xml
+    request.format = "xml" unless params[:format]
+  end
+
   def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
     # make the current_user object from any auth sources we have
     setup_user_auth