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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 2172d2d874d5fb40c83b0a47cbff37960e1f5128..e8db6f81818653993c1d98577b8b863ef133c089 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -81,13 +81,12 @@ nominatim_url: "https://nominatim.openstreetmap.org/"
 default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""
-# OAuth consumer key for iD
-#id_key: ""
+# OAuth application for iD
+#id_application: ""
 # 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