@maplibre/maplibre-react-native 10.1.5 → 11.0.0-alpha.2

package/src/index.ts

@@ -1,7 +1 @@
-import * as MapLibreRN from "./MapLibreRN";
 export * from "./MapLibreRN";
-
-/**
- * @deprecated Use named imports or `import * as MapLibreRN` instead
- */
-export default MapLibreRN;

package/src/modules/snapshot/NativeSnapshotModule.ts

@@ -0,0 +1,24 @@
+import type { TurboModule } from "react-native";
+import { TurboModuleRegistry } from "react-native";
+
+export interface SnapshotJsonOptions {
+  centerCoordinate?: string;
+  zoomLevel?: number;
+
+  bounds?: string;
+
+  styleURL: string;
+  heading: number;
+  pitch: number;
+  width: number;
+  height: number;
+  writeToDisk: boolean;
+  withLogo: boolean;
+}
+
+export interface Spec extends TurboModule {
+  takeSnap(options: SnapshotJsonOptions): Promise<string>;
+}
+
+export const NativeSnapshotModule =
+  TurboModuleRegistry.getEnforcing<Spec>("MLRNSnapshotModule");

package/src/modules/snapshot/SnapshotManager.ts

@@ -1,8 +1,5 @@
-import { NativeModules } from "react-native";
-
-import { SnapshotOptions, type SnapshotInputOptions } from "./SnapshotOptions";
-
-const MLRNSnapshotModule = NativeModules.MLRNSnapshotModule;
+import { NativeSnapshotModule } from "./NativeSnapshotModule";
+import { type SnapshotInputOptions, SnapshotOptions } from "./SnapshotOptions";
 
 /**
  * The SnapshotManager generates static raster images of the map.
@@ -53,7 +50,7 @@ class SnapshotManager {
   async takeSnap(options: SnapshotInputOptions = {}): Promise<string> {
     const snapshotOptions = new SnapshotOptions(options);
 
-    const uri = await MLRNSnapshotModule.takeSnap(snapshotOptions);
+    const uri = await NativeSnapshotModule.takeSnap(snapshotOptions.toJSON());
     return uri;
   }
 }

package/src/modules/snapshot/SnapshotOptions.ts

@@ -1,37 +1,18 @@
 import { featureCollection, point } from "@turf/helpers";
 import { NativeModules } from "react-native";
 
+import type { SnapshotJsonOptions } from "./NativeSnapshotModule";
 import { toJSONString } from "../../utils";
 
 const MLRNModule = NativeModules.MLRNModule;
 
-export interface SnapshotInputOptions {
+export interface SnapshotInputOptions
+  extends Partial<Omit<SnapshotJsonOptions, "centerCoordinate" | "bounds">> {
   centerCoordinate?: GeoJSON.Position;
   bounds?: GeoJSON.Position[];
-  styleURL?: string;
-  heading?: number;
-  pitch?: number;
-  zoomLevel?: number;
-  width?: number;
-  height?: number;
-  writeToDisk?: boolean;
-  withLogo?: boolean;
 }
 
-interface SnapshotJsonOptions {
-  centerCoordinate?: string;
-  bounds?: string;
-  styleURL: string;
-  heading: number;
-  pitch: number;
-  zoomLevel: number;
-  width: number;
-  height: number;
-  writeToDisk: boolean;
-  withLogo: boolean;
-}
-
-export class SnapshotOptions {
+export class SnapshotOptions implements SnapshotJsonOptions {
   centerCoordinate?: string;
   bounds?: string;
   styleURL: string;
@@ -60,13 +41,13 @@ export class SnapshotOptions {
     this.withLogo = options.withLogo === undefined ? true : options.withLogo;
 
     if (options.centerCoordinate) {
-      this.centerCoordinate = this._createCenterCoordPoint(
+      this.centerCoordinate = this.stringifyCenterCoordinate(
         options.centerCoordinate,
       );
     }
 
     if (options.bounds) {
-      this.bounds = this._createBoundsCollection(options.bounds);
+      this.bounds = this.stringifyBounds(options.bounds);
     }
   }
 
@@ -85,11 +66,13 @@ export class SnapshotOptions {
     };
   }
 
-  _createCenterCoordPoint(centerCoordinate: GeoJSON.Position): string {
+  private stringifyCenterCoordinate(
+    centerCoordinate: GeoJSON.Position,
+  ): string {
     return toJSONString(point(centerCoordinate));
   }
 
-  _createBoundsCollection(bounds: GeoJSON.Position[]): string {
+  private stringifyBounds(bounds: GeoJSON.Position[]): string {
     const features = [];
 
     for (const bound of bounds) {

package/src/utils/animated/AnimatedRouteCoordinatesArray.ts

@@ -26,11 +26,6 @@ interface AnimatedRouteToValue {
         along: number;
         units?: Units;
       };
-
-  /**
-   * @deprecated Use `end.units` in conjunction with `end.along` instead
-   */
-  units?: Units;
 }
 
 interface AnimatedRouteState {
@@ -128,17 +123,9 @@ export class AnimatedRouteCoordinatesArray extends AbstractAnimatedCoordinates<
     let to: number | undefined = undefined;
 
     if ("along" in toValue.end) {
-      const { units } = toValue;
-
-      if (units !== undefined) {
-        console.warn(
-          "RouteCoordinatesArray: `toValue.units` is deprecated, use `toValue.end.units` instead.",
-        );
-      }
-
       to =
         length(fullRouteLineString) -
-        convertLength(toValue.end.along, toValue.end.units ?? units);
+        convertLength(toValue.end.along, toValue.end.units);
     } else {
       const nearest = nearestPointOnLine(
         fullRouteLineString,

package/android/src/main/AndroidManifestNew.xml

@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-</manifest>

package/android/src/main/java/org/maplibre/reactnative/MLRNPackage.java

@@ -1,90 +0,0 @@
-package org.maplibre.reactnative;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
-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.Collections;
-import java.util.List;
-
-import org.maplibre.reactnative.components.annotation.MLRNCalloutManager;
-import org.maplibre.reactnative.components.annotation.MLRNPointAnnotationManager;
-import org.maplibre.reactnative.components.annotation.MLRNMarkerViewManager;
-import org.maplibre.reactnative.components.camera.MLRNCameraManager;
-import org.maplibre.reactnative.components.images.MLRNImagesManager;
-import org.maplibre.reactnative.components.location.MLRNNativeUserLocationManager;
-import org.maplibre.reactnative.components.mapview.MLRNMapViewManager;
-import org.maplibre.reactnative.components.mapview.MLRNAndroidTextureMapViewManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNBackgroundLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNCircleLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNFillExtrusionLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNFillLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNHeatmapLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNLineLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNRasterLayerManager;
-import org.maplibre.reactnative.components.styles.layers.MLRNSymbolLayerManager;
-import org.maplibre.reactnative.components.styles.light.MLRNLightManager;
-import org.maplibre.reactnative.components.styles.sources.MLRNImageSourceManager;
-import org.maplibre.reactnative.components.styles.sources.MLRNRasterSourceManager;
-import org.maplibre.reactnative.components.styles.sources.MLRNShapeSourceManager;
-import org.maplibre.reactnative.components.styles.sources.MLRNVectorSourceManager;
-import org.maplibre.reactnative.modules.MLRNLocationModule;
-import org.maplibre.reactnative.modules.MLRNLogging;
-import org.maplibre.reactnative.modules.MLRNModule;
-import org.maplibre.reactnative.modules.MLRNOfflineModule;
-import org.maplibre.reactnative.modules.MLRNSnapshotModule;
-
-public class MLRNPackage implements ReactPackage {
-
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
-        List<NativeModule> modules = new ArrayList<>();
-
-        modules.add(new MLRNModule(reactApplicationContext));
-        modules.add(new MLRNOfflineModule(reactApplicationContext));
-        modules.add(new MLRNSnapshotModule(reactApplicationContext));
-        modules.add(new MLRNLocationModule(reactApplicationContext));
-        modules.add(new MLRNLogging(reactApplicationContext));
-
-        return modules;
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
-        List<ViewManager> managers = new ArrayList<>();
-
-        // components
-        managers.add(new MLRNCameraManager(reactApplicationContext));
-        managers.add(new MLRNMapViewManager(reactApplicationContext));
-        managers.add(new MLRNMarkerViewManager(reactApplicationContext));
-        managers.add(new MLRNAndroidTextureMapViewManager(reactApplicationContext));
-        managers.add(new MLRNLightManager());
-        managers.add(new MLRNPointAnnotationManager(reactApplicationContext));
-        managers.add(new MLRNCalloutManager());
-        managers.add(new MLRNNativeUserLocationManager());
-
-        // sources
-        managers.add(new MLRNVectorSourceManager(reactApplicationContext));
-        managers.add(new MLRNShapeSourceManager(reactApplicationContext));
-        managers.add(new MLRNRasterSourceManager(reactApplicationContext));
-        managers.add(new MLRNImageSourceManager());
-
-        // images
-        managers.add(new MLRNImagesManager(reactApplicationContext));
-
-        // layers
-        managers.add(new MLRNFillLayerManager());
-        managers.add(new MLRNFillExtrusionLayerManager());
-        managers.add(new MLRNHeatmapLayerManager());
-        managers.add(new MLRNLineLayerManager());
-        managers.add(new MLRNCircleLayerManager());
-        managers.add(new MLRNSymbolLayerManager());
-        managers.add(new MLRNRasterLayerManager());
-        managers.add(new MLRNBackgroundLayerManager());
-
-        return managers;
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNSnapshotModule.java

@@ -1,135 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Base64;
-import android.util.Log;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.module.annotations.ReactModule;
-import org.maplibre.geojson.Feature;
-import org.maplibre.geojson.FeatureCollection;
-import org.maplibre.geojson.Point;
-import org.maplibre.android.camera.CameraPosition;
-import org.maplibre.android.snapshotter.MapSnapshot;
-import org.maplibre.android.snapshotter.MapSnapshotter;
-import org.maplibre.android.storage.FileSource;
-import org.maplibre.reactnative.utils.BitmapUtils;
-import org.maplibre.reactnative.utils.GeoJSONUtils;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static android.content.Context.CONTEXT_IGNORE_SECURITY;
-
-@ReactModule(name = MLRNSnapshotModule.REACT_CLASS)
-public class MLRNSnapshotModule extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNSnapshotModule";
-
-    private ReactApplicationContext mContext;
-
-    // prevents snapshotter from being GC'ed
-    private Map<String, MapSnapshotter> mSnapshotterMap;
-
-    public MLRNSnapshotModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        mContext = reactContext;
-        mSnapshotterMap = new HashMap<>();
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactMethod
-    public void takeSnap(final ReadableMap jsOptions, final Promise promise) {
-        FileSource.getInstance(mContext).activate();
-
-        mContext.runOnUiQueueThread(new Runnable() {
-            @Override
-            public void run() {
-                final String snapshotterID = UUID.randomUUID().toString();
-                final MapSnapshotter snapshotter = new MapSnapshotter(mContext, getOptions(jsOptions));
-                mSnapshotterMap.put(snapshotterID, snapshotter);
-
-                snapshotter.start(new MapSnapshotter.SnapshotReadyCallback() {
-                    @Override
-                    public void onSnapshotReady(MapSnapshot snapshot) {
-                        Bitmap bitmap = snapshot.getBitmap();
-
-                        String result = null;
-                        if (jsOptions.getBoolean("writeToDisk")) {
-                            result = BitmapUtils.createTempFile(mContext, bitmap);
-                        } else {
-                            result = BitmapUtils.createBase64(bitmap);
-                        }
-
-                        if (result == null) {
-                            promise.reject(REACT_CLASS, "Could not generate snapshot, please check Android logs for more info.");
-                            return;
-                        }
-
-                        promise.resolve(result);
-                        mSnapshotterMap.remove(snapshotterID);
-                    }
-                }, new MapSnapshotter.ErrorHandler() {
-                    @Override
-                    public void onError(String error) {
-                        Log.w(REACT_CLASS, error);
-                        mSnapshotterMap.remove(snapshotterID);
-                    }
-                });
-            }
-        });
-    }
-
-    private MapSnapshotter.Options getOptions(ReadableMap jsOptions) {
-        MapSnapshotter.Options options = new MapSnapshotter.Options(
-                (int) jsOptions.getDouble("width"),
-                (int) jsOptions.getDouble("height"));
-
-        options.withLogo(jsOptions.getBoolean("withLogo"));
-        options.withStyle(jsOptions.getString("styleURL"));
-        options.withPixelRatio(Float.valueOf(mContext.getResources().getDisplayMetrics().scaledDensity).intValue());
-
-        if (jsOptions.hasKey("bounds")) {
-            FeatureCollection bounds = FeatureCollection.fromJson(jsOptions.getString("bounds"));
-            options.withRegion(GeoJSONUtils.toLatLngBounds(bounds));
-        } else {
-            Feature centerPoint = Feature.fromJson(jsOptions.getString("centerCoordinate"));
-            CameraPosition cameraPosition = new CameraPosition.Builder()
-                    .target(GeoJSONUtils.toLatLng((Point) centerPoint.geometry()))
-                    .tilt(jsOptions.getDouble("pitch"))
-                    .bearing(jsOptions.getDouble("heading"))
-                    .zoom(jsOptions.getDouble("zoomLevel"))
-                    .build();
-            options.withCameraPosition(cameraPosition);
-        }
-
-        return options;
-    }
-
-    private void closeSnapshotOutputStream(OutputStream outputStream) {
-        if (outputStream == null) {
-            return;
-        }
-        try {
-            outputStream.close();
-        } catch (IOException e) {
-            Log.w(REACT_CLASS, e.getLocalizedMessage());
-        }
-    }
-}

package/ios/MLRN/MLRNSnapshotModule.h

@@ -1,5 +0,0 @@
-#import <React/RCTBridgeModule.h>
-
-@interface MLRNSnapshotModule : NSObject <RCTBridgeModule>
-
-@end

package/ios/MLRN/MLRNSnapshotModule.m

@@ -1,70 +0,0 @@
-#import "MLRNSnapshotModule.h"
-#import "MLRNImageUtils.h"
-#import "MLRNUtils.h"
-@import MapLibre;
-
-@implementation MLRNSnapshotModule
-
-RCT_EXPORT_MODULE()
-
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-RCT_EXPORT_METHOD(takeSnap : (NSDictionary *)jsOptions resolver : (RCTPromiseResolveBlock)
-                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    MLNMapSnapshotOptions *options = [self _getOptions:jsOptions];
-    __block MLNMapSnapshotter *snapshotter = [[MLNMapSnapshotter alloc] initWithOptions:options];
-
-    [snapshotter
-        startWithCompletionHandler:^(MLNMapSnapshot *_Nullable snapshot, NSError *_Nullable err) {
-          if (err != nil) {
-            reject(@"takeSnap", @"Could not create snapshot", err);
-            snapshotter = nil;
-            return;
-          }
-
-          NSString *result = nil;
-          if ([jsOptions[@"writeToDisk"] boolValue]) {
-            result = [MLRNImageUtils createTempFile:snapshot.image];
-          } else {
-            result = [MLRNImageUtils createBase64:snapshot.image];
-          }
-
-          resolve(result);
-          snapshotter = nil;
-        }];
-  });
-}
-
-- (MLNMapSnapshotOptions *)_getOptions:(NSDictionary *)jsOptions {
-  MLNMapCamera *camera = [[MLNMapCamera alloc] init];
-
-  camera.pitch = [jsOptions[@"pitch"] doubleValue];
-  camera.heading = [jsOptions[@"heading"] doubleValue];
-
-  if (jsOptions[@"centerCoordinate"] != nil) {
-    camera.centerCoordinate = [MLRNUtils fromFeature:jsOptions[@"centerCoordinate"]];
-  }
-
-  NSNumber *width = jsOptions[@"width"];
-  NSNumber *height = jsOptions[@"height"];
-  CGSize size = CGSizeMake([width doubleValue], [height doubleValue]);
-
-  MLNMapSnapshotOptions *options =
-      [[MLNMapSnapshotOptions alloc] initWithStyleURL:[NSURL URLWithString:jsOptions[@"styleURL"]]
-                                               camera:camera
-                                                 size:size];
-  if (jsOptions[@"zoomLevel"] != nil) {
-    options.zoomLevel = [jsOptions[@"zoomLevel"] doubleValue];
-  }
-
-  if (jsOptions[@"bounds"] != nil) {
-    options.coordinateBounds = [MLRNUtils fromFeatureCollection:jsOptions[@"bounds"]];
-  }
-
-  return options;
-}
-
-@end

package/ios/MLRN.xcodeproj/project.pbxproj

@@ -1 +0,0 @@
-https://github.com/rnmapbox/maps/issues/2254