react-native-maps 1.23.5 → 1.23.7

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

@@ -41,6 +41,8 @@ public class MapPolyline extends MapFeature {
     private ReadableArray patternValues;
     private List<PatternItem> pattern;
 
+    private List<StyleSpan> spans;
+
     public MapPolyline(Context context) {
         super(context);
     }
@@ -76,8 +78,10 @@ public class MapPolyline extends MapFeature {
             }
             spans.add(new StyleSpan(stroke));
         }
-
+        this.spans = spans;
+        if (polyline != null){
         polyline.setSpans(spans);
+        }
     }
 
     public void setWidth(float width) {
@@ -178,6 +182,9 @@ public class MapPolyline extends MapFeature {
         PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
         polyline = polylineCollection.addPolyline(getPolylineOptions());
         polyline.setClickable(this.tappable);
+        if (spans != null){
+            polyline.setSpans(spans);
+        }
     }
 
     @Override

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

@@ -1512,7 +1512,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragStartEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragStartEvent::new);
     }
 
     @Override
@@ -1522,7 +1522,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragEvent::new);
     }
 
     @Override
@@ -1531,7 +1531,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         dispatchEvent(event, OnMarkerDragEndEvent::new);
         MapMarker markerView = getMarkerMap(marker);
         event = makeClickEventData(marker.getPosition());
-        dispatchEvent(event, OnMarkerDragEndEvent::new, markerView.getId(), context);
+        markerView.dispatchEvent(event, OnDragEndEvent::new);
     }
 
     @Override

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

@@ -1,45 +1,102 @@
 package com.rnmaps.maps;
 
+import androidx.annotation.NonNull;
+
+import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
+import com.rnmaps.fabric.CalloutManager;
+import com.rnmaps.fabric.CircleManager;
+import com.rnmaps.fabric.MapViewManager;
+import com.rnmaps.fabric.MarkerManager;
+import com.rnmaps.fabric.NativeAirMapsModule;
+import com.rnmaps.fabric.OverlayManager;
+import com.rnmaps.fabric.PolygonManager;
+import com.rnmaps.fabric.PolylineManager;
+import com.rnmaps.fabric.UrlTileManager;
+import com.rnmaps.fabric.WMSTileManager;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-public class MapsPackage implements ReactPackage {
+public class MapsPackage extends BaseReactPackage implements ReactPackage {
 
   @Override
-  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    return List.of(new MapViewManager(reactContext),
+            new MarkerManager(reactContext),
+            new CalloutManager(reactContext),
+            new PolygonManager(reactContext),
+            new PolylineManager(reactContext),
+            new CircleManager(reactContext),
+            new OverlayManager(reactContext),
+            new UrlTileManager(reactContext),
+            new WMSTileManager(reactContext),
+            new MapGradientPolylineManager(reactContext),
+            new MapLocalTileManager(reactContext),
+            new MapHeatmapManager());
+  }
 
-    modules.add(new MapModule(reactContext));
 
-    return modules;
+  @Override
+  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    if (OverlayManager.REACT_CLASS.equals(name)) {
+      return new OverlayManager(reactContext);
+    }
+    if (CircleManager.REACT_CLASS.equals(name)) {
+      return new CircleManager(reactContext);
+    }
+    if (PolylineManager.REACT_CLASS.equals(name)) {
+      return new PolylineManager(reactContext);
+    }
+    if (PolygonManager.REACT_CLASS.equals(name)) {
+      return new PolygonManager(reactContext);
+    }
+    if (CalloutManager.REACT_CLASS.equals(name)) {
+      return new CalloutManager(reactContext);
+    }
+    if (MarkerManager.REACT_CLASS.equals(name)) {
+      return new MarkerManager(reactContext);
+    }
+    if (MapViewManager.REACT_CLASS.equals(name)) {
+      return new MapViewManager(reactContext);
+    }
+    if (UrlTileManager.REACT_CLASS.equals(name)) {
+      return new UrlTileManager(reactContext);
+    }
+    if (WMSTileManager.REACT_CLASS.equals(name)) {
+      return new WMSTileManager(reactContext);
+    }
+    if (NativeAirMapsModuleSpec.NAME.equals(name)) {
+      return new NativeAirMapsModule(reactContext);
+    } else {
+      return null;
+    }
   }
 
   @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-    MapManager mapManager = new MapManager(reactContext);
