@maplibre/maplibre-react-native 11.0.0-alpha.1 → 11.0.0-alpha.10

package/src/utils/animated/Animated.ts

@@ -9,19 +9,19 @@ import { AnimatedCoordinatesArray } from "./AnimatedCoordinatesArray";
 import { AnimatedExtractCoordinateFromArray } from "./AnimatedExtractCoordinateFromArray";
 import { AnimatedRouteCoordinatesArray } from "./AnimatedRouteCoordinatesArray";
 import { AnimatedShape } from "./AnimatedShape";
-import { BackgroundLayer } from "../../components/BackgroundLayer";
-import { CircleLayer } from "../../components/CircleLayer";
-import { FillExtrusionLayer } from "../../components/FillExtrusionLayer";
-import { FillLayer } from "../../components/FillLayer";
-import { ImageSource } from "../../components/ImageSource";
-import { LineLayer } from "../../components/LineLayer";
-import { RasterLayer } from "../../components/RasterLayer";
+import { BackgroundLayer } from "../../components/layers/BackgroundLayer";
+import { CircleLayer } from "../../components/layers/CircleLayer";
+import { FillExtrusionLayer } from "../../components/layers/FillExtrusionLayer";
+import { FillLayer } from "../../components/layers/FillLayer";
+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/ShapeSource";
-import { SymbolLayer } from "../../components/SymbolLayer";
+} from "../../components/sources/ShapeSource";
 
 export const Animated = {
   // sources

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/src/utils/index.ts

@@ -12,14 +12,7 @@ export function isAndroid(): boolean {
   return Platform.OS === "android";
 }
 
-export function existenceChange(cur: boolean, next: boolean): boolean {
-  if (!cur && !next) {
-    return false;
-  }
-  return (!cur && next) || (cur && !next);
-}
-
-export function isFunction(fn: unknown): fn is boolean {
+export function isFunction(fn: unknown): fn is Function {
   return typeof fn === "function";
 }
 
@@ -39,12 +32,6 @@ export function isBoolean(bool: unknown): bool is boolean {
   return typeof bool === "boolean";
 }
 
-export function isPrimitive(
-  value: unknown,
-): value is string | number | boolean {
-  return isString(value) || isNumber(value) || isBoolean(value);
-}
-
 export type NativeArg =
   | string
   | number

package/android/src/main/java/org/maplibre/reactnative/components/AbstractEvent.java

@@ -1,35 +0,0 @@
-package org.maplibre.reactnative.components;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-import javax.annotation.Nullable;
-
-public class AbstractEvent extends Event<AbstractEvent> {
-    private String mEventName;
-    private final boolean mCanCoalesce;
-    private WritableMap mEvent;
-
-    public AbstractEvent(int viewId, String eventName, boolean canCoalesce, @Nullable WritableMap event) {
-        super(viewId);
-        mEventName = eventName;
-        mCanCoalesce = canCoalesce;
-        mEvent = event;
-    }
-
-    @Override
-    public String getEventName() {
-        return mEventName;
-    }
-
-    @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEvent);
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return mCanCoalesce;
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/AbstractEventEmitter.java

@@ -1,80 +0,0 @@
-package org.maplibre.reactnative.components;
-
-import android.view.ViewGroup;
-
-import org.maplibre.reactnative.BuildConfig;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.common.UIManagerType;
-
-import org.maplibre.reactnative.events.IEvent;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-abstract public class AbstractEventEmitter<T extends ViewGroup> extends ViewGroupManager<T> {
-    private static final double BRIDGE_TIMEOUT_MS = 10;
-    private Map<String, Long> mRateLimitedEvents;
-    private EventDispatcher mEventDispatcher;
-    private ReactApplicationContext mRCTAppContext;
-
-    public AbstractEventEmitter(ReactApplicationContext reactApplicationContext) {
-        mRateLimitedEvents = new HashMap<>();
-        mRCTAppContext = reactApplicationContext;
-    }
-
-    public void handleEvent(IEvent event) {
-        String eventCacheKey = getEventCacheKey(event);
-
-        // fail safe to protect bridge from being spammed
-        if (shouldDropEvent(eventCacheKey, event)) {
-            return;
-        }
-
-        mRateLimitedEvents.put(eventCacheKey, System.currentTimeMillis());
-        mEventDispatcher.dispatchEvent(new AbstractEvent(event.getID(), event.getKey(), event.canCoalesce(), event.toJSON()));
-    }
-
-    @Override
-    protected void addEventEmitters(ThemedReactContext context, @Nonnull T view) {
-        mEventDispatcher = UIManagerHelper.getUIManager(context, UIManagerType.FABRIC).getEventDispatcher();
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        Map<String, String> events = customEvents();
-
-        if (events == null) {
-            return null;
-        }
-
-        Map<String, Object> exportedEvents = new HashMap<>();
-
-        for (Map.Entry<String, String> event : events.entrySet()) {
-            exportedEvents.put(event.getKey(), MapBuilder.of("registrationName", event.getValue()));
-        }
-
-        return exportedEvents;
-    }
-
-    @Nullable
-    public abstract Map<String, String> customEvents();
-
-    private boolean shouldDropEvent(String cacheKey, IEvent event) {
-        Long lastEventTimestamp = mRateLimitedEvents.get(cacheKey);
-        return lastEventTimestamp != null && (event.getTimestamp() - lastEventTimestamp) <= BRIDGE_TIMEOUT_MS;
-    }
-
-    private String getEventCacheKey(IEvent event) {
-        return String.format("%s-%s", event.getKey(), event.getType());
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNCallout.java

@@ -1,11 +0,0 @@
-package org.maplibre.reactnative.components.annotation;
-
-import android.content.Context;
-
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class MLRNCallout extends ReactViewGroup {
-    public MLRNCallout(Context context) {
-        super(context);
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNCalloutManager.java

@@ -1,18 +0,0 @@
-package org.maplibre.reactnative.components.annotation;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-
-public class MLRNCalloutManager extends ViewGroupManager<MLRNCallout> {
-    public static final String REACT_CLASS = "MLRNCallout";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected MLRNCallout createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNCallout(reactContext);
-    }
-}

package/android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNMarkerView.java

@@ -1,112 +0,0 @@
-package org.maplibre.reactnative.components.annotation;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import org.maplibre.geojson.Point;
-import org.maplibre.android.maps.MapLibreMap;
-import org.maplibre.android.maps.OnMapReadyCallback;
-import org.maplibre.reactnative.components.AbstractMapFeature;
-import org.maplibre.reactnative.components.mapview.MLRNMapView;
-import org.maplibre.reactnative.utils.GeoJSONUtils;
-
-public class MLRNMarkerView extends AbstractMapFeature implements MarkerView.OnPositionUpdateListener, View.OnLayoutChangeListener {
-    private MLRNMarkerViewManager mManager;
-    private MLRNMapView mMapView;
-
-    private View mChildView;
-
-    private MarkerViewManager mMarkerViewManager;
-
-    private MarkerView mMarkerView;
-    private Point mCoordinate;
-    private Float[] mAnchor;
-
-
-    public MLRNMarkerView(Context context, MLRNMarkerViewManager manager) {
-        super(context);
-        mManager = manager;
-    }
-
-    @Override
-    public void addView(View childView, int childPosition) {
-        mChildView = childView;
-    }
-
-    public void setCoordinate(Point point) {
-        mCoordinate = point;
-
-        if (mMarkerView != null) {
-            mMarkerView.setLatLng(GeoJSONUtils.toLatLng(point));
-        }
-    }
-
-    public void setAnchor(float x, float y) {
-        mAnchor = new Float[]{x, y};
-        refresh();
-    }
-
-    public void refresh() {
-        // this will cause position to be recalculated
-        if (mMarkerView != null) {
-            mMarkerView.setLatLng(GeoJSONUtils.toLatLng(mCoordinate));
-        }
-    }
-
-    @Override
-    public void addToMap(MLRNMapView mapView) {
-        mMapView = mapView;
-
-        final MLRNMarkerView mlrnMarkerView = this;
-
-        mMapView.getMapAsync(
-            new OnMapReadyCallback() {
-                @Override
-                public void onMapReady(@NonNull MapLibreMap mapLibreMap) {
-                    mMarkerViewManager = mMapView.getMarkerViewManager(mapLibreMap);
-
-                    if (mChildView != null) {
-                        mMarkerView = new MarkerView(GeoJSONUtils.toLatLng(mCoordinate), mChildView);
-                        mMarkerView.setOnPositionUpdateListener(mlrnMarkerView);
-                        mChildView.addOnLayoutChangeListener(mlrnMarkerView);
-                        mMarkerViewManager.addMarker(mMarkerView);
-                    }
-                }
-            }
-        );
-    }
-
-    @Override
-    public PointF onUpdate(PointF pointF) {
-        if (mAnchor != null) {
-            return new PointF(
-                    pointF.x - mChildView.getWidth() * mAnchor[0],
-                    pointF.y - mChildView.getHeight() * mAnchor[1]
-                    );
-        }
-        return pointF;
-    }
-
-    @Override
-    public void removeFromMap(MLRNMapView mapView) {
-        if (mMarkerView != null) {
-            mMarkerViewManager.removeMarker(mMarkerView);
-            mChildView.removeOnLayoutChangeListener(this);
-            mMarkerView.setOnPositionUpdateListener(null);
-            mMarkerView = null;
-            mMarkerViewManager = null;
-        }
-    }
-
-    @Override
-    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop,
-                               int oldRight, int oldBottom) {
-        if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
-            refresh();
-        }
-    }
-}
-

package/android/src/main/java/org/maplibre/reactnative/components/annotation/MLRNMarkerViewManager.java

@@ -1,45 +0,0 @@
-package org.maplibre.reactnative.components.annotation;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import org.maplibre.reactnative.components.AbstractEventEmitter;
-import org.maplibre.reactnative.utils.GeoJSONUtils;
-
-import java.util.Map;
-
-public class MLRNMarkerViewManager extends AbstractEventEmitter<MLRNMarkerView> {
-    public static final String REACT_CLASS = "MLRNMarkerView";
-
-    public MLRNMarkerViewManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactProp(name="coordinate")
-    public void setCoordinate(MLRNMarkerView markerView, String geoJSONStr) {
-        markerView.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
-    }
-
-    @ReactProp(name="anchor")
-    public void setAnchor(MLRNMarkerView markerView, ReadableMap map) {
-        markerView.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
-    }
-
-    @Override
-    protected MLRNMarkerView createViewInstance(ThemedReactContext reactContext) {
-        return new MLRNMarkerView(reactContext, this);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .build();
-    }
-}