@maplibre/maplibre-react-native 9.1.0 → 10.0.0-alpha.10

package/javascript/utils/animated/AnimatedShape.ts

@@ -0,0 +1,93 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
+import { Animated } from "react-native";
+
+import AnimatedCoordinatesArray from "./AnimatedCoordinatesArray";
+import AnimatedExtractCoordinateFromArray from "./AnimatedExtractCoordinateFromArray";
+import AnimatedRouteCoordinatesArray from "./AnimatedRouteCoordinatesArray";
+
+// see
+// https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedWithChildren.js
+const AnimatedWithChildren = Object.getPrototypeOf(Animated.ValueXY);
+if (__DEV__) {
+  if (AnimatedWithChildren.name !== "AnimatedWithChildren") {
+    console.error(
+      "AnimatedShape could not obtain AnimatedWithChildren base class",
+    );
+  }
+}
+
+type Shape =
+  | {
+      type: "Point";
+      coordinates:
+        | AnimatedExtractCoordinateFromArray
+        | AnimatedRouteCoordinatesArray;
+    }
+  | {
+      type: "LineString";
+      coordinates: AnimatedCoordinatesArray;
+    };
+
+/**
+ * AnimatedShape can be used to have animated properties inside the shape property
+ * @example
+ * <AnimatedShapeSource ... shape={new AnimatedShape({type:'LineString', coordinates: animatedCoords})} />
+ */
+class AnimatedShape extends AnimatedWithChildren {
+  // equivalent of AnimatedStyle for shapes
+  // https://github.com/facebook/react-native/blob/master/Libraries/Animated/src/nodes/AnimatedStyle.js
+
+  constructor(shape: Shape) {
+    super();
+    this.shape = shape;
+  }
+
+  _walkShapeAndGetValues(value: any): any {
+    if (Array.isArray(value)) {
+      return value.map((i) => this._walkShapeAndGetValues(i));
+    }
+    // @ts-expect-error Animated.Node is not exported
+    if (value instanceof Animated.Node) {
+      return (value as any).__getValue();
+    }
+    if (typeof value === "object") {
+      const result: { [key: string]: any } = {};
+      for (const key in value) {
+        result[key] = this._walkShapeAndGetValues(value[key]);
+      }
+      return result;
+    }
+    return value;
+  }
+
+  __getValue(): any {
+    const result = this._walkShapeAndGetValues(this.shape);
+    return result;
+  }
+
+  // @ts-expect-error Animated.Node is not exported
+  _walkAndProcess(value: any, cb: (value: Animated.Node) => void): void {
+    if (Array.isArray(value)) {
+      value.forEach((i) => this._walkAndProcess(i, cb));
+      // @ts-expect-error Animated.Node is not exported
+    } else if (value instanceof Animated.Node) {
+      cb(value);
+    } else if (typeof value === "object") {
+      for (const key in value) {
+        this._walkAndProcess(value[key], cb);
+      }
+    }
+  }
+
+  __attach(): void {
+    this._walkAndProcess(this.shape, (v) => (v as any).__addChild(this));
+  }
+
+  __detach(): void {
+    this._walkAndProcess(this.shape, (v) => (v as any).__removeChild(this));
+    super.__detach();
+  }
+}
+
+export default AnimatedShape;

package/javascript/utils/deprecation.ts

@@ -0,0 +1,31 @@
+/**
+ * Copy properties from origObject to newObject, which not exists in newObject,
+ * calls onDeprecatedCalled callback in case a copied property is invoked.
+ */
+
+export function copyPropertiesAsDeprecated<
+  DeprecatedType extends object,
+  WithDeprecatedType extends Record<string, unknown>,
+>(
+  origObject: DeprecatedType,
+  newObject: WithDeprecatedType,
+  onDeprecatedCalled: (key: string) => void,
+  accessors: Record<string, (value: any) => unknown> = {},
+): WithDeprecatedType {
+  const result = { ...newObject };
+
+  for (const [key, value] of Object.entries(origObject)) {
+    if (!(key in newObject)) {
+      Object.defineProperty(result, key, {
+        get() {
+          onDeprecatedCalled(key);
+          return accessors[key] ? accessors[key](value) : value;
+        },
+        enumerable: true, // Ensure the property is enumerable
+        configurable: true, // Ensure the property can be reconfigured
+      });
+    }
+  }
+
+  return result;
+}

