react-native-maps 1.26.14 → 1.26.16

package/android/build.gradle

@@ -58,7 +58,7 @@ android {
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 34)
+        targetSdkVersion safeExtGet('targetSdkVersion', 35)
 
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -39,6 +39,7 @@ import com.rnmaps.maps.MapOverlay;
 import com.rnmaps.maps.MapView;
 import com.rnmaps.maps.SizeReportingShadowNode;
 
+import java.util.List;
 import java.util.Map;
 
 @ReactModule(name = MapViewManager.REACT_CLASS)
@@ -318,12 +319,21 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void addView(MapView parent, View child, int index) {
+        parent.addFeature(child, index);
         if (child instanceof MapMarker && ((MapMarker) child).isLoadingImage()){
-            ((MapMarker) child).setImageLoadedListener((uri, drawable, b) -> {
-                parent.addFeature(child, parent.getFeatureCount());
+            MapMarker markerView = (MapMarker) child;
+            // Marker is already added as invisible, restore visibility when image loads
+            markerView.setImageLoadedListener((uri, drawable, b) -> {
+                com.google.android.gms.maps.model.Marker googleMarker =
+                    (com.google.android.gms.maps.model.Marker) markerView.getFeature();
+                if (googleMarker != null) {
+                    // Restore original visibility (marker was hidden temporarily during image load)
+                    if (View.VISIBLE == markerView.getVisibility()) {
+                        googleMarker.setVisible(true);
+                    }
+                }
+                markerView.update(true);
             });
-        } else {
-            parent.addFeature(child, index);
         }
     }
 

package/android/src/main/java/com/rnmaps/maps/MapMarker.java

@@ -665,7 +665,6 @@ public class MapMarker extends MapFeature {
     private Bitmap createDrawable() {
         int width = this.width <= 0 ? 100 : this.width;
         int height = this.height <= 0 ? 100 : this.height;
-        this.buildDrawingCache();
 
         // Do not create the doublebuffer-bitmap each time. reuse it to save memory.
         Bitmap bitmap = mLastBitmapCreated;

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -14,6 +14,7 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -90,7 +91,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener, DefaultLifecycleObserver {
     public GoogleMap map;
     private Bundle savedMapState;
-    private Map<Integer, MapFeature> savedFeatures = new HashMap<>();
+    private ArrayList<MapFeature> savedFeatures = null;
     private boolean shouldRestorePadding = false;
 
     private MarkerManager markerManager;
@@ -140,7 +141,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private static final String[] PERMISSIONS = new String[]{
             "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
-    private final Map<Integer, MapFeature> features = new HashMap<>();
+    private final List<MapFeature> features = new ArrayList<>();
     private final Map<Marker, MapMarker> markerMap = new HashMap<>();
     private final Map<Polyline, MapPolyline> polylineMap = new HashMap<>();
     private final Map<Polygon, MapPolygon> polygonMap = new HashMap<>();
@@ -228,16 +229,16 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     @Override
     public void onPause(LifecycleOwner owner) {
-        super.onPause();
         if (hasPermissions() && map != null) {
             //noinspection MissingPermission
             map.setMyLocationEnabled(false);
         }
         synchronized (MapView.this) {
-            if (!destroyed) {
+            if (!paused) {
+                super.onPause();
                 MapView.this.onPause();
+                paused = true;
             }
-            paused = true;
         }
     }
 
@@ -317,6 +318,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
+
+        // Reset lifecycle flags when reattaching
+        synchronized (this) {
+            paused = false;
+        }
+
         attachLifecycleObserver();
         if (savedMapState != null) {
             super.onCreate(savedMapState);
@@ -325,9 +332,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             prepareAttacherView();
             getMapAsync((map)->{
                 onMapReady(map);
-                savedFeatures.forEach((index, feature) -> {
-                    addFeature(feature, index);
-                });
+                if (savedFeatures != null && !savedFeatures.isEmpty()) {
+                    for (int i = 0; i < savedFeatures.size(); i++) {
+                        addFeature(savedFeatures.get(i), i);
+                    }
+                }
+                savedFeatures = null;
             });
         }
     }
@@ -335,14 +345,35 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     // Override onDetachedFromWindow to detach lifecycle observer
     @Override
     protected void onDetachedFromWindow() {
-        if (savedMapState == null) {
-            savedMapState = new Bundle();
+        synchronized (this) {
+            // Save instance state if not already saved and map is ready
+            if (map != null && isMapReady) {
+                try {
+                    if (savedMapState == null) {
+                        savedMapState = new Bundle();
+                    }
+                    super.onSaveInstanceState(savedMapState);
+                } catch (Exception e) {
+                    Log.e("MapView", "Error saving state in onDetachedFromWindow: " + e.getMessage());
+                    // Continue with cleanup even if state saving fails
+                }
+            }
+
+            // Pause safely if not already paused
+            if (!paused) {
+                onPause();
+            }
         }
-        super.onSaveInstanceState(savedMapState);
-        super.onPause();
-        super.onStop();
-        savedFeatures = new HashMap<>(features);
-        savedFeatures.keySet().forEach(this::removeFeatureAt);
+
+        // These operations don't need synchronization
+        try {
+            onStop();
+        } catch (Exception e) {
+            Log.e("MapView", "Error during stop in onDetachedFromWindow: " + e.getMessage());
+        }
+
+        savedFeatures = new ArrayList<>(features);
+        features.clear();
         shouldRestorePadding = true;
         removeView(attacherGroup);
         attacherGroup = null;
@@ -374,7 +405,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
         boolean addedPosition = false;
         LatLngBounds mapBounds = map.getProjection().getVisibleRegion().latLngBounds;
-        for (MapFeature feature : features.values()) {
+        for (MapFeature feature : features) {
             if (feature instanceof MapMarker) {
                 Marker marker = (Marker) feature.getFeature();
                 if (!onlyVisible ||
@@ -1128,7 +1159,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         if (child instanceof MapMarker) {
             MapMarker annotation = (MapMarker) child;
             annotation.addToMap(markerCollection);
-            features.put(index, annotation);
+            features.add(index, annotation);
 
             // Allow visibility event to be triggered later
             int visibility = annotation.getVisibility();
@@ -1155,47 +1186,47 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         } else if (child instanceof MapPolyline) {
             MapPolyline polylineView = (MapPolyline) child;
             polylineView.addToMap(polylineCollection);
-            features.put(index, polylineView);
+            features.add(index, polylineView);
             Polyline polyline = (Polyline) polylineView.getFeature();
             polylineMap.put(polyline, polylineView);
         } else if (child instanceof MapGradientPolyline) {
             MapGradientPolyline polylineView = (MapGradientPolyline) child;
             polylineView.addToMap(map);
-            features.put(index, polylineView);
+            features.add(index, polylineView);
             TileOverlay tileOverlay = (TileOverlay) polylineView.getFeature();
             gradientPolylineMap.put(tileOverlay, polylineView);
         } else if (child instanceof MapPolygon) {
             MapPolygon polygonView = (MapPolygon) child;
             polygonView.addToMap(polygonCollection);
-            features.put(index, polygonView);
+            features.add(index, polygonView);
             Polygon polygon = (Polygon) polygonView.getFeature();
             polygonMap.put(polygon, polygonView);
         } else if (child instanceof MapCircle) {
             MapCircle circleView = (MapCircle) child;
             circleView.addToMap(circleCollection);
-            features.put(index, circleView);
+            features.add(index, circleView);
         } else if (child instanceof MapUrlTile) {
             MapUrlTile urlTileView = (MapUrlTile) child;
             urlTileView.addToMap(map);
-            features.put(index, urlTileView);
+            features.add(index, urlTileView);
         } else if (child instanceof MapWMSTile) {
             MapWMSTile urlTileView = (MapWMSTile) child;
             urlTileView.addToMap(map);
-            features.put(index, urlTileView);
+            features.add(index, urlTileView);
         } else if (child instanceof MapLocalTile) {
             MapLocalTile localTileView = (MapLocalTile) child;
             localTileView.addToMap(map);
-            features.put(index, localTileView);
+            features.add(index, localTileView);
         } else if (child instanceof MapOverlay) {
             MapOverlay overlayView = (MapOverlay) child;
             overlayView.addToMap(groundOverlayCollection);
-            features.put(index, overlayView);
+            features.add(index, overlayView);
             GroundOverlay overlay = (GroundOverlay) overlayView.getFeature();
             overlayMap.put(overlay, overlayView);
         } else if (child instanceof MapHeatmap) {
             MapHeatmap heatmapView = (MapHeatmap) child;
             heatmapView.addToMap(map);
-            features.put(index, heatmapView);
+            features.add(index, heatmapView);
             TileOverlay heatmap = (TileOverlay) heatmapView.getFeature();
             heatmapMap.put(heatmap, heatmapView);
         } else if (child instanceof ViewGroup) {
@@ -1340,8 +1371,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
         boolean addedPosition = false;
-        if (!features.isEmpty()) {
-            for (MapFeature feature : features.values()) {
+        if (features.size() > 0) {
+            for (MapFeature feature : features) {
                 if (feature instanceof MapMarker) {
                     Marker marker = (Marker) feature.getFeature();
                     builder.include(marker.getPosition());
@@ -1383,7 +1414,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         List<String> markerIDList = Arrays.asList(markerIDs);
 
-        for (MapFeature feature : features.values()) {
+        for (MapFeature feature : features) {
             if (feature instanceof MapMarker) {
                 String identifier = ((MapMarker) feature).getIdentifier();
                 Marker marker = (Marker) feature.getFeature();

package/package.json

@@ -7,7 +7,7 @@
   "types": "dist/src/index.d.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.26.14",
+  "version": "1.26.16",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",