Move all settings to settings.yml
We leave the STATUS setting alone, since it's required before rails boots. The test-specific settings now live in config/settings/test.yml
This commit is contained in:
parent
7b08270526
commit
d102c9aaf4
62 changed files with 316 additions and 349 deletions
|
@ -1,20 +1,20 @@
|
|||
xml.instruct! :xml, :version => "1.0"
|
||||
xml.osm(OSM::API.new.xml_root_attributes) do |osm|
|
||||
osm.api do |api|
|
||||
api.version(:minimum => API_VERSION.to_s, :maximum => API_VERSION.to_s)
|
||||
api.area(:maximum => MAX_REQUEST_AREA.to_s)
|
||||
api.note_area(:maximum => MAX_NOTE_REQUEST_AREA.to_s)
|
||||
api.tracepoints(:per_page => TRACEPOINTS_PER_PAGE.to_s)
|
||||
api.waynodes(:maximum => MAX_NUMBER_OF_WAY_NODES.to_s)
|
||||
api.changesets(:maximum_elements => Changeset::MAX_ELEMENTS.to_s)
|
||||
api.timeout(:seconds => API_TIMEOUT.to_s)
|
||||
api.status(:database => @database_status.to_s,
|
||||
:api => @api_status.to_s,
|
||||
:gpx => @gpx_status.to_s)
|
||||
api.version(:minimum => Settings.api_version, :maximum => Settings.api_version)
|
||||
api.area(:maximum => Settings.max_request_area)
|
||||
api.note_area(:maximum => Settings.max_note_request_area)
|
||||
api.tracepoints(:per_page => Settings.tracepoints_per_page)
|
||||
api.waynodes(:maximum => Settings.max_number_of_way_nodes)
|
||||
api.changesets(:maximum_elements => Changeset::MAX_ELEMENTS)
|
||||
api.timeout(:seconds => Settings.api_timeout)
|
||||
api.status(:database => @database_status,
|
||||
:api => @api_status,
|
||||
:gpx => @gpx_status)
|
||||
end
|
||||
osm.policy do |policy|
|
||||
policy.imagery do |imagery|
|
||||
IMAGERY_BLACKLIST.each do |url_regex|
|
||||
Settings.imagery_blacklist.each do |url_regex|
|
||||
imagery.blacklist(:regex => url_regex.to_s)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue