@loaders.gl/mvt 3.1.7 → 3.2.0-alpha.2

package/dist/esm/lib/parse-mvt.js

@@ -1,93 +1,146 @@
-import VectorTile from './mapbox-vector-tile/vector-tile';
-import BinaryVectorTile from './binary-vector-tile/vector-tile';
 import { flatGeojsonToBinary } from '@loaders.gl/gis';
 import Protobuf from 'pbf';
+import VectorTile from './mapbox-vector-tile/vector-tile';
+import BinaryVectorTile from './binary-vector-tile/vector-tile';
 export default function parseMVT(arrayBuffer, options) {
-  options = normalizeOptions(options);
-  const features = [];
-
-  if (options) {
-    const binary = options.gis.format === 'binary';
-    const geometryInfo = {
-      coordLength: 2,
-      pointPositionsCount: 0,
-      pointFeaturesCount: 0,
-      linePositionsCount: 0,
-      linePathsCount: 0,
-      lineFeaturesCount: 0,
-      polygonPositionsCount: 0,
-      polygonObjectsCount: 0,
-      polygonRingsCount: 0,
-      polygonFeaturesCount: 0
-    };
-
-    if (arrayBuffer.byteLength > 0) {
-      const tile = binary ? new BinaryVectorTile(new Protobuf(arrayBuffer)) : new VectorTile(new Protobuf(arrayBuffer));
-      const loaderOptions = options.mvt;
-      const selectedLayers = Array.isArray(loaderOptions.layers) ? loaderOptions.layers : Object.keys(tile.layers);
-      selectedLayers.forEach(layerName => {
-        const vectorTileLayer = tile.layers[layerName];
-        const featureOptions = { ...loaderOptions,
-          layerName
+  var _options$gis, _options$mvt;
+
+  const mvtOptions = normalizeOptions(options);
+  const shape = (options === null || options === void 0 ? void 0 : (_options$gis = options.gis) === null || _options$gis === void 0 ? void 0 : _options$gis.format) || (options === null || options === void 0 ? void 0 : (_options$mvt = options.mvt) === null || _options$mvt === void 0 ? void 0 : _options$mvt.shape);
+
+  switch (shape) {
+    case 'columnar-table':
+      return {
+        shape: 'columnar-table',
+        data: parseToBinary(arrayBuffer, mvtOptions)
+      };
+
+    case 'geojson-row-table':
+      {
+        const table = {
+          shape: 'geojson-row-table',
+          data: parseToGeojson(arrayBuffer, mvtOptions)
         };
+        return table;
+      }
+
+    case 'geojson':
+      return parseToGeojson(arrayBuffer, mvtOptions);
+
+    case 'binary-geometry':
+      return parseToBinary(arrayBuffer, mvtOptions);
+
+    case 'binary':
+      return parseToBinary(arrayBuffer, mvtOptions);
+
+    default:
+      throw new Error(shape);
+  }
+}
+
+function parseToBinary(arrayBuffer, options) {
+  const [flatGeoJsonFeatures, geometryInfo] = parseToFlatGeoJson(arrayBuffer, options);
+  const binaryData = flatGeojsonToBinary(flatGeoJsonFeatures, geometryInfo);
+  binaryData.byteLength = arrayBuffer.byteLength;
+  return binaryData;
+}
+
+function parseToFlatGeoJson(arrayBuffer, options) {
+  const features = [];
+  const geometryInfo = {
+    coordLength: 2,
+    pointPositionsCount: 0,
+    pointFeaturesCount: 0,
+    linePositionsCount: 0,
+    linePathsCount: 0,
+    lineFeaturesCount: 0,
+    polygonPositionsCount: 0,
+    polygonObjectsCount: 0,
+    polygonRingsCount: 0,
+    polygonFeaturesCount: 0
+  };
+
+  if (arrayBuffer.byteLength <= 0) {
+    return [features, geometryInfo];
+  }
 
-        if (!vectorTileLayer) {
-          return;
-        }
+  const tile = new BinaryVectorTile(new Protobuf(arrayBuffer));
+  const selectedLayers = options && Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);
+  selectedLayers.forEach(layerName => {
+    const vectorTileLayer = tile.layers[layerName];
 
-        for (let i = 0; i < vectorTileLayer.length; i++) {
-          const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);
-          const decodedFeature = binary ? getDecodedFeatureBinary(vectorTileFeature, featureOptions) : getDecodedFeature(vectorTileFeature, featureOptions);
-          features.push(decodedFeature);
-        }
-      });
+    if (!vectorTileLayer) {
+      return;
     }
 
-    if (binary) {
-      const data = flatGeojsonToBinary(features, geometryInfo);
-      data.byteLength = arrayBuffer.byteLength;
-      return data;
+    for (let i = 0; i < vectorTileLayer.length; i++) {
+      const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);
+      const decodedFeature = getDecodedFeatureBinary(vectorTileFeature, options, layerName);
+      features.push(decodedFeature);
     }
+  });
+  return [features, geometryInfo];
+}
+
+function parseToGeojson(arrayBuffer, options) {
+  if (arrayBuffer.byteLength <= 0) {
+    return [];
   }
 
+  const features = [];
+  const tile = new VectorTile(new Protobuf(arrayBuffer));
+  const selectedLayers = Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);
+  selectedLayers.forEach(layerName => {
+    const vectorTileLayer = tile.layers[layerName];
+
+    if (!vectorTileLayer) {
+      return;
+    }
+
+    for (let i = 0; i < vectorTileLayer.length; i++) {
+      const vectorTileFeature = vectorTileLayer.feature(i);
+      const decodedFeature = getDecodedFeature(vectorTileFeature, options, layerName);
+      features.push(decodedFeature);
+    }
+  });
   return features;
 }
 
 function normalizeOptions(options) {
-  if (options) {
-    options = { ...options,
-      mvt: options.mvt || {},
-      gis: options.gis || {}
-    };
-    const wgs84Coordinates = options.coordinates === 'wgs84';
-    const {
-      tileIndex
-    } = options;
-    const hasTileIndex = tileIndex && Number.isFinite(tileIndex.x) && Number.isFinite(tileIndex.y) && Number.isFinite(tileIndex.z);
-
-    if (wgs84Coordinates && !hasTileIndex) {
-      throw new Error('MVT Loader: WGS84 coordinates need tileIndex property. Check documentation.');
-    }
+  var _options$mvt2;
+
+  if (!(options !== null && options !== void 0 && options.mvt)) {
+    throw new Error('mvt options required');
+  }
+
+  const wgs84Coordinates = ((_options$mvt2 = options.mvt) === null || _options$mvt2 === void 0 ? void 0 : _options$mvt2.coordinates) === 'wgs84';
+  const {
+    tileIndex
+  } = options.mvt;
+  const hasTileIndex = tileIndex && Number.isFinite(tileIndex.x) && Number.isFinite(tileIndex.y) && Number.isFinite(tileIndex.z);
+
+  if (wgs84Coordinates && !hasTileIndex) {
+    throw new Error('MVT Loader: WGS84 coordinates need tileIndex property');
   }
 
-  return options;
+  return options.mvt;
 }
 
-function getDecodedFeature(feature, options) {
+function getDecodedFeature(feature, options, layerName) {
   const decodedFeature = feature.toGeoJSON(options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinates);
 
   if (options.layerProperty) {
-    decodedFeature.properties[options.layerProperty] = options.layerName;
+    decodedFeature.properties[options.layerProperty] = layerName;
   }
 
   return decodedFeature;
 }
 
-function getDecodedFeatureBinary(feature, options) {
+function getDecodedFeatureBinary(feature, options, layerName) {
   const decodedFeature = feature.toBinaryCoordinates(options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinatesBinary);
 
   if (options.layerProperty && decodedFeature.properties) {
-    decodedFeature.properties[options.layerProperty] = options.layerName;
+    decodedFeature.properties[options.layerProperty] = layerName;
   }
 
   return decodedFeature;

package/dist/esm/lib/parse-mvt.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/parse-mvt.ts"],"names":["VectorTile","BinaryVectorTile","flatGeojsonToBinary","Protobuf","parseMVT","arrayBuffer","options","normalizeOptions","features","binary","gis","format","geometryInfo","coordLength","pointPositionsCount","pointFeaturesCount","linePositionsCount","linePathsCount","lineFeaturesCount","polygonPositionsCount","polygonObjectsCount","polygonRingsCount","polygonFeaturesCount","byteLength","tile","loaderOptions","mvt","selectedLayers","Array","isArray","layers","Object","keys","forEach","layerName","vectorTileLayer","featureOptions","i","length","vectorTileFeature","feature","decodedFeature","getDecodedFeatureBinary","getDecodedFeature","push","data","wgs84Coordinates","coordinates","tileIndex","hasTileIndex","Number","isFinite","x","y","z","Error","toGeoJSON","transformToLocalCoordinates","layerProperty","properties","toBinaryCoordinates","transformToLocalCoordinatesBinary","line","extent","p","il"],"mappings":"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","sourcesContent":["// import {VectorTile} from '@mapbox/vector-tile';\nimport VectorTile from './mapbox-vector-tile/vector-tile';\nimport BinaryVectorTile from './binary-vector-tile/vector-tile';\n\nimport {flatGeojsonToBinary} from '@loaders.gl/gis';\nimport Protobuf from 'pbf';\nimport type {FlatFeature} from '@loaders.gl/schema';\nimport type {MvtMapboxCoordinates, MvtOptions} from '../lib/types';\nimport VectorTileFeatureBinary from './binary-vector-tile/vector-tile-feature';\nimport VectorTileFeatureMapBox from './mapbox-vector-tile/vector-tile-feature';\nimport {LoaderOptions} from '@loaders.gl/loader-utils';\n\n/**\n * Parse MVT arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer A MVT arrayBuffer\n * @param options\n * @returns A GeoJSON geometry object or a binary representation\n */\nexport default function parseMVT(arrayBuffer: ArrayBuffer, options?: LoaderOptions) {\n  options = normalizeOptions(options);\n  const features: (FlatFeature | MvtMapboxCoordinates)[] = [];\n\n  if (options) {\n    const binary = options.gis.format === 'binary';\n    const geometryInfo = {\n      coordLength: 2,\n      pointPositionsCount: 0,\n      pointFeaturesCount: 0,\n      linePositionsCount: 0,\n      linePathsCount: 0,\n      lineFeaturesCount: 0,\n      polygonPositionsCount: 0,\n      polygonObjectsCount: 0,\n      polygonRingsCount: 0,\n      polygonFeaturesCount: 0\n    };\n\n    if (arrayBuffer.byteLength > 0) {\n      const tile = binary\n        ? new BinaryVectorTile(new Protobuf(arrayBuffer))\n        : new VectorTile(new Protobuf(arrayBuffer));\n      const loaderOptions = options.mvt;\n\n      const selectedLayers = Array.isArray(loaderOptions.layers)\n        ? loaderOptions.layers\n        : Object.keys(tile.layers);\n\n      selectedLayers.forEach((layerName: string) => {\n        const vectorTileLayer = tile.layers[layerName];\n        const featureOptions = {...loaderOptions, layerName};\n\n        if (!vectorTileLayer) {\n          return;\n        }\n\n        for (let i = 0; i < vectorTileLayer.length; i++) {\n          const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);\n\n          const decodedFeature = binary\n            ? getDecodedFeatureBinary(vectorTileFeature as VectorTileFeatureBinary, featureOptions)\n            : getDecodedFeature(vectorTileFeature as VectorTileFeatureMapBox, featureOptions);\n          features.push(decodedFeature);\n        }\n      });\n    }\n\n    if (binary) {\n      const data = flatGeojsonToBinary(features as FlatFeature[], geometryInfo);\n      // Add the original byteLength (as a reasonable approximation of the size of the binary data)\n      // TODO decide where to store extra fields like byteLength (header etc) and document\n      // @ts-ignore\n      data.byteLength = arrayBuffer.byteLength;\n      return data;\n    }\n  }\n  return features;\n}\n\n/**\n * @param options\n * @returns options\n */\nfunction normalizeOptions(options: LoaderOptions | undefined) {\n  if (options) {\n    options = {\n      ...options,\n      mvt: options.mvt || {},\n      gis: options.gis || {}\n    };\n\n    // Validate\n    const wgs84Coordinates = options.coordinates === 'wgs84';\n    const {tileIndex} = options;\n    const hasTileIndex =\n      tileIndex &&\n      Number.isFinite(tileIndex.x) &&\n      Number.isFinite(tileIndex.y) &&\n      Number.isFinite(tileIndex.z);\n\n    if (wgs84Coordinates && !hasTileIndex) {\n      throw new Error(\n        'MVT Loader: WGS84 coordinates need tileIndex property. Check documentation.'\n      );\n    }\n  }\n  return options;\n}\n\n/**\n * @param feature\n * @param options\n * @returns decoded feature\n */\nfunction getDecodedFeature(\n  feature: VectorTileFeatureMapBox,\n  options: MvtOptions\n): MvtMapboxCoordinates {\n  const decodedFeature = feature.toGeoJSON(\n    options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinates\n  );\n\n  // Add layer name to GeoJSON properties\n  if (options.layerProperty) {\n    decodedFeature.properties[options.layerProperty] = options.layerName;\n  }\n\n  return decodedFeature;\n}\n\n/**\n * @param feature\n * @param options\n * @returns decoded binary feature\n */\nfunction getDecodedFeatureBinary(\n  feature: VectorTileFeatureBinary,\n  options: MvtOptions\n): FlatFeature {\n  const decodedFeature = feature.toBinaryCoordinates(\n    options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinatesBinary\n  );\n\n  // Add layer name to GeoJSON properties\n  if (options.layerProperty && decodedFeature.properties) {\n    decodedFeature.properties[options.layerProperty] = options.layerName;\n  }\n\n  return decodedFeature;\n}\n\n/**\n * @param line\n * @param feature\n */\nfunction transformToLocalCoordinates(line: number[], feature: {extent: any}): void {\n  // This function transforms local coordinates in a\n  // [0 - bufferSize, this.extent + bufferSize] range to a\n  // [0 - (bufferSize / this.extent), 1 + (bufferSize / this.extent)] range.\n  // The resulting extent would be 1.\n  const {extent} = feature;\n  for (let i = 0; i < line.length; i++) {\n    const p = line[i];\n    p[0] /= extent;\n    p[1] /= extent;\n  }\n}\n\nfunction transformToLocalCoordinatesBinary(data: number[], feature: {extent: any}) {\n  // For the binary code path, the feature data is just\n  // one big flat array, so we just divide each value\n  const {extent} = feature;\n  for (let i = 0, il = data.length; i < il; ++i) {\n    data[i] /= extent;\n  }\n}\n"],"file":"parse-mvt.js"}
+{"version":3,"sources":["../../../src/lib/parse-mvt.ts"],"names":["flatGeojsonToBinary","Protobuf","VectorTile","BinaryVectorTile","parseMVT","arrayBuffer","options","mvtOptions","normalizeOptions","shape","gis","format","mvt","data","parseToBinary","table","parseToGeojson","Error","flatGeoJsonFeatures","geometryInfo","parseToFlatGeoJson","binaryData","byteLength","features","coordLength","pointPositionsCount","pointFeaturesCount","linePositionsCount","linePathsCount","lineFeaturesCount","polygonPositionsCount","polygonObjectsCount","polygonRingsCount","polygonFeaturesCount","tile","selectedLayers","Array","isArray","layers","Object","keys","forEach","layerName","vectorTileLayer","i","length","vectorTileFeature","feature","decodedFeature","getDecodedFeatureBinary","push","getDecodedFeature","wgs84Coordinates","coordinates","tileIndex","hasTileIndex","Number","isFinite","x","y","z","toGeoJSON","transformToLocalCoordinates","layerProperty","properties","toBinaryCoordinates","transformToLocalCoordinatesBinary","line","extent","p","il"],"mappings":"AAAA,SAAQA,mBAAR,QAAkC,iBAAlC;AAQA,OAAOC,QAAP,MAAqB,KAArB;AAIA,OAAOC,UAAP,MAAuB,kCAAvB;AACA,OAAOC,gBAAP,MAA6B,kCAA7B;AAWA,eAAe,SAASC,QAAT,CAAkBC,WAAlB,EAA4CC,OAA5C,EAAwE;AAAA;;AACrF,QAAMC,UAAU,GAAGC,gBAAgB,CAACF,OAAD,CAAnC;AAEA,QAAMG,KAAK,GAAG,CAAAH,OAAO,SAAP,IAAAA,OAAO,WAAP,4BAAAA,OAAO,CAAEI,GAAT,8DAAcC,MAAd,MAAwBL,OAAxB,aAAwBA,OAAxB,uCAAwBA,OAAO,CAAEM,GAAjC,iDAAwB,aAAcH,KAAtC,CAAd;;AACA,UAAQA,KAAR;AACE,SAAK,gBAAL;AACE,aAAO;AAACA,QAAAA,KAAK,EAAE,gBAAR;AAA0BI,QAAAA,IAAI,EAAEC,aAAa,CAACT,WAAD,EAAcE,UAAd;AAA7C,OAAP;;AACF,SAAK,mBAAL;AAA0B;AACxB,cAAMQ,KAAsB,GAAG;AAC7BN,UAAAA,KAAK,EAAE,mBADsB;AAE7BI,UAAAA,IAAI,EAAEG,cAAc,CAACX,WAAD,EAAcE,UAAd;AAFS,SAA/B;AAIA,eAAOQ,KAAP;AACD;;AACD,SAAK,SAAL;AACE,aAAOC,cAAc,CAACX,WAAD,EAAcE,UAAd,CAArB;;AACF,SAAK,iBAAL;AACE,aAAOO,aAAa,CAACT,WAAD,EAAcE,UAAd,CAApB;;AACF,SAAK,QAAL;AACE,aAAOO,aAAa,CAACT,WAAD,EAAcE,UAAd,CAApB;;AACF;AACE,YAAM,IAAIU,KAAJ,CAAUR,KAAV,CAAN;AAjBJ;AAmBD;;AAED,SAASK,aAAT,CAAuBT,WAAvB,EAAiDC,OAAjD,EAAsF;AACpF,QAAM,CAACY,mBAAD,EAAsBC,YAAtB,IAAsCC,kBAAkB,CAACf,WAAD,EAAcC,OAAd,CAA9D;AAEA,QAAMe,UAAU,GAAGrB,mBAAmB,CAACkB,mBAAD,EAAsBC,YAAtB,CAAtC;AAIAE,EAAAA,UAAU,CAACC,UAAX,GAAwBjB,WAAW,CAACiB,UAApC;AACA,SAAOD,UAAP;AACD;;AAED,SAASD,kBAAT,CACEf,WADF,EAEEC,OAFF,EAGwC;AACtC,QAAMiB,QAAuB,GAAG,EAAhC;AACA,QAAMJ,YAAiC,GAAG;AACxCK,IAAAA,WAAW,EAAE,CAD2B;AAExCC,IAAAA,mBAAmB,EAAE,CAFmB;AAGxCC,IAAAA,kBAAkB,EAAE,CAHoB;AAIxCC,IAAAA,kBAAkB,EAAE,CAJoB;AAKxCC,IAAAA,cAAc,EAAE,CALwB;AAMxCC,IAAAA,iBAAiB,EAAE,CANqB;AAOxCC,IAAAA,qBAAqB,EAAE,CAPiB;AAQxCC,IAAAA,mBAAmB,EAAE,CARmB;AASxCC,IAAAA,iBAAiB,EAAE,CATqB;AAUxCC,IAAAA,oBAAoB,EAAE;AAVkB,GAA1C;;AAaA,MAAI5B,WAAW,CAACiB,UAAZ,IAA0B,CAA9B,EAAiC;AAC/B,WAAO,CAACC,QAAD,EAAWJ,YAAX,CAAP;AACD;;AAED,QAAMe,IAAI,GAAG,IAAI/B,gBAAJ,CAAqB,IAAIF,QAAJ,CAAaI,WAAb,CAArB,CAAb;AAEA,QAAM8B,cAAc,GAClB7B,OAAO,IAAI8B,KAAK,CAACC,OAAN,CAAc/B,OAAO,CAACgC,MAAtB,CAAX,GAA2ChC,OAAO,CAACgC,MAAnD,GAA4DC,MAAM,CAACC,IAAP,CAAYN,IAAI,CAACI,MAAjB,CAD9D;AAGAH,EAAAA,cAAc,CAACM,OAAf,CAAwBC,SAAD,IAAuB;AAC5C,UAAMC,eAAe,GAAGT,IAAI,CAACI,MAAL,CAAYI,SAAZ,CAAxB;;AACA,QAAI,CAACC,eAAL,EAAsB;AACpB;AACD;;AAED,SAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGD,eAAe,CAACE,MAApC,EAA4CD,CAAC,EAA7C,EAAiD;AAC/C,YAAME,iBAAiB,GAAGH,eAAe,CAACI,OAAhB,CAAwBH,CAAxB,EAA2BzB,YAA3B,CAA1B;AACA,YAAM6B,cAAc,GAAGC,uBAAuB,CAACH,iBAAD,EAAoBxC,OAApB,EAA6BoC,SAA7B,CAA9C;AACAnB,MAAAA,QAAQ,CAAC2B,IAAT,CAAcF,cAAd;AACD;AACF,GAXD;AAaA,SAAO,CAACzB,QAAD,EAAWJ,YAAX,CAAP;AACD;;AAED,SAASH,cAAT,CAAwBX,WAAxB,EAAkDC,OAAlD,EAAkF;AAChF,MAAID,WAAW,CAACiB,UAAZ,IAA0B,CAA9B,EAAiC;AAC/B,WAAO,EAAP;AACD;;AAED,QAAMC,QAAgC,GAAG,EAAzC;AACA,QAAMW,IAAI,GAAG,IAAIhC,UAAJ,CAAe,IAAID,QAAJ,CAAaI,WAAb,CAAf,CAAb;AAEA,QAAM8B,cAAc,GAAGC,KAAK,CAACC,OAAN,CAAc/B,OAAO,CAACgC,MAAtB,IAAgChC,OAAO,CAACgC,MAAxC,GAAiDC,MAAM,CAACC,IAAP,CAAYN,IAAI,CAACI,MAAjB,CAAxE;AAEAH,EAAAA,cAAc,CAACM,OAAf,CAAwBC,SAAD,IAAuB;AAC5C,UAAMC,eAAe,GAAGT,IAAI,CAACI,MAAL,CAAYI,SAAZ,CAAxB;;AACA,QAAI,CAACC,eAAL,EAAsB;AACpB;AACD;;AAED,SAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGD,eAAe,CAACE,MAApC,EAA4CD,CAAC,EAA7C,EAAiD;AAC/C,YAAME,iBAAiB,GAAGH,eAAe,CAACI,OAAhB,CAAwBH,CAAxB,CAA1B;AACA,YAAMI,cAAc,GAAGG,iBAAiB,CAACL,iBAAD,EAAoBxC,OAApB,EAA6BoC,SAA7B,CAAxC;AACAnB,MAAAA,QAAQ,CAAC2B,IAAT,CAAcF,cAAd;AACD;AACF,GAXD;AAaA,SAAOzB,QAAP;AACD;;AAED,SAASf,gBAAT,CAA0BF,OAA1B,EAAkE;AAAA;;AAChE,MAAI,EAACA,OAAD,aAACA,OAAD,eAACA,OAAO,CAAEM,GAAV,CAAJ,EAAmB;AACjB,UAAM,IAAIK,KAAJ,CAAU,sBAAV,CAAN;AACD;;AAGD,QAAMmC,gBAAgB,GAAG,kBAAA9C,OAAO,CAACM,GAAR,gEAAayC,WAAb,MAA6B,OAAtD;AACA,QAAM;AAACC,IAAAA;AAAD,MAAchD,OAAO,CAACM,GAA5B;AACA,QAAM2C,YAAY,GAChBD,SAAS,IACTE,MAAM,CAACC,QAAP,CAAgBH,SAAS,CAACI,CAA1B,CADA,IAEAF,MAAM,CAACC,QAAP,CAAgBH,SAAS,CAACK,CAA1B,CAFA,IAGAH,MAAM,CAACC,QAAP,CAAgBH,SAAS,CAACM,CAA1B,CAJF;;AAMA,MAAIR,gBAAgB,IAAI,CAACG,YAAzB,EAAuC;AACrC,UAAM,IAAItC,KAAJ,CAAU,uDAAV,CAAN;AACD;;AAED,SAAOX,OAAO,CAACM,GAAf;AACD;;AAOD,SAASuC,iBAAT,CACEJ,OADF,EAEEzC,OAFF,EAGEoC,SAHF,EAIwB;AACtB,QAAMM,cAAc,GAAGD,OAAO,CAACc,SAAR,CACrBvD,OAAO,CAAC+C,WAAR,KAAwB,OAAxB,GAAkC/C,OAAO,CAACgD,SAA1C,GAAsDQ,2BADjC,CAAvB;;AAKA,MAAIxD,OAAO,CAACyD,aAAZ,EAA2B;AACzBf,IAAAA,cAAc,CAACgB,UAAf,CAA0B1D,OAAO,CAACyD,aAAlC,IAAmDrB,SAAnD;AACD;;AAED,SAAOM,cAAP;AACD;;AAOD,SAASC,uBAAT,CACEF,OADF,EAEEzC,OAFF,EAGEoC,SAHF,EAIe;AACb,QAAMM,cAAc,GAAGD,OAAO,CAACkB,mBAAR,CACrB3D,OAAO,CAAC+C,WAAR,KAAwB,OAAxB,GAAkC/C,OAAO,CAACgD,SAA1C,GAAsDY,iCADjC,CAAvB;;AAKA,MAAI5D,OAAO,CAACyD,aAAR,IAAyBf,cAAc,CAACgB,UAA5C,EAAwD;AACtDhB,IAAAA,cAAc,CAACgB,UAAf,CAA0B1D,OAAO,CAACyD,aAAlC,IAAmDrB,SAAnD;AACD;;AAED,SAAOM,cAAP;AACD;;AAMD,SAASc,2BAAT,CAAqCK,IAArC,EAAqDpB,OAArD,EAAmF;AAKjF,QAAM;AAACqB,IAAAA;AAAD,MAAWrB,OAAjB;;AACA,OAAK,IAAIH,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGuB,IAAI,CAACtB,MAAzB,EAAiCD,CAAC,EAAlC,EAAsC;AACpC,UAAMyB,CAAC,GAAGF,IAAI,CAACvB,CAAD,CAAd;AACAyB,IAAAA,CAAC,CAAC,CAAD,CAAD,IAAQD,MAAR;AACAC,IAAAA,CAAC,CAAC,CAAD,CAAD,IAAQD,MAAR;AACD;AACF;;AAED,SAASF,iCAAT,CAA2CrD,IAA3C,EAA2DkC,OAA3D,EAAmF;AAGjF,QAAM;AAACqB,IAAAA;AAAD,MAAWrB,OAAjB;;AACA,OAAK,IAAIH,CAAC,GAAG,CAAR,EAAW0B,EAAE,GAAGzD,IAAI,CAACgC,MAA1B,EAAkCD,CAAC,GAAG0B,EAAtC,EAA0C,EAAE1B,CAA5C,EAA+C;AAC7C/B,IAAAA,IAAI,CAAC+B,CAAD,CAAJ,IAAWwB,MAAX;AACD;AACF","sourcesContent":["import {flatGeojsonToBinary} from '@loaders.gl/gis';\nimport type {\n  FlatFeature,\n  Feature,\n  GeojsonGeometryInfo,\n  BinaryFeatures,\n  GeoJSONRowTable\n} from '@loaders.gl/schema';\nimport Protobuf from 'pbf';\n\nimport type {MVTMapboxCoordinates, MVTOptions, MVTLoaderOptions} from '../lib/types';\n\nimport VectorTile from './mapbox-vector-tile/vector-tile';\nimport BinaryVectorTile from './binary-vector-tile/vector-tile';\nimport VectorTileFeatureBinary from './binary-vector-tile/vector-tile-feature';\nimport VectorTileFeatureMapBox from './mapbox-vector-tile/vector-tile-feature';\n\n/**\n * Parse MVT arrayBuffer and return GeoJSON.\n *\n * @param arrayBuffer A MVT arrayBuffer\n * @param options\n * @returns A GeoJSON geometry object or a binary representation\n */\nexport default function parseMVT(arrayBuffer: ArrayBuffer, options?: MVTLoaderOptions) {\n  const mvtOptions = normalizeOptions(options);\n\n  const shape = options?.gis?.format || options?.mvt?.shape;\n  switch (shape) {\n    case 'columnar-table': // binary + some JS arrays\n      return {shape: 'columnar-table', data: parseToBinary(arrayBuffer, mvtOptions)};\n    case 'geojson-row-table': {\n      const table: GeoJSONRowTable = {\n        shape: 'geojson-row-table',\n        data: parseToGeojson(arrayBuffer, mvtOptions)\n      };\n      return table;\n    }\n    case 'geojson':\n      return parseToGeojson(arrayBuffer, mvtOptions);\n    case 'binary-geometry':\n      return parseToBinary(arrayBuffer, mvtOptions);\n    case 'binary':\n      return parseToBinary(arrayBuffer, mvtOptions);\n    default:\n      throw new Error(shape);\n  }\n}\n\nfunction parseToBinary(arrayBuffer: ArrayBuffer, options: MVTOptions): BinaryFeatures {\n  const [flatGeoJsonFeatures, geometryInfo] = parseToFlatGeoJson(arrayBuffer, options);\n\n  const binaryData = flatGeojsonToBinary(flatGeoJsonFeatures, geometryInfo);\n  // Add the original byteLength (as a reasonable approximation of the size of the binary data)\n  // TODO decide where to store extra fields like byteLength (header etc) and document\n  // @ts-ignore\n  binaryData.byteLength = arrayBuffer.byteLength;\n  return binaryData;\n}\n\nfunction parseToFlatGeoJson(\n  arrayBuffer: ArrayBuffer,\n  options: MVTOptions\n): [FlatFeature[], GeojsonGeometryInfo] {\n  const features: FlatFeature[] = [];\n  const geometryInfo: GeojsonGeometryInfo = {\n    coordLength: 2,\n    pointPositionsCount: 0,\n    pointFeaturesCount: 0,\n    linePositionsCount: 0,\n    linePathsCount: 0,\n    lineFeaturesCount: 0,\n    polygonPositionsCount: 0,\n    polygonObjectsCount: 0,\n    polygonRingsCount: 0,\n    polygonFeaturesCount: 0\n  };\n\n  if (arrayBuffer.byteLength <= 0) {\n    return [features, geometryInfo];\n  }\n\n  const tile = new BinaryVectorTile(new Protobuf(arrayBuffer));\n\n  const selectedLayers =\n    options && Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);\n\n  selectedLayers.forEach((layerName: string) => {\n    const vectorTileLayer = tile.layers[layerName];\n    if (!vectorTileLayer) {\n      return;\n    }\n\n    for (let i = 0; i < vectorTileLayer.length; i++) {\n      const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);\n      const decodedFeature = getDecodedFeatureBinary(vectorTileFeature, options, layerName);\n      features.push(decodedFeature);\n    }\n  });\n\n  return [features, geometryInfo];\n}\n\nfunction parseToGeojson(arrayBuffer: ArrayBuffer, options: MVTOptions): Feature[] {\n  if (arrayBuffer.byteLength <= 0) {\n    return [];\n  }\n\n  const features: MVTMapboxCoordinates[] = [];\n  const tile = new VectorTile(new Protobuf(arrayBuffer));\n\n  const selectedLayers = Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);\n\n  selectedLayers.forEach((layerName: string) => {\n    const vectorTileLayer = tile.layers[layerName];\n    if (!vectorTileLayer) {\n      return;\n    }\n\n    for (let i = 0; i < vectorTileLayer.length; i++) {\n      const vectorTileFeature = vectorTileLayer.feature(i);\n      const decodedFeature = getDecodedFeature(vectorTileFeature, options, layerName);\n      features.push(decodedFeature);\n    }\n  });\n\n  return features as Feature[];\n}\n\nfunction normalizeOptions(options?: MVTLoaderOptions): MVTOptions {\n  if (!options?.mvt) {\n    throw new Error('mvt options required');\n  }\n\n  // Validate\n  const wgs84Coordinates = options.mvt?.coordinates === 'wgs84';\n  const {tileIndex} = options.mvt;\n  const hasTileIndex =\n    tileIndex &&\n    Number.isFinite(tileIndex.x) &&\n    Number.isFinite(tileIndex.y) &&\n    Number.isFinite(tileIndex.z);\n\n  if (wgs84Coordinates && !hasTileIndex) {\n    throw new Error('MVT Loader: WGS84 coordinates need tileIndex property');\n  }\n\n  return options.mvt;\n}\n\n/**\n * @param feature\n * @param options\n * @returns decoded feature\n */\nfunction getDecodedFeature(\n  feature: VectorTileFeatureMapBox,\n  options: MVTOptions,\n  layerName: string\n): MVTMapboxCoordinates {\n  const decodedFeature = feature.toGeoJSON(\n    options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinates\n  );\n\n  // Add layer name to GeoJSON properties\n  if (options.layerProperty) {\n    decodedFeature.properties[options.layerProperty] = layerName;\n  }\n\n  return decodedFeature;\n}\n\n/**\n * @param feature\n * @param options\n * @returns decoded binary feature\n */\nfunction getDecodedFeatureBinary(\n  feature: VectorTileFeatureBinary,\n  options: MVTOptions,\n  layerName: string\n): FlatFeature {\n  const decodedFeature = feature.toBinaryCoordinates(\n    options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinatesBinary\n  );\n\n  // Add layer name to GeoJSON properties\n  if (options.layerProperty && decodedFeature.properties) {\n    decodedFeature.properties[options.layerProperty] = layerName;\n  }\n\n  return decodedFeature;\n}\n\n/**\n * @param line\n * @param feature\n */\nfunction transformToLocalCoordinates(line: number[], feature: {extent: any}): void {\n  // This function transforms local coordinates in a\n  // [0 - bufferSize, this.extent + bufferSize] range to a\n  // [0 - (bufferSize / this.extent), 1 + (bufferSize / this.extent)] range.\n  // The resulting extent would be 1.\n  const {extent} = feature;\n  for (let i = 0; i < line.length; i++) {\n    const p = line[i];\n    p[0] /= extent;\n    p[1] /= extent;\n  }\n}\n\nfunction transformToLocalCoordinatesBinary(data: number[], feature: {extent: any}) {\n  // For the binary code path, the feature data is just\n  // one big flat array, so we just divide each value\n  const {extent} = feature;\n  for (let i = 0, il = data.length; i < il; ++i) {\n    data[i] /= extent;\n  }\n}\n"],"file":"parse-mvt.js"}

package/dist/esm/mvt-loader.js

@@ -1,5 +1,14 @@
 import parseMVT from './lib/parse-mvt';
-const VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : 'latest';
+const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 'latest';
+const DEFAULT_MVT_LOADER_OPTIONS = {
+  mvt: {
+    shape: 'geojson',
+    coordinates: 'local',
+    layerProperty: 'layerName',
+    layers: undefined,
+    tileIndex: null
+  }
+};
 export const MVTWorkerLoader = {
   name: 'Mapbox Vector Tile',
   id: 'mvt',
@@ -9,14 +18,7 @@ export const MVTWorkerLoader = {
   mimeTypes: ['application/vnd.mapbox-vector-tile', 'application/x-protobuf'],
   worker: true,
   category: 'geometry',
-  options: {
-    mvt: {
-      coordinates: 'local',
-      layerProperty: 'layerName',
-      layers: null,
-      tileIndex: null
-    }
-  }
+  options: DEFAULT_MVT_LOADER_OPTIONS
 };
 export const MVTLoader = { ...MVTWorkerLoader,
   parse: async (arrayBuffer, options) => parseMVT(arrayBuffer, options),

package/dist/esm/mvt-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mvt-loader.ts"],"names":["parseMVT","VERSION","MVTWorkerLoader","name","id","module","version","extensions","mimeTypes","worker","category","options","mvt","coordinates","layerProperty","layers","tileIndex","MVTLoader","parse","arrayBuffer","parseSync","binary"],"mappings":"AACA,OAAOA,QAAP,MAAqB,iBAArB;AAIA,MAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmD,QAAnE;AAKA,OAAO,MAAMC,eAAuB,GAAG;AACrCC,EAAAA,IAAI,EAAE,oBAD+B;AAErCC,EAAAA,EAAE,EAAE,KAFiC;AAGrCC,EAAAA,MAAM,EAAE,KAH6B;AAIrCC,EAAAA,OAAO,EAAEL,OAJ4B;AAMrCM,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,KAAR,CANyB;AAOrCC,EAAAA,SAAS,EAAE,CACT,oCADS,EAET,wBAFS,CAP0B;AAYrCC,EAAAA,MAAM,EAAE,IAZ6B;AAarCC,EAAAA,QAAQ,EAAE,UAb2B;AAcrCC,EAAAA,OAAO,EAAE;AACPC,IAAAA,GAAG,EAAE;AACHC,MAAAA,WAAW,EAAE,OADV;AAEHC,MAAAA,aAAa,EAAE,WAFZ;AAGHC,MAAAA,MAAM,EAAE,IAHL;AAIHC,MAAAA,SAAS,EAAE;AAJR;AADE;AAd4B,CAAhC;AA2BP,OAAO,MAAMC,SAA2B,GAAG,EACzC,GAAGf,eADsC;AAEzCgB,EAAAA,KAAK,EAAE,OAAOC,WAAP,EAAoBR,OAApB,KAAgCX,QAAQ,CAACmB,WAAD,EAAcR,OAAd,CAFN;AAGzCS,EAAAA,SAAS,EAAEpB,QAH8B;AAIzCqB,EAAAA,MAAM,EAAE;AAJiC,CAApC","sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport parseMVT from './lib/parse-mvt';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Worker loader for the Mapbox Vector Tile format\n */\nexport const MVTWorkerLoader: Loader = {\n  name: 'Mapbox Vector Tile',\n  id: 'mvt',\n  module: 'mvt',\n  version: VERSION,\n  // Note: ArcGIS uses '.pbf' extension and 'application/octet-stream'\n  extensions: ['mvt', 'pbf'],\n  mimeTypes: [\n    'application/vnd.mapbox-vector-tile',\n    'application/x-protobuf'\n    // 'application/octet-stream'\n  ],\n  worker: true,\n  category: 'geometry',\n  options: {\n    mvt: {\n      coordinates: 'local',\n      layerProperty: 'layerName',\n      layers: null,\n      tileIndex: null\n    }\n  }\n};\n\n/**\n * Loader for the Mapbox Vector Tile format\n */\nexport const MVTLoader: LoaderWithParser = {\n  ...MVTWorkerLoader,\n  parse: async (arrayBuffer, options) => parseMVT(arrayBuffer, options),\n  parseSync: parseMVT,\n  binary: true\n};\n"],"file":"mvt-loader.js"}
+{"version":3,"sources":["../../src/mvt-loader.ts"],"names":["parseMVT","VERSION","DEFAULT_MVT_LOADER_OPTIONS","mvt","shape","coordinates","layerProperty","layers","undefined","tileIndex","MVTWorkerLoader","name","id","module","version","extensions","mimeTypes","worker","category","options","MVTLoader","parse","arrayBuffer","parseSync","binary"],"mappings":"AAEA,OAAOA,QAAP,MAAqB,iBAArB;AAIA,MAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAEA,MAAMC,0BAA4C,GAAG;AACnDC,EAAAA,GAAG,EAAE;AACHC,IAAAA,KAAK,EAAE,SADJ;AAEHC,IAAAA,WAAW,EAAE,OAFV;AAGHC,IAAAA,aAAa,EAAE,WAHZ;AAIHC,IAAAA,MAAM,EAAEC,SAJL;AAKHC,IAAAA,SAAS,EAAE;AALR;AAD8C,CAArD;AAaA,OAAO,MAAMC,eAAuB,GAAG;AACrCC,EAAAA,IAAI,EAAE,oBAD+B;AAErCC,EAAAA,EAAE,EAAE,KAFiC;AAGrCC,EAAAA,MAAM,EAAE,KAH6B;AAIrCC,EAAAA,OAAO,EAAEb,OAJ4B;AAMrCc,EAAAA,UAAU,EAAE,CAAC,KAAD,EAAQ,KAAR,CANyB;AAOrCC,EAAAA,SAAS,EAAE,CACT,oCADS,EAET,wBAFS,CAP0B;AAYrCC,EAAAA,MAAM,EAAE,IAZ6B;AAarCC,EAAAA,QAAQ,EAAE,UAb2B;AAcrCC,EAAAA,OAAO,EAAEjB;AAd4B,CAAhC;AAoBP,OAAO,MAAMkB,SAA2B,GAAG,EACzC,GAAGV,eADsC;AAEzCW,EAAAA,KAAK,EAAE,OAAOC,WAAP,EAAoBH,OAApB,KAAmDnB,QAAQ,CAACsB,WAAD,EAAcH,OAAd,CAFzB;AAGzCI,EAAAA,SAAS,EAAEvB,QAH8B;AAIzCwB,EAAAA,MAAM,EAAE;AAJiC,CAApC","sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {MVTLoaderOptions} from './lib/types';\nimport parseMVT from './lib/parse-mvt';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nconst DEFAULT_MVT_LOADER_OPTIONS: MVTLoaderOptions = {\n  mvt: {\n    shape: 'geojson',\n    coordinates: 'local',\n    layerProperty: 'layerName',\n    layers: undefined,\n    tileIndex: null\n  }\n};\n\n/**\n * Worker loader for the Mapbox Vector Tile format\n */\nexport const MVTWorkerLoader: Loader = {\n  name: 'Mapbox Vector Tile',\n  id: 'mvt',\n  module: 'mvt',\n  version: VERSION,\n  // Note: ArcGIS uses '.pbf' extension and 'application/octet-stream'\n  extensions: ['mvt', 'pbf'],\n  mimeTypes: [\n    'application/vnd.mapbox-vector-tile',\n    'application/x-protobuf'\n    // 'application/octet-stream'\n  ],\n  worker: true,\n  category: 'geometry',\n  options: DEFAULT_MVT_LOADER_OPTIONS\n};\n\n/**\n * Loader for the Mapbox Vector Tile format\n */\nexport const MVTLoader: LoaderWithParser = {\n  ...MVTWorkerLoader,\n  parse: async (arrayBuffer, options?: MVTLoaderOptions) => parseMVT(arrayBuffer, options),\n  parseSync: parseMVT,\n  binary: true\n};\n"],"file":"mvt-loader.js"}

package/dist/helpers/mapbox-util-functions.d.ts

@@ -1,12 +1,12 @@
 import Protobuf from 'pbf';
-import { MvtMapboxGeometry } from '../lib/types';
+import { MVTMapboxGeometry } from '../lib/types';
 import VectorTileFeature from '../lib/mapbox-vector-tile/vector-tile-feature';
 /**
  * Classifies an array of rings into polygons with outer rings and holes
  * @param rings
  * @returns polygons
  */
-export declare function classifyRings(rings: MvtMapboxGeometry): MvtMapboxGeometry[] | number[][][];
+export declare function classifyRings(rings: MVTMapboxGeometry): MVTMapboxGeometry[] | number[][][];
 /**
  *
  * @param ring

package/dist/lib/mapbox-vector-tile/vector-tile-feature.d.ts

@@ -1,5 +1,5 @@
 import Protobuf from 'pbf';
-import { MvtMapboxCoordinates, MvtMapboxGeometry } from '../types';
+import { MVTMapboxCoordinates, MVTMapboxGeometry } from '../types';
 export default class VectorTileFeature {
     properties: {
         [x: string]: string | number | boolean | null;
@@ -13,15 +13,15 @@ export default class VectorTileFeature {
     _values: (string | number | boolean | null)[];
     static get types(): string[];
     constructor(pbf: Protobuf, end: number, extent: any, keys: string[], values: (string | number | boolean | null)[]);
-    loadGeometry(): MvtMapboxGeometry;
+    loadGeometry(): MVTMapboxGeometry;
     bbox(): number[];
-    _toGeoJSON(transform: any): MvtMapboxCoordinates;
+    _toGeoJSON(transform: any): MVTMapboxCoordinates;
     toGeoJSON(options: {
         x: number;
         y: number;
         z: number;
     } | ((data: number[], feature: {
         extent: any;
-    }) => void)): MvtMapboxCoordinates;
+    }) => void)): MVTMapboxCoordinates;
 }
 //# sourceMappingURL=vector-tile-feature.d.ts.map

package/dist/lib/parse-mvt.d.ts

@@ -1,5 +1,5 @@
-import type { MvtMapboxCoordinates } from '../lib/types';
-import { LoaderOptions } from '@loaders.gl/loader-utils';
+import type { Feature, BinaryFeatures, GeoJSONRowTable } from '@loaders.gl/schema';
+import type { MVTLoaderOptions } from '../lib/types';
 /**
  * Parse MVT arrayBuffer and return GeoJSON.
  *
@@ -7,11 +7,8 @@ import { LoaderOptions } from '@loaders.gl/loader-utils';
  * @param options
  * @returns A GeoJSON geometry object or a binary representation
  */
-export default function parseMVT(arrayBuffer: ArrayBuffer, options?: LoaderOptions): (MvtMapboxCoordinates | {
-    type: "Feature";
-    geometry: import("@loaders.gl/schema").FlatGeometry;
-    id?: string | number | undefined;
-    properties: import("geojson").GeoJsonProperties;
-    bbox?: import("geojson").BBox | undefined;
-})[] | import("@loaders.gl/schema").BinaryFeatures;
+export default function parseMVT(arrayBuffer: ArrayBuffer, options?: MVTLoaderOptions): BinaryFeatures | GeoJSONRowTable | Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>[] | {
+    shape: string;
+    data: BinaryFeatures;
+};
 //# sourceMappingURL=parse-mvt.d.ts.map

package/dist/lib/parse-mvt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-mvt.d.ts","sourceRoot":"","sources":["../../src/lib/parse-mvt.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,oBAAoB,EAAa,MAAM,cAAc,CAAC;AAGnE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,aAAa;;;;;;mDA0DjF"}
+{"version":3,"file":"parse-mvt.d.ts","sourceRoot":"","sources":["../../src/lib/parse-mvt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,OAAO,EAEP,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAmC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAOrF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,gBAAgB;;;EAuBpF"}

package/dist/lib/parse-mvt.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// import {VectorTile} from '@mapbox/vector-tile';
-const vector_tile_1 = __importDefault(require("./mapbox-vector-tile/vector-tile"));
-const vector_tile_2 = __importDefault(require("./binary-vector-tile/vector-tile"));
 const gis_1 = require("@loaders.gl/gis");
 const pbf_1 = __importDefault(require("pbf"));
+const vector_tile_1 = __importDefault(require("./mapbox-vector-tile/vector-tile"));
+const vector_tile_2 = __importDefault(require("./binary-vector-tile/vector-tile"));
 /**
  * Parse MVT arrayBuffer and return GeoJSON.
  *
@@ -16,91 +15,116 @@ const pbf_1 = __importDefault(require("pbf"));
  * @returns A GeoJSON geometry object or a binary representation
  */
 function parseMVT(arrayBuffer, options) {
-    options = normalizeOptions(options);
+    const mvtOptions = normalizeOptions(options);
+    const shape = options?.gis?.format || options?.mvt?.shape;
+    switch (shape) {
+        case 'columnar-table': // binary + some JS arrays
+            return { shape: 'columnar-table', data: parseToBinary(arrayBuffer, mvtOptions) };
+        case 'geojson-row-table': {
+            const table = {
+                shape: 'geojson-row-table',
+                data: parseToGeojson(arrayBuffer, mvtOptions)
+            };
+            return table;
+        }
+        case 'geojson':
+            return parseToGeojson(arrayBuffer, mvtOptions);
+        case 'binary-geometry':
+            return parseToBinary(arrayBuffer, mvtOptions);
+        case 'binary':
+            return parseToBinary(arrayBuffer, mvtOptions);
+        default:
+            throw new Error(shape);
+    }
+}
+exports.default = parseMVT;
+function parseToBinary(arrayBuffer, options) {
+    const [flatGeoJsonFeatures, geometryInfo] = parseToFlatGeoJson(arrayBuffer, options);
+    const binaryData = (0, gis_1.flatGeojsonToBinary)(flatGeoJsonFeatures, geometryInfo);
+    // Add the original byteLength (as a reasonable approximation of the size of the binary data)
+    // TODO decide where to store extra fields like byteLength (header etc) and document
+    // @ts-ignore
+    binaryData.byteLength = arrayBuffer.byteLength;
+    return binaryData;
+}
+function parseToFlatGeoJson(arrayBuffer, options) {
     const features = [];
-    if (options) {
-        const binary = options.gis.format === 'binary';
-        const geometryInfo = {
-            coordLength: 2,
-            pointPositionsCount: 0,
-            pointFeaturesCount: 0,
-            linePositionsCount: 0,
-            linePathsCount: 0,
-            lineFeaturesCount: 0,
-            polygonPositionsCount: 0,
-            polygonObjectsCount: 0,
-            polygonRingsCount: 0,
-            polygonFeaturesCount: 0
-        };
-        if (arrayBuffer.byteLength > 0) {
-            const tile = binary
-                ? new vector_tile_2.default(new pbf_1.default(arrayBuffer))
-                : new vector_tile_1.default(new pbf_1.default(arrayBuffer));
-            const loaderOptions = options.mvt;
-            const selectedLayers = Array.isArray(loaderOptions.layers)
-                ? loaderOptions.layers
-                : Object.keys(tile.layers);
-            selectedLayers.forEach((layerName) => {
-                const vectorTileLayer = tile.layers[layerName];
-                const featureOptions = { ...loaderOptions, layerName };
-                if (!vectorTileLayer) {
-                    return;
-                }
-                for (let i = 0; i < vectorTileLayer.length; i++) {
-                    const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);
-                    const decodedFeature = binary
-                        ? getDecodedFeatureBinary(vectorTileFeature, featureOptions)
-                        : getDecodedFeature(vectorTileFeature, featureOptions);
-                    features.push(decodedFeature);
-                }
-            });
+    const geometryInfo = {
+        coordLength: 2,
+        pointPositionsCount: 0,
+        pointFeaturesCount: 0,
+        linePositionsCount: 0,
+        linePathsCount: 0,
+        lineFeaturesCount: 0,
+        polygonPositionsCount: 0,
+        polygonObjectsCount: 0,
+        polygonRingsCount: 0,
+        polygonFeaturesCount: 0
+    };
+    if (arrayBuffer.byteLength <= 0) {
+        return [features, geometryInfo];
+    }
+    const tile = new vector_tile_2.default(new pbf_1.default(arrayBuffer));
+    const selectedLayers = options && Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);
+    selectedLayers.forEach((layerName) => {
+        const vectorTileLayer = tile.layers[layerName];
+        if (!vectorTileLayer) {
+            return;
         }
-        if (binary) {
-            const data = (0, gis_1.flatGeojsonToBinary)(features, geometryInfo);
-            // Add the original byteLength (as a reasonable approximation of the size of the binary data)
-            // TODO decide where to store extra fields like byteLength (header etc) and document
-            // @ts-ignore
-            data.byteLength = arrayBuffer.byteLength;
-            return data;
+        for (let i = 0; i < vectorTileLayer.length; i++) {
+            const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);
+            const decodedFeature = getDecodedFeatureBinary(vectorTileFeature, options, layerName);
+            features.push(decodedFeature);
         }
+    });
+    return [features, geometryInfo];
+}
+function parseToGeojson(arrayBuffer, options) {
+    if (arrayBuffer.byteLength <= 0) {
+        return [];
     }
+    const features = [];
+    const tile = new vector_tile_1.default(new pbf_1.default(arrayBuffer));
+    const selectedLayers = Array.isArray(options.layers) ? options.layers : Object.keys(tile.layers);
+    selectedLayers.forEach((layerName) => {
+        const vectorTileLayer = tile.layers[layerName];
+        if (!vectorTileLayer) {
+            return;
+        }
+        for (let i = 0; i < vectorTileLayer.length; i++) {
+            const vectorTileFeature = vectorTileLayer.feature(i);
+            const decodedFeature = getDecodedFeature(vectorTileFeature, options, layerName);
+            features.push(decodedFeature);
+        }
+    });
     return features;
 }
-exports.default = parseMVT;
-/**
- * @param options
- * @returns options
- */
 function normalizeOptions(options) {
-    if (options) {
-        options = {
-            ...options,
-            mvt: options.mvt || {},
-            gis: options.gis || {}
-        };
-        // Validate
-        const wgs84Coordinates = options.coordinates === 'wgs84';
-        const { tileIndex } = options;
-        const hasTileIndex = tileIndex &&
-            Number.isFinite(tileIndex.x) &&
-            Number.isFinite(tileIndex.y) &&
-            Number.isFinite(tileIndex.z);
-        if (wgs84Coordinates && !hasTileIndex) {
-            throw new Error('MVT Loader: WGS84 coordinates need tileIndex property. Check documentation.');
-        }
+    if (!options?.mvt) {
+        throw new Error('mvt options required');
+    }
+    // Validate
+    const wgs84Coordinates = options.mvt?.coordinates === 'wgs84';
+    const { tileIndex } = options.mvt;
+    const hasTileIndex = tileIndex &&
+        Number.isFinite(tileIndex.x) &&
+        Number.isFinite(tileIndex.y) &&
+        Number.isFinite(tileIndex.z);
+    if (wgs84Coordinates && !hasTileIndex) {
+        throw new Error('MVT Loader: WGS84 coordinates need tileIndex property');
     }
-    return options;
+    return options.mvt;
 }
 /**
  * @param feature
  * @param options
  * @returns decoded feature
  */
-function getDecodedFeature(feature, options) {
+function getDecodedFeature(feature, options, layerName) {
     const decodedFeature = feature.toGeoJSON(options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinates);
     // Add layer name to GeoJSON properties
     if (options.layerProperty) {
-        decodedFeature.properties[options.layerProperty] = options.layerName;
+        decodedFeature.properties[options.layerProperty] = layerName;
     }
     return decodedFeature;
 }
@@ -109,11 +133,11 @@ function getDecodedFeature(feature, options) {
  * @param options
  * @returns decoded binary feature
  */
-function getDecodedFeatureBinary(feature, options) {
+function getDecodedFeatureBinary(feature, options, layerName) {
     const decodedFeature = feature.toBinaryCoordinates(options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinatesBinary);
     // Add layer name to GeoJSON properties
     if (options.layerProperty && decodedFeature.properties) {
-        decodedFeature.properties[options.layerProperty] = options.layerName;
+        decodedFeature.properties[options.layerProperty] = layerName;
     }
     return decodedFeature;
 }