From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 27 Apr 2022 15:10:46 +0000 (+0100)
Subject: Merge commit '73f0be96472a8d021a6347953192ca7b6ec509d7'
X-Git-Tag: live~1955
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/50f658142be71156945d5ab3a73ae3851365768b?hp=f6a1700ef675bf3787cc55c541d3318308f03c98

Merge commit '73f0be96472a8d021a6347953192ca7b6ec509d7'

Closes #3512
---

diff --git a/config/settings.yml b/config/settings.yml
index 2172d2d87..e0e844778 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -86,8 +86,7 @@ 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}.*"
+  - ".*\\.google(apis)?\\..*/.*"
   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here