react-native-maps 1.21.0-alpha.66 → 1.21.0-alpha.68

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

@@ -20,7 +20,6 @@ import java.util.Map;
 @ReactModule(name = CalloutManager.REACT_CLASS)
 public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMapsCalloutManagerInterface<MapCallout> {
 
-
     public CalloutManager(ReactApplicationContext context){
         super(context);
     }
@@ -75,15 +74,4 @@ public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMa
         return new SizeReportingShadowNode();
     }
 
-    @Override
-    public void updateExtraData(MapCallout view, Object extraData) {
-        // This method is called from the shadow node with the width/height of the rendered
-        // marker view.
-        //noinspection unchecked
-        Map<String, Float> data = (Map<String, Float>) extraData;
-        float width = data.get("width");
-        float height = data.get("height");
-        view.width = (int) width;
-        view.height = (int) height;
-    }
 }

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

@@ -1,5 +1,18 @@
 package com.rnmaps.fabric;
 
+import static com.rnmaps.maps.MapModule.SNAPSHOT_FORMAT_JPG;
+import static com.rnmaps.maps.MapModule.SNAPSHOT_FORMAT_PNG;
+import static com.rnmaps.maps.MapModule.SNAPSHOT_RESULT_BASE64;
+import static com.rnmaps.maps.MapModule.SNAPSHOT_RESULT_FILE;
+import static com.rnmaps.maps.MapModule.closeQuietly;
+
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Base64;
+import android.util.DisplayMetrics;
+
+import androidx.annotation.Nullable;
+
 import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -8,9 +21,18 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.UIManagerHelper;
+import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.CameraPosition;
+import com.rnmaps.maps.MapUIBlock;
 import com.rnmaps.maps.MapView;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+
 public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
     public NativeAirMapsModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -23,23 +45,23 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
 
     @Override
     public void getCamera(double tag, Promise promise) {
-            UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
-            getReactApplicationContext().runOnUiQueueThread(new Runnable() {
-                @Override
-                public void run() {
-                    MapView view = (MapView) uiManager.resolveView((int) tag);
-                    CameraPosition position = view.map.getCameraPosition();
-                    WritableMap map = Arguments.createMap();
-                    WritableMap center = Arguments.createMap();
-                    center.putDouble("latitude", position.target.latitude);
-                    center.putDouble("longitude", position.target.longitude);
-                    map.putMap("center", center);
-                    map.putDouble("heading", position.bearing);
-                    map.putDouble("pitch", position.tilt);
-                    map.putDouble("zoom", position.zoom);
-                    promise.resolve(map);
-                }
-            });
+        UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
+        getReactApplicationContext().runOnUiQueueThread(new Runnable() {
+            @Override
+            public void run() {
+                MapView view = (MapView) uiManager.resolveView((int) tag);
+                CameraPosition position = view.map.getCameraPosition();
+                WritableMap map = Arguments.createMap();
+                WritableMap center = Arguments.createMap();
+                center.putDouble("latitude", position.target.latitude);
+                center.putDouble("longitude", position.target.longitude);
+                map.putMap("center", center);
+                map.putDouble("heading", position.bearing);
+                map.putDouble("pitch", position.tilt);
+                map.putDouble("zoom", position.zoom);
+                promise.resolve(map);
+            }
+        });
     }
 
     @Override
