Merging 17905:17944 from trunk.

[rails.git] / config / application.yml

diff --git a/config/application.yml b/config/application.yml
index 7400a7b9a916088639aa0a092198f9c3000d82f4..6a67a51236af20f3c1a9fe234513a54553e360fb 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -7,6 +7,14 @@ standard_settings: &standard_settings
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000
+  # 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
+  # Periods (in hours) which are allowed for user blocks
+  user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
  
 development:
   <<: *standard_settings