react-native-maps 1.21.0-alpha.85 → 1.21.0-alpha.87

package/android/src/main/java/com/rnmaps/fabric/event/OnKmlReadyEvent.java

@@ -0,0 +1,28 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnKmlReadyEvent extends Event<OnKmlReadyEvent> {
+    public static final String EVENT_NAME = "topKmlReady";
+
+    private final WritableMap payload;
+
+    public OnKmlReadyEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.rnmaps.maps;
 
 import android.content.Context;
-import android.util.Log;
+import android.graphics.Color;
 
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -42,6 +42,7 @@ public class MapPolygon extends MapFeature {
 
   public MapPolygon(Context context) {
     super(context);
+    strokeWidth = 10;
   }
 
     public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
@@ -193,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++) {
@@ -212,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

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

@@ -12,7 +12,6 @@ import android.location.Location;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -80,6 +79,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -501,8 +501,10 @@ public void onCreate(LifecycleOwner owner) {
             public void onPolylineClick(@NonNull Polyline polyline) {
                 WritableMap event = makeClickEventData(tapLocation);
                 event.putString("action", "polyline-press");
-                // todo: use Fabric events
-                //  manager.pushEvent(context, polylineMap.get(polyline), "onPress", event);
+                dispatchEvent(event, OnPressEvent::new);
+                event = makeClickEventData(tapLocation);
+                dispatchEvent(event, OnPressEvent::new, polylineMap.get(polyline).getId(), context);
+
             }
         });
 
@@ -550,8 +552,10 @@ public void onCreate(LifecycleOwner owner) {
             public void onGroundOverlayClick(@NonNull GroundOverlay groundOverlay) {
                 WritableMap event = makeClickEventData(groundOverlay.getPosition());
                 event.putString("action", "overlay-press");
-                // todo: use Fabric events
-                //  manager.pushEvent(context, overlayMap.get(groundOverlay), "onPress", event);
+
+                dispatchEvent(event, OnPressEvent::new);
+                event =  makeClickEventData(groundOverlay.getPosition());
+                dispatchEvent(event, OnPressEvent::new,overlayMap.get(groundOverlay).getId(), context);
             }
         });
 
@@ -664,7 +668,8 @@ public void onCreate(LifecycleOwner owner) {
                 OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME),
                 OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME),
                 OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME),
-                OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME)
+                OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME),
+                OnKmlReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnKmlReadyEvent.EVENT_NAME)
         );
     }
 
@@ -1255,15 +1260,16 @@ public void onCreate(LifecycleOwner owner) {
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
         boolean addedPosition = false;
-
-        for (MapFeature feature : features) {
-            if (feature instanceof MapMarker) {
-                Marker marker = (Marker) feature.getFeature();
-                builder.include(marker.getPosition());
-                addedPosition = true;
-            }
-            // TODO(lmr): may want to include shapes / etc.
-        }
+       if (features.size() > 0) {
+           for (MapFeature feature : features) {
+               if (feature instanceof MapMarker) {
+                   Marker marker = (Marker) feature.getFeature();
+                   builder.include(marker.getPosition());
+                   addedPosition = true;
+               }
+               // TODO(lmr): may want to include shapes / etc.
+           }
+       }
         if (addedPosition) {
             LatLngBounds bounds = builder.build();
             CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
@@ -1642,16 +1648,14 @@ public void onCreate(LifecycleOwner owner) {
                 WritableArray markers = new WritableNativeArray();
 
                 if (kmlLayer.getContainers() == null) {
-                    // todo: use Fabric events
-                    // manager.pushEvent(context, this, "onKmlReady", pointers);
+                    dispatchEvent(pointers, OnKmlReadyEvent::new);
                     return;
                 }
 
                 //Retrieve a nested container within the first container
                 KmlContainer container = kmlLayer.getContainers().iterator().next();
                 if (container == null || container.getContainers() == null) {
-                    // todo: use Fabric events
-                    // manager.pushEvent(context, this, "onKmlReady", pointers);
+                    dispatchEvent(pointers, OnKmlReadyEvent::new);
                     return;
                 }
 
@@ -1714,8 +1718,7 @@ public void onCreate(LifecycleOwner owner) {
                 }
 
                 pointers.putArray("markers", markers);
-                // todo: use Fabric events
-                //  manager.pushEvent(context, this, "onKmlReady", pointers);
+                dispatchEvent(new WritableNativeMap(), OnKmlReadyEvent::new);
 
             } catch (XmlPullParserException | IOException | InterruptedException |
                      ExecutionException e) {

package/lib/MapView.d.ts

@@ -690,6 +690,7 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private handleMapPress;
     private handleMarkerPress;
     private handleMarkerSelect;
+    private handleKmlReady;
     private handleMarkerDeselect;
     private handleRegionChange;
     private handleRegionChangeStarted;

package/lib/MapView.js

@@ -319,6 +319,11 @@ class MapView extends React.Component {
             this.props.onMarkerSelect(event);
         }
     };
+    handleKmlReady = (event) => {
+        if (this.props.onKmlReady) {
+            this.props.onKmlReady(event);
+        }
+    };
     handleMarkerDeselect = (event) => {
         if (this.props.onMarkerDeselect) {
             this.props.onMarkerDeselect(event);
@@ -373,6 +378,7 @@ class MapView extends React.Component {
             onMarkerPress: this.handleMarkerPress,
             onMarkerSelect: this.handleMarkerSelect,
             onMarkerDeselect: this.handleMarkerDeselect,
+            onKmlReady: this.handleKmlReady,
             userInterfaceStyle: userInterfaceStyle,
             minZoom: minZoomLevel,
             maxZoom: maxZoomLevel,

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.85",
+  "version": "1.21.0-alpha.87",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",