@@ -54,7 +76,74 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
 
     @Override
     public void takeSnapshot(double tag, String config, Promise promise) {
-
+        WritableMap options = null;
+        try {
+            if (config != null) {
+                JSONObject jsonObject = new JSONObject(config);
+                options = JSONUtil.convertJsonToWritable(jsonObject);
+                WritableMap finalOptions = options;
+
+                final ReactApplicationContext context = getReactApplicationContext();
+                final String format = finalOptions.hasKey("format") ? finalOptions.getString("format") : "png";
+                final Bitmap.CompressFormat compressFormat =
+                        format.equals(SNAPSHOT_FORMAT_PNG) ? Bitmap.CompressFormat.PNG :
+                                format.equals(SNAPSHOT_FORMAT_JPG) ? Bitmap.CompressFormat.JPEG : null;
+                final double quality = finalOptions.hasKey("quality") ? finalOptions.getDouble("quality") : 1.0;
+                final DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+                final Integer width =
+                        finalOptions.hasKey("width") ? (int) (displayMetrics.density * finalOptions.getDouble("width")) : 0;
+                final Integer height =
+                        finalOptions.hasKey("height") ? (int) (displayMetrics.density * finalOptions.getDouble("height")) : 0;
+                final String result = finalOptions.hasKey("result") ? finalOptions.getString("result") : "file";
+
+                UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
+                getReactApplicationContext().runOnUiQueueThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        MapView view = (MapView) uiManager.resolveView((int) tag);
+                        view.map.snapshot(snapshot -> {
+
+                            // Convert image to requested width/height if necessary
+                            if (snapshot == null) {
+                                promise.reject("Failed to generate bitmap, snapshot = null");
+                                return;
+                            }
+                            if ((width != 0) && (height != 0) &&
+                                    (width != snapshot.getWidth() || height != snapshot.getHeight())) {
+                                snapshot = Bitmap.createScaledBitmap(snapshot, width, height, true);
+                            }
+                            // Save the snapshot to disk
+                            if (result.equals(SNAPSHOT_RESULT_FILE)) {
+                                File tempFile;
+                                FileOutputStream outputStream;
+                                try {
+                                    tempFile =
+                                            File.createTempFile("AirMapSnapshot", "." + format, context.getCacheDir());
+                                    outputStream = new FileOutputStream(tempFile);
+                                } catch (Exception e) {
+                                    promise.reject(e);
+                                    return;
+                                }
+                                snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
+                                closeQuietly(outputStream);
+                                String uri = Uri.fromFile(tempFile).toString();
+                                promise.resolve(uri);
+                            } else if (result.equals(SNAPSHOT_RESULT_BASE64)) {
+                                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                                snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
+                                closeQuietly(outputStream);
+                                byte[] bytes = outputStream.toByteArray();
+                                String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
+                                promise.resolve(data);
+                            }
+                        });
+                    }
+                });
+            }
+        } catch (JSONException e) {
+            promise.reject("Failed to parse config ", config);
+
+        }
     }
 
     @Override

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

@@ -4,14 +4,6 @@ import android.content.Context;
 
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.views.view.ReactViewGroup;
-import com.rnmaps.fabric.event.OnLongPressEvent;
-import com.rnmaps.fabric.event.OnMarkerDeselectEvent;
-import com.rnmaps.fabric.event.OnMarkerDragEndEvent;
-import com.rnmaps.fabric.event.OnMarkerDragEvent;
-import com.rnmaps.fabric.event.OnMarkerDragStartEvent;
-import com.rnmaps.fabric.event.OnMarkerPressEvent;
-import com.rnmaps.fabric.event.OnMarkerSelectEvent;
-import com.rnmaps.fabric.event.OnPoiClickEvent;
 import com.rnmaps.fabric.event.OnPressEvent;
 
 import java.util.Map;
@@ -33,6 +25,13 @@ public class MapCallout extends ReactViewGroup {
     return this.tooltip;
   }
 
+  @Override
+  protected void onLayout(boolean changed,
+                                   int left, int top, int right, int bottom){
+    width = right - left;
+    height = bottom - top;
+  }
+
 
   public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
     MapBuilder.Builder<String, Object> builder = MapBuilder.builder();

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

