From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 Aug 2020 10:12:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2777'
X-Git-Tag: live~2973
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/82ca99eea56f4091d15933e30b94e367dbcd0c8b?hp=f988a159238ec9425b8a9f0ed5085095629ee35a

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

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