Update to iD v2.21.0

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index ef46ae216ab66327ba5c2db32037bdd50cae9a33..44e3cb7011ab7bf78f14989403cb5aae774c4a15 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -65,9 +65,6 @@ spam_threshold: 50
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
-# Location of GPX traces and images
-gpx_trace_dir: "/home/osm/traces"
-gpx_image_dir: "/home/osm/images"
 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use
@@ -85,12 +82,11 @@ default_editor: "id"
 # OAuth application for the web site
 #oauth_application: ""
 # OAuth consumer key for iD
-#id_key: ""
+#id_oauth_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