Merge branch 'master' into patch/view_migration

diff --cc app/controllers/api/map_controller.rb
index 4790e2f60992bb08a9b3261c8c8ef66a0abbf7ff,e1d1a3b37844878661c9458fd41dd282a3396b81..e8a27042d0f0e0a88fa46875d53bfc1c48dbe01d
--- 1/app/controllers/api/map_controller.rb
--- 2/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@@ -19,11 -19,11 +19,11 @@@ module Ap
        # check boundary is sane and area within defined
        # see /config/application.yml
        begin
 -        bbox = BoundingBox.from_bbox_params(params)
 -        bbox.check_boundaries
 -        bbox.check_size
 +        @bounds = BoundingBox.from_bbox_params(params)
 +        @bounds.check_boundaries
 +        @bounds.check_size
-       rescue StandardError => err
-         report_error(err.message)
+       rescue StandardError => e
+         report_error(e.message)
          return
        end
  

diff --cc config/routes.rb
Simple merge

diff --cc test/controllers/api/changesets_controller_test.rb
Simple merge

diff --cc test/controllers/api/old_nodes_controller_test.rb
index e43707245f8461e6984bcedcf01fcf2c16cf7909,0f8954541034c726d68c15b71462d9146fbeaf71..c94a4bb1d1a61f7caa6074aca1d8e2f00c567ede
--- 1/test/controllers/api/old_nodes_controller_test.rb
--- 2/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@@ -154,10 -154,10 +154,10 @@@ module Ap
      end
  
      def check_not_found_id_version(id, version)
 -      get :version, :params => { :id => id, :version => version }
 +      get :version, :params => { :id => id, :version => version }, :format => :xml
        assert_response :not_found
-     rescue ActionController::UrlGenerationError => ex
-       assert_match(/No route matches/, ex.to_s)
+     rescue ActionController::UrlGenerationError => e
+       assert_match(/No route matches/, e.to_s)
      end
  
      ##