From 4ae3afb288756d945c8c279b083903277a502dbd Mon Sep 17 00:00:00 2001 From: Peter Hanecak <115141505+phanecak-maptiler@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:56:54 +0200 Subject: [PATCH] Clean-up of `LanguageUtils` (#200) * string() and transliteratedName() used only here, so moved here from LanguageUtils * use string() from OmtLanguageUtils --- .../java/org/openmaptiles/util/OmtLanguageUtils.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java b/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java index 1cc36c5..8004fc1 100644 --- a/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java +++ b/src/main/java/org/openmaptiles/util/OmtLanguageUtils.java @@ -114,10 +114,18 @@ public class OmtLanguageUtils { return result; } + public static String string(Object obj) { + return nullIfEmpty(obj == null ? null : obj.toString()); + } + + public static String transliteratedName(Map tags) { + return Translations.transliterate(string(tags.get("name"))); + } + private static Stream getAllNameTranslationsBesidesEnglishAndGerman(Map tags) { return tags.entrySet().stream() .filter(e -> !EN_DE_NAME_KEYS.contains(e.getKey()) && VALID_NAME_TAGS.test(e.getKey())) .map(Map.Entry::getValue) - .map(LanguageUtils::string); + .map(OmtLanguageUtils::string); } }