react-native-maps 1.21.0-alpha.14 → 1.21.0-alpha.141

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

@@ -2,8 +2,26 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
 
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.BaseDataSubscriber;
+import com.facebook.datasource.DataSource;
+import com.facebook.datasource.DataSubscriber;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.drawable.ScalingUtils;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.imagepipeline.core.ImagePipeline;
+import com.facebook.imagepipeline.image.CloseableBitmap;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.MapBuilder;
+import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.GroundOverlay;
@@ -11,156 +29,234 @@ import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.maps.android.collections.GroundOverlayManager;
+import com.rnmaps.fabric.event.OnPressEvent;
 
-public class MapOverlay extends MapFeature implements ImageReadable {
-
-  private GroundOverlayOptions groundOverlayOptions;
-  private GroundOverlay groundOverlay;
-  private LatLngBounds bounds;
-  private float bearing;
-  private BitmapDescriptor iconBitmapDescriptor;
-  private boolean tappable;
-  private float zIndex;
-  private float transparency;
-
-  private final ImageReader mImageReader;
-  private GroundOverlayManager.Collection groundOverlayCollection;
-
-  public MapOverlay(Context context) {
-    super(context);
-    this.mImageReader = new ImageReader(context, getResources(), this);
-  }
-
-  public void setBounds(ReadableArray bounds) {
-    LatLng sw = new LatLng(bounds.getArray(0).getDouble(0), bounds.getArray(0).getDouble(1));
-    LatLng ne = new LatLng(bounds.getArray(1).getDouble(0), bounds.getArray(1).getDouble(1));
-    this.bounds = new LatLngBounds(sw, ne);
-    if (this.groundOverlay != null) {
-      this.groundOverlay.setPositionFromBounds(this.bounds);
-    }
-  }
-
-  public void setBearing(float bearing){
-    this.bearing = bearing;
-    if (this.groundOverlay != null) {
-      this.groundOverlay.setBearing(bearing);
-    }
-  }
-
-  public void setZIndex(float zIndex) {
-    this.zIndex = zIndex;
-    if (this.groundOverlay != null) {
-      this.groundOverlay.setZIndex(zIndex);
-    }
-  }
-
-  public void setTransparency(float transparency) {
-      this.transparency = transparency;
-      if (groundOverlay != null) {
-          groundOverlay.setTransparency(transparency);
-      }
-  }
-
-  public void setImage(String uri) {
-    this.mImageReader.setImage(uri);
-  }
-
-  public void setTappable(boolean tapabble) {
-    this.tappable = tapabble;
-    if (groundOverlay != null) {
-      groundOverlay.setClickable(tappable);
-    }
-  }
-
-
-  public GroundOverlayOptions getGroundOverlayOptions() {
-    if (this.groundOverlayOptions == null) {
-      this.groundOverlayOptions = createGroundOverlayOptions();
-    }
-    return this.groundOverlayOptions;
-  }
-
-  private GroundOverlayOptions createGroundOverlayOptions() {
-    if (this.groundOverlayOptions != null) {
-      return this.groundOverlayOptions;
-    }
-    GroundOverlayOptions options = new GroundOverlayOptions();
-    if (this.iconBitmapDescriptor != null) {
-      options.image(iconBitmapDescriptor);
-    } else {
-      // add stub image to be able to instantiate the overlay
-      // and store a reference to it in MapView
-      options.image(BitmapDescriptorFactory.defaultMarker());
-      // hide overlay until real image gets added
-      options.visible(false);
-    }
-    options.positionFromBounds(bounds);
-    options.zIndex(zIndex);
-    options.bearing(bearing);
-    options.transparency(transparency);
-    return options;
-  }
-
-  @Override
-  public Object getFeature() {
-    return groundOverlay;
-  }
-
-  @Override
-  public void addToMap(Object collection) {
-    GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
-    GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
-    if (groundOverlayOptions != null) {
-      groundOverlay = groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
-      groundOverlay.setClickable(this.tappable);
-    } else {
-      this.groundOverlayCollection = groundOverlayCollection;
-    }
-  }
-
-  @Override
-  public void removeFromMap(Object collection) {
-    if (groundOverlay != null) {
-      GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
-      groundOverlayCollection.remove(groundOverlay);
-      groundOverlay = null;
-      groundOverlayOptions = null;
-    }
-    groundOverlayCollection = null;
-  }
-
-  @Override
-  public void setIconBitmap(Bitmap bitmap) {
-  }
-
-  @Override
-  public void setIconBitmapDescriptor(
-      BitmapDescriptor iconBitmapDescriptor) {
-    this.iconBitmapDescriptor = iconBitmapDescriptor;
-  }
-
-  @Override
-  public void update() {
-    this.groundOverlay = getGroundOverlay();
-    if (this.groundOverlay != null) {
-      this.groundOverlay.setVisible(true);
-      this.groundOverlay.setImage(this.iconBitmapDescriptor);
-      this.groundOverlay.setTransparency(this.transparency);
-      this.groundOverlay.setClickable(this.tappable);
-    }
-  }
-
-  private GroundOverlay getGroundOverlay() {
-    if (this.groundOverlay != null) {
-      return this.groundOverlay;
-    }
-    if (this.groundOverlayCollection == null) {
-      return null;
-    }
-    GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
-    if (groundOverlayOptions != null) {
-      return this.groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
-    }
-    return null;
-  }
+import java.util.Map;
+import java.util.concurrent.Executors;
+
+public class MapOverlay extends MapFeature {
+
+
+    private String imageUri;
+
+    private GroundOverlayOptions groundOverlayOptions;
+    private GroundOverlay groundOverlay;
+    private LatLngBounds bounds;
+    private float bearing;
+    private BitmapDescriptor bitmapDescriptor;
+    private boolean tappable;
+    private float zIndex;
+    private float transparency;
+
+    private DataSource<CloseableReference<CloseableImage>> dataSource;
+
+    private GroundOverlayManager.Collection groundOverlayCollection;
+
+    private ImageManager.OnImageLoadedListener imageLoadedListener;
+
+
+    public MapOverlay(Context context) {
+        super(context);
+        transparency = 1;
+    }
+
+    private GenericDraweeHierarchy createDraweeHierarchy() {
+        return new GenericDraweeHierarchyBuilder(getResources())
+                .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+                .setFadeDuration(0)
+                .build();
+    }
+
+
+
+    public void setBounds(LatLngBounds bounds) {
+        this.bounds = bounds;
+        if (this.groundOverlay != null) {
+            this.groundOverlay.setPositionFromBounds(this.bounds);
+        }
+    }
+
+    public void setBearing(float bearing) {
+        this.bearing = bearing;
+        if (this.groundOverlay != null) {
+            this.groundOverlay.setBearing(bearing);
+        }
+    }
+
+    public void setZIndex(float zIndex) {
+        this.zIndex = zIndex;
+        if (this.groundOverlay != null) {
+            this.groundOverlay.setZIndex(zIndex);
+        }
+    }
+
+    public void setTransparency(float transparency) {
+        this.transparency = transparency;
+        if (groundOverlay != null) {
+            groundOverlay.setTransparency(transparency);
+        }
+    }
+
+
+    public void setImage(String uri) {
+        boolean shouldLoadImage = true;
+
+        this.imageUri = uri;
+        if (!shouldLoadImage) {
+            return;
+        }
+
+        if (uri == null) {
+            bitmapDescriptor = null;
+        } else if (uri.startsWith("http://") || uri.startsWith("https://") ||
+                uri.startsWith("file://") || uri.startsWith("asset://") || uri.startsWith("data:")) {
+
+            ImageRequest imageRequest = ImageRequestBuilder
+                    .newBuilderWithSource(Uri.parse(uri))
+                    .build();
+
+            ImagePipeline imagePipeline = Fresco.getImagePipeline();
+            dataSource = imagePipeline.fetchDecodedImage(imageRequest, this);
+
+            DataSubscriber<CloseableReference<CloseableImage>> subscriber = new BaseDataSubscriber<CloseableReference<CloseableImage>>() {
+                @Override
+                protected void onNewResultImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
+                    if (!dataSource.isFinished()) {
+                        return;
+                    }
+
+                    CloseableReference<CloseableImage> imageReference = dataSource.getResult();
+                    if (imageReference != null) {
+                        try {
+                            CloseableImage closeableImage = imageReference.get();
+                            if (closeableImage instanceof CloseableBitmap) {
+                                Bitmap bitmap = ((CloseableBitmap) closeableImage).getUnderlyingBitmap();
+                                if (bitmap != null) {
+                                    bitmapDescriptor = BitmapDescriptorFactory.fromBitmap(bitmap);
+                                }
+                            }
+                        } finally {
+                            CloseableReference.closeSafely(imageReference);
+                        }
+                        new Handler(Looper.getMainLooper()).post(() -> update());
+                    }
+                }
+
+                @Override
+                protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
+                    // Handle failure
+                }
+            };
+
+            dataSource.subscribe(subscriber, Executors.newSingleThreadExecutor());
+
+        } else {
+            bitmapDescriptor = getBitmapDescriptorByName(uri);
+        }
+    }
+
+
+    private BitmapDescriptor getBitmapDescriptorByName(String name) {
+        return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
+    }
+
+    private int getDrawableResourceByName(String name) {
+        return getResources().getIdentifier(
+                name,
+                "drawable",
+                getContext().getPackageName());
+    }
+
+    public void setTappable(boolean tapabble) {
+        this.tappable = tapabble;
+        if (groundOverlay != null) {
+            groundOverlay.setClickable(tappable);
+        }
+    }
+
+    public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+        builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+        return builder.build();
+    }
+
+    public GroundOverlayOptions getGroundOverlayOptions() {
+        if (this.groundOverlayOptions == null) {
+            this.groundOverlayOptions = createGroundOverlayOptions();
+        }
+        return this.groundOverlayOptions;
+    }
+
+    private GroundOverlayOptions createGroundOverlayOptions() {
+        if (this.groundOverlayOptions != null) {
+            return this.groundOverlayOptions;
+        }
+        GroundOverlayOptions options = new GroundOverlayOptions();
+        if (this.bitmapDescriptor != null) {
+            options.image(bitmapDescriptor);
+        } else {
+            // add stub image to be able to instantiate the overlay
+            // and store a reference to it in MapView
+            options.image(BitmapDescriptorFactory.defaultMarker());
+            // hide overlay until real image gets added
+            options.visible(false);
+        }
+        options.positionFromBounds(bounds);
+        options.zIndex(zIndex);
+        options.bearing(bearing);
+//        options.transparency(transparency);
+        return options;
+    }
+
+    @Override
+    public Object getFeature() {
+        return groundOverlay;
+    }
+
+    @Override
+    public void addToMap(Object collection) {
+        GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
+        GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
+        if (groundOverlayOptions != null) {
+            groundOverlay = groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
+            groundOverlay.setClickable(this.tappable);
+        } else {
+            this.groundOverlayCollection = groundOverlayCollection;
+        }
+    }
+
+    @Override
+    public void removeFromMap(Object collection) {
+        if (groundOverlay != null) {
+            GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
+            groundOverlayCollection.remove(groundOverlay);
+            groundOverlay = null;
+            groundOverlayOptions = null;
+        }
+        groundOverlayCollection = null;
+    }
+
+    public void update() {
+        this.groundOverlay = getGroundOverlay();
+        if (this.groundOverlay != null) {
+            this.groundOverlay.setVisible(true);
+            this.groundOverlay.setImage(this.bitmapDescriptor);
+            //          this.groundOverlay.setTransparency(this.transparency);
+            this.groundOverlay.setClickable(this.tappable);
+        }
+    }
+
+    private GroundOverlay getGroundOverlay() {
+        if (this.groundOverlay != null) {
+            return this.groundOverlay;
+        }
+        if (this.groundOverlayCollection == null) {
+            return null;
+        }
+        GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
+        if (groundOverlayOptions != null) {
+            return this.groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
+        }
+        return null;
+    }
 }

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