@@ -35,249 +35,249 @@ import java.util.Map;
 @ReactModule(name = MapModule.NAME)
 public class MapModule extends ReactContextBaseJavaModule {
 
-  public static final String NAME = "AirMapModule";
-  private static final String SNAPSHOT_RESULT_FILE = "file";
-  private static final String SNAPSHOT_RESULT_BASE64 = "base64";
-  private static final String SNAPSHOT_FORMAT_PNG = "png";
-  private static final String SNAPSHOT_FORMAT_JPG = "jpg";
-
-  public MapModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public Map<String, Object> getConstants() {
-    final Map<String, Object> constants = new HashMap<>();
-    constants.put("legalNotice", "This license information is displayed in Settings > Google > Open Source on any device running Google Play services.");
-    return constants;
-  }
-
-  public Activity getActivity() {
-    return getCurrentActivity();
-  }
-
-  public static void closeQuietly(Closeable closeable) {
-    if (closeable == null) return;
-    try {
-      closeable.close();
-    } catch (IOException ignored) {
+    public static final String NAME = "AirMapModule";
+    public static final String SNAPSHOT_RESULT_FILE = "file";
+    public static final String SNAPSHOT_RESULT_BASE64 = "base64";
+    public static final String SNAPSHOT_FORMAT_PNG = "png";
+    public static final String SNAPSHOT_FORMAT_JPG = "jpg";
+
+    public MapModule(ReactApplicationContext reactContext) {
+        super(reactContext);
     }
-  }
-
-  @ReactMethod
-  public void takeSnapshot(final int tag, final ReadableMap options, final Promise promise) {
-
-    // Parse and verity options
-    final ReactApplicationContext context = getReactApplicationContext();
-    final String format = options.hasKey("format") ? options.getString("format") : "png";
-    final Bitmap.CompressFormat compressFormat =
-        format.equals(SNAPSHOT_FORMAT_PNG) ? Bitmap.CompressFormat.PNG :
-            format.equals(SNAPSHOT_FORMAT_JPG) ? Bitmap.CompressFormat.JPEG : null;
-    final double quality = options.hasKey("quality") ? options.getDouble("quality") : 1.0;
-    final DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-    final Integer width =
-        options.hasKey("width") ? (int) (displayMetrics.density * options.getDouble("width")) : 0;
-    final Integer height =
-        options.hasKey("height") ? (int) (displayMetrics.density * options.getDouble("height")) : 0;
-    final String result = options.hasKey("result") ? options.getString("result") : "file";
-
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
-        view.map.snapshot(new GoogleMap.SnapshotReadyCallback() {
-          public void onSnapshotReady(@Nullable Bitmap snapshot) {
-
-            // Convert image to requested width/height if necessary
-            if (snapshot == null) {
-              promise.reject("Failed to generate bitmap, snapshot = null");
-              return;
-            }
-            if ((width != 0) && (height != 0) &&
-                (width != snapshot.getWidth() || height != snapshot.getHeight())) {
-              snapshot = Bitmap.createScaledBitmap(snapshot, width, height, true);
-            }
 
-            // Save the snapshot to disk
-            if (result.equals(SNAPSHOT_RESULT_FILE)) {
-              File tempFile;
-              FileOutputStream outputStream;
-              try {
-                tempFile =
-                    File.createTempFile("AirMapSnapshot", "." + format, context.getCacheDir());
-                outputStream = new FileOutputStream(tempFile);
-              } catch (Exception e) {
-                promise.reject(e);
-                return;
-              }
-              snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
-              closeQuietly(outputStream);
-              String uri = Uri.fromFile(tempFile).toString();
-              promise.resolve(uri);
-            } else if (result.equals(SNAPSHOT_RESULT_BASE64)) {
-              ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-              snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
-              closeQuietly(outputStream);
-              byte[] bytes = outputStream.toByteArray();
-              String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
-              promise.resolve(data);
-            }
-          }
-        });
+    @Override
+    public String getName() {
+        return NAME;
+    }
 
-        return null;
-      });
+    @Override
+    public Map<String, Object> getConstants() {
+        final Map<String, Object> constants = new HashMap<>();
+        constants.put("legalNotice", "This license information is displayed in Settings > Google > Open Source on any device running Google Play services.");
+        return constants;
+    }
+
+    public Activity getActivity() {
+        return getCurrentActivity();
+    }
 
-    // Add UI-block so we can get a valid reference to the map-view
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable == null) return;
+        try {
+            closeable.close();
+        } catch (IOException ignored) {
+        }
+    }
 
