androidlover5842/TrisolarisServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer district for pin geocode city
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
Details

Browse Source
This commit is contained in:
androidlover5842
2026-01-31 11:01:40 +05:30
parent 8e547570e1
commit 41452ccd3d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/com/android/trisolarisserver/component/GoogleGeocodingClient.kt
View File

@@ -46,6 +46,7 @@ class GoogleGeocodingClient(
if (!components.isArray) return null if (!components.isArray) return null
var city: String? = null var city: String? = null
var admin2: String? = null
var state: String? = null var state: String? = null
for (comp in components) { for (comp in components) {
val types = comp.path("types").mapNotNull { it.asText(null) }.toSet() val types = comp.path("types").mapNotNull { it.asText(null) }.toSet()
@@ -57,13 +58,12 @@ class GoogleGeocodingClient(
"sublocality" in types -> if (city == null) { "sublocality" in types -> if (city == null) {
city = comp.path("long_name").asText(null) city = comp.path("long_name").asText(null)
} }
"administrative_area_level_2" in types -> if (city == null) { "administrative_area_level_2" in types -> admin2 = comp.path("long_name").asText(null) ?: admin2
city = comp.path("long_name").asText(null)
}
"administrative_area_level_1" in types -> state = comp.path("long_name").asText(null) ?: state "administrative_area_level_1" in types -> state = comp.path("long_name").asText(null) ?: state
} }
} }
if (city.isNullOrBlank() && state.isNullOrBlank()) return null val preferredCity = admin2?.trim()?.ifBlank { null } ?: city?.trim()?.ifBlank { null }
return listOfNotNull(city?.trim()?.ifBlank { null }, state?.trim()?.ifBlank { null }).joinToString(", ") if (preferredCity == null && state.isNullOrBlank()) return null
return listOfNotNull(preferredCity, state?.trim()?.ifBlank { null }).joinToString(", ")
} }
} }