From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 Aug 2020 13:11:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2779'
X-Git-Tag: live~3064
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/74f3d003358c3ce910b19c04c7e434908507b8a6?hp=966c66a0430d1929306d94a4b1f8e32bf97834d7

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

diff --git a/config/settings.yml b/config/settings.yml
index f5f35f6a2..e5e6c3788 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -97,8 +97,9 @@ imagery_blacklist:
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
-  # Blacklist Kanton SH
+  # Blacklist Kanton SH and GL
   - ".*wms.geo.sh.ch.*Luftbild_201[06].*"
+  - ".*wms.geo.gl.ch.*ch.gl.imagery.orthofoto201[357].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 # Routing endpoints