Rename twain geocoder to nominatim.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index f92e370c0c862a5d1918b2f04b26a770e2b9d5ea..6c98d49ddef8cd01373f716d04861e5923ec27b1 100644 (file)
--- 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 4983d362726763ecf8b3e5f52c077808f6f394bd..fce78a364456000025649cba580f17fb898fd0b4 100644 (file)
--- 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 6484fb20437b914d5cc4178e95b14910d8603776..79609d578a8013d33d64a836a7c80225f1d25a3d 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -385,13 +385,13 @@ br:
         geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Disoc'hoù diwar <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Disoc'hoù diwar <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Disoc'hoù diwar <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Disoc'hoù diwar <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Disoc'hoù diwar <a href="http://geocoder.us/">Geocoder.us</a>
     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 7591a0d6e8a689b2fde4fca3d20469b1c78e9080..6011b14c386132504507b772fa4bd89a6ed7971d 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -367,7 +367,7 @@ dsb:
       title: 
         geonames: Městno z <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} z <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Městno z <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Městno z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Wjelike města
         places: Městna
@@ -395,13 +395,13 @@ dsb:
         geonames: Wuslědki z <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Wuslědki z <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Wuslědki z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Wuslědki z <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Wuslědki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Wuslědki z <a href="http://geocoder.us/">Geocoder.us</a>
     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 7b5e846011a9afffae73aac952f79141cd050810..22db70b10b854e07be25c8ca7cea2c8d23a04ccd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,20 +371,20 @@ en:
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        osm_twain: 'Results from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'
+        osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     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 <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        osm_twain: 'Location from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'
+        osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 47402115be914b52c7833604e39ac4bf179f9849..dbb6ff8d67da69542c36324b95dee4568ee01637 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -279,13 +279,13 @@ eo:
         geonames: Rezultoj el <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Rezultoj el <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Rezultoj el <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Rezultoj el <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Rezultoj el <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Rezultoj el <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Rezultoj el <a href="http://geocoder.us/">Geocoder.us</a>
     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 665f9ce2d2b0b1933f58f01b8cb7d633b77aea59..6c03426d2ddd08a9d43e850dd37275e0849c36c6 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -359,7 +359,7 @@ es:
       title: 
         geonames: Ubicación de <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Situaciones desde <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Situaciones desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Ciudades
         places: Lugares
@@ -387,13 +387,13 @@ es:
         geonames: Resultados en <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultados en <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Resultados en <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Resultados de <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultados en <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultados en <a href="http://geocoder.us/">Geocoder.us</a>
     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 ea6c1918feb4f54ca04bf1a5f1638a0322d3e296..28381f692a1821cffbae660ec5172f21157d34af 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -363,7 +363,7 @@ fr:
       title: 
         geonames: Localisation depuis <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} depuis <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Localisation depuis <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Localisation depuis <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Villes
         places: Places
@@ -391,13 +391,13 @@ fr:
         geonames: Résultats depuis <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Résultats <a href="http://openstreetmap.org/">internes</a>
         osm_namefinder: Résultats depuis <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Résultats de <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Résultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Résultats depuis <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Résultats depuis <a href="http://geocoder.us/">Geocoder.us</a>
     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 b0dc4c16fec65ddacd8a1d9c81c0856feff15921..866d520b6ad045201b55ba6509d30083f28c063a 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -363,7 +363,7 @@ hr:
       title: 
         geonames: Lokacija sa <a href="http://www.geonames.org/">GeoNames-a</a>
         osm_namefinder: "{{types}} sa <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefindera</a>"
-        osm_twain: Lokacija sa <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twaina</a>
+        osm_nominatim: Lokacija sa <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatima</a>
       types: 
         cities: Gradovi
         places: Mjesta
@@ -391,13 +391,13 @@ hr:
         geonames: Rezultati iz <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Rezultati iz <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Rezultati iz <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Rezultati sa a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Rezultati sa a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Rezultati iz <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Rezultati iz <a href="http://geocoder.us/">Geocoder.us</a>
     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 079b00a826d9c2b1b10b85b3b98588a04c8531e3..967fc998f8824985fdc020ac9173f601164559fa 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -367,7 +367,7 @@ hsb:
       title: 
         geonames: Městno wot from <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} wot <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Městno z <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Městno z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Wulkoměsta
         places: Městna
@@ -395,13 +395,13 @@ hsb:
         geonames: Wuslědki wot <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Wuslědki wot <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Wuslědki wot <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Wuslědki z <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Wuslědki z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Wuslědki wot <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Wuslědki wot <a href="http://geocoder.us/">Geocoder.us</a>
     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 9bce458a25bc1a21493d821dbc9fed4d76a5494e..b3aa761cce017ef8f7b6eb904f8fab7a05bd24b9 100644 (file)