-    uiBlock.addToUIManager();
-  }
+    @ReactMethod
+    public void takeSnapshot(final int tag, final ReadableMap options, final Promise promise) {
+
+        // Parse and verity options
+        final ReactApplicationContext context = getReactApplicationContext();
+        final String format = options.hasKey("format") ? options.getString("format") : "png";
+        final Bitmap.CompressFormat compressFormat =
+                format.equals(SNAPSHOT_FORMAT_PNG) ? Bitmap.CompressFormat.PNG :
+                        format.equals(SNAPSHOT_FORMAT_JPG) ? Bitmap.CompressFormat.JPEG : null;
+        final double quality = options.hasKey("quality") ? options.getDouble("quality") : 1.0;
+        final DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        final Integer width =
+                options.hasKey("width") ? (int) (displayMetrics.density * options.getDouble("width")) : 0;
+        final Integer height =
+                options.hasKey("height") ? (int) (displayMetrics.density * options.getDouble("height")) : 0;
+        final String result = options.hasKey("result") ? options.getString("result") : "file";
+
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
+            view.map.snapshot(new GoogleMap.SnapshotReadyCallback() {
+                public void onSnapshotReady(@Nullable Bitmap snapshot) {
+
+                    // Convert image to requested width/height if necessary
+                    if (snapshot == null) {
+                        promise.reject("Failed to generate bitmap, snapshot = null");
+                        return;
+                    }
+                    if ((width != 0) && (height != 0) &&
+                            (width != snapshot.getWidth() || height != snapshot.getHeight())) {
+                        snapshot = Bitmap.createScaledBitmap(snapshot, width, height, true);
+                    }
+
+                    // Save the snapshot to disk
+                    if (result.equals(SNAPSHOT_RESULT_FILE)) {
+                        File tempFile;
+                        FileOutputStream outputStream;
+                        try {
+                            tempFile =
+                                    File.createTempFile("AirMapSnapshot", "." + format, context.getCacheDir());
+                            outputStream = new FileOutputStream(tempFile);
+                        } catch (Exception e) {
+                            promise.reject(e);
+                            return;
+                        }
+                        snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
+                        closeQuietly(outputStream);
+                        String uri = Uri.fromFile(tempFile).toString();
+                        promise.resolve(uri);
+                    } else if (result.equals(SNAPSHOT_RESULT_BASE64)) {
+                        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                        snapshot.compress(compressFormat, (int) (100.0 * quality), outputStream);
+                        closeQuietly(outputStream);
+                        byte[] bytes = outputStream.toByteArray();
+                        String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
+                        promise.resolve(data);
+                    }
+                }
+            });
 
-  @ReactMethod
-  public void getCamera(final int tag, final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
+            return null;
+        });
 
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
-        CameraPosition position = view.map.getCameraPosition();
+        // Add UI-block so we can get a valid reference to the map-view
 
-        WritableMap centerJson = new WritableNativeMap();
-        centerJson.putDouble("latitude", position.target.latitude);
-        centerJson.putDouble("longitude", position.target.longitude);
+        uiBlock.addToUIManager();
+    }
 
-        WritableMap cameraJson = new WritableNativeMap();
-        cameraJson.putMap("center", centerJson);
-        cameraJson.putDouble("heading", (double)position.bearing);
-        cameraJson.putDouble("zoom", (double)position.zoom);
-        cameraJson.putDouble("pitch", (double)position.tilt);
+    @ReactMethod
+    public void getCamera(final int tag, final Promise promise) {
+        final ReactApplicationContext context = getReactApplicationContext();
 
-        promise.resolve(cameraJson);
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
+            CameraPosition position = view.map.getCameraPosition();
 
-        return null;
-    });
+            WritableMap centerJson = new WritableNativeMap();
+            centerJson.putDouble("latitude", position.target.latitude);
+            centerJson.putDouble("longitude", position.target.longitude);
 
-    uiBlock.addToUIManager();
-  }
+            WritableMap cameraJson = new WritableNativeMap();
+            cameraJson.putMap("center", centerJson);
+            cameraJson.putDouble("heading", (double) position.bearing);
+            cameraJson.putDouble("zoom", (double) position.zoom);
+            cameraJson.putDouble("pitch", (double) position.tilt);
 
