From: mmd <mmd-osm@users.noreply.github.com>
Date: Thu, 27 Jun 2019 20:40:51 +0000 (+0200)
Subject: Merge branch 'master' into patch/view_migration
X-Git-Tag: live~2530^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11cc4a5e601dd288d601e6e35a72d159062f18b5

Merge branch 'master' into patch/view_migration
---

11cc4a5e601dd288d601e6e35a72d159062f18b5
diff --cc app/controllers/api/map_controller.rb
index 4790e2f60,e1d1a3b37..e8a27042d
--- a/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 test/controllers/api/old_nodes_controller_test.rb
index e43707245,0f8954541..c94a4bb1d
--- a/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
  
      ##