@rnmapbox/maps 10.0.0-beta.74 → 10.0.0-beta.75

package/javascript/utils/geoUtils.ts

@@ -0,0 +1,91 @@
+import {
+  featureCollection,
+  point,
+  feature,
+  lineString,
+  Position,
+  Properties,
+  Id,
+  BBox,
+  FeatureCollection,
+  Geometry,
+  Point,
+  Feature,
+} from '@turf/helpers';
+import distance from '@turf/distance';
+import along from '@turf/along';
+import geoViewport from '@mapbox/geo-viewport';
+
+const VECTOR_TILE_SIZE = 512;
+
+export const makePoint = point;
+
+export const makeLineString = lineString;
+
+export function makeLatLngBounds(
+  northEastCoordinates: Position,
+  southWestCoordinates: Position,
+): FeatureCollection<Point> {
+  return featureCollection([
+    point(northEastCoordinates),
+    point(southWestCoordinates),
+  ]);
+}
+
+export const makeFeature = feature;
+
+export function makeFeatureCollection<G = Geometry, P = Properties>(
+  features: Array<Feature<G, P>> = [],
+  options?: {
+    bbox?: BBox;
+    id?: Id;
+  },
+) {
+  return featureCollection(features, options);
+}
+
+export function addToFeatureCollection(
+  newFeatureCollection: FeatureCollection,
+  newFeature: Feature,
+): FeatureCollection {
+  return {
+    ...newFeatureCollection,
+    features: [...newFeatureCollection.features, newFeature],
+  };
+}
+
+export const calculateDistance = distance;
+
+export const pointAlongLine = along;
+
+export function getOrCalculateVisibleRegion(
+  coord: [number, number],
+  zoomLevel: number,
+  width: number,
+  height: number,
+  nativeRegion: {
+    properties: {
+      visibleBounds: number[][];
+    };
+  },
+) {
+  const region = {
+    ne: [0, 0],
+    sw: [0, 0],
+  };
+
+  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, region.sw] = nativeRegion.properties.visibleBounds;
+  }
+
+  return region;
+}

package/javascript/utils/{index.js → index.ts}

@@ -1,15 +1,15 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import React from 'react';
 import {
-  View,
   NativeModules,
   findNodeHandle,
   Platform,
   Image,
+  ImageSourcePropType,
 } from 'react-native';
-import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import PropTypes from 'prop-types';
 