package/javascript/utils/filterUtils.ts

@@ -0,0 +1,9 @@
+import { FilterExpression } from "./MaplibreStyles";
+
+export function getFilter(filter: FilterExpression | undefined): string[] {
+  if (!Array.isArray(filter) || filter.length === 0) {
+    return [];
+  }
+
+  return filter;
+}

package/javascript/utils/geoUtils.ts

@@ -0,0 +1,79 @@
+import geoViewport from "@mapbox/geo-viewport";
+import along from "@turf/along";
+import distance from "@turf/distance";
+import {
+  featureCollection,
+  point,
+  feature,
+  lineString,
+  Id,
+  Properties,
+} from "@turf/helpers";
+
+const VECTOR_TILE_SIZE = 512;
+
+export const makePoint = point;
+
+export const makeLineString = lineString;
+
+export function makeLatLngBounds(
+  northEastCoordinates: GeoJSON.Position,
+  southWestCoordinates: GeoJSON.Position,
+): GeoJSON.FeatureCollection {
+  return featureCollection([
+    point(northEastCoordinates),
+    point(southWestCoordinates),
+  ]);
+}
+
+export const makeFeature = feature;
+
+export function makeFeatureCollection(
+  features: GeoJSON.Feature[] = [],
+  options?: { bbox?: GeoJSON.BBox; id?: Id },
+): GeoJSON.FeatureCollection {
+  return featureCollection(features, options);
+}
+
+export function addToFeatureCollection<T extends GeoJSON.Geometry>(
+  newFeatureCollection: GeoJSON.FeatureCollection<T, Properties>,
+  newFeature: GeoJSON.Feature<T, Properties>,
+): GeoJSON.FeatureCollection<T, Properties> {
+  return {
+    ...newFeatureCollection,
+    features: [...newFeatureCollection.features, newFeature],
+  };
+}
+
+export const calculateDistance = distance;
+
+export const pointAlongLine = along;
+
+export function getOrCalculateVisibleRegion(
+  coord: [number, number] | { lon: number; lat: number },
+  zoomLevel: number,
+  width: number,
+  height: number,
+  nativeRegion: { properties: { visibleBounds: [number, number][] } },
+): { ne: [number, number]; sw: [number, number] } {
+  const region = {
+    ne: [0, 0] as [number, number],
+    sw: [0, 0] as [number, number],
+  };
+
+  if (!nativeRegion || !Array.isArray(nativeRegion.properties.visibleBounds)) {
+    const bounds = geoViewport.bounds(
+      coord,
+      zoomLevel,
+      [width, height],
+      VECTOR_TILE_SIZE,
+    );
+    region.ne = [bounds[3], bounds[2]];
+    region.sw = [bounds[1], bounds[0]];
+  } else {
+    region.ne = nativeRegion.properties.visibleBounds[0];
+    region.sw = nativeRegion.properties.visibleBounds[1];
+  }
+
+  return region;
+}

package/javascript/utils/index.ts

