diff --git a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
index 31f79f81..94451fe2 100644
--- a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
@@ -14,6 +14,7 @@ import net.vonforst.evmap.joinToSpannedString
import net.vonforst.evmap.model.ChargeCard
import net.vonforst.evmap.model.ChargeCardId
import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Coordinate
import net.vonforst.evmap.model.OpeningHoursDays
import net.vonforst.evmap.plus
import net.vonforst.evmap.ui.currency
diff --git a/app/src/main/res/layout/detail_view.xml b/app/src/main/res/layout/detail_view.xml
index e91f7e7a..dcc33bf5 100644
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -23,6 +23,8 @@
+
+
@@ -123,9 +125,9 @@
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
- android:text="@{charger.data.address.toString()}"
+ android:text="@{charger.data != null ? (charger.data.address != null ? charger.data.address.toString() : LocationUtilsKt.formatDMS(charger.data.coordinates)) : null }"
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
- app:invisibleUnless="@{charger.data.address != null}"
+ app:invisibleUnless="@{charger.data != null}"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/txtName"