react-native-maps 0.31.0 → 1.0.0-alpha.1

package/android/src/main/java/com/{airbnb/android/react/maps/AirMapWMSTile.java → rnmaps/maps/MapWMSTile.java}

@@ -1,26 +1,22 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 
-import android.util.Log;
-
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.model.TileOverlay;
 import com.google.android.gms.maps.model.TileOverlayOptions;
 import com.google.android.gms.maps.model.UrlTileProvider;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-public class AirMapWMSTile extends AirMapUrlTile {
+public class MapWMSTile extends MapUrlTile {
   private static final double[] mapBound = {-20037508.34789244, 20037508.34789244};
   private static final double FULL = 20037508.34789244 * 2;
 
-  class AIRMapGSUrlTileProvider extends AirMapTileProvider {
+  class AIRMapGSUrlTileProvider extends MapTileProvider {
 
     class AIRMapWMSTileProvider extends UrlTileProvider {
     private String urlTemplate;
-    private int tileSize;
+    private final int tileSize;
 
     public AIRMapWMSTileProvider(int width, int height, String urlTemplate) {
       super(width, height);
@@ -30,11 +26,11 @@ public class AirMapWMSTile extends AirMapUrlTile {
 
     @Override
     public URL getTileUrl(int x, int y, int zoom) {
-      if(AirMapWMSTile.this.maximumZ > 0 && zoom > maximumZ) {
+      if(MapWMSTile.this.maximumZ > 0 && zoom > maximumZ) {
           return null;
       }
 
-      if(AirMapWMSTile.this.minimumZ > 0 && zoom < minimumZ) {
+      if(MapWMSTile.this.minimumZ > 0 && zoom < minimumZ) {
           return null;
       }
 
@@ -80,9 +76,7 @@ public class AirMapWMSTile extends AirMapUrlTile {
     }
   }
 
-  private AIRMapGSUrlTileProvider tileProvider;
-
-  public AirMapWMSTile(Context context) {
+  public MapWMSTile(Context context) {
     super(context);
   }
 
@@ -91,10 +85,10 @@ public class AirMapWMSTile extends AirMapUrlTile {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
     options.transparency(1 - this.opacity);
-    this.tileProvider = new AIRMapGSUrlTileProvider((int)this.tileSize, this.urlTemplate, 
-      (int)this.maximumZ, (int)this.maximumNativeZ, (int)this.minimumZ, this.tileCachePath, 
-      (int)this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
-    options.tileProvider(this.tileProvider);
+    AIRMapGSUrlTileProvider tileProvider = new AIRMapGSUrlTileProvider(this.tileSize, this.urlTemplate,
+            this.maximumZ, this.maximumNativeZ, this.minimumZ, this.tileCachePath,
+            this.tileCacheMaxAge, this.offlineMode, this.context, this.customTileProviderNeeded);
+    options.tileProvider(tileProvider);
     return options;
   }
 }

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

@@ -0,0 +1,81 @@
+package com.rnmaps.maps;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+import android.view.WindowManager;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+public class MapWMSTileManager extends ViewGroupManager<MapWMSTile> {
+
+  public MapWMSTileManager(ReactApplicationContext reactContext) {
+    super();
+    DisplayMetrics metrics = new DisplayMetrics();
+    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
+        .getDefaultDisplay()
+        .getRealMetrics(metrics);
+  }
+
+  @Override
+  public String getName() {
+    return "AIRMapWMSTile";
+  }
+
+  @Override
+  public MapWMSTile createViewInstance(ThemedReactContext context) {
+    return new MapWMSTile(context);
+  }
+
+  @ReactProp(name = "urlTemplate")
+  public void setUrlTemplate(MapWMSTile view, String urlTemplate) {
+    view.setUrlTemplate(urlTemplate);
+  }
+
+  @ReactProp(name = "zIndex", defaultFloat = -1.0f)
+  public void setZIndex(MapWMSTile view, float zIndex) {
+    view.setZIndex(zIndex);
+  }
+
+  @ReactProp(name = "minimumZ", defaultInt = 0)
+  public void setMinimumZ(MapWMSTile view, int minimumZ) {
+    view.setMinimumZ(minimumZ);
+  }
+
+  @ReactProp(name = "maximumZ", defaultInt = 100)
+  public void setMaximumZ(MapWMSTile view, int maximumZ) {
+    view.setMaximumZ(maximumZ);
+  }
+
+  @ReactProp(name = "maximumNativeZ", defaultInt= 100)
+  public void setMaximumNativeZ(MapWMSTile view, int maximumNativeZ) {
+    view.setMaximumNativeZ(maximumNativeZ);
+  }
+
+  @ReactProp(name = "tileSize", defaultInt = 256)
+  public void setTileSize(MapWMSTile view, int tileSize) {
+    view.setTileSize(tileSize);
+  }
+
+  @ReactProp(name = "tileCachePath")
+  public void setTileCachePath(MapWMSTile view, String tileCachePath) {
+    view.setTileCachePath(tileCachePath);
+  }
+
+  @ReactProp(name = "tileCacheMaxAge", defaultInt = 0)
+  public void setTileCacheMaxAge(MapWMSTile view, int tileCacheMaxAge) {
+    view.setTileCacheMaxAge(tileCacheMaxAge);
+  }
+
+  @ReactProp(name = "offlineMode", defaultBoolean = false)
+  public void setOfflineMode(MapWMSTile view, boolean offlineMode) {
+    view.setOfflineMode(offlineMode);
+  }
+
+  @ReactProp(name = "opacity", defaultFloat = 1.0f)
+  public void setOpacity(MapWMSTile view, float opacity) {
+    view.setOpacity(opacity);
+  }
+}

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

@@ -0,0 +1,45 @@
+package com.rnmaps.maps;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapsPackage implements ReactPackage {
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    List<NativeModule> modules = new ArrayList<>();
+
+    modules.add(new MapModule(reactContext));
+
+    return modules;
+  }
+
+  @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;
+  }
+}

package/android/src/main/java/com/{airbnb/android/react → rnmaps}/maps/RegionChangeEvent.java

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;

package/android/src/main/java/com/{airbnb/android/react → rnmaps}/maps/SizeReportingShadowNode.java

@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.UIViewOperationQueue;

package/android/src/main/java/com/{airbnb/android/react → rnmaps}/maps/ViewAttacherGroup.java

@@ -1,11 +1,8 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
-import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.os.Build;
 
-import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewGroup;
 
 public class ViewAttacherGroup extends ReactViewGroup {
@@ -17,9 +14,7 @@ public class ViewAttacherGroup extends ReactViewGroup {
     this.setVisibility(VISIBLE);
     this.setAlpha(0.0f);
     this.setRemoveClippedSubviews(false);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      this.setClipBounds(new Rect(0, 0, 0, 0));
-    }
+    this.setClipBounds(new Rect(0, 0, 0, 0));
     this.setOverflow("hidden"); // Change to ViewProps.HIDDEN until RN 0.57 is base
   }
 

package/android/src/main/java/com/{airbnb/android/react → rnmaps}/maps/ViewChangesTracker.java

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -8,22 +8,23 @@ import java.util.LinkedList;
 public class ViewChangesTracker {
 
   private static ViewChangesTracker instance;
-  private Handler handler;
-  private LinkedList<AirMapMarker> markers = new LinkedList<>();
+  private final Handler handler;
+  private final LinkedList<MapMarker> markers = new LinkedList<>();
   private boolean hasScheduledFrame = false;
-  private Runnable updateRunnable;
+  private final Runnable updateRunnable;
   private final long fps = 40;
 
   private ViewChangesTracker() {
     handler = new Handler(Looper.myLooper());
     updateRunnable = new Runnable() {
       @Override
-      public void run() {
-        hasScheduledFrame = false;
+      public void run() {        
         update();
 
         if (markers.size() > 0) {
           handler.postDelayed(updateRunnable, fps);
+        } else {
+          hasScheduledFrame = false;
         }
       }
     };
@@ -39,7 +40,7 @@ public class ViewChangesTracker {
     return instance;
   }
 
-  public void addMarker(AirMapMarker marker) {
+  public void addMarker(MapMarker marker) {
     markers.add(marker);
 
     if (!hasScheduledFrame) {
@@ -48,18 +49,18 @@ public class ViewChangesTracker {
     }
   }
 
-  public void removeMarker(AirMapMarker marker) {
+  public void removeMarker(MapMarker marker) {
     markers.remove(marker);
   }
 
-  public boolean containsMarker(AirMapMarker marker) {
+  public boolean containsMarker(MapMarker marker) {
     return markers.contains(marker);
   }
 
-  private LinkedList<AirMapMarker> markersToRemove = new LinkedList<>();
+  private final LinkedList<MapMarker> markersToRemove = new LinkedList<>();
 
   public void update() {
-    for (AirMapMarker marker : markers) {
+    for (MapMarker marker : markers) {
       if (!marker.updateCustomForTracking()) {
         markersToRemove.add(marker);
       }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNMapsSpecs/*.cpp)
+
+add_library(
+  react_codegen_RNMapsSpecs
+  OBJECT
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_RNMapsSpecs PUBLIC . react/renderer/components/RNMapsSpecs)
+
+target_link_libraries(
+  react_codegen_RNMapsSpecs
+  fbjni
+  jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
+  reactnative
+)
+
+target_compile_options(
+  react_codegen_RNMapsSpecs
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)

package/android/src/main/jni/RNMapsSpecs-generated.cpp

@@ -0,0 +1,68 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniCpp.js
+ */
+
+#include "RNMapsSpecs.h"
+
+namespace facebook::react {
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getCamera(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getCamera", "(DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getMarkersFrames(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getMarkersFrames", "(DZLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getMapBoundaries(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getMapBoundaries", "(DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_takeSnapshot(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "takeSnapshot", "(DLjava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getAddressFromCoordinates(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getAddressFromCoordinates", "(DLcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getPointForCoordinate(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getPointForCoordinate", "(DLcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeAirMapsModuleSpecJSI_getCoordinateForPoint(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getCoordinateForPoint", "(DLcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+NativeAirMapsModuleSpecJSI::NativeAirMapsModuleSpecJSI(const JavaTurboModule::InitParams &params)
+  : JavaTurboModule(params) {
+  methodMap_["getCamera"] = MethodMetadata {1, __hostFunction_NativeAirMapsModuleSpecJSI_getCamera};
+  methodMap_["getMarkersFrames"] = MethodMetadata {2, __hostFunction_NativeAirMapsModuleSpecJSI_getMarkersFrames};
+  methodMap_["getMapBoundaries"] = MethodMetadata {1, __hostFunction_NativeAirMapsModuleSpecJSI_getMapBoundaries};
+  methodMap_["takeSnapshot"] = MethodMetadata {2, __hostFunction_NativeAirMapsModuleSpecJSI_takeSnapshot};
+  methodMap_["getAddressFromCoordinates"] = MethodMetadata {2, __hostFunction_NativeAirMapsModuleSpecJSI_getAddressFromCoordinates};
+  methodMap_["getPointForCoordinate"] = MethodMetadata {2, __hostFunction_NativeAirMapsModuleSpecJSI_getPointForCoordinate};
+  methodMap_["getCoordinateForPoint"] = MethodMetadata {2, __hostFunction_NativeAirMapsModuleSpecJSI_getCoordinateForPoint};
+}
+
+std::shared_ptr<TurboModule> RNMapsSpecs_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+  if (moduleName == "RNMapsAirModule") {
+    return std::make_shared<NativeAirMapsModuleSpecJSI>(params);
+  }
+  return nullptr;
+}
+
+} // namespace facebook::react

package/android/src/main/jni/RNMapsSpecs.h

@@ -0,0 +1,31 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+/**
+ * JNI C++ class for module 'NativeAirMapsModule'
+ */
+class JSI_EXPORT NativeAirMapsModuleSpecJSI : public JavaTurboModule {
+public:
+  NativeAirMapsModuleSpecJSI(const JavaTurboModule::InitParams &params);
+};
+
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> RNMapsSpecs_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+
+} // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.cpp

@@ -0,0 +1,31 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorCpp.js
+ */
+
+#include "ComponentDescriptors.h"
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+registry->add(concreteComponentDescriptorProvider<RNMapsCalloutComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsCircleComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsMarkerComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsOverlayComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsPolylineComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsUrlTileComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNMapsWMSTileComponentDescriptor>());
+}
+
+} // namespace facebook::react

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/ComponentDescriptors.h

@@ -0,0 +1,33 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include "ShadowNodes.h"
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+using RNMapsCalloutComponentDescriptor = ConcreteComponentDescriptor<RNMapsCalloutShadowNode>;
+using RNMapsCircleComponentDescriptor = ConcreteComponentDescriptor<RNMapsCircleShadowNode>;
+using RNMapsGoogleMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsGoogleMapViewShadowNode>;
+using RNMapsGooglePolygonComponentDescriptor = ConcreteComponentDescriptor<RNMapsGooglePolygonShadowNode>;
+using RNMapsMapViewComponentDescriptor = ConcreteComponentDescriptor<RNMapsMapViewShadowNode>;
+using RNMapsMarkerComponentDescriptor = ConcreteComponentDescriptor<RNMapsMarkerShadowNode>;
+using RNMapsOverlayComponentDescriptor = ConcreteComponentDescriptor<RNMapsOverlayShadowNode>;
+using RNMapsPolylineComponentDescriptor = ConcreteComponentDescriptor<RNMapsPolylineShadowNode>;
+using RNMapsUrlTileComponentDescriptor = ConcreteComponentDescriptor<RNMapsUrlTileShadowNode>;
+using RNMapsWMSTileComponentDescriptor = ConcreteComponentDescriptor<RNMapsWMSTileShadowNode>;
+
+void RNMapsSpecs_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
+
+} // namespace facebook::react