From 23782313b5bf37a1ba373e9cc086b2137c722015 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 14 Jun 2024 15:27:29 +0200
Subject: [PATCH] Remove OSM category 'other'

---
 core/i18n/src/main/res/values/strings.xml                     | 1 -
 .../locations/providers/openstreetmaps/OsmLocation.kt         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml
index bd7a62a4..8dd9e590 100644
--- a/core/i18n/src/main/res/values/strings.xml
+++ b/core/i18n/src/main/res/values/strings.xml
@@ -856,7 +856,6 @@
     <string name="poi_category_cafe">Cafe</string>
     <string name="poi_category_hotel">Hotel</string>
     <string name="poi_category_supermarket">Supermarket</string>
-    <string name="poi_category_other">Place of interest</string>
     <string name="poi_category_school">School</string>
     <string name="poi_category_parking">Parking</string>
     <string name="poi_category_fuel">Gas station</string>
diff --git a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
index 63720092..6a84c887 100644
--- a/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
+++ b/data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
@@ -159,7 +159,7 @@ private fun <A, B> Map<String, String>.matchAnyTag(
         ?.firstNotNullOfOrNull { scope[it] }
 }
 
-private fun Map<String, String>.categorize(context: Context): Pair<String, LocationIcon?> {
+private fun Map<String, String>.categorize(context: Context): Pair<String?, LocationIcon?> {
     val category = this.firstNotNullOfOrNull { (tag, value) ->
         val values = value.split(' ', ',', '.', ';').map { it.trim() }.toSet()
         when (tag.lowercase()) {
@@ -305,7 +305,7 @@ private fun Map<String, String>.categorize(context: Context): Pair<String, Locat
             else -> null
         }
     }
-    val (rid, icon) = category ?: (R.string.poi_category_other to null)
+    val (rid, icon) = category ?: return null to null
     return context.resources.getString(rid) to icon
 }