Add support for logical deletion of diary entries and comments.

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index df051f09d748195a7c0d67e008fdfe8822d1d3c9..eed63c7a44fd5de3ab2ba1c9340ff6b0549bc921 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -239,11 +239,11 @@ class GeocoderController < ApplicationController
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s

-      type = place.attributes["type"].to_s
+      type = place.attributes["type"].to_s.gsub("_", " ")

       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
 
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
 

-      if klass == "highway"
+      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
         prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
       else
         prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize