X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/64e0c0794b80634697855beaecbf959a8d02363a..e83b793437184341c9a6fef2a1c6735c42fe1c30:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 16d427cfa..9210fa8b5 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -240,14 +240,9 @@ class GeocoderController < ApplicationController
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
       type = place.attributes["type"].to_s
-      name = place.attributes["display_name"].to_s.gsub("_", " ")
+      name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
-
-      if klass == "highway" and ["trunk","primary","secondary","tertiary","unclassified","residential"].include?(type)
-        prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
-      else
-        prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
-      end
+      prefix = t "geocoder.search_osm_nominatim.prefix_#{type}", :default => type.gsub("_", " ").capitalize
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,