Refactor nominatim translation a bit more.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 9210fa8b5ebd31dee7f17b5aad09e0fa7ad2b068..85e056a55d6f6cef28ef7f2462edcdb986751b1e 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -242,7 +242,7 @@ class GeocoderController < ApplicationController
       type = place.attributes["type"].to_s
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
       type = place.attributes["type"].to_s
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")

-      prefix = t "geocoder.search_osm_nominatim.prefix_#{type}", :default => type.gsub("_", " ").capitalize
+      prefix = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize

 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 12297734682e0537f75de94b7f36693ceb11e4f6..a053a77936c3ced0700253a7ed2d815f1a341e6d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -391,21 +391,30 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:

-      prefix_motorway: "Motorway"
-      prefix_trunk: "Trunk road"
-      prefix_primary: "Primary road"
-      prefix_secondary: "Secondary road"
-      prefix_tertiary: "Tertiary road"
-      prefix_unclassified: "Unclassified road"
-      prefix_residential: "Residential road"
-      prefix_city: "City"
-      prefix_town: "Town"
-      prefix_suburb: "Suburb"
-      prefix_village: "Village"
-      prefix_hamlet: "Hamlet"
-      prefix_station: "Station"
-      prefix_bus_stop: "Bus stop"
-      prefix_pub: "Pub"
+      prefix
+        highway:
+          motorway: "Motorway"
+          trunk: "Trunk road"
+          primary: "Primary road"
+          secondary: "Secondary road"
+          tertiary: "Tertiary road"
+          unclassified: "Unclassified road"
+          residential: "Residential road"
+          track: "Track"
+          footway: "Footpath"
+          cycleway: "Cycle path"
+          bridleway: "Bridleway"
+        place:             
+          city: "City"
+          town: "Town"
+          suburb: "Suburb"
+          village: "Village"
+          hamlet: "Hamlet"
+        railway:
+          station: "Station"
+        amenity:
+          bus_stop: "Bus stop"
+          pub: "Pub"

     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'