From: Tom Hughes <tom@compton.nu>
Date: Tue, 1 Dec 2020 22:26:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2989' into master
X-Git-Tag: live~2838
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/404f99af1a98e780bb9e3845ef00aa72960d69cc?hp=c418523ed8bd64ea4ff822f8ce390038c8b18b61

Merge remote-tracking branch 'upstream/pull/2989' into master
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 309950308..7d05b6765 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -149,10 +149,10 @@ class GeocoderController < ApplicationController
                       t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.tr("_", " ").capitalize
                     end
       if klass == "boundary" && type == "administrative"
-        rank = (place.attributes["place_rank"].to_i + 1) / 2
+        rank = (place.attributes["address_rank"].to_i + 1) / 2
         prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
         place.elements["extratags"].elements.each("tag") do |extratag|
-          prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place"
+          prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "linked_place" || extratag.attributes["key"] == "place"
         end
       end
       prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7613cfd4..7e7302e79 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1244,12 +1244,15 @@ en:
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
+        level3: "Region Boundary"
         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"
+        level7: "Municipality Boundary"
         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
+        level11: "Neighbourhood Boundary"
       types:
         cities: Cities
         towns: Towns