react-native-maps 1.26.8 → 1.26.10

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

@@ -17,11 +17,13 @@ import android.animation.TypeEvaluator;
 import android.os.Handler;
 import android.os.Looper;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.AbstractDraweeController;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.controller.ControllerListener;
 import com.facebook.drawee.drawable.ScalingUtils;
@@ -29,6 +31,8 @@ import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.view.DraweeHolder;
+import com.facebook.drawee.view.DraweeView;
+import com.facebook.fresco.ui.common.ControllerListener2;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.image.CloseableStaticBitmap;
@@ -56,6 +60,7 @@ import com.rnmaps.fabric.event.OnDragStartEvent;
 import com.rnmaps.fabric.event.OnPressEvent;
 import com.rnmaps.fabric.event.OnSelectEvent;
 
+import java.lang.reflect.Method;
 import java.util.Map;
 
 public class MapMarker extends MapFeature {
@@ -324,7 +329,7 @@ public class MapMarker extends MapFeature {
         }
 
         updateMarkerIcon();
-        if (updated > 0){
+        if (updated > 0) {
             updated--;
         }
         return true;
@@ -449,9 +454,67 @@ public class MapMarker extends MapFeature {
         if (!(child instanceof MapCallout)) {
             hasCustomMarkerView = true;
             updateTracksViewChanges();
+            hackToHandleDraweeLifecycle(child);
         }
         update(true);
     }
+    private void hackToHandleDraweeLifecycle(View child){
+        if (child instanceof DraweeView<?>) {
+            try {
+                DraweeView draweeView = (DraweeView) child;
+
+                Method onAttachMethod = DraweeView.class.getDeclaredMethod("onAttachedToWindow");
+                onAttachMethod.setAccessible(true);
+                onAttachMethod.invoke(child);
+
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+
+                if (draweeView.getController() instanceof AbstractDraweeController<?,?>){
+                    AbstractDraweeController abstractController = (AbstractDraweeController) draweeView.getController();
+
+                    abstractController.addControllerListener2(new ControllerListener2() {
+                        @Override
+                        public void onSubmit(@NonNull String s, @Nullable Object o, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onFinalImageSet(@NonNull String s, @Nullable Object o, @Nullable Extras extras) {
+                            mainHandler.postDelayed(() -> update(true), ((GenericDraweeHierarchy) draweeView.getHierarchy()).getFadeDuration());
+                        }
+
+                        @Override
+                        public void onIntermediateImageSet(@NonNull String s, @Nullable Object o) {
+                            mainHandler.post(() -> update(true));
+                        }
+
+                        @Override
+                        public void onIntermediateImageFailed(@NonNull String s) {
+
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull String s, @Nullable Throwable throwable, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onRelease(@NonNull String s, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onEmptyEvent(@Nullable Object o) {
+
+                        }
+                    });
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
     @Override
     public void requestLayout() {
@@ -556,13 +619,13 @@ public class MapMarker extends MapFeature {
         } else {
             marker.setInfoWindowAnchor(0.5f, 0);
         }
-        updated +=1;
+        updated += 1;
     }
 
     public void update(int width, int height) {
         this.width = width;
         this.height = height;
-        updated +=1;
+        updated += 1;
         updateTracksViewChanges();
         clearDrawableCache();
         update(true);
@@ -740,10 +803,10 @@ public class MapMarker extends MapFeature {
         );
     }
 
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-    this.height = b-t;
-    this.width = r-l;
-  }
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        this.height = b - t;
+        this.width = r - l;
+    }
 }

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

@@ -872,8 +872,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         builder.tilt((float) camera.getDouble("pitch"));
         builder.bearing((float) camera.getDouble("heading"));
-        builder.zoom((float) camera.getDouble("zoom"));
-
+        if (camera.hasKey("zoom")) {
+            builder.zoom((float) camera.getDouble("zoom"));
+        }
         return builder.build();
     }
 
@@ -1911,7 +1912,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     /**
      * Safely removes a view from its parent ViewGroup.
      * Prevents NullPointerException during component lifecycle operations.
-     * 
+     *
      * @param view The view to remove from its parent
      * @return true if the view was successfully removed, false otherwise
      */
@@ -1929,7 +1930,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     /**
      * Safely requests touch event handling from parent ViewGroup.
      * Prevents NullPointerException during touch event dispatching.
-     * 
+     *
      * @param disallowIntercept Whether to disallow parent touch interception
      * @return true if the request was successfully made, false otherwise
      */
@@ -1945,7 +1946,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     /**
      * Safely removes a MapFeature from the attacherGroup.
      * Prevents NullPointerException during feature removal operations.
-     * 
+     *
      * @param feature The MapFeature to remove from attacherGroup
      * @return true if the feature was successfully removed, false otherwise
      */

package/ios/AirMaps/RNMapsMapView.mm

@@ -525,6 +525,7 @@ if (!(newViewProps.name.latitude == 0 &&                                    \
 #define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \
 if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
 newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
+newViewProps.name.altitude != oldViewProps.name.altitude ||       \
 newViewProps.name.heading != oldViewProps.name.heading ||         \
 newViewProps.name.pitch != oldViewProps.name.pitch) {             \
 CLLocationCoordinate2D center = CLLocationCoordinate2DMake(       \

package/package.json

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