@@ -0,0 +1,133 @@
+import React, { Component, ReactElement } from "react";
+import {
+  Image,
+  NativeModules,
+  findNodeHandle,
+  Platform,
+  ImageSourcePropType,
+} from "react-native";
+
+function getAndroidManagerInstance(module: string): any {
+  const haveViewManagerConfig =
+    NativeModules.UIManager && NativeModules.UIManager.getViewManagerConfig;
+  return haveViewManagerConfig
+    ? NativeModules.UIManager.getViewManagerConfig(module)
+    : NativeModules.UIManager[module];
+}
+
+function getIosManagerInstance(module: string): any {
+  return NativeModules[getIOSModuleName(module)];
+}
+
+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 {
+  return typeof fn === "function";
+}
+
+export function isNumber(num: unknown): num is number {
+  return typeof num === "number" && !Number.isNaN(num);
+}
+
+export function isUndefined(obj: unknown): obj is undefined {
+  return typeof obj === "undefined";
+}
+
+export function isString(str: unknown): str is string {
+  return typeof str === "string";
+}
+
+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
+  | boolean
+  | null
+  | { [k: string]: NativeArg }
+  | NativeArg[];
+
+export function runNativeCommand<ReturnType = NativeArg>(
+  module: string,
+  name: string,
+  nativeRef: Component,
+  args: NativeArg[] = [],
+): ReturnType {
+  const handle = findNodeHandle(nativeRef);
+  if (!handle) {
+    throw new Error(`Could not find handle for native ref ${module}.${name}`);
+  }
+
+  const managerInstance = isAndroid()
+    ? getAndroidManagerInstance(module)
+    : getIosManagerInstance(module);
+
+  if (!managerInstance) {
+    throw new Error(`Could not find ${module}`);
+  }
+
+  if (isAndroid()) {
+    return NativeModules.UIManager.dispatchViewManagerCommand(
+      handle,
+      managerInstance.Commands[name],
+      args,
+    );
+  }
+
+  return managerInstance[name](handle, ...args);
+}
+
+export function cloneReactChildrenWithProps(
+  children: Parameters<typeof React.Children.map>[0],
+  propsToAdd: { [key: string]: string } = {},
+): ReactElement[] | undefined {
+  if (!children) {
+    return undefined;
+  }
+
+  let foundChildren = null;
+
+  if (!Array.isArray(children)) {
+    foundChildren = [children];
+  } else {
+    foundChildren = children;
+  }
+
+  const filteredChildren = foundChildren.filter((child) => !!child); // filter out falsy children, since some can be null
+  return React.Children.map(filteredChildren, (child) =>
+    React.cloneElement(child, propsToAdd),
+  );
+}
+
+export function resolveImagePath(imageRef: ImageSourcePropType): string {
+  const res = Image.resolveAssetSource(imageRef);
+  return res.uri;
+}
+
+export function getIOSModuleName(moduleName: string): string {
+  if (moduleName.startsWith("RCT")) {
+    return moduleName.substring(3);
+  }
+  return moduleName;
+}
+
+export function toJSONString(json: object | string = ""): string {
+  return JSON.stringify(json);
+}

package/javascript/utils/styleMap.ts