-  @ReactMethod
-  public void getAddressFromCoordinates(final int tag, final ReadableMap coordinate, final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
+            promise.resolve(cameraJson);
 
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, mapView -> {
-        if (coordinate == null ||
-                !coordinate.hasKey("latitude") ||
-                !coordinate.hasKey("longitude")) {
-          promise.reject("Invalid coordinate format");
-          return null;
-        }
-        Geocoder geocoder = new Geocoder(context);
-        try {
-          List<Address> list =
-                  geocoder.getFromLocation(coordinate.getDouble("latitude"),coordinate.getDouble("longitude"),1);
-          if (list.isEmpty()) {
-            promise.reject("Can not get address location");
             return null;
-          }
-          Address address = list.get(0);
-
-          WritableMap addressJson = new WritableNativeMap();
-          addressJson.putString("name", address.getFeatureName());
-          addressJson.putString("locality", address.getLocality());
-          addressJson.putString("thoroughfare", address.getThoroughfare());
-          addressJson.putString("subThoroughfare", address.getSubThoroughfare());
-          addressJson.putString("subLocality", address.getSubLocality());
-          addressJson.putString("administrativeArea", address.getAdminArea());
-          addressJson.putString("subAdministrativeArea", address.getSubAdminArea());
-          addressJson.putString("postalCode", address.getPostalCode());
-          addressJson.putString("countryCode", address.getCountryCode());
-          addressJson.putString("country", address.getCountryName());
-
-          promise.resolve(addressJson);
-        } catch (IOException e) {
-          promise.reject("Can not get address location");
-        }
+        });
 
-        return null;
-    });
+        uiBlock.addToUIManager();
+    }
+
+    @ReactMethod
+    public void getAddressFromCoordinates(final int tag, final ReadableMap coordinate, final Promise promise) {
+        final ReactApplicationContext context = getReactApplicationContext();
+
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, mapView -> {
+            if (coordinate == null ||
+                    !coordinate.hasKey("latitude") ||
+                    !coordinate.hasKey("longitude")) {
+                promise.reject("Invalid coordinate format");
+                return null;
+            }
+            Geocoder geocoder = new Geocoder(context);
+            try {
+                List<Address> list =
+                        geocoder.getFromLocation(coordinate.getDouble("latitude"), coordinate.getDouble("longitude"), 1);
+                if (list.isEmpty()) {
+                    promise.reject("Can not get address location");
+                    return null;
+                }
+                Address address = list.get(0);
+
+                WritableMap addressJson = new WritableNativeMap();
+                addressJson.putString("name", address.getFeatureName());
+                addressJson.putString("locality", address.getLocality());
+                addressJson.putString("thoroughfare", address.getThoroughfare());
+                addressJson.putString("subThoroughfare", address.getSubThoroughfare());
+                addressJson.putString("subLocality", address.getSubLocality());
+                addressJson.putString("administrativeArea", address.getAdminArea());
+                addressJson.putString("subAdministrativeArea", address.getSubAdminArea());
+                addressJson.putString("postalCode", address.getPostalCode());
+                addressJson.putString("countryCode", address.getCountryCode());
+                addressJson.putString("country", address.getCountryName());
+
+                promise.resolve(addressJson);
+            } catch (IOException e) {
+                promise.reject("Can not get address location");
+            }
 
-    uiBlock.addToUIManager();
-  }
+            return null;
+        });
+
+        uiBlock.addToUIManager();
+    }
 
