Merge branch 'master' into openstreetbugs

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index cf18ab5577cceed5fc7fe2395246cc0710c6757f..c795fc0d9e4966b219d9c54ce7ea8b3142dbc3c8 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -3,6 +3,9 @@ defaults: &defaults
   server_url: "www.openstreetmap.org"
   # The generator
   generator: "OpenStreetMap server"
   server_url: "www.openstreetmap.org"
   # The generator
   generator: "OpenStreetMap server"

+  copyright_owner: "OpenStreetMap and contributors"
+  attribution_url: "http://www.openstreetmap.org/copyright"
+  license_url: "http://opendatacommons.org/licenses/odbl/1-0/"

   # Sender addresses for emails
   email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
   email_return_path: "bounces@openstreetmap.org"
   # Sender addresses for emails
   email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
   email_return_path: "bounces@openstreetmap.org"


@@ -24,6 +27,8 @@ defaults: &defaults
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000

+  # The maximum area you're allowed to request notes from, in square degrees
+  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
   # Zoom level to use for postcode results from the geocoder
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder