Skip to content

Commit c015d4d

Browse files
committed
Add a name when a custom place doesn't have one
Signed-off-by: Rafael Chagas <chagas@gmail.com>
1 parent 6b55894 commit c015d4d

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

library/src/main/java/com/rtchagas/pingplacepicker/repository/googlemaps/GoogleMapsRepository.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,22 @@ class GoogleMapsRepository constructor(
154154

155155
val latLng = LatLng(place.geometry.location.lat, place.geometry.location.lng)
156156

157-
val address =
157+
val address: String =
158158
if (place.formattedAddress.isNotEmpty()) place.formattedAddress
159159
else place.vicinity
160160

161-
return CustomPlace(place.placeId, place.name, photoList, address, typeList, latLng)
161+
val name: String = buildPlaceName(place.name, address)
162+
163+
return CustomPlace(place.placeId, name, photoList, address, typeList, latLng)
164+
}
165+
166+
private fun buildPlaceName(originalName: String, address: String): String {
167+
// We have a nice name, use it
168+
if (originalName.isNotEmpty()) {
169+
return originalName
170+
}
171+
// Return the first part of the address, usually the street + number
172+
return address.split(",").first()
162173
}
163174

164175
/**

0 commit comments

Comments
 (0)