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

Merge remote-tracking branch 'upstream/pull/5493'

Browse source
This commit is contained in:
Tom Hughes 2025-03-08 11:18:17 +00:00
commit 121ef82e2c
3 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/index/query.js
View file

@ -68,9 +68,11 @@ OSM.Query = function (map) {
const tags = feature.tags;
let prefix = "";
if (tags.boundary === "administrative" && tags.admin_level) {
prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative")
if (tags.boundary === "administrative" && (tags.border_type || tags.admin_level)) {
prefix = I18n.t("geocoder.search_osm_nominatim.border_types." + tags.border_type, {
defaultValue: I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative")
})
});
} else {
const prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");

6
app/controllers/geocoder_controller.rb
View file

@ -101,10 +101,14 @@ class GeocoderController < ApplicationController
if klass == "boundary" && type == "administrative"
rank = (place.attributes["address_rank"].to_i + 1) / 2
prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
border_type = nil
place_type = nil
place_tags = %w[linked_place place]
place.elements["extratags"].elements.each("tag") do |extratag|
prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if place_tags.include?(extratag.attributes["key"])
border_type = t "geocoder.search_osm_nominatim.border_types.#{extratag.attributes['value']}", :default => border_type if extratag.attributes["key"] == "border_type"
place_type = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => place_type if place_tags.include?(extratag.attributes["key"])
end
prefix_name = place_type || border_type || prefix_name
end
prefix = t ".prefix_format", :name => prefix_name
object_type = place.attributes["osm_type"]

47
config/locales/en.yml
View file

@ -1496,16 +1496,43 @@ en:
weir: "Weir"
"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"
level2: "International Boundary"
level3: "Administrative Boundary (Level 3)"
level4: "Administrative Boundary (Level 4)"
level5: "Administrative Boundary (Level 5)"
level6: "Administrative Boundary (Level 6)"
level7: "Administrative Boundary (Level 7)"
level8: "Administrative Boundary (Level 8)"
level9: "Administrative Boundary (Level 9)"
level10: "Administrative Boundary (Level 10)"
level11: "Administrative Boundary (Level 11)"
border_types:
arrondissement: "Arrondissement Boundary"
borough: "Borough Boundary"
cercle: "Cercle Boundary"
city: "City Boundary"
comarca: "Comarca Boundary"
county: "County Boundary"
departement: "Departmental Boundary"
department: "Departmental Boundary"
district: "District Boundary"
distrito: "District Boundary"
freguesia: "Freguesia Boundary"
local_authority: "Local Authority Boundary"
municipality: "Municipal Boundary"
municipi: "Municipal Boundary"
município: "Municipal Boundary"
nation: "International Boundary"
national: "International Boundary"
neighbourhood: "Neighborhood Boundary"
parish: "Parish Boundary"
province: "Provincial Boundary"
região: "Regional Boundary"
region: "Regional Boundary"
state: "State Boundary"
town: "Town Boundary"
township: "Township Boundary"
village: "Village Boundary"
results:
no_results: "No results found"
more_results: "More results"