@@ -0,0 +1,264 @@
+/* eslint-disable */
+// DO NOT MODIFY
+// THIS FILE IS AUTOGENERATED
+
+import { isAndroid } from "./index";
+
+export const StyleTypes = {
+  Constant: "constant",
+  Color: "color",
+  Transition: "transition",
+  Translation: "translation",
+  Function: "function",
+  Image: "image",
+  Enum: "enum",
+};
+
+export function getStyleType(styleProp: keyof typeof styleExtras): string {
+  if (!isAndroid() && styleExtras[styleProp]) {
+    return styleExtras[styleProp].iosType;
+  }
+
+  if (styleMap[styleProp]) {
+    return styleMap[styleProp];
+  }
+
+  throw new Error(`${styleProp} is not a valid MapLibre layer style`);
+}
+
+const styleMap = {
+  fillSortKey: StyleTypes.Constant,
+  fillAntialias: StyleTypes.Constant,
+  fillOpacity: StyleTypes.Constant,
+  fillOpacityTransition: StyleTypes.Transition,
+  fillColor: StyleTypes.Color,
+  fillColorTransition: StyleTypes.Transition,
+  fillOutlineColor: StyleTypes.Color,
+  fillOutlineColorTransition: StyleTypes.Transition,
+  fillTranslate: StyleTypes.Translation,
+  fillTranslateTransition: StyleTypes.Transition,
+  fillTranslateAnchor: StyleTypes.Enum,
+  fillPattern: StyleTypes.Image,
+  fillPatternTransition: StyleTypes.Transition,
+
+  lineCap: StyleTypes.Enum,
+  lineJoin: StyleTypes.Enum,
+  lineMiterLimit: StyleTypes.Constant,
+  lineRoundLimit: StyleTypes.Constant,
+  lineSortKey: StyleTypes.Constant,
+  lineOpacity: StyleTypes.Constant,
+  lineOpacityTransition: StyleTypes.Transition,
+  lineColor: StyleTypes.Color,
+  lineColorTransition: StyleTypes.Transition,
+  lineTranslate: StyleTypes.Translation,
+  lineTranslateTransition: StyleTypes.Transition,
+  lineTranslateAnchor: StyleTypes.Enum,
+  lineWidth: StyleTypes.Constant,
+  lineWidthTransition: StyleTypes.Transition,
+  lineGapWidth: StyleTypes.Constant,
+  lineGapWidthTransition: StyleTypes.Transition,
+  lineOffset: StyleTypes.Constant,
+  lineOffsetTransition: StyleTypes.Transition,
+  lineBlur: StyleTypes.Constant,
+  lineBlurTransition: StyleTypes.Transition,
+  lineDasharray: StyleTypes.Constant,
+  lineDasharrayTransition: StyleTypes.Transition,
+  linePattern: StyleTypes.Image,
+  linePatternTransition: StyleTypes.Transition,
+  lineGradient: StyleTypes.Color,
+
+  symbolPlacement: StyleTypes.Enum,
+  symbolSpacing: StyleTypes.Constant,
+  symbolAvoidEdges: StyleTypes.Constant,
+  symbolSortKey: StyleTypes.Constant,
+  symbolZOrder: StyleTypes.Enum,
+  iconAllowOverlap: StyleTypes.Constant,
+  iconIgnorePlacement: StyleTypes.Constant,
+  iconOptional: StyleTypes.Constant,
+  iconRotationAlignment: StyleTypes.Enum,
+  iconSize: StyleTypes.Constant,
+  iconTextFit: StyleTypes.Enum,
+  iconTextFitPadding: StyleTypes.Constant,
+  iconImage: StyleTypes.Image,
+  iconRotate: StyleTypes.Constant,
+  iconPadding: StyleTypes.Constant,
+  iconKeepUpright: StyleTypes.Constant,
+  iconOffset: StyleTypes.Constant,
+  iconAnchor: StyleTypes.Enum,
+  iconPitchAlignment: StyleTypes.Enum,
+  textPitchAlignment: StyleTypes.Enum,
+  textRotationAlignment: StyleTypes.Enum,
+  textField: StyleTypes.Constant,
+  textFont: StyleTypes.Constant,
+  textSize: StyleTypes.Constant,
+  textMaxWidth: StyleTypes.Constant,
+  textLineHeight: StyleTypes.Constant,
+  textLetterSpacing: StyleTypes.Constant,
+  textJustify: StyleTypes.Enum,
+  textRadialOffset: StyleTypes.Constant,
+  textVariableAnchor: StyleTypes.Constant,
+  textAnchor: StyleTypes.Enum,
+  textMaxAngle: StyleTypes.Constant,
+  textWritingMode: StyleTypes.Constant,
+  textRotate: StyleTypes.Constant,
+  textPadding: StyleTypes.Constant,
+  textKeepUpright: StyleTypes.Constant,
+  textTransform: StyleTypes.Enum,
+  textOffset: StyleTypes.Constant,
+  textAllowOverlap: StyleTypes.Constant,
+  textIgnorePlacement: StyleTypes.Constant,
+  textOptional: StyleTypes.Constant,
+  iconOpacity: StyleTypes.Constant,
+  iconOpacityTransition: StyleTypes.Transition,
+  iconColor: StyleTypes.Color,
+  iconColorTransition: StyleTypes.Transition,
+  iconHaloColor: StyleTypes.Color,
+  iconHaloColorTransition: StyleTypes.Transition,
+  iconHaloWidth: StyleTypes.Constant,
+  iconHaloWidthTransition: StyleTypes.Transition,
+  iconHaloBlur: StyleTypes.Constant,
+  iconHaloBlurTransition: StyleTypes.Transition,
+  iconTranslate: StyleTypes.Translation,
+  iconTranslateTransition: StyleTypes.Transition,
+  iconTranslateAnchor: StyleTypes.Enum,
+  textOpacity: StyleTypes.Constant,
+  textOpacityTransition: StyleTypes.Transition,
+  textColor: StyleTypes.Color,
+  textColorTransition: StyleTypes.Transition,
+  textHaloColor: StyleTypes.Color,
+  textHaloColorTransition: StyleTypes.Transition,
+  textHaloWidth: StyleTypes.Constant,
+  textHaloWidthTransition: StyleTypes.Transition,
+  textHaloBlur: StyleTypes.Constant,
+  textHaloBlurTransition: StyleTypes.Transition,
+  textTranslate: StyleTypes.Translation,
+  textTranslateTransition: StyleTypes.Transition,
+  textTranslateAnchor: StyleTypes.Enum,
+
+  circleSortKey: StyleTypes.Constant,
+  circleRadius: StyleTypes.Constant,
+  circleRadiusTransition: StyleTypes.Transition,
+  circleColor: StyleTypes.Color,
+  circleColorTransition: StyleTypes.Transition,
+  circleBlur: StyleTypes.Constant,
+  circleBlurTransition: StyleTypes.Transition,
+  circleOpacity: StyleTypes.Constant,
+  circleOpacityTransition: StyleTypes.Transition,
+  circleTranslate: StyleTypes.Translation,
+  circleTranslateTransition: StyleTypes.Transition,
+  circleTranslateAnchor: StyleTypes.Enum,
+  circlePitchScale: StyleTypes.Enum,
+  circlePitchAlignment: StyleTypes.Enum,
+  circleStrokeWidth: StyleTypes.Constant,
+  circleStrokeWidthTransition: StyleTypes.Transition,
+  circleStrokeColor: StyleTypes.Color,
+  circleStrokeColorTransition: StyleTypes.Transition,
+  circleStrokeOpacity: StyleTypes.Constant,
+  circleStrokeOpacityTransition: StyleTypes.Transition,
+
+  heatmapRadius: StyleTypes.Constant,
+  heatmapRadiusTransition: StyleTypes.Transition,
+  heatmapWeight: StyleTypes.Constant,
+  heatmapIntensity: StyleTypes.Constant,
+  heatmapIntensityTransition: StyleTypes.Transition,
+  heatmapColor: StyleTypes.Color,
+  heatmapOpacity: StyleTypes.Constant,
+  heatmapOpacityTransition: StyleTypes.Transition,
+
+  fillExtrusionOpacity: StyleTypes.Constant,
+  fillExtrusionOpacityTransition: StyleTypes.Transition,
+  fillExtrusionColor: StyleTypes.Color,
+  fillExtrusionColorTransition: StyleTypes.Transition,
+  fillExtrusionTranslate: StyleTypes.Translation,
+  fillExtrusionTranslateTransition: StyleTypes.Transition,
+  fillExtrusionTranslateAnchor: StyleTypes.Enum,
+  fillExtrusionPattern: StyleTypes.Image,
+  fillExtrusionPatternTransition: StyleTypes.Transition,
+  fillExtrusionHeight: StyleTypes.Constant,
+  fillExtrusionHeightTransition: StyleTypes.Transition,
+  fillExtrusionBase: StyleTypes.Constant,
+  fillExtrusionBaseTransition: StyleTypes.Transition,
+
+  rasterOpacity: StyleTypes.Constant,
+  rasterOpacityTransition: StyleTypes.Transition,
+  rasterHueRotate: StyleTypes.Constant,
+  rasterHueRotateTransition: StyleTypes.Transition,
+  rasterBrightnessMin: StyleTypes.Constant,
+  rasterBrightnessMinTransition: StyleTypes.Transition,
+  rasterBrightnessMax: StyleTypes.Constant,
+  rasterBrightnessMaxTransition: StyleTypes.Transition,
+  rasterSaturation: StyleTypes.Constant,
+  rasterSaturationTransition: StyleTypes.Transition,
+  rasterContrast: StyleTypes.Constant,
+  rasterContrastTransition: StyleTypes.Transition,
+  rasterResampling: StyleTypes.Enum,
+  rasterFadeDuration: StyleTypes.Constant,
+
+  hillshadeIlluminationDirection: StyleTypes.Constant,
+  hillshadeIlluminationAnchor: StyleTypes.Enum,
+  hillshadeExaggeration: StyleTypes.Constant,
+  hillshadeExaggerationTransition: StyleTypes.Transition,
+  hillshadeShadowColor: StyleTypes.Color,
+  hillshadeShadowColorTransition: StyleTypes.Transition,
+  hillshadeHighlightColor: StyleTypes.Color,
+  hillshadeHighlightColorTransition: StyleTypes.Transition,
+  hillshadeAccentColor: StyleTypes.Color,
+  hillshadeAccentColorTransition: StyleTypes.Transition,
+
+  backgroundColor: StyleTypes.Color,
+  backgroundColorTransition: StyleTypes.Transition,
+  backgroundPattern: StyleTypes.Image,
+  backgroundPatternTransition: StyleTypes.Transition,
+  backgroundOpacity: StyleTypes.Constant,
+  backgroundOpacityTransition: StyleTypes.Transition,
+
+  anchor: StyleTypes.Enum,
+  position: StyleTypes.Constant,
+  positionTransition: StyleTypes.Transition,
+  color: StyleTypes.Color,
+  colorTransition: StyleTypes.Transition,
+  intensity: StyleTypes.Constant,
+  intensityTransition: StyleTypes.Transition,
+
+  visibility: StyleTypes.Constant,
+};
+
+export const styleExtras = {
+  // padding
+  iconTextFitPadding: {
+    iosType: "edgeinsets",
+  },
+
+  // offsets
+  iconOffset: {
+    iosType: "vector",
+  },
+  textOffset: {
+    iosType: "vector",
+  },
+  lineOffset: {
+    iosType: "vector",
+  },
+
+  // translates
+  fillTranslate: {
+    iosType: "vector",
+  },
+  lineTranslate: {
+    iosType: "vector",
+  },
+  iconTranslate: {
+    iosType: "vector",
+  },
+  textTranslate: {
+    iosType: "vector",
+  },
+  circleTranslate: {
+    iosType: "vector",
+  },
+  fillExtrusionTranslate: {
+    iosType: "vector",
+  },
+};
+
+export default styleMap;