@@ -12,6 +12,8 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
 
 import java.util.Map;
 
@@ -37,7 +39,27 @@ public class MapOverlayManager extends ViewGroupManager<MapOverlay> {
 
   @ReactProp(name = "bounds")
   public void setBounds(MapOverlay view, ReadableArray bounds) {
-    view.setBounds(bounds);
+    view.setBounds(fixBoundsIfNecessary(bounds));
+  }
+
+  // seems like apple users north west, south east
+  // google uses north east, south west
+  private static LatLngBounds fixBoundsIfNecessary(ReadableArray bounds) {
+    double lat1 = bounds.getArray(0).getDouble(0);
+    double lon1 = bounds.getArray(0).getDouble(1);
+    double lat2 = bounds.getArray(1).getDouble(0);
+    double lon2 = bounds.getArray(1).getDouble(1);
+
+// Ensure lat1/lon1 is the SW corner and lat2/lon2 is the NE corner
+    double southLat = Math.min(lat1, lat2);
+    double northLat = Math.max(lat1, lat2);
+    double westLon = Math.min(lon1, lon2);
+    double eastLon = Math.max(lon1, lon2);
+
+// Create corrected LatLngs
+    LatLng sw = new LatLng(southLat, westLon);
+    LatLng ne = new LatLng(northLat, eastLon);
+    return new LatLngBounds(sw, ne);
   }
 
   @ReactProp(name = "bearing")

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

@@ -1,9 +1,16 @@
 package com.rnmaps.maps;
 
 import android.content.Context;
+import android.graphics.Color;
 
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.model.Dash;
 import com.google.android.gms.maps.model.Gap;
 import com.google.android.gms.maps.model.LatLng;
@@ -11,9 +18,11 @@ import com.google.android.gms.maps.model.PatternItem;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
 import com.google.maps.android.collections.PolygonManager;
+import com.rnmaps.fabric.event.OnPressEvent;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class MapPolygon extends MapFeature {
 
@@ -33,8 +42,29 @@ public class MapPolygon extends MapFeature {
 
   public MapPolygon(Context context) {
     super(context);
+    strokeWidth = 10;
   }
 
+    public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+      MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+      builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+      return builder.build();
+    }
+
+  public  <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator, ReactContext reactContext) {
+
+    // Get the event dispatcher
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+
+    // If there is a dispatcher, create and dispatch the event
+    if (eventDispatcher != null) {
+      int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
+      T event = creator.create(surfaceId, getId(), payload);
+      eventDispatcher.dispatchEvent(event);
+    }
+  }
+
+
   public void setCoordinates(ReadableArray coordinates) {
     // it's kind of a bummer that we can't run map() or anything on the ReadableArray
     this.coordinates = new ArrayList<>(coordinates.size());
@@ -164,6 +194,7 @@ public class MapPolygon extends MapFeature {
     options.geodesic(geodesic);
     options.zIndex(zIndex);
     options.strokePattern(this.pattern);
+    options.clickable(this.tappable);
 
     if (this.holes != null) {
       for (int i = 0; i < holes.size(); i++) {
@@ -183,7 +214,6 @@ public class MapPolygon extends MapFeature {
   public void addToMap(Object collection) {
     PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection;
     polygon = polygonCollection.addPolygon(getPolygonOptions());
-    polygon.setClickable(this.tappable);
   }
 
   @Override