From 2fbf735eb16fa2293c572a2efcdf88fd0653c3c0 Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Thu, 22 May 2025 01:38:06 +0200
Subject: [PATCH] Use same logic for feature names

---
 app/assets/javascripts/index/query.js | 19 +++++--------------
 app/helpers/browse_helper.rb          | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 0864418ea..0c9651174 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -109,23 +109,14 @@ OSM.Query = function (map) {
 
   function featureName(feature) {
     const tags = feature.tags,
-          locales = OSM.preferred_languages;
+          localeKeys = OSM.preferred_languages.map(locale => `name:${locale}`);
 
-    for (const locale of locales) {
-      if (tags["name:" + locale]) {
-        return tags["name:" + locale];
-      }
+    for (const key of [...localeKeys, "name", "ref", "addr:housename"]) {
+      if (tags[key]) return tags[key];
     }
+    // TODO: Localize format to country of address
+    if (tags["addr:housenumber"] && tags["addr:street"]) return `${tags["addr:housenumber"]} ${tags["addr:street"]}`;
 
-    for (const key of ["name", "ref", "addr:housename"]) {
-      if (tags[key]) {
-        return tags[key];
-      }
-    }
-
-    if (tags["addr:housenumber"] && tags["addr:street"]) {
-      return tags["addr:housenumber"] + " " + tags["addr:street"];
-    }
     return "#" + feature.id;
   }
 
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 5909706fb..e462eb61b 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -47,17 +47,8 @@ module BrowseHelper
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
-      available_locales = Locale.list(name_locales(object))
-
-      locale = available_locales.preferred(preferred_languages, :default => nil)
-
-      if object.tags.include? "name:#{locale}"
-        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name)
-      elsif object.tags.include? "name"
-        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name"].to_s), :id => tag.bdi(name)
-      elsif object.tags.include? "ref"
-        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["ref"].to_s), :id => tag.bdi(name)
-      end
+      feature_name = feature_name(object.tags)
+      name = t "printable_name.with_name_html", :name => tag.bdi(feature_name), :id => tag.bdi(id.to_s) if feature_name.present?
     end
 
     name
@@ -104,7 +95,15 @@ module BrowseHelper
 
   private
 
-  def name_locales(object)
-    object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten
+  def feature_name(tags)
+    locale_keys = preferred_languages.expand.map { |locale| "name:#{locale}" }
+
+    (locale_keys + %w[name ref addr:housename]).each do |key|
+      return tags[key] if tags[key]
+    end
+    # TODO: Localize format to country of address
+    return "#{tags['addr:housenumber']} #{tags['addr:street']}" if tags["addr:housenumber"] && tags["addr:street"]
+
+    nil
   end
 end
-- 
2.39.5