-function getAndroidManagerInstance(module) {
+function getAndroidManagerInstance(module: string) {
   const haveViewManagerConfig =
     NativeModules.UIManager && NativeModules.UIManager.getViewManagerConfig;
   return haveViewManagerConfig
@@ -17,12 +17,10 @@ function getAndroidManagerInstance(module) {
     : NativeModules.UIManager[module];
 }
 
-function getIosManagerInstance(module) {
+function getIosManagerInstance(module: string): any {
   return NativeModules[getIOSModuleName(module)];
 }
 
-export const viewPropTypes = ViewPropTypes || View.props;
-
 export const ornamentPositionPropType = PropTypes.oneOfType([
   PropTypes.shape({ top: PropTypes.number, left: PropTypes.number }),
   PropTypes.shape({ top: PropTypes.number, right: PropTypes.number }),
@@ -30,42 +28,57 @@ export const ornamentPositionPropType = PropTypes.oneOfType([
   PropTypes.shape({ bottom: PropTypes.number, right: PropTypes.number }),
 ]);
 
-export function isAndroid() {
+export function isAndroid(): boolean {
   return Platform.OS === 'android';
 }
 
-export function existenceChange(cur, next) {
+export function existenceChange(cur: boolean, next: boolean): boolean {
   if (!cur && !next) {
     return false;
   }
   return (!cur && next) || (cur && !next);
 }
 
-export function isFunction(fn) {
+export function isFunction(fn: unknown): fn is boolean {
   return typeof fn === 'function';
 }
 
-export function isNumber(num) {
+export function isNumber(num: unknown): num is number {
   return typeof num === 'number' && !Number.isNaN(num);
 }
 
-export function isUndefined(obj) {
+export function isUndefined(obj: unknown): obj is undefined {
   return typeof obj === 'undefined';
 }
 
-export function isString(str) {
+export function isString(str: unknown): str is string {
   return typeof str === 'string';
 }
 
-export function isBoolean(bool) {
+export function isBoolean(bool: unknown): bool is boolean {
   return typeof bool === 'boolean';
 }
 
-export function isPrimitive(value) {
+export function isPrimitive(
+  value: unknown,
+): value is string | number | boolean {
   return isString(value) || isNumber(value) || isBoolean(value);
 }
 
-export function runNativeCommand(module, name, nativeRef, args = []) {
+export type NativeArg =
+  | string
+  | number
+  | boolean
+  | null
+  | { [k: string]: NativeArg }
+  | NativeArg[];
+
+export function runNativeCommand<ReturnType = NativeArg>(
+  module: string,
+  name: string,
+  nativeRef: any,
+  args: NativeArg[],
+): Promise<ReturnType> {
   const handle = findNodeHandle(nativeRef);
   if (!handle) {
     throw new Error(`Could not find handle for native ref ${module}.${name}`);
@@ -93,7 +106,10 @@ export function runNativeCommand(module, name, nativeRef, args = []) {
   return managerInstance[name](handle, ...args);
 }
 
-export function cloneReactChildrenWithProps(children, propsToAdd = {}) {
+export function cloneReactChildrenWithProps(
+  children: Parameters<typeof React.Children.map>[0],
+  propsToAdd: { [key: string]: string } = {},
+) {
   if (!children) {
     return null;
   }
@@ -112,18 +128,24 @@ export function cloneReactChildrenWithProps(children, propsToAdd = {}) {
   );
 }
 
-export function resolveImagePath(imageRef) {
+export function resolveImagePath(imageRef: ImageSourcePropType): string {
   const res = Image.resolveAssetSource(imageRef);
   return res.uri;
 }
 
-export function getIOSModuleName(moduleName) {
+export function getIOSModuleName(moduleName: string): string {
   if (moduleName.startsWith('RCT')) {
     return moduleName.substring(3);
   }
   return moduleName;
 }
 
-export function toJSONString(json = '') {
+export function toJSONString(json: any = '') {
   return JSON.stringify(json);
 }
+
+export type OrnamentPositonProp =
+  | { top: number; left: number }
+  | { top: number; right: number }
+  | { bottom: number; left: number }
+  | { bottom: number; right: number };

package/lib/commonjs/components/ImageSource.js

@@ -5,44 +5,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.NATIVE_MODULE_NAME = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactNative = require("react-native");
 var _utils = require("../utils");
 var _AbstractSource = _interopRequireDefault(require("./AbstractSource"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const NATIVE_MODULE_NAME = 'RCTMGLImageSource';
-
+exports.NATIVE_MODULE_NAME = NATIVE_MODULE_NAME;
 /**
  * ImageSource is a content source that is used for a georeferenced raster image to be shown on the map.
  * The georeferenced image scales and rotates as the user zooms and rotates the map
  */
-exports.NATIVE_MODULE_NAME = NATIVE_MODULE_NAME;
 class ImageSource extends _AbstractSource.default {
-  static propTypes = {
-    ..._utils.viewPropTypes,
-    /**
-     * A string that uniquely identifies the source.
-     */
-    id: _propTypes.default.string.isRequired,
-    /**
-     * An HTTP(S) URL, absolute file URL, or local file URL to the source image.
-     * Gifs are currently not supported.
-     */
-    url: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    /**
-     * The top left, top right, bottom right, and bottom left coordinates for the image.
-     */
-    coordinates: _propTypes.default.arrayOf(_propTypes.default.arrayOf(_propTypes.default.number).isRequired).isRequired
-  };
   _getURL() {
-    let {
+    const {
       url
     } = this.props;
-    if ((0, _utils.isNumber)(this.props.url)) {
-      url = (0, _utils.resolveImagePath)(this.props.url);
+    if ((0, _utils.isNumber)(url)) {
+      return (0, _utils.resolveImagePath)(url);
+    } else {
+      return url;
     }
-    return url;
   }
   render() {
     if (!this.props.url || !this.props.coordinates || !this.props.coordinates.length) {
@@ -53,13 +36,13 @@ class ImageSource extends _AbstractSource.default {
       url: this._getURL()
     };
     return /*#__PURE__*/_react.default.createElement(RCTMGLImageSource, _extends({
-      ref: "nativeSource"
+      ref: this.setNativeRef
     }, props), (0, _utils.cloneReactChildrenWithProps)(this.props.children, {
       sourceID: this.props.id
     }));
   }
 }
-const RCTMGLImageSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME, ImageSource);
+const RCTMGLImageSource = (0, _reactNative.requireNativeComponent)(NATIVE_MODULE_NAME);
 var _default = ImageSource;
 exports.default = _default;
 //# sourceMappingURL=ImageSource.js.map

package/lib/commonjs/components/ImageSource.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_propTypes","_reactNative","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NATIVE_MODULE_NAME","exports","ImageSource","AbstractSource","propTypes","viewPropTypes","id","PropTypes","string","isRequired","url","oneOfType","number","coordinates","arrayOf","_getURL","props","isNumber","resolveImagePath","render","createElement","RCTMGLImageSource","ref","cloneReactChildrenWithProps","children","sourceID","requireNativeComponent","_default"],"sourceRoot":"../../../javascript","sources":["components/ImageSource.js"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AAOA,IAAAI,eAAA,GAAAL,sBAAA,CAAAC,OAAA;AAA8C,SAAAD,uBAAAM,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,SAAA,IAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAAP,MAAA,CAAAS,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAJ,QAAA,CAAAa,KAAA,OAAAP,SAAA;AAEvC,MAAMQ,kBAAkB,GAAG,mBAAmB;;AAErD;AACA;AACA;AACA;AAHAC,OAAA,CAAAD,kBAAA,GAAAA,kBAAA;AAIA,MAAME,WAAW,SAASC,uBAAc,CAAC;EACvC,OAAOC,SAAS,GAAG;IACjB,GAAGC,oBAAa;IAEhB;AACJ;AACA;IACIC,EAAE,EAAEC,kBAAS,CAACC,MAAM,CAACC,UAAU;IAE/B;AACJ;AACA;AACA;IACIC,GAAG,EAAEH,kBAAS,CAACI,SAAS,CAAC,CAACJ,kBAAS,CAACK,MAAM,EAAEL,kBAAS,CAACC,MAAM,CAAC,CAAC;IAE9D;AACJ;AACA;IACIK,WAAW,EAAEN,kBAAS,CAACO,OAAO,CAC5BP,kBAAS,CAACO,OAAO,CAACP,kBAAS,CAACK,MAAM,CAAC,CAACH,UAAU,CAC/C,CAACA;EACJ,CAAC;EAEDM,OAAOA,CAAA,EAAG;IACR,IAAI;MAAEL;IAAI,CAAC,GAAG,IAAI,CAACM,KAAK;IAExB,IAAI,IAAAC,eAAQ,EAAC,IAAI,CAACD,KAAK,CAACN,GAAG,CAAC,EAAE;MAC5BA,GAAG,GAAG,IAAAQ,uBAAgB,EAAC,IAAI,CAACF,KAAK,CAACN,GAAG,CAAC;IACxC;IAEA,OAAOA,GAAG;EACZ;EAEAS,MAAMA,CAAA,EAAG;IACP,IACE,CAAC,IAAI,CAACH,KAAK,CAACN,GAAG,IACf,CAAC,IAAI,CAACM,KAAK,CAACH,WAAW,IACvB,CAAC,IAAI,CAACG,KAAK,CAACH,WAAW,CAACpB,MAAM,EAC9B;MACA,OAAO,IAAI;IACb;IAEA,MAAMuB,KAAK,GAAG;MACZ,GAAG,IAAI,CAACA,KAAK;MACbN,GAAG,EAAE,IAAI,CAACK,OAAO;IACnB,CAAC;IAED,oBACEvC,MAAA,CAAAS,OAAA,CAAAmC,aAAA,CAACC,iBAAiB,EAAAnC,QAAA;MAACoC,GAAG,EAAC;IAAc,GAAKN,KAAK,GAC5C,IAAAO,kCAA2B,EAAC,IAAI,CAACP,KAAK,CAACQ,QAAQ,EAAE;MAChDC,QAAQ,EAAE,IAAI,CAACT,KAAK,CAACV;IACvB,CAAC,CAAC,CACgB;EAExB;AACF;AAEA,MAAMe,iBAAiB,GAAG,IAAAK,mCAAsB,EAC9C1B,kBAAkB,EAClBE,WAAW,CACZ;AAAC,IAAAyB,QAAA,GAEazB,WAAW;AAAAD,OAAA,CAAAhB,OAAA,GAAA0C,QAAA"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_AbstractSource","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","NATIVE_MODULE_NAME","exports","ImageSource","AbstractSource","_getURL","url","props","isNumber","resolveImagePath","render","coordinates","createElement","RCTMGLImageSource","ref","setNativeRef","cloneReactChildrenWithProps","children","sourceID","id","requireNativeComponent","_default"],"sourceRoot":"../../../javascript","sources":["components/ImageSource.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AAOA,IAAAG,eAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAA8C,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,SAAA,IAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,GAAAF,SAAA,CAAAD,CAAA,YAAAI,GAAA,IAAAD,MAAA,QAAAP,MAAA,CAAAS,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAJ,MAAA,EAAAC,GAAA,KAAAL,MAAA,CAAAK,GAAA,IAAAD,MAAA,CAAAC,GAAA,gBAAAL,MAAA,YAAAJ,QAAA,CAAAa,KAAA,OAAAP,SAAA;AAEvC,MAAMQ,kBAAkB,GAAG,mBAAmB;AAACC,OAAA,CAAAD,kBAAA,GAAAA,kBAAA;AA0BtD;AACA;AACA;AACA;AACA,MAAME,WAAW,SAASC,uBAAc,CAAqB;EAC3DC,OAAOA,CAAA,EAAuB;IAC5B,MAAM;MAAEC;IAAI,CAAC,GAAG,IAAI,CAACC,KAAK;IAE1B,IAAI,IAAAC,eAAQ,EAACF,GAAG,CAAC,EAAE;MACjB,OAAO,IAAAG,uBAAgB,EAACH,GAAG,CAAC;IAC9B,CAAC,MAAM;MACL,OAAOA,GAAG;IACZ;EACF;EAEAI,MAAMA,CAAA,EAAG;IACP,IACE,CAAC,IAAI,CAACH,KAAK,CAACD,GAAG,IACf,CAAC,IAAI,CAACC,KAAK,CAACI,WAAW,IACvB,CAAC,IAAI,CAACJ,KAAK,CAACI,WAAW,CAACjB,MAAM,EAC9B;MACA,OAAO,IAAI;IACb;IAEA,MAAMa,KAAK,GAAG;MACZ,GAAG,IAAI,CAACA,KAAK;MACbD,GAAG,EAAE,IAAI,CAACD,OAAO;IACnB,CAAC;IAED,oBACE3B,MAAA,CAAAQ,OAAA,CAAA0B,aAAA,CAACC,iBAAiB,EAAA1B,QAAA;MAAC2B,GAAG,EAAE,IAAI,CAACC;IAAa,GAAKR,KAAK,GACjD,IAAAS,kCAA2B,EAAC,IAAI,CAACT,KAAK,CAACU,QAAQ,EAAE;MAChDC,QAAQ,EAAE,IAAI,CAACX,KAAK,CAACY;IACvB,CAAC,CAAC,CACgB;EAExB;AACF;AAEA,MAAMN,iBAAiB,GACrB,IAAAO,mCAAsB,EAAcnB,kBAAkB,CAAC;AAAC,IAAAoB,QAAA,GAE3ClB,WAAW;AAAAD,OAAA,CAAAhB,OAAA,GAAAmC,QAAA"}