@maplibre/maplibre-react-native 11.0.0-alpha.16 → 11.0.0-alpha.18

package/src/modules/log/LogManager.ts

@@ -0,0 +1,114 @@
+import { type EventSubscription } from "react-native";
+
+import NativeLogModule from "./NativeLogModule";
+
+/**
+ * Log levels in decreasing order of severity
+ */
+export type LogLevel = "error" | "warn" | "info" | "debug" | "verbose";
+
+interface LogEvent {
+  level: LogLevel;
+  tag: string;
+  message: string;
+}
+
+/**
+ * Handler for `onLog` events
+ *
+ * Called before logging a message, return false to proceed with default logging.
+ *
+ * @param event
+ */
+type LogHandler = (event: LogEvent) => boolean;
+
+class LogManager {
+  private logLevel: LogLevel = "warn";
+  private startedCount: number = 0;
+  private logHandler: LogHandler | undefined = undefined;
+  private subscription: EventSubscription | undefined = undefined;
+
+  constructor() {
+    this.handleLog = this.handleLog.bind(this);
+  }
+
+  /**
+   * Override logging behavior
+   *
+   * @param logHandler
+   */
+  onLog(logHandler: LogHandler): void {
+    this.logHandler = logHandler;
+  }
+
+  /**
+   * Set the minimum log level for a message to be logged
+   *
+   * @param level Minimum log level
+   */
+  setLogLevel(level: LogLevel): void {
+    this.logLevel = level;
+    NativeLogModule.setLogLevel(level);
+  }
+
+  start(): void {
+    if (this.startedCount === 0) {
+      this.subscribe();
+    }
+
+    this.startedCount += 1;
+  }
+
+  stop(): void {
+    this.startedCount -= 1;
+
+    if (this.startedCount === 0) {
+      this.unsubscribe();
+    }
+  }
+
+  private subscribe(): void {
+    this.subscription = NativeLogModule.onLog(this.handleLog);
+  }
+
+  private unsubscribe(): void {
+    if (this.subscription) {
+      this.subscription.remove();
+      this.subscription = undefined;
+    }
+  }
+
+  private effectiveLevel({ level, message, tag }: LogEvent): LogLevel {
+    // Reduce level of cancelled HTTP requests from warn to info
+    if (
+      level === "warn" &&
+      tag === "Mbgl-HttpRequest" &&
+      message.startsWith("Request failed due to a permanent error: Canceled")
+    ) {
+      return "info";
+    }
+
+    return level;
+  }
+
+  private handleLog(log: LogEvent): void {
+    if (!this.logHandler || !this.logHandler(log)) {
+      const { message, tag } = log;
+      const level = this.effectiveLevel(log);
+
+      const consoleMessage = `MapLibre Native [${level.toUpperCase()}] [${tag}] ${message}`;
+
+      if (level === "error") {
+        console.error(consoleMessage);
+      } else if (level === "warn" && this.logLevel !== "error") {
+        console.warn(consoleMessage);
+      } else if (this.logLevel !== "error" && this.logLevel !== "warn") {
+        console.info(consoleMessage);
+      }
+    }
+  }
+}
+
+const logManager = new LogManager();
+
+export { logManager as LogManager };

package/src/modules/log/NativeLogModule.ts

