From: Tom Hughes <tom@compton.nu>
Date: Mon, 21 Oct 2013 15:54:56 +0000 (+0200)
Subject: Handle an empty type value in a nominatim result
X-Git-Tag: live~4692
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/82e4970766d1493a8ee4088c0d9867b42e9f7558?ds=sidebyside

Handle an empty type value in a nominatim result
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 34d8efdbc..6db70a6f3 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -160,7 +160,11 @@ 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(",")
-      prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      if type.empty?
+        prefix_name = ""
+      else
+        prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      end
       if klass == 'boundary' and type == 'administrative'
         rank = (place.attributes["place_rank"].to_i + 1) / 2
         prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name