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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 09672c2c3a6565748d89be6f375055dbf99b9a0b..49b4531ada4ecd64fec8458a8840924953d9b35c 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -27,6 +27,10 @@ status: "online"
 max_request_area: 0.25
 # Number of GPS trace/trackpoints returned per-page
 tracepoints_per_page: 5000
 max_request_area: 0.25
 # Number of GPS trace/trackpoints returned per-page
 tracepoints_per_page: 5000

+# Default limit on the number of changesets returned by the changeset query api method
+default_changeset_query_limit: 100
+# Maximum limit on the number of changesets returned by the changeset query api method
+max_changeset_query_limit: 100

 # Maximum number of nodes that will be returned by the api in a map request
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 # Maximum number of nodes that will be returned by the api in a map request
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)


@@ -37,8 +41,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 +53,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,19 +86,14 @@ 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
 # Routing endpoints
 graphhopper_url: "https://graphhopper.com/api/1/route"
 fossgis_osrm_url: "https://routing.openstreetmap.de/"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false
 # Routing endpoints
 graphhopper_url: "https://graphhopper.com/api/1/route"
 fossgis_osrm_url: "https://routing.openstreetmap.de/"

+fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route"

 # External authentication credentials
 #google_auth_id: ""
 #google_auth_secret: ""
 # External authentication credentials
 #google_auth_id: ""
 #google_auth_secret: ""