lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove OSM category 'other'

Browse Source
This commit is contained in:
MM20 2024-06-14 15:27:29 +02:00
parent 01710760d2
commit 23782313b5
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/i18n/src/main/res/values/strings.xml
View File

@ -856,7 +856,6 @@
<string name="poi_category_cafe">Cafe</string> <string name="poi_category_cafe">Cafe</string>
<string name="poi_category_hotel">Hotel</string> <string name="poi_category_hotel">Hotel</string>
<string name="poi_category_supermarket">Supermarket</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_school">School</string>
<string name="poi_category_parking">Parking</string> <string name="poi_category_parking">Parking</string>
<string name="poi_category_fuel">Gas station</string> <string name="poi_category_fuel">Gas station</string>

4
data/locations/src/main/java/de/mm20/launcher2/locations/providers/openstreetmaps/OsmLocation.kt
View File

@ -159,7 +159,7 @@ private fun <A, B> Map<String, String>.matchAnyTag(
?.firstNotNullOfOrNull { scope[it] } ?.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 category = this.firstNotNullOfOrNull { (tag, value) ->
val values = value.split(' ', ',', '.', ';').map { it.trim() }.toSet() val values = value.split(' ', ',', '.', ';').map { it.trim() }.toSet()
when (tag.lowercase()) { when (tag.lowercase()) {
@ -305,7 +305,7 @@ private fun Map<String, String>.categorize(context: Context): Pair<String, Locat
else -> null 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 return context.resources.getString(rid) to icon
} }