package/maplibre-react-native.podspec

@@ -2,9 +2,9 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-$RNMBGL = Object.new
+$RCTMLN = Object.new
 
-def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
+def $RCTMLN._add_spm_to_target(project, target, url, requirement, product_name)
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
   pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
@@ -23,18 +23,18 @@ def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
   end
 end
 
-def $RNMBGL.post_install(installer)
+def $RCTMLN.post_install(installer)
   spm_spec = {
     url: "https://github.com/maplibre/maplibre-gl-native-distribution",
     requirement: {
       kind: "exactVersion",
-      version: "5.13.0"
+      version: "6.4.0"
     },
-    product_name: "Mapbox"
+    product_name: "MapLibre"
   }
 
-  if $RNMBGL_SPM_Spec.is_a?(Hash)
-    spm_spec = $RNMBGL_SPM_Spec
+  if $RCTMLN_SPM_Spec.is_a?(Hash)
+    spm_spec = $RCTMLN_SPM_Spec
   end
   project = installer.pods_project
   self._add_spm_to_target(
@@ -74,6 +74,6 @@ Pod::Spec.new do |s|
   s.dependency 'React'
 
   s.subspec 'DynamicLibrary' do |sp|
-    sp.source_files	= "ios/RCTMGL/**/*.{h,m}"
+    sp.source_files	= "ios/RCTMLN/**/*.{h,m}"
   end
 end