-  @ReactMethod
-  public void pointForCoordinate(final int tag, ReadableMap coordinate, final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
-    final double density = (double) context.getResources().getDisplayMetrics().density;
+    @ReactMethod
+    public void pointForCoordinate(final int tag, ReadableMap coordinate, final Promise promise) {
+        final ReactApplicationContext context = getReactApplicationContext();
+        final double density = (double) context.getResources().getDisplayMetrics().density;
 
-    final LatLng coord = new LatLng(
-            coordinate.hasKey("latitude") ? coordinate.getDouble("latitude") : 0.0,
-            coordinate.hasKey("longitude") ? coordinate.getDouble("longitude") : 0.0
-    );
+        final LatLng coord = new LatLng(
+                coordinate.hasKey("latitude") ? coordinate.getDouble("latitude") : 0.0,
+                coordinate.hasKey("longitude") ? coordinate.getDouble("longitude") : 0.0
+        );
 
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
-        Point pt = view.map.getProjection().toScreenLocation(coord);
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
+            Point pt = view.map.getProjection().toScreenLocation(coord);
 
-        WritableMap ptJson = new WritableNativeMap();
-        ptJson.putDouble("x", (double)pt.x / density);
-        ptJson.putDouble("y", (double)pt.y / density);
+            WritableMap ptJson = new WritableNativeMap();
+            ptJson.putDouble("x", (double) pt.x / density);
+            ptJson.putDouble("y", (double) pt.y / density);
 
-        promise.resolve(ptJson);
+            promise.resolve(ptJson);
 
-        return null;
-    });
+            return null;
+        });
 
-    uiBlock.addToUIManager();
-  }
+        uiBlock.addToUIManager();
+    }
 
-  @ReactMethod
-  public void coordinateForPoint(final int tag, ReadableMap point, final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
-    final double density = (double) context.getResources().getDisplayMetrics().density;
+    @ReactMethod
+    public void coordinateForPoint(final int tag, ReadableMap point, final Promise promise) {
+        final ReactApplicationContext context = getReactApplicationContext();
+        final double density = (double) context.getResources().getDisplayMetrics().density;
 
-    final Point pt = new Point(
-            point.hasKey("x") ? (int)(point.getDouble("x") * density) : 0,
-            point.hasKey("y") ? (int)(point.getDouble("y") * density) : 0
-    );
+        final Point pt = new Point(
+                point.hasKey("x") ? (int) (point.getDouble("x") * density) : 0,
+                point.hasKey("y") ? (int) (point.getDouble("y") * density) : 0
+        );
 
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
-        LatLng coord = view.map.getProjection().fromScreenLocation(pt);
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
+            LatLng coord = view.map.getProjection().fromScreenLocation(pt);
 
-        WritableMap coordJson = new WritableNativeMap();
-        coordJson.putDouble("latitude", coord.latitude);
-        coordJson.putDouble("longitude", coord.longitude);
+            WritableMap coordJson = new WritableNativeMap();
+            coordJson.putDouble("latitude", coord.latitude);
+            coordJson.putDouble("longitude", coord.longitude);
 
-        promise.resolve(coordJson);
+            promise.resolve(coordJson);
 
-        return null;
-    });
+            return null;
+        });
 
-    uiBlock.addToUIManager();
-  }
+        uiBlock.addToUIManager();
+    }
 
-  @ReactMethod
-  public void getMapBoundaries(final int tag, final Promise promise) {
-    final ReactApplicationContext context = getReactApplicationContext();
+    @ReactMethod
+    public void getMapBoundaries(final int tag, final Promise promise) {
+        final ReactApplicationContext context = getReactApplicationContext();
 
-    MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
-        double[][] boundaries = view.getMapBoundaries();
+        MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
+            double[][] boundaries = view.getMapBoundaries();
 
-        WritableMap coordinates = new WritableNativeMap();
-        WritableMap northEastHash = new WritableNativeMap();
-        WritableMap southWestHash = new WritableNativeMap();
+            WritableMap coordinates = new WritableNativeMap();
+            WritableMap northEastHash = new WritableNativeMap();
+            WritableMap southWestHash = new WritableNativeMap();
 
-        northEastHash.putDouble("longitude", boundaries[0][0]);
-        northEastHash.putDouble("latitude", boundaries[0][1]);
-        southWestHash.putDouble("longitude", boundaries[1][0]);
-        southWestHash.putDouble("latitude", boundaries[1][1]);
+            northEastHash.putDouble("longitude", boundaries[0][0]);
+            northEastHash.putDouble("latitude", boundaries[0][1]);
+            southWestHash.putDouble("longitude", boundaries[1][0]);
+            southWestHash.putDouble("latitude", boundaries[1][1]);
 
-        coordinates.putMap("northEast", northEastHash);
-        coordinates.putMap("southWest", southWestHash);
+            coordinates.putMap("northEast", northEastHash);
+            coordinates.putMap("southWest", southWestHash);
 
-        promise.resolve(coordinates);
+            promise.resolve(coordinates);
 
-        return null;
-    });
+            return null;
+        });
 
