From: hlfan <50826859+hlfan@users.noreply.github.com>
Date: Sat, 26 Mar 2022 01:02:32 +0000 (+0100)
Subject: google imagery blacklist entry update
X-Git-Tag: live~1232^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/29c199d581576536cd3c59026203e0c5c1ba1955

google imagery blacklist entry update

Updated google imagery blacklist entry to include the pb implementation of the vt endpoint for URLs like these:
https://www.google.at/maps/vt?pb=!1m4!1m3!1e{z}!2i{x}!3u{y}!2m2!1e1!2sm!3b0
---

diff --git a/config/settings.yml b/config/settings.yml
index 2172d2d87..316744f31 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -86,8 +86,8 @@ default_editor: "id"
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
-  # with a vt or kh endpoint, and x, y and z query parameters
-  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
+  # with a vt or kh endpoint, and x, y and z or pb-based query parameters
+  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*|!\d[a-z]\d+){3}.*"
   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here