--- 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 424518664d39a49f50dc3d75e868f237d40b4fb8..60152c703a8022ea4fecef772cf44edfb935820f 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -384,13 +384,13 @@ ia:
         geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultatos <a href="http://openstreetmap.org/">interne</a>
         osm_namefinder: Resultatos de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Resultatos de <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Resultatos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultatos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultatos de <a href="http://geocoder.us/">Geocoder.us</a>
     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 e0777904067f5c9a1a58e36121c38f5f41c436dd..252971ffdd012af6e247a0d8bf326a5f1fed0c72 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -382,7 +382,7 @@ is:
         geonames: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Niðurstöður frá <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Niðurstöður frá <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Niðurstöður frá <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Niðurstöður frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Niðurstöður frá <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 8faa12cd8ccab3d02668e6bce9caa373b7931fd8..46d02d4e994ccdbbf7ab582b98f5322eafa3599f 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -357,7 +357,7 @@ mk:
       title: 
         geonames: Локација од <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} од <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Именикот</a>"
-        osm_twain: Локација од <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Локација од <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Градови
         places: Места
@@ -385,13 +385,13 @@ mk:
         geonames: Резултати од <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Резултати од <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Резултати од <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Именик</a>
-        osm_twain: Резултати од <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Резултати од <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Резултати од <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Резултати од <a href="http://geocoder.us/">Geocoder.us</a>
     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 61789c397912947bba794f0f7cc0409d59f08991..af6e573859fffc5d2f3d298c8caef3f84870851d 100644 (file)
--- 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 3aad74eaa8b120d1961acff8d00db34b32428cea..1decd8911a6858198465a8d137e9daac93e39979 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -359,7 +359,7 @@ nl:
       title: 
         geonames: Locatie van <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} van <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Locatie van <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Locatie van <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Steden
         places: Plaatsen
@@ -387,13 +387,13 @@ nl:
         geonames: Resultaten van <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultaten van <a href="http://openstreetmap.org/">intern</a>
         osm_namefinder: Resultaten van <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Resultaten van <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Resultaten van <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultaten van <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultaten van <a href="http://geocoder.us/">Geocoder.us</a>
     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 97b7b7203e2bb3132c9141e5012f34439cbd995e..3882487e623c13ff026c6089964a70607920f196 100644 (file)
--- 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 6dd73375e20781f2a3a616aae372a60aafcfe79c..0c294ae706ee235aab6b9db886acc4860a9b8a1c 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -388,7 +388,7 @@ pt-BR:
         geonames: Resultados do <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultados <a href="http://openstreetmap.org/">Internos</a>
         osm_namefinder: Resultados do <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Resultados de <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultados do <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultados do <a href="http://geocoder.us/">Geocoder.us</a>
     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 04e11df48465057bb17d938ed3e29299e3102a7c..f2f29c8022f54c688e3c90a6539704058488a738 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -358,7 +358,7 @@ ru:
       title: 
         geonames: Местоположение из <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} из <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Местоположение из <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Местоположение из <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Города
         places: Места
@@ -386,13 +386,13 @@ ru:
         geonames: Результаты от <a href="http://www.geonames.org/">GeoNames</a>
         latlon: <a href="http://openstreetmap.org/">Внутренние результаты</a>
         osm_namefinder: Результаты от <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Результаты, полученые из <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Результаты, полученые из <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Результаты от <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Результаты от <a href="http://geocoder.us/">Geocoder.us</a>
     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 2034d015e68996599109dfa50158b20db7d2cdb4..f111a02e0309c20a4ce4c504760215a8b8a81864 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -153,7 +153,7 @@ te:
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> నుండి ఫలితాలు
         geonames: <a href="http://www.geonames.org/">GeoNames</a> నుండి ఫలితాలు
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> నుండి ఫలితాలు
-    search_osm_twain: 
+    search_osm_nominatim: 
       prefix_highway: "{{type}} రహదారి"
   javascripts: 
     map: 

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e424495a0d17e48ae4fcb9112a082a6e489f3cd5..2bfcbcca02a61d2f850b298c6c049f5c55a34140 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -357,7 +357,7 @@ vi:
       title: 
         geonames: Vị trí từ <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} từ <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
-        osm_twain: Vị trí từ <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Vị trí từ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Thành phố
         places: Địa điểm
@@ -385,13 +385,13 @@ vi:
         geonames: Kết quả <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Kết quả <a href="http://www.openstreetmap.org/">nội bộ</a>
         osm_namefinder: Kết quả <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
-        osm_twain: Kết quả <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>
+        osm_nominatim: Kết quả <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Kết quả <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Kết quả <a href="http://www.geocoder.us/">Geocoder.us</a>
     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 17f393894b3aeda0ef5dac99e8a3c3f45d347ab6..5c8547430571148bab1b45248af95391ae86abfb 100644 (file)
--- 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