From 2593c767ff1766df32015c84d7a54f7ff49f2980 Mon Sep 17 00:00:00 2001
From: Alex Cristici <alex.cristici@gmail.com>
Date: Tue, 30 Sep 2025 16:59:47 +0300
Subject: [PATCH] Fix crash in camera position (#3847)

---
 .../android/location/LocationAnimatorCoordinator.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java
index 8392a2e7d..77be82463 100644
--- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java
+++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java
@@ -108,6 +108,10 @@ final class LocationAnimatorCoordinator {
     LatLng previousCameraLatLng = currentCameraPosition.target;
     float previousCameraBearing = normalize((float) currentCameraPosition.bearing);
 
+    if (previousCameraLatLng == null) {
+      previousCameraLatLng = previousLayerLatLng;
+    }
+
     // generate targets for layer
     LatLng[] latLngValues = getLatLngValues(previousLayerLatLng, newLocations);
     Float[] bearingValues = getBearingValues(previousLayerBearing, newLocations);