From: Tom Hughes Date: Mon, 9 Nov 2009 09:06:52 +0000 (+0000) Subject: Rename twain geocoder to nominatim. X-Git-Tag: live~6565 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ea2652a211fb94a1148ce27f7877cc53199cf251?ds=sidebyside Rename twain geocoder to nominatim. --- diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index f92e370c0..6c98d49dd 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -19,13 +19,13 @@ 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_namefinder" - @sources.push "osm_twain" if APP_CONFIG['twain_enabled'] 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_namefinder" - @sources.push "osm_twain" if APP_CONFIG['twain_enabled'] @sources.push "geonames" end @@ -215,7 +215,7 @@ class GeocoderController < ApplicationController render :action => "error" end - def search_osm_twain + def search_osm_nominatim # get query parameters query = params[:query] @@ -223,7 +223,7 @@ class GeocoderController < ApplicationController @results = Array.new # ask OSM namefinder - response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&polygon=true&q=#{escape_query(query)}") + response = fetch_xml("http://nominatim.openstreetmap.org/search.php?format=xml&polygon=true&q=#{escape_query(query)}") # parse the response response.elements.each("searchresults/place") do |place| @@ -236,9 +236,9 @@ class GeocoderController < ApplicationController min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",") if klass == "highway" - prefix = t 'geocoder.search_osm_twain.prefix_highway', :type => type.capitalize + prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize else - prefix = t 'geocoder.search_osm_twain.prefix_other', :type => type.capitalize + prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize end @results.push({:lat => lat, :lon => lon, :zoom => zoom, @@ -249,7 +249,7 @@ class GeocoderController < ApplicationController render :action => "results" rescue Exception => ex - @error = "Error contacting katie.openstreetmap.org: #{ex.to_s}" + @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}" render :action => "error" end @@ -284,10 +284,10 @@ class GeocoderController < ApplicationController def description @sources = Array.new + @sources.push({ :name => "osm_nominatim" }) if APP_CONFIG['nominatim_enabled'] @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 }) - @sources.push({ :name => "osm_twain" }) if APP_CONFIG['twain_enabled'] @sources.push({ :name => "geonames" }) render :update do |page| @@ -332,7 +332,7 @@ class GeocoderController < ApplicationController render :action => "error" end - def description_osm_twain + def description_osm_nominatim # get query parameters lat = params[:lat] lon = params[:lon] @@ -342,7 +342,7 @@ class GeocoderController < ApplicationController @results = Array.new # ask OSM namefinder - response = fetch_xml("http://katie.openstreetmap.org/~twain/reverse.php?lat=#{lat}&lon=#{lon}&zoom=#{zoom}") + response = fetch_xml("http://nominatim.openstreetmap.org/reverse.php?lat=#{lat}&lon=#{lon}&zoom=#{zoom}") # parse the response response.elements.each("reversegeocode") do |result| @@ -353,7 +353,7 @@ class GeocoderController < ApplicationController render :action => "results" rescue Exception => ex - @error = "Error contacting katie.openstreetmap.org: #{ex.to_s}" + @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}" render :action => "error" end diff --git a/config/application.yml b/config/application.yml index 4983d3627..fce78a364 100644 --- a/config/application.yml +++ b/config/application.yml @@ -11,8 +11,8 @@ standard_settings: &standard_settings postcode_zoom: 15 # Zoom level to use for geonames results from the geocoder geonames_zoom: 12 - # Enable experimental "twain" geocoder - twain_enabled: false + # 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 diff --git a/config/locales/br.yml b/config/locales/br.yml index 6484fb204..79609d578 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -385,13 +385,13 @@ br: geonames: Disoc'hoù diwar GeoNames latlon: Disoc'hoù diwar Internal osm_namefinder: Disoc'hoù diwar OpenStreetMap Namefinder - osm_twain: Disoc'hoù diwar OpenStreetMap Twain + osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim uk_postcode: Disoc'hoù diwar NPEMap / FreeThe Postcode us_postcode: Disoc'hoù diwar Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})" suffix_place: " {{distance}} {{direction}} diouzh {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: hent {{type}} javascripts: map: diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 7591a0d6e..6011b14c3 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -367,7 +367,7 @@ dsb: title: geonames: Městno z GeoNames osm_namefinder: "{{types}} z OpenStreetMap Namefinder" - osm_twain: Městno z OpenStreetMap Twain + osm_nominatim: Městno z OpenStreetMap Nominatim types: cities: Wjelike města places: Městna @@ -395,13 +395,13 @@ dsb: geonames: Wuslědki z GeoNames latlon: Wuslědki z Internal osm_namefinder: Wuslědki z OpenStreetMap Namefinder - osm_twain: Wuslědki z OpenStreetMap Twain + osm_nominatim: Wuslědki z OpenStreetMap Nominatim uk_postcode: Wuslědki z NPEMap / FreeThe Postcode us_postcode: Wuslědki z Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wót {{parentname}})" suffix_place: ", {{distance}} {{direction}} wót {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: Droga typa {{type}} javascripts: map: diff --git a/config/locales/en.yml b/config/locales/en.yml index 7b5e84601..22db70b10 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -371,20 +371,20 @@ en: uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' osm_namefinder: 'Results from OpenStreetMap Namefinder' - osm_twain: 'Results from OpenStreetMap Twain' + osm_nominatim: 'Results from OpenStreetMap Nominatim' geonames: 'Results from GeoNames' search_osm_namefinder: prefix: "{{type}}" suffix_place: ", {{distance}} {{direction}} of {{placename}}" suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})" suffix_suburb: "{{suffix}}, {{parentname}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} road" prefix_other: "{{type}}" description: title: osm_namefinder: '{{types}} from OpenStreetMap Namefinder' - osm_twain: 'Location from OpenStreetMap Twain' + osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 47402115b..dbb6ff8d6 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -279,13 +279,13 @@ eo: geonames: Rezultoj el GeoNames latlon: Rezultoj el Internal osm_namefinder: Rezultoj el OpenStreetMap Namefinder - osm_twain: Rezultoj el OpenStreetMap Twain + osm_nominatim: Rezultoj el OpenStreetMap Nominatim uk_postcode: Rezultoj el NPEMap / FreeThe Postcode us_postcode: Rezultoj el Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})" suffix_place: ", {{distance}} {{direction}} de {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} vojo" layouts: edit: Redakti diff --git a/config/locales/es.yml b/config/locales/es.yml index 665f9ce2d..6c03426d2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -359,7 +359,7 @@ es: title: geonames: Ubicación de GeoNames osm_namefinder: "{{types}} de OpenStreetMap Namefinder" - osm_twain: Situaciones desde OpenStreetMap Twain + osm_nominatim: Situaciones desde OpenStreetMap Nominatim types: cities: Ciudades places: Lugares @@ -387,13 +387,13 @@ es: geonames: Resultados en GeoNames latlon: Resultados en Internal osm_namefinder: Resultados en OpenStreetMap Namefinder - osm_twain: Resultados de OpenStreetMap Twain + osm_nominatim: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados en NPEMap / FreeThe Postcode us_postcode: Resultados en Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})" suffix_place: ", {{distance}} {{direction}} de {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: vía {{type}} javascripts: map: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ea6c1918f..28381f692 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -363,7 +363,7 @@ fr: title: geonames: Localisation depuis GeoNames osm_namefinder: "{{types}} depuis OpenStreetMap Namefinder" - osm_twain: Localisation depuis OpenStreetMap Twain + osm_nominatim: Localisation depuis OpenStreetMap Nominatim types: cities: Villes places: Places @@ -391,13 +391,13 @@ fr: geonames: Résultats depuis GeoNames latlon: Résultats internes osm_namefinder: Résultats depuis OpenStreetMap Namefinder - osm_twain: Résultats de OpenStreetMap Twain + osm_nominatim: Résultats de OpenStreetMap Nominatim uk_postcode: Résultats depuis NPEMap / FreeThe Postcode us_postcode: Résultats depuis Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})" suffix_place: ", {{distance}} {{direction}} de {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: route {{type}} javascripts: map: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index b0dc4c16f..866d520b6 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -363,7 +363,7 @@ hr: title: geonames: Lokacija sa GeoNames-a osm_namefinder: "{{types}} sa OpenStreetMap Namefindera" - osm_twain: Lokacija sa OpenStreetMap Twaina + osm_nominatim: Lokacija sa OpenStreetMap Nominatima types: cities: Gradovi places: Mjesta @@ -391,13 +391,13 @@ hr: geonames: Rezultati iz GeoNames latlon: Rezultati iz Internal osm_namefinder: Rezultati iz OpenStreetMap Namefinder - osm_twain: Rezultati sa a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain + osm_nominatim: Rezultati sa a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim uk_postcode: Rezultati iz NPEMap / FreeThe Postcode us_postcode: Rezultati iz Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})" suffix_place: ", {{distance}} {{direction}} od {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} cesta" javascripts: map: diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 079b00a82..967fc998f 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -367,7 +367,7 @@ hsb: title: geonames: Městno wot from GeoNames osm_namefinder: "{{types}} wot OpenStreetMap Namefinder" - osm_twain: Městno z OpenStreetMap Twain + osm_nominatim: Městno z OpenStreetMap Nominatim types: cities: Wulkoměsta places: Městna @@ -395,13 +395,13 @@ hsb: geonames: Wuslědki wot GeoNames latlon: Wuslědki wot Internal osm_namefinder: Wuslědki wot OpenStreetMap Namefinder - osm_twain: Wuslědki z OpenStreetMap Twain + osm_nominatim: Wuslědki z OpenStreetMap Nominatim uk_postcode: Wuslědki wot NPEMap / FreeThe Postcode us_postcode: Wuslědki wot Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wot {{parentname}})" suffix_place: ", {{distance}} {{direction}} z {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: Dróha typa {{type}} javascripts: map: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 9bce458a2..b3aa761cc 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -389,7 +389,7 @@ hu: suffix_parent: "{{suffix}} ({{parentdistance}}-re {{parentdirection}} innen: {{parentname}})" suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}" suffix_suburb: "{{suffix}} ({{parentname}})" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} út" javascripts: map: diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 424518664..60152c703 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -384,13 +384,13 @@ ia: geonames: Resultatos de GeoNames latlon: Resultatos interne osm_namefinder: Resultatos de OpenStreetMap Namefinder - osm_twain: Resultatos de OpenStreetMap Twain + osm_nominatim: Resultatos de OpenStreetMap Nominatim uk_postcode: Resultatos de NPEMap / FreeThe Postcode us_postcode: Resultatos de Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} al {{parentdirection}} de {{parentname}})" suffix_place: ", {{distance}} al {{direction}} de {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: cammino {{type}} javascripts: map: diff --git a/config/locales/is.yml b/config/locales/is.yml index e07779040..252971ffd 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -382,7 +382,7 @@ is: geonames: Niðurstöður frá GeoNames latlon: Niðurstöður frá Internal osm_namefinder: Niðurstöður frá OpenStreetMap Namefinder - osm_twain: Niðurstöður frá OpenStreetMap Twain + osm_nominatim: Niðurstöður frá OpenStreetMap Nominatim uk_postcode: Niðurstöður frá NPEMap / FreeThe Postcode us_postcode: Niðurstöður frá Geocoder.us search_osm_namefinder: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 8faa12cd8..46d02d4e9 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -357,7 +357,7 @@ mk: title: geonames: Локација од GeoNames osm_namefinder: "{{types}} од OpenStreetMap Именикот" - osm_twain: Локација од OpenStreetMap Twain + osm_nominatim: Локација од OpenStreetMap Nominatim types: cities: Градови places: Места @@ -385,13 +385,13 @@ mk: geonames: Резултати од GeoNames latlon: Резултати од Internal osm_namefinder: Резултати од OpenStreetMap Именик - osm_twain: Резултати од OpenStreetMap Twain + osm_nominatim: Резултати од OpenStreetMap Nominatim uk_postcode: Резултати од NPEMap / FreeThe Postcode us_postcode: Резултати од Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} од {{parentname}})" suffix_place: ", {{distance}} {{direction}} од {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} пат" javascripts: map: diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 61789c397..af6e57385 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -229,7 +229,7 @@ nds: search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})" suffix_place: ", {{distance}} {{direction}} von {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: Straat von’n Typ {{type}} javascripts: map: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3aad74eaa..1decd8911 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -359,7 +359,7 @@ nl: title: geonames: Locatie van GeoNames osm_namefinder: "{{types}} van OpenStreetMap Namefinder" - osm_twain: Locatie van OpenStreetMap Twain + osm_nominatim: Locatie van OpenStreetMap Nominatim types: cities: Steden places: Plaatsen @@ -387,13 +387,13 @@ nl: geonames: Resultaten van GeoNames latlon: Resultaten van intern osm_namefinder: Resultaten van OpenStreetMap Namefinder - osm_twain: Resultaten van OpenStreetMap Twain + osm_nominatim: Resultaten van OpenStreetMap Nominatim uk_postcode: Resultaten van NPEMap / FreeThe Postcode us_postcode: Resultaten van Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})" suffix_place: ", {{distance}} {{direction}} van {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: Weg van type {{type}} javascripts: map: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 97b7b7203..3882487e6 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -298,7 +298,7 @@ pl: search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} względem {{parentname}})" suffix_place: ", {{distance}} {{direction}} względem {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: droga {{type}} layouts: donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 6dd73375e..0c294ae70 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -388,7 +388,7 @@ pt-BR: geonames: Resultados do GeoNames latlon: Resultados Internos osm_namefinder: Resultados do OpenStreetMap Namefinder - osm_twain: Resultados de OpenStreetMap Twain + osm_nominatim: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados do NPEMap / FreeThe Postcode us_postcode: Resultados do Geocoder.us search_osm_namefinder: @@ -396,7 +396,7 @@ pt-BR: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})" suffix_place: ", {{distance}} {{direction}} de {{placename}}" suffix_suburb: "{{suffix}}, {{parentname}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: via {{type}} prefix_other: "{{type}}" javascripts: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 04e11df48..f2f29c802 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -358,7 +358,7 @@ ru: title: geonames: Местоположение из GeoNames osm_namefinder: "{{types}} из OpenStreetMap Namefinder" - osm_twain: Местоположение из OpenStreetMap Twain + osm_nominatim: Местоположение из OpenStreetMap Nominatim types: cities: Города places: Места @@ -386,13 +386,13 @@ ru: geonames: Результаты от GeoNames latlon: Внутренние результаты osm_namefinder: Результаты от OpenStreetMap Namefinder - osm_twain: Результаты, полученые из OpenStreetMap Twain + osm_nominatim: Результаты, полученые из OpenStreetMap Nominatim uk_postcode: Результаты от NPEMap / FreeThe Postcode us_postcode: Результаты от Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})" suffix_place: ", {{distance}} {{direction}} {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} дорога" javascripts: map: diff --git a/config/locales/te.yml b/config/locales/te.yml index 2034d015e..f111a02e0 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -153,7 +153,7 @@ te: ca_postcode: Geocoder.CA నుండి ఫలితాలు geonames: GeoNames నుండి ఫలితాలు us_postcode: Geocoder.us నుండి ఫలితాలు - search_osm_twain: + search_osm_nominatim: prefix_highway: "{{type}} రహదారి" javascripts: map: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e424495a0..2bfcbcca0 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -357,7 +357,7 @@ vi: title: geonames: Vị trí từ GeoNames osm_namefinder: "{{types}} từ OpenStreetMap Namefinder" - osm_twain: Vị trí từ OpenStreetMap Twain + osm_nominatim: Vị trí từ OpenStreetMap Nominatim types: cities: Thành phố places: Địa điểm @@ -385,13 +385,13 @@ vi: geonames: Kết quả GeoNames latlon: Kết quả nội bộ osm_namefinder: Kết quả OpenStreetMap Namefinder - osm_twain: Kết quả OpenStreetMap Twain + osm_nominatim: Kết quả OpenStreetMap Nominatim uk_postcode: Kết quả NPEMap / FreeThe Postcode us_postcode: Kết quả Geocoder.us search_osm_namefinder: suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})" suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}" - search_osm_twain: + search_osm_nominatim: prefix_highway: Đường {{type}} javascripts: map: diff --git a/config/routes.rb b/config/routes.rb index 17f393894..5c8547430 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,11 +180,11 @@ ActionController::Routing::Routes.draw do |map| map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_uk_postcode' map.connect '/geocoder/search_ca_postcode', :controller => 'geocoder', :action => 'search_ca_postcode' map.connect '/geocoder/search_osm_namefinder', :controller => 'geocoder', :action => 'search_osm_namefinder' - map.connect '/geocoder/search_osm_twain', :controller => 'geocoder', :action => 'search_osm_twain' + map.connect '/geocoder/search_osm_nominatim', :controller => 'geocoder', :action => 'search_osm_nominatim' map.connect '/geocoder/search_geonames', :controller => 'geocoder', :action => 'search_geonames' map.connect '/geocoder/description', :controller => 'geocoder', :action => 'description' map.connect '/geocoder/description_osm_namefinder', :controller => 'geocoder', :action => 'description_osm_namefinder' - map.connect '/geocoder/description_osm_twain', :controller => 'geocoder', :action => 'description_osm_twain' + map.connect '/geocoder/description_osm_nominatim', :controller => 'geocoder', :action => 'description_osm_nominatim' map.connect '/geocoder/description_geonames', :controller => 'geocoder', :action => 'description_geonames' # export