mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-23 07:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mapbox Autocomplete: handle cases where house number comes in front of address

Browse Source
This commit is contained in:
johan12345
2021-09-01 19:11:12 +02:00
parent 3ded108c3c
commit c045eed41a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt
View File

@@ -36,11 +36,19 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
}
return result.body()!!.features().map { feature ->
results[feature.id()!!] = feature
var secondaryText = (feature.matchingPlaceName() ?: feature.placeName())!!
val matchingText = (feature.matchingText() ?: feature.text())!!
val primaryText =
(feature.matchingText() ?: feature.text())!! + (feature.address()?.let { " $it" }
?: "")
val secondaryText =
(feature.matchingPlaceName() ?: feature.placeName())!!.replace("$primaryText, ", "")
if (feature.address() != null && secondaryText.startsWith(feature.address() + " " + matchingText)) {
// countries where house number comes in front of road ("10 Downing Street")
feature.address() + " " + matchingText
} else {
// countries where house number comes after road ("Willy-Brandt-Str. 1")
matchingText + (feature.address()?.let { " $it" } ?: "")
}
secondaryText = secondaryText.replace("$primaryText, ", "")
AutocompletePlace(
highlightMatch(primaryText, query),
secondaryText,