-    MapMarkerManager annotationManager = new MapMarkerManager();
-    mapManager.setMarkerManager(annotationManager);
-
-    List<ViewManager> viewManagers = new ArrayList<>();
-
-    viewManagers.add(mapManager);
-    viewManagers.add(annotationManager);
-    viewManagers.add(new MapCalloutManager());
-    viewManagers.add(new MapPolylineManager(reactContext));
-    viewManagers.add(new MapGradientPolylineManager(reactContext));
-    viewManagers.add(new MapPolygonManager(reactContext));
-    viewManagers.add(new MapCircleManager(reactContext));
-    viewManagers.add(new MapUrlTileManager(reactContext));
-    viewManagers.add(new MapWMSTileManager(reactContext));
-    viewManagers.add(new MapLocalTileManager(reactContext));
-    viewManagers.add(new MapOverlayManager(reactContext));
-    viewManagers.add(new MapHeatmapManager());
-
-    return viewManagers;
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return new ReactModuleInfoProvider() {
+      @NonNull
+      @Override
+      public Map<String, ReactModuleInfo> getReactModuleInfos() {
+        Map<String, ReactModuleInfo> map = new HashMap<>();
+        map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
+                NativeAirMapsModuleSpec.NAME,       // name
+                NativeAirMapsModuleSpec.NAME,       // className
+                false, // canOverrideExistingModule
+                false, // needsEagerInit
+                false, // isCXXModule
+                true   // isTurboModule
+        ));
+        return map;
+      }
+    };
   }
 }

package/ios/AirMaps/RNMapsMapView.mm

@@ -12,6 +12,7 @@
 #import "AIRMapManager.h"
 #import "RNMapsMarkerView.h"
 #if __has_include(<ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMaps/generated/RNMapsAirModuleDelegate.h>
 #import <ReactNativeMaps/generated/RNMapsSpecs.h>
 #import <ReactNativeMaps/generated/RNMapsHostVewDelegate.h>
 #import <ReactNativeMaps/generated/ComponentDescriptors.h>
@@ -19,6 +20,7 @@
 #import <ReactNativeMaps/generated/Props.h>
 #import <ReactNativeMaps/generated/RCTComponentViewHelpers.h>
 #else
+#import "../generated/RNMapsAirModuleDelegate.h"
 #import "../generated/RNMapsSpecs/RNMapsSpecs.h"
 #import "../generated/RNMapsSpecs/ComponentDescriptors.h"
 #import "../generated/RNMapsSpecs/EventEmitters.h"
@@ -41,7 +43,7 @@ using namespace facebook::react;
 
 
 - (id<RNMapsAirModuleDelegate>) mapView {
-    return nil;
+    return (id<RNMapsAirModuleDelegate>)_view;
 }
 
 - (void) prepareForRecycle

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.23.5",
+  "version": "1.23.7",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

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

@@ -1,98 +0,0 @@
-package com.rnmaps.maps;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
-import com.rnmaps.fabric.CalloutManager;
-import com.rnmaps.fabric.CircleManager;
-import com.rnmaps.fabric.MapViewManager;
-import com.rnmaps.fabric.MarkerManager;
-import com.rnmaps.fabric.NativeAirMapsModule;
-import com.rnmaps.fabric.OverlayManager;
-import com.rnmaps.fabric.PolygonManager;
-import com.rnmaps.fabric.PolylineManager;
-import com.rnmaps.fabric.UrlTileManager;
-import com.rnmaps.fabric.WMSTileManager;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class MapAirModulePackage extends TurboReactPackage {
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return List.of(new MapViewManager(reactContext),
-                new MarkerManager(reactContext),
-                new CalloutManager(reactContext),
-                new PolygonManager(reactContext),
-                new PolylineManager(reactContext),
-                new CircleManager(reactContext),
-                new OverlayManager(reactContext),
-                new UrlTileManager(reactContext),
-                new WMSTileManager(reactContext));
-    }
-
-
-    @Override
-    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (OverlayManager.REACT_CLASS.equals(name)) {
-            return new OverlayManager(reactContext);
-        }
-        if (CircleManager.REACT_CLASS.equals(name)) {
-            return new CircleManager(reactContext);
-        }
-        if (PolylineManager.REACT_CLASS.equals(name)) {
-            return new PolylineManager(reactContext);
-        }
-        if (PolygonManager.REACT_CLASS.equals(name)) {
-            return new PolygonManager(reactContext);
-        }
-        if (CalloutManager.REACT_CLASS.equals(name)) {
-            return new CalloutManager(reactContext);
-        }
-        if (MarkerManager.REACT_CLASS.equals(name)) {
-            return new MarkerManager(reactContext);
-        }
-        if (MapViewManager.REACT_CLASS.equals(name)) {
-            return new MapViewManager(reactContext);
-        }
-        if (UrlTileManager.REACT_CLASS.equals(name)) {
-            return new UrlTileManager(reactContext);
-        }
-        if (WMSTileManager.REACT_CLASS.equals(name)) {
-            return new WMSTileManager(reactContext);
-        }
-        if (NativeAirMapsModuleSpec.NAME.equals(name)) {
-            return new NativeAirMapsModule(reactContext);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return new ReactModuleInfoProvider() {
-            @NonNull
-            @Override
-            public Map<String, ReactModuleInfo> getReactModuleInfos() {
-                Map<String, ReactModuleInfo> map = new HashMap<>();
-                map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
-                        NativeAirMapsModuleSpec.NAME,       // name
-                        NativeAirMapsModuleSpec.NAME,       // className
-                        false, // canOverrideExistingModule
-                        false, // needsEagerInit
-                        false, // isCXXModule
-                        true   // isTurboModule
-                ));
-                return map;
-            }
-        };
-    }
-}