cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make nominatim live.

Browse source
This commit is contained in:
Tom Hughes 2009-11-11 14:22:21 +00:00
parent 6b379a19d1
commit c6eb4d5856
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/geocoder_controller.rb
View file

@ -19,12 +19,12 @@ class GeocoderController < ApplicationController
@sources.push "us_postcode"
elsif @query.match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)
@sources.push "uk_postcode"
@sources.push "osm_nominatim" if APP_CONFIG['nominatim_enabled']
@sources.push "osm_nominatim"
@sources.push "osm_namefinder"
elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
@sources.push "ca_postcode"
else
@sources.push "osm_nominatim" if APP_CONFIG['nominatim_enabled']
@sources.push "osm_nominatim"
@sources.push "osm_namefinder"
@sources.push "geonames"
end
@ -292,7 +292,7 @@ class GeocoderController < ApplicationController
def description
@sources = Array.new
@sources.push({ :name => "osm_nominatim" }) if APP_CONFIG['nominatim_enabled']
@sources.push({ :name => "osm_nominatim" })
@sources.push({ :name => "osm_namefinder", :types => "cities", :max => 2 })
@sources.push({ :name => "osm_namefinder", :types => "towns", :max => 4 })
@sources.push({ :name => "osm_namefinder", :types => "places", :max => 10 })

2
config/application.yml
View file

@ -11,8 +11,6 @@ standard_settings: &standard_settings
postcode_zoom: 15
# Zoom level to use for geonames results from the geocoder
geonames_zoom: 12
# Enable experimental nominatim geocoder
nominatim_enabled: false
# Timeout for API calls in seconds
api_timeout: 300
# Periods (in hours) which are allowed for user blocks