cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2020-12-01 22:26:02 +00:00
commit 404f99af1a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/geocoder_controller.rb
View file

@ -149,10 +149,10 @@ class GeocoderController < ApplicationController
t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.tr("_", " ").capitalize t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.tr("_", " ").capitalize
end end
if klass == "boundary" && type == "administrative" 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 prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
place.elements["extratags"].elements.each("tag") do |extratag| 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
end end
prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name

3
config/locales/en.yml
View file

@ -1244,12 +1244,15 @@ en:
"yes": "Waterway" "yes": "Waterway"
admin_levels: admin_levels:
level2: "Country Boundary" level2: "Country Boundary"
level3: "Region Boundary"
level4: "State Boundary" level4: "State Boundary"
level5: "Region Boundary" level5: "Region Boundary"
level6: "County Boundary" level6: "County Boundary"
level7: "Municipality Boundary"
level8: "City Boundary" level8: "City Boundary"
level9: "Village Boundary" level9: "Village Boundary"
level10: "Suburb Boundary" level10: "Suburb Boundary"
level11: "Neighbourhood Boundary"
types: types:
cities: Cities cities: Cities
towns: Towns towns: Towns