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

diff --git a/Gemfile.lock b/Gemfile.lock
index dad42fd2978d16a25b16f65610d8a4c3f2a297bf..4ed1bfa36bb421bc29208cb34ea792fb7aa765c6 100644 (file)
--- 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 462f45a9f1ca329ecd7c0096557876e9f06ea724..fbc109c395fe5ade24f6267bb682f7a066f7e3b4 100644 (file)
--- 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

diff --git a/public/robots.txt b/public/robots.txt
index 2edd47453f01fff6df512b2483de3a26c552b7ca..31260fc1f83add193a232f65d97ee8cc8311c77f 100644 (file)
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -11,7 +11,11 @@ Disallow: /traces/tag/
 Disallow: /traces/page/
 Disallow: /api/
 Disallow: /edit
-Disallow: /browse
+Disallow: /changeset
+Disallow: /node
+Disallow: /note
+Disallow: /relation
+Disallow: /way
 Disallow: /login
 Disallow: /geocoder
 Disallow: /history

diff --git a/yarn.lock b/yarn.lock
index af2cf3d8a3f308d67bcc2a60886272bb61591078..01b7896fb4ace373c5f33a077027e9ec2471ddb7 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -55,10 +55,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.25.0":
-  version "9.25.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.0.tgz#4656b39de7cbf12fd66e7d54d9a26d05855b2a5a"
-  integrity sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w==
+"@eslint/js@9.25.1":
+  version "9.25.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117"
+  integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==
 
 "@eslint/object-schema@^2.1.6":
   version "2.1.6"
@@ -578,9 +578,9 @@ eslint-visitor-keys@^4.2.0:
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
 eslint@^9.0.0:
-  version "9.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.0.tgz#ebf629bb26d8e7490ff94f87321863cd73272351"
-  integrity sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA==
+  version "9.25.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.1.tgz#8a7cf8dd0e6acb858f86029720adb1785ee57580"
+  integrity sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
@@ -588,7 +588,7 @@ eslint@^9.0.0:
     "@eslint/config-helpers" "^0.2.1"
     "@eslint/core" "^0.13.0"
     "@eslint/eslintrc" "^3.3.1"
-    "@eslint/js" "9.25.0"
+    "@eslint/js" "9.25.1"
     "@eslint/plugin-kit" "^0.2.8"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"