-    uiBlock.addToUIManager();
-  }
+        uiBlock.addToUIManager();
+    }
 }

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

@@ -253,16 +253,19 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
     private <T extends Event> void dispatchEvent(WritableMap payload, EventCreator<T> creator) {
+        dispatchEvent(payload, creator, getId(), context);
+    }
+    public static <T extends Event> void dispatchEvent(WritableMap payload, EventCreator<T> creator, int viewId, ReactContext context){
         // Cast context to ReactContext
         ReactContext reactContext = context;
 
         // Get the event dispatcher
-        EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+        EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, viewId);
 
         // 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);
+            T event = creator.create(surfaceId, viewId, payload);
             eventDispatcher.dispatchEvent(event);
         }
     }
@@ -401,25 +404,22 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             }
         });
 
-        markerCollection.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
-            @Override
-            public void onInfoWindowClick(@NonNull Marker marker) {
-                WritableMap event = makeClickEventData(marker.getPosition());
-                event.putString("action", "callout-press");
-                // todo: use Fabric events
-//        manager.pushEvent(context, view, "onCalloutPress", event);
+        markerCollection.setOnInfoWindowClickListener(marker -> {
+            WritableMap event = makeClickEventData(marker.getPosition());
+            event.putString("action", "callout-press");
+            dispatchEvent(event, OnCalloutPressEvent::new);
 
-                event = makeClickEventData(marker.getPosition());
-                event.putString("action", "callout-press");
-                MapMarker markerView = getMarkerMap(marker);
-                // todo: use Fabric events
-                //  manager.pushEvent(context, markerView, "onCalloutPress", event);
 
+            event = makeClickEventData(marker.getPosition());
+            event.putString("action", "callout-press");
+            MapMarker markerView = getMarkerMap(marker);
+            dispatchEvent(event, OnCalloutPressEvent::new, markerView.getId(), context);
+
+            MapCallout infoWindow = markerView.getCalloutView();
+            if (infoWindow != null) {
                 event = makeClickEventData(marker.getPosition());
                 event.putString("action", "callout-press");
-                MapCallout infoWindow = markerView.getCalloutView();
-                // todo: use Fabric events
-                // if (infoWindow != null) manager.pushEvent(context, infoWindow, "onPress", event);
+                dispatchEvent(event, OnPressEvent::new, infoWindow.getId(), context);
             }
         });
 
@@ -460,6 +460,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                 boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
                 WritableMap event = new WritableNativeMap();
                 event.putBoolean("isGesture", isGesture);
+            //    dispatchEvent(event, OnRegionChangeEvent::new);
                 // todo: use Fabric events
                 // manager.pushEvent(context, view, "onRegionChangeStart", event);
             }

package/lib/MapView.js

@@ -206,15 +206,9 @@ class MapView extends React.Component {
         if (config.result !== 'file' && config.result !== 'base64') {
             throw new Error('Invalid result specified');
         }
-        // Call native function
-        if (react_native_1.Platform.OS === 'android') {
-            return react_native_1.NativeModules.AirMapModule.takeSnapshot(this._getHandle(), config);
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            if (this.fabricMap.current) {
-                // @ts-ignore
-                return this.fabricMap.current.takeSnapshot(config);
-            }
+        if (this.fabricMap.current) {
+            // @ts-ignore
+            return this.fabricMap.current.takeSnapshot(config);
         }
         return Promise.reject('takeSnapshot not supported on this platform');
     }

package/package.json

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