From: Tom Hughes <tom@compton.nu>
Date: Tue, 22 Apr 2025 17:20:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5944'
X-Git-Tag: live~24
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ee16577ba4379e9f05788ec522d76cf91172cd3c?hp=d9481ad3a8e8b24d0f73f3cad9f78843893aeedb

Merge remote-tracking branch 'upstream/pull/5944'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index dad42fd29..4ed1bfa36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,8 +96,8 @@ GEM
     autoprefixer-rails (10.4.21.0)
       execjs (~> 2)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1087.0)
-    aws-sdk-core (3.222.1)
+    aws-partitions (1.1090.0)
+    aws-sdk-core (3.222.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -131,8 +131,7 @@ GEM
       debug_inspector (>= 1.2.0)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    bootstrap (5.3.3)
-      autoprefixer-rails (>= 9.1.0)
+    bootstrap (5.3.5)
       popper_js (>= 2.11.8, < 3)
     bootstrap_form (5.4.0)
       actionpack (>= 6.1)
@@ -167,7 +166,7 @@ GEM
     config (5.5.2)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
-    connection_pool (2.5.0)
+    connection_pool (2.5.1)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (1.0.0)
@@ -397,7 +396,7 @@ GEM
     nap (1.1.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.6)
+    net-imap (0.5.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -407,7 +406,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -488,7 +487,7 @@ GEM
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
@@ -564,7 +563,7 @@ GEM
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.75.2)
+    rubocop (1.75.3)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -635,8 +634,9 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sprockets (4.2.1)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
+      logger
       rack (>= 2.2.4, < 4)
     sprockets-exporters_pack (0.1.2)
       brotli (>= 0.2.0)
@@ -645,7 +645,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    stringio (3.1.6)
+    stringio (3.1.7)
     strong_migrations (2.3.0)
       activerecord (>= 7)
     teaspoon (1.4.0)
@@ -671,7 +671,7 @@ GEM
       i18n (>= 0.8.0)
       simpleidn
     vendorer (0.2.0)
-    version_gem (1.1.6)
+    version_gem (1.1.7)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 462f45a9f..fbc109c39 100644
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -140,17 +140,17 @@ class BoundingBox
   end
 
   def to_scaled
-    BoundingBox.new((min_lon * GeoRecord::SCALE),
-                    (min_lat * GeoRecord::SCALE),
-                    (max_lon * GeoRecord::SCALE),
-                    (max_lat * GeoRecord::SCALE))
+    BoundingBox.new(min_lon * GeoRecord::SCALE,
+                    min_lat * GeoRecord::SCALE,
+                    max_lon * GeoRecord::SCALE,
+                    max_lat * GeoRecord::SCALE)
   end
 
   def to_unscaled
-    BoundingBox.new((min_lon / GeoRecord::SCALE),
-                    (min_lat / GeoRecord::SCALE),
-                    (max_lon / GeoRecord::SCALE),
-                    (max_lat / GeoRecord::SCALE))
+    BoundingBox.new(min_lon / GeoRecord::SCALE,
+                    min_lat / GeoRecord::SCALE,
+                    max_lon / GeoRecord::SCALE,
+                    max_lat / GeoRecord::SCALE)
   end
 
   def to_a