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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 6e3f431f754b1b8c90ce3fc46b0f33c63562c220..ec6cedb5ac903b945b78a967ed04d3ef0f5396a2 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -37,8 +37,6 @@ max_number_of_relation_members: 32000
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder
 postcode_zoom: 15
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder
 postcode_zoom: 15

-# Zoom level to use for geonames results from the geocoder
-geonames_zoom: 12

 # Timeout for API calls in seconds
 api_timeout: 300
 # Timeout for web pages in seconds
 # Timeout for API calls in seconds
 api_timeout: 300
 # Timeout for web pages in seconds


@@ -51,8 +49,6 @@ max_messages_per_hour: 60
 max_friends_per_hour: 60
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 max_friends_per_hour: 60
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"

-# Geonames authentication details
-#geonames_username: ""

 # MaxMind GeoIPv2 database
 #maxmind_database: ""
 # Users to show as being nearby
 # MaxMind GeoIPv2 database
 #maxmind_database: ""
 # Users to show as being nearby


@@ -86,13 +82,7 @@ default_editor: "id"
 # OAuth application for iD
 #id_application: ""
 # Imagery to return in capabilities as blacklisted
 # 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
-  - ".*\\.google(apis)?\\..*/.*"
-  # Blacklist VWorld
-  - "http://xdworld\\.vworld\\.kr:8080/.*"
-  # Blacklist here
-  - ".*\\.here\\.com[/:].*"
+imagery_blacklist: []

 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false