@@ -0,0 +1,16 @@
+import type { TurboModule, CodegenTypes } from "react-native";
+import { TurboModuleRegistry } from "react-native";
+
+type NativeLogLevel = "error" | "warn" | "info" | "debug" | "verbose";
+
+export interface Spec extends TurboModule {
+  setLogLevel(logLevel: NativeLogLevel): void;
+
+  readonly onLog: CodegenTypes.EventEmitter<{
+    level: NativeLogLevel;
+    tag: string;
+    message: string;
+  }>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>("MLRNLogModule");

package/src/utils/animated/Animated.ts

@@ -1,8 +1,3 @@
-import {
-  type ForwardRefExoticComponent,
-  type MemoExoticComponent,
-  type RefAttributes,
-} from "react";
 import { Animated as RNAnimated } from "react-native";
 
 import { AnimatedCoordinatesArray } from "./AnimatedCoordinatesArray";
@@ -17,11 +12,7 @@ import { LineLayer } from "../../components/layers/LineLayer";
 import { RasterLayer } from "../../components/layers/RasterLayer";
 import { SymbolLayer } from "../../components/layers/SymbolLayer";
 import { ImageSource } from "../../components/sources/ImageSource";
-import {
-  ShapeSource,
-  type ShapeSourceProps,
-  type ShapeSourceRef,
-} from "../../components/sources/ShapeSource";
+import { ShapeSource } from "../../components/sources/ShapeSource";
 
 export const Animated = {
   // sources
@@ -43,21 +34,3 @@ export const Animated = {
   Shape: AnimatedShape,
   ExtractCoordinateFromArray: AnimatedExtractCoordinateFromArray,
 };
-
-type ShapeSourcePropsWithRef = ShapeSourceProps & RefAttributes<ShapeSourceRef>;
-
-type BaseShapeSourceComponent =
-  ForwardRefExoticComponent<ShapeSourcePropsWithRef>;
-
-type AnimatedShapeSourceType =
-  RNAnimated.AnimatedComponent<BaseShapeSourceComponent> &
-    MemoExoticComponent<BaseShapeSourceComponent>;
-
-/**
- * Manual typing is required for AnimatedShapeSource because the
- * following error:
- * `Type instantiation is excessively deep and possibly infinite.ts(2589)`
- */
-export const AnimatedShapeSource = RNAnimated.createAnimatedComponent(
-  ShapeSource,
-) as AnimatedShapeSourceType;

package/android/src/main/java/org/maplibre/reactnative/components/location/LocationComponentManager.java

@@ -1,165 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-
-import org.maplibre.android.location.LocationComponent;
-import org.maplibre.android.location.LocationComponentActivationOptions;
-import org.maplibre.android.location.LocationComponentOptions;
-import org.maplibre.android.location.OnCameraTrackingChangedListener;
-import org.maplibre.android.location.modes.CameraMode;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.Style;
-import org.maplibre.reactnative.R;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.location.LocationManager;
-
-import androidx.annotation.NonNull;
-
-/**
- * The LocationComponent on android implements both location tracking and display of user's current location.
- * LocationComponentManager attempts to separate that, so that Camera can ask for location tracking independent of display of user current location.
- * And NativeUserLocation can ask for display of user's current location - independent of Camera's user tracking.
- */
-public class LocationComponentManager {
-    private MLRNMapView mMapView = null;
-    private MapLibreMap mMap = null;
-
-    private LocationManager mLocationManager = null;
-    private LocationComponent mLocationComponent = null;
-    private Context mContext = null;
-
-    private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
-
-    public LocationComponentManager(MLRNMapView mlrnMapView, Context context) {
-        mMapView = mlrnMapView;
-        mMap = mMapView.getMapLibreMap();
-        mContext = context;
-
-        mLocationManager = LocationManager.getInstance(context);
-    }
-
-    private boolean mShowUserLocation = false;
-
-    private boolean mFollowUserLocation = false;
-
-    private boolean mShowingUserLocation = false;
-
-    private OnCameraTrackingChangedListener mOnCameraTrackingChangedListener = null;
-
-    public void showUserLocation(boolean showUserLocation) {
-        mShowUserLocation = showUserLocation;
-        stateChanged();
-    }
-
-    public void setFollowUserLocation(boolean followUserLocation) {
-        mFollowUserLocation = followUserLocation;
-        stateChanged();
-    }
-
-    public void setCameraMode(@CameraMode.Mode int cameraMode) {
-        mLocationComponent.setCameraMode(cameraMode);
-    }
-
-    public void setRenderMode(@RenderMode.Mode int renderMode) {
-        mRenderMode = renderMode;
-        if (mShowingUserLocation) {
-            mLocationComponent.setRenderMode(renderMode);
-        }
-    }
-
-    public void setPreferredFramesPerSecond(int preferredFramesPerSecond) {
-        if (mLocationComponent == null || preferredFramesPerSecond <= 0) {
-            return;
-        }
-
-        mLocationComponent.setMaxAnimationFps(preferredFramesPerSecond);
-    }
-
-    public void addOnCameraTrackingChangedListener(OnCameraTrackingChangedListener onCameraTrackingChangedListener) {
-        if (mOnCameraTrackingChangedListener != null) {
-            mLocationComponent.removeOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
-        }
-
-        mOnCameraTrackingChangedListener = onCameraTrackingChangedListener;
-
-        mLocationComponent.addOnCameraTrackingChangedListener(mOnCameraTrackingChangedListener);
-    }
-
-    @SuppressLint("MissingPermission")
-    private void stateChanged() {
-        mLocationComponent.setLocationComponentEnabled((mFollowUserLocation || mShowUserLocation));
-
-        if (mShowingUserLocation != mShowUserLocation) {
-            updateShowUserLocation(mShowUserLocation);
-        }
-
-        if (mFollowUserLocation) {
-            if (!mShowUserLocation) {
-                mLocationComponent.setRenderMode(RenderMode.GPS);
-            } else {
-                mLocationComponent.setRenderMode(mRenderMode);
-            }
-            mLocationComponent.onStart();
-        } else {
-            mLocationComponent.setCameraMode(CameraMode.NONE);
-        }
-    }
-
-    public boolean hasLocationComponent() {
-        return (mLocationComponent != null);
-    }
-
-    public void update(@NonNull Style style) {
-        update(mShowUserLocation, style);
-    }
-
-    public void update(boolean displayUserLocation, @NonNull Style style) {
-        Integer tintColor = mMapView.getTintColor();
-
-        if (mLocationComponent == null || tintColor != null) {
-            mLocationComponent = mMap.getLocationComponent();
-
-            LocationComponentActivationOptions locationComponentActivationOptions = LocationComponentActivationOptions
-                    .builder(mContext, style)
-                    .locationComponentOptions(options(displayUserLocation))
-                    .build();
-            mLocationComponent.activateLocationComponent(locationComponentActivationOptions);
-            mLocationComponent.setLocationEngine(mLocationManager.getEngine());
-            mShowingUserLocation = displayUserLocation;
-        }
-
-        updateShowUserLocation(displayUserLocation);
-    }
-
-    private void updateShowUserLocation(boolean displayUserLocation) {
-        if (mShowingUserLocation != displayUserLocation) {
-            mLocationComponent.applyStyle(options(displayUserLocation));
-            mShowingUserLocation = displayUserLocation;
-        }
-    }
-
-    LocationComponentOptions options(boolean displayUserLocation) {
-        LocationComponentOptions.Builder builder = LocationComponentOptions.builder(mContext);
-        Integer tintColor = mMapView.getTintColor();
-        if (!displayUserLocation) {
-            builder = builder
-                    .padding(mMap.getPadding())
-                    .backgroundDrawable(R.drawable.empty)
-                    .backgroundDrawableStale(R.drawable.empty)
-                    .bearingDrawable(R.drawable.empty)
-                    .foregroundDrawable(R.drawable.empty)
-                    .foregroundDrawableStale(R.drawable.empty)
-                    .gpsDrawable(R.drawable.empty)
-                    .accuracyAlpha(0.0f);
-        } else if (tintColor != null) {
-            builder = builder
-                    .enableStaleState(false)
-                    .bearingTintColor(tintColor)
-                    .foregroundTintColor(tintColor)
-                    .accuracyColor(tintColor);
-        }
-        return builder.build();
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/location/MLRNNativeUserLocation.java

@@ -1,76 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import androidx.annotation.NonNull;
-
-import org.maplibre.android.location.permissions.PermissionsManager;
-import org.maplibre.android.location.modes.RenderMode;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.OnMapReadyCallback;
-import org.maplibre.android.maps.Style;
-import org.maplibre.reactnative.components.AbstractMapFeature;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-
-public class MLRNNativeUserLocation extends AbstractMapFeature implements OnMapReadyCallback, Style.OnStyleLoaded {
-    private boolean mEnabled = true;
-    private MapLibreMap mMap;
-    private MLRNMapView mMapView;
-    private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
-    private int mPreferredFramesPerSecond;
-
-    public MLRNNativeUserLocation(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        mEnabled = true;
-        mMapView = mapView;
-        mapView.getMapAsync(this);
-        setRenderMode(mRenderMode);
-        setPreferredFramesPerSecond(mPreferredFramesPerSecond);
-    }
-
-    @Override
-    public void removeFromMap(MLRNMapView mapView) {
-        mEnabled = false;
-        if (mMap != null) mMap.getStyle(this);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onMapReady(@NonNull MapLibreMap mapboxMap) {
-        mMap = mapboxMap;
-        mapboxMap.getStyle(this);
-    }
-
-    @SuppressLint("MissingPermission")
-    @Override
-    public void onStyleLoaded(@NonNull Style style) {
-        Context context = getContext();
-        if (!PermissionsManager.areLocationPermissionsGranted(context)) {
-            return;
-        }
-
-        LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-        locationComponent.update(style);
-        locationComponent.showUserLocation(mEnabled);
-    }
-
-    public void setRenderMode(@RenderMode.Mode int renderMode) {
-        mRenderMode = renderMode;
-        if (mMapView != null) {
-            LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-            locationComponent.setRenderMode(renderMode);
-        }
-    }
-
-    public void setPreferredFramesPerSecond(int framesPerSecond) {
-        mPreferredFramesPerSecond = framesPerSecond;
-        if (mMapView != null) {
-            LocationComponentManager locationComponent = mMapView.getLocationComponentManager();
-            locationComponent.setPreferredFramesPerSecond(framesPerSecond);
-        }
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/location/MLRNNativeUserLocationManager.java

@@ -1,40 +0,0 @@
-package org.maplibre.reactnative.components.location;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import org.maplibre.android.location.modes.RenderMode;
-
-import javax.annotation.Nonnull;
-
-public class MLRNNativeUserLocationManager extends ViewGroupManager<MLRNNativeUserLocation> {
-    public static final String REACT_CLASS = "MLRNNativeUserLocation";
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactProp(name="androidRenderMode")
-    public void setAndroidRenderMode(MLRNNativeUserLocation userLocation, String mode) {
-       if ("compass".equalsIgnoreCase(mode)) {
-           userLocation.setRenderMode(RenderMode.COMPASS);
-        } else if ("gps".equalsIgnoreCase(mode)) {
-           userLocation.setRenderMode(RenderMode.GPS);
-        } else {
-           userLocation.setRenderMode(RenderMode.NORMAL);
-       }
-    }
-
-    @ReactProp(name="androidPreferredFramesPerSecond")
-    public void setPreferredFramesPerSecond(MLRNNativeUserLocation userLocation, int preferredFramesPerSecond) {
-       userLocation.setPreferredFramesPerSecond(preferredFramesPerSecond);
-    }
-
-    @Nonnull
-    @Override
-    protected MLRNNativeUserLocation createViewInstance(@Nonnull ThemedReactContext reactContext) {
-        return new MLRNNativeUserLocation(reactContext);
-    }
-}

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

@@ -1,140 +0,0 @@
-package org.maplibre.reactnative.modules;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import org.maplibre.android.log.Logger;
-import org.maplibre.android.log.LoggerDefinition;
-import android.util.Log;
-
-@ReactModule(name = MLRNLogging.REACT_CLASS)
-public class MLRNLogging extends ReactContextBaseJavaModule {
-    public static final String REACT_CLASS = "MLRNLogging";
-    private ReactApplicationContext mReactContext;
-
-    public MLRNLogging(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-        mReactContext = reactApplicationContext;
-
-        Logger.setVerbosity(Logger.WARN);
-        Logger.setLoggerDefinition(new LoggerDefinition() {
-            @Override
-            public void v(String tag, String msg) {
-                Log.v(tag, msg);
-                onLog("verbose", tag, msg, null);
-            }
-
-            @Override
-            public void v(String tag, String msg, Throwable tr) {
-                Log.v(tag, msg, tr);
-                onLog("verbose", tag, msg, tr);
-            }
-
-            @Override
-            public void d(String tag, String msg) {
-                Log.d(tag, msg);
-                onLog("debug", tag, msg, null);
-            }
-
-            @Override
-            public void d(String tag, String msg, Throwable tr) {
-                Log.d(tag, msg, tr);
-                onLog("debug",tag,msg,tr);
-            }
-
-            @Override
-            public void i(String tag, String msg) {
-                Log.i(tag, msg);
-                onLog("info", tag, msg, null);
-            }
-
-            @Override
-            public void i(String tag, String msg, Throwable tr) {
-                Log.i(tag, msg, tr);
-                onLog("info", tag, msg, tr);
-            }
-
-            @Override
-            public void w(String tag, String msg) {
-                Log.w(tag, msg);
-                onLog("warning", tag, msg, null);
-            }
-
-            @Override
-            public void w(String tag, String msg, Throwable tr) {
-                Log.w(tag, msg, tr);
-                onLog("warning", tag, msg, tr);
-            }
-
-            @Override
-            public void e(String tag, String msg) {
-                Log.e(tag, msg);
-                onLog("error", tag, msg, null);
-            }
-
-            @Override
-            public void e(String tag, String msg, Throwable tr) {
-                Log.e(tag, msg, tr);
-                onLog("error", tag, msg, tr);
-            }
-        });
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactMethod
-    public void setLogLevel(String level) {
-        @Logger.LogLevel int logLevel = Logger.NONE;
-        switch(level)
-        {
-            case "error":
-                logLevel = Logger.ERROR;
-                break;
-            case "warning":
-                logLevel = Logger.WARN;
-                break;
-            case "info":
-                logLevel = Logger.INFO;
-                break;
-            case "debug":
-                logLevel = Logger.DEBUG;
-                break;
-            case "verbose":
-                logLevel = Logger.VERBOSE;
-                break;
-            default:
-                logLevel = Logger.NONE;
-                break;
-        }
-        Logger.setVerbosity(logLevel);
-    }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // Set up any upstream listeners or background tasks as necessary
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Remove upstream listeners, stop unnecessary background tasks
-    }
-
-    public void onLog(String level, String tag, String msg, Throwable tr) {
-        WritableMap event = Arguments.createMap();
-        event.putString("message", msg);
-        event.putString("tag", tag);
-        event.putString("level", level);
-
-        mReactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit("LogEvent", event);
-    }
-
-}

package/ios/components/user-location/MLRNNativeUserLocationManager.h

@@ -1,5 +0,0 @@
-#import "ViewManager.h"
-
-@interface MLRNNativeUserLocationManager : ViewManager
-
-@end

package/ios/components/user-location/MLRNNativeUserLocationManager.m

@@ -1,21 +0,0 @@
-#import "MLRNNativeUserLocationManager.h"
-#import "MLRNNativeUserLocation.h"
-
-@implementation MLRNNativeUserLocationManager
-
-RCT_EXPORT_MODULE(MLRNNativeUserLocation)
-RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL)
-
-#pragma - View Properties
-
-#pragma Methods
-
-- (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-- (UIView *)view {
-  return [[MLRNNativeUserLocation alloc] init];
-}
-
-@end