@loaders.gl/mvt 3.1.0 → 3.1.1

package/dist/bundle.js

@@ -877,12 +877,14 @@
 
   // src/helpers/binary-util-functions.ts
   function classifyRings2(geom) {
-    const len = geom.lines.length;
+    const len = geom.indices.length;
+    const type = "Polygon";
     if (len <= 1) {
       return {
+        type,
         data: geom.data,
         areas: [[getPolygonSignedArea(geom.data)]],
-        lines: [geom.lines]
+        indices: [geom.indices]
       };
     }
     const areas = [];
@@ -892,8 +894,8 @@
     let ccw;
     let offset = 0;
     for (let endIndex, i2 = 0, startIndex; i2 < len; i2++) {
-      startIndex = geom.lines[i2] - offset;
-      endIndex = geom.lines[i2 + 1] - offset || geom.data.length;
+      startIndex = geom.indices[i2] - offset;
+      endIndex = geom.indices[i2 + 1] - offset || geom.data.length;
       const shape = geom.data.slice(startIndex, endIndex);
       const area2 = getPolygonSignedArea(shape);
       if (area2 === 0) {
@@ -921,7 +923,7 @@
       areas.push(ringAreas);
     if (polygon.length)
       polygons.push(polygon);
-    return { areas, lines: polygons, data: geom.data };
+    return { type, areas, indices: polygons, data: geom.data };
   }
   function project(data, x0, y0, size) {
     for (let j = 0, jl = data.length; j < jl; j += 2) {
@@ -962,10 +964,7 @@
     "src/lib/binary-vector-tile/vector-tile-feature.ts"() {
       init_binary_util_functions();
       VectorTileFeature2 = class {
-        static get types() {
-          return ["Unknown", "Point", "LineString", "Polygon"];
-        }
-        constructor(pbf, end, extent, keys, values, firstPassData) {
+        constructor(pbf, end, extent, keys, values, geometryInfo) {
           this.properties = {};
           this.extent = extent;
           this.type = 0;
@@ -974,7 +973,7 @@
           this._geometry = -1;
           this._keys = keys;
           this._values = values;
-          this._firstPassData = firstPassData;
+          this._geometryInfo = geometryInfo;
           pbf.readFields(readFeature2, this, end);
         }
         loadGeometry() {
@@ -986,7 +985,7 @@
           x = 0;
           y = 0;
           i = 0;
-          const lines = [];
+          const indices = [];
           const data = [];
           while (pbf.pos < endPos) {
             if (length <= 0) {
@@ -999,13 +998,13 @@
               x += pbf.readSVarint();
               y += pbf.readSVarint();
               if (cmd === 1) {
-                lines.push(i);
+                indices.push(i);
               }
               data.push(x, y);
               i += 2;
             } else if (cmd === 7) {
               if (i > 0) {
-                const start = lines[lines.length - 1];
+                const start = indices[indices.length - 1];
                 data.push(data[start], data[start + 1]);
                 i += 2;
               }
@@ -1013,42 +1012,38 @@
               throw new Error(`unknown command ${cmd}`);
             }
           }
-          return { data, lines };
+          return { data, indices };
         }
         _toBinaryCoordinates(transform) {
-          let geom = this.loadGeometry();
+          const geom = this.loadGeometry();
+          let geometry;
           transform(geom.data, this);
           const coordLength = 2;
           switch (this.type) {
             case 1:
-              this._firstPassData.pointFeaturesCount++;
-              this._firstPassData.pointPositionsCount += geom.lines.length;
+              this._geometryInfo.pointFeaturesCount++;
+              this._geometryInfo.pointPositionsCount += geom.indices.length;
+              geometry = { type: "Point", ...geom };
               break;
             case 2:
-              this._firstPassData.lineFeaturesCount++;
-              this._firstPassData.linePathsCount += geom.lines.length;
-              this._firstPassData.linePositionsCount += geom.data.length / coordLength;
+              this._geometryInfo.lineFeaturesCount++;
+              this._geometryInfo.linePathsCount += geom.indices.length;
+              this._geometryInfo.linePositionsCount += geom.data.length / coordLength;
+              geometry = { type: "LineString", ...geom };
               break;
             case 3:
-              const classified = classifyRings2(geom);
-              this._firstPassData.polygonFeaturesCount++;
-              this._firstPassData.polygonObjectsCount += classified.lines.length;
-              for (const lines of classified.lines) {
-                this._firstPassData.polygonRingsCount += lines.length;
+              geometry = classifyRings2(geom);
+              this._geometryInfo.polygonFeaturesCount++;
+              this._geometryInfo.polygonObjectsCount += geometry.indices.length;
+              for (const indices of geometry.indices) {
+                this._geometryInfo.polygonRingsCount += indices.length;
               }
-              this._firstPassData.polygonPositionsCount += classified.data.length / coordLength;
-              geom = classified;
+              this._geometryInfo.polygonPositionsCount += geometry.data.length / coordLength;
               break;
+            default:
+              throw new Error(`Invalid geometry type: ${this.type}`);
           }
-          geom.type = VectorTileFeature2.types[this.type];
-          if (geom.lines.length > 1) {
-            geom.type = `Multi${geom.type}`;
-          }
-          const result = {
-            type: "Feature",
-            geometry: geom,
-            properties: this.properties
-          };
+          const result = { type: "Feature", geometry, properties: this.properties };
           if (this.id !== null) {
             result.id = this.id;
           }
@@ -1107,13 +1102,13 @@
           pbf.readFields(readLayer2, this, end);
           this.length = this._features.length;
         }
-        feature(i2, firstPassData) {
+        feature(i2, geometryInfo) {
           if (i2 < 0 || i2 >= this._features.length) {
             throw new Error("feature index out of bounds");
           }
           this._pbf.pos = this._features[i2];
           const end = this._pbf.readVarint() + this._pbf.pos;
-          return new VectorTileFeature2(this._pbf, end, this.extent, this._keys, this._values, firstPassData);
+          return new VectorTileFeature2(this._pbf, end, this.extent, this._keys, this._values, geometryInfo);
         }
       };
     }
@@ -1142,13 +1137,15 @@
     }
   });
 
-  // src/lib/binary-vector-tile/features-to-binary.ts
-  function featuresToBinary(features, firstPassData, options) {
+  // ../gis/src/lib/flat-geojson-to-binary.ts
+  function flatGeojsonToBinary(features, geometryInfo, options) {
     const propArrayTypes = extractNumericPropTypes(features);
     const numericPropKeys = Object.keys(propArrayTypes).filter((k) => propArrayTypes[k] !== Array);
-    return fillArrays(features, firstPassData, {
-      numericPropKeys: options ? options.numericPropKeys : numericPropKeys,
+    return fillArrays(features, {
       propArrayTypes,
+      ...geometryInfo
+    }, {
+      numericPropKeys: options && options.numericPropKeys || numericPropKeys,
       PositionDataType: options ? options.PositionDataType : Float32Array
     });
   }
@@ -1164,7 +1161,7 @@
     }
     return propArrayTypes;
   }
-  function fillArrays(features, firstPassData, options) {
+  function fillArrays(features, geometryInfo, options) {
     const {
       pointPositionsCount,
       pointFeaturesCount,
@@ -1174,13 +1171,15 @@
       polygonPositionsCount,
       polygonObjectsCount,
       polygonRingsCount,
-      polygonFeaturesCount
-    } = firstPassData;
-    const { numericPropKeys, propArrayTypes, PositionDataType = Float32Array } = options;
+      polygonFeaturesCount,
+      propArrayTypes,
+      coordLength
+    } = geometryInfo;
+    const { numericPropKeys = [], PositionDataType = Float32Array } = options;
     const hasGlobalId = features[0] && "id" in features[0];
-    const coordLength = 2;
     const GlobalFeatureIdsDataType = features.length > 65535 ? Uint32Array : Uint16Array;
     const points = {
+      type: "Point",
       positions: new PositionDataType(pointPositionsCount * coordLength),
       globalFeatureIds: new GlobalFeatureIdsDataType(pointPositionsCount),
       featureIds: pointFeaturesCount > 65535 ? new Uint32Array(pointPositionsCount) : new Uint16Array(pointPositionsCount),
@@ -1189,6 +1188,7 @@
       fields: []
     };
     const lines = {
+      type: "LineString",
       pathIndices: linePositionsCount > 65535 ? new Uint32Array(linePathsCount + 1) : new Uint16Array(linePathsCount + 1),
       positions: new PositionDataType(linePositionsCount * coordLength),
       globalFeatureIds: new GlobalFeatureIdsDataType(linePositionsCount),
@@ -1198,6 +1198,7 @@
       fields: []
     };
     const polygons = {
+      type: "Polygon",
       polygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonObjectsCount + 1) : new Uint16Array(polygonObjectsCount + 1),
       primitivePolygonIndices: polygonPositionsCount > 65535 ? new Uint32Array(polygonRingsCount + 1) : new Uint16Array(polygonRingsCount + 1),
       positions: new PositionDataType(polygonPositionsCount * coordLength),
@@ -1210,8 +1211,8 @@
     };
     for (const object of [points, lines, polygons]) {
       for (const propName of numericPropKeys) {
-        const TypedArray = propArrayTypes[propName];
-        object.numericProps[propName] = new TypedArray(object.positions.length / coordLength);
+        const T = propArrayTypes[propName];
+        object.numericProps[propName] = new T(object.positions.length / coordLength);
       }
     }
     lines.pathIndices[linePathsCount] = linePositionsCount;
@@ -1234,7 +1235,6 @@
       const properties = feature.properties || {};
       switch (geometry.type) {
         case "Point":
-        case "MultiPoint":
           handlePoint(geometry, points, indexMap, coordLength, properties);
           points.properties.push(keepStringProperties(properties, numericPropKeys));
           if (hasGlobalId) {
@@ -1243,7 +1243,6 @@
           indexMap.pointFeature++;
           break;
         case "LineString":
-        case "MultiLineString":
           handleLineString(geometry, lines, indexMap, coordLength, properties);
           lines.properties.push(keepStringProperties(properties, numericPropKeys));
           if (hasGlobalId) {
@@ -1252,7 +1251,6 @@
           indexMap.lineFeature++;
           break;
         case "Polygon":
-        case "MultiPolygon":
           handlePolygon(geometry, polygons, indexMap, coordLength, properties);
           polygons.properties.push(keepStringProperties(properties, numericPropKeys));
           if (hasGlobalId) {
@@ -1281,9 +1279,9 @@
     fillNumericProperties(lines, properties, indexMap.linePosition, nPositions);
     lines.globalFeatureIds.fill(indexMap.feature, indexMap.linePosition, indexMap.linePosition + nPositions);
     lines.featureIds.fill(indexMap.lineFeature, indexMap.linePosition, indexMap.linePosition + nPositions);
-    for (let i2 = 0, il = geometry.lines.length; i2 < il; ++i2) {
-      const start = geometry.lines[i2];
-      const end = i2 === il - 1 ? geometry.data.length : geometry.lines[i2 + 1];
+    for (let i2 = 0, il = geometry.indices.length; i2 < il; ++i2) {
+      const start = geometry.indices[i2];
+      const end = i2 === il - 1 ? geometry.data.length : geometry.indices[i2 + 1];
       lines.pathIndices[indexMap.linePath++] = indexMap.linePosition;
       indexMap.linePosition += (end - start) / coordLength;
     }
@@ -1294,23 +1292,23 @@
     fillNumericProperties(polygons, properties, indexMap.polygonPosition, nPositions);
     polygons.globalFeatureIds.fill(indexMap.feature, indexMap.polygonPosition, indexMap.polygonPosition + nPositions);
     polygons.featureIds.fill(indexMap.polygonFeature, indexMap.polygonPosition, indexMap.polygonPosition + nPositions);
-    for (let l = 0, ll = geometry.lines.length; l < ll; ++l) {
+    for (let l = 0, ll = geometry.indices.length; l < ll; ++l) {
       const startPosition = indexMap.polygonPosition;
       polygons.polygonIndices[indexMap.polygonObject++] = startPosition;
       const areas = geometry.areas[l];
-      const lines = geometry.lines[l];
-      const nextLines = geometry.lines[l + 1];
-      for (let i2 = 0, il = lines.length; i2 < il; ++i2) {
-        const start = lines[i2];
-        const end = i2 === il - 1 ? nextLines === void 0 ? geometry.data.length : nextLines[0] : lines[i2 + 1];
+      const indices = geometry.indices[l];
+      const nextIndices = geometry.indices[l + 1];
+      for (let i2 = 0, il = indices.length; i2 < il; ++i2) {
+        const start = indices[i2];
+        const end = i2 === il - 1 ? nextIndices === void 0 ? geometry.data.length : nextIndices[0] : indices[i2 + 1];
         polygons.primitivePolygonIndices[indexMap.polygonRing++] = indexMap.polygonPosition;
         indexMap.polygonPosition += (end - start) / coordLength;
       }
       const endPosition = indexMap.polygonPosition;
-      triangulatePolygon(polygons, areas, lines, { startPosition, endPosition, coordLength });
+      triangulatePolygon(polygons, areas, indices, { startPosition, endPosition, coordLength });
     }
   }
-  function triangulatePolygon(polygons, areas, lines, {
+  function triangulatePolygon(polygons, areas, indices, {
     startPosition,
     endPosition,
     coordLength
@@ -1318,52 +1316,54 @@
     const start = startPosition * coordLength;
     const end = endPosition * coordLength;
     const polygonPositions = polygons.positions.subarray(start, end);
-    const offset = lines[0];
-    const holes = lines.slice(1).map((n) => (n - offset) / coordLength);
-    const indices = earcut(polygonPositions, holes, coordLength, areas);
-    for (let t = 0, tl = indices.length; t < tl; ++t) {
-      polygons.triangles.push(startPosition + indices[t]);
+    const offset = indices[0];
+    const holes = indices.slice(1).map((n) => (n - offset) / coordLength);
+    const triangles = earcut(polygonPositions, holes, coordLength, areas);
+    for (let t = 0, tl = triangles.length; t < tl; ++t) {
+      polygons.triangles.push(startPosition + triangles[t]);
     }
   }
+  function wrapProps(obj, size) {
+    const returnObj = {};
+    for (const key in obj) {
+      returnObj[key] = { value: obj[key], size };
+    }
+    return returnObj;
+  }
   function makeAccessorObjects(points, lines, polygons, coordLength) {
-    const returnObj = {
+    return {
       points: {
         ...points,
         positions: { value: points.positions, size: coordLength },
         globalFeatureIds: { value: points.globalFeatureIds, size: 1 },
-        featureIds: { value: points.featureIds, size: 1 }
+        featureIds: { value: points.featureIds, size: 1 },
+        numericProps: wrapProps(points.numericProps, 1)
       },
       lines: {
         ...lines,
-        pathIndices: { value: lines.pathIndices, size: 1 },
         positions: { value: lines.positions, size: coordLength },
+        pathIndices: { value: lines.pathIndices, size: 1 },
         globalFeatureIds: { value: lines.globalFeatureIds, size: 1 },
-        featureIds: { value: lines.featureIds, size: 1 }
+        featureIds: { value: lines.featureIds, size: 1 },
+        numericProps: wrapProps(lines.numericProps, 1)
       },
       polygons: {
         ...polygons,
+        positions: { value: polygons.positions, size: coordLength },
         polygonIndices: { value: polygons.polygonIndices, size: 1 },
         primitivePolygonIndices: { value: polygons.primitivePolygonIndices, size: 1 },
-        positions: { value: polygons.positions, size: coordLength },
         triangles: { value: new Uint32Array(polygons.triangles), size: 1 },
         globalFeatureIds: { value: polygons.globalFeatureIds, size: 1 },
-        featureIds: { value: polygons.featureIds, size: 1 }
+        featureIds: { value: polygons.featureIds, size: 1 },
+        numericProps: wrapProps(polygons.numericProps, 1)
       }
     };
-    for (const geomType in returnObj) {
-      for (const numericProp in returnObj[geomType].numericProps) {
-        returnObj[geomType].numericProps[numericProp] = {
-          value: returnObj[geomType].numericProps[numericProp],
-          size: 1
-        };
-      }
-    }
-    return returnObj;
   }
   function fillNumericProperties(object, properties, index, length2) {
     for (const numericPropName in object.numericProps) {
       if (numericPropName in properties) {
-        object.numericProps[numericPropName].fill(properties[numericPropName], index, index + length2);
+        const value = properties[numericPropName];
+        object.numericProps[numericPropName].fill(value, index, index + length2);
       }
     }
   }
@@ -1382,12 +1382,19 @@
     }
     return constructor === Float64Array || Math.fround(x2) !== x2 ? Float64Array : Float32Array;
   }
-  var init_features_to_binary = __esm({
-    "src/lib/binary-vector-tile/features-to-binary.ts"() {
+  var init_flat_geojson_to_binary = __esm({
+    "../gis/src/lib/flat-geojson-to-binary.ts"() {
       init_esm();
     }
   });
 
+  // ../gis/src/index.ts
+  var init_src = __esm({
+    "../gis/src/index.ts"() {
+      init_flat_geojson_to_binary();
+    }
+  });
+
   // ../../node_modules/ieee754/index.js
   var require_ieee754 = __commonJS({
     "../../node_modules/ieee754/index.js"(exports) {
@@ -2130,7 +2137,8 @@
     const features = [];
     if (options) {
       const binary = options.gis.format === "binary";
-      const firstPassData = {
+      const geometryInfo = {
+        coordLength: 2,
         pointPositionsCount: 0,
         pointFeaturesCount: 0,
         linePositionsCount: 0,
@@ -2152,14 +2160,14 @@
             return;
           }
           for (let i2 = 0; i2 < vectorTileLayer.length; i2++) {
-            const vectorTileFeature = vectorTileLayer.feature(i2, firstPassData);
+            const vectorTileFeature = vectorTileLayer.feature(i2, geometryInfo);
             const decodedFeature = binary ? getDecodedFeatureBinary(vectorTileFeature, featureOptions) : getDecodedFeature(vectorTileFeature, featureOptions);
             features.push(decodedFeature);
           }
         });
       }
       if (binary) {
-        const data = featuresToBinary(features, firstPassData);
+        const data = flatGeojsonToBinary(features, geometryInfo);
         data.byteLength = arrayBuffer.byteLength;
         return data;
       }
@@ -2191,7 +2199,7 @@
   }
   function getDecodedFeatureBinary(feature, options) {
     const decodedFeature = feature.toBinaryCoordinates(options.coordinates === "wgs84" ? options.tileIndex : transformToLocalCoordinatesBinary);
-    if (options.layerProperty) {
+    if (options.layerProperty && decodedFeature.properties) {
       decodedFeature.properties[options.layerProperty] = options.layerName;
     }
     return decodedFeature;
@@ -2215,7 +2223,7 @@
     "src/lib/parse-mvt.ts"() {
       init_vector_tile();
       init_vector_tile2();
-      init_features_to_binary();
+      init_src();
       import_pbf = __toModule(require_pbf());
     }
   });
@@ -2262,7 +2270,7 @@
     MVTLoader: () => MVTLoader,
     MVTWorkerLoader: () => MVTWorkerLoader
   });
-  var init_src = __esm({
+  var init_src2 = __esm({
     "src/index.ts"() {
       init_mvt_loader();
     }
@@ -2271,7 +2279,7 @@
   // src/bundle.ts
   var require_bundle = __commonJS({
     "src/bundle.ts"(exports, module) {
-      var moduleExports = (init_src(), src_exports);
+      var moduleExports = (init_src2(), src_exports);
       globalThis.loaders = globalThis.loaders || {};
       module.exports = Object.assign(globalThis.loaders, moduleExports);
     }

package/dist/es5/helpers/binary-util-functions.js

@@ -11,13 +11,15 @@ exports.readTag = readTag;
 var _polygon = require("@math.gl/polygon");
 
 function classifyRings(geom) {
-  var len = geom.lines.length;
+  var len = geom.indices.length;
+  var type = 'Polygon';
 
   if (len <= 1) {
     return {
+      type: type,
       data: geom.data,
       areas: [[(0, _polygon.getPolygonSignedArea)(geom.data)]],
-      lines: [geom.lines]
+      indices: [geom.indices]
     };
   }
 
@@ -29,8 +31,8 @@ function classifyRings(geom) {
   var offset = 0;
 
   for (var endIndex, i = 0, startIndex; i < len; i++) {
-    startIndex = geom.lines[i] - offset;
-    endIndex = geom.lines[i + 1] - offset || geom.data.length;
+    startIndex = geom.indices[i] - offset;
+    endIndex = geom.indices[i + 1] - offset || geom.data.length;
     var shape = geom.data.slice(startIndex, endIndex);
     var area = (0, _polygon.getPolygonSignedArea)(shape);
 
@@ -61,8 +63,9 @@ function classifyRings(geom) {
   if (ringAreas) areas.push(ringAreas);
   if (polygon.length) polygons.push(polygon);
   return {
+    type: type,
     areas: areas,
-    lines: polygons,
+    indices: polygons,
     data: geom.data
   };
 }

package/dist/es5/helpers/binary-util-functions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/binary-util-functions.ts"],"names":["classifyRings","geom","len","lines","length","data","areas","polygons","ringAreas","polygon","ccw","offset","endIndex","i","startIndex","shape","slice","area","before","after","concat","undefined","push","project","x0","y0","size","j","jl","y2","Math","PI","atan","exp","readFeature","tag","feature","pbf","id","readVarint","readTag","type","_geometry","pos","end","key","_keys","value","_values","properties"],"mappings":";;;;;;;;;;AACA;;AAcO,SAASA,aAAT,CAAuBC,IAAvB,EAAgD;AACrD,MAAMC,GAAG,GAAGD,IAAI,CAACE,KAAL,CAAWC,MAAvB;;AAEA,MAAIF,GAAG,IAAI,CAAX,EAAc;AACZ,WAAO;AACLG,MAAAA,IAAI,EAAEJ,IAAI,CAACI,IADN;AAELC,MAAAA,KAAK,EAAE,CAAC,CAAC,mCAAqBL,IAAI,CAACI,IAA1B,CAAD,CAAD,CAFF;AAGLF,MAAAA,KAAK,EAAE,CAACF,IAAI,CAACE,KAAN;AAHF,KAAP;AAKD;;AAED,MAAMG,KAAY,GAAG,EAArB;AACA,MAAMC,QAAe,GAAG,EAAxB;AACA,MAAIC,SAAmB,GAAG,EAA1B;AACA,MAAIC,OAAiB,GAAG,EAAxB;AACA,MAAIC,GAAJ;AACA,MAAIC,MAAM,GAAG,CAAb;;AAEA,OAAK,IAAIC,QAAJ,EAAsBC,CAAC,GAAG,CAA1B,EAA6BC,UAAlC,EAAsDD,CAAC,GAAGX,GAA1D,EAA+DW,CAAC,EAAhE,EAAoE;AAClEC,IAAAA,UAAU,GAAGb,IAAI,CAACE,KAAL,CAAWU,CAAX,IAAgBF,MAA7B;AAEAC,IAAAA,QAAQ,GAAGX,IAAI,CAACE,KAAL,CAAWU,CAAC,GAAG,CAAf,IAAoBF,MAApB,IAA8BV,IAAI,CAACI,IAAL,CAAUD,MAAnD;AACA,QAAMW,KAAK,GAAGd,IAAI,CAACI,IAAL,CAAUW,KAAV,CAAgBF,UAAhB,EAA4BF,QAA5B,CAAd;AACA,QAAMK,IAAI,GAAG,mCAAqBF,KAArB,CAAb;;AAEA,QAAIE,IAAI,KAAK,CAAb,EAAgB;AAGd,UAAMC,MAAM,GAAGjB,IAAI,CAACI,IAAL,CAAUW,KAAV,CAAgB,CAAhB,EAAmBF,UAAnB,CAAf;AACA,UAAMK,KAAK,GAAGlB,IAAI,CAACI,IAAL,CAAUW,KAAV,CAAgBJ,QAAhB,CAAd;AACAX,MAAAA,IAAI,CAACI,IAAL,GAAYa,MAAM,CAACE,MAAP,CAAcD,KAAd,CAAZ;AAIAR,MAAAA,MAAM,IAAIC,QAAQ,GAAGE,UAArB;AAGA;AACD;;AAED,QAAIJ,GAAG,KAAKW,SAAZ,EAAuBX,GAAG,GAAGO,IAAI,GAAG,CAAb;;AAEvB,QAAIP,GAAG,KAAKO,IAAI,GAAG,CAAnB,EAAsB;AACpB,UAAIR,OAAO,CAACL,MAAZ,EAAoB;AAClBE,QAAAA,KAAK,CAACgB,IAAN,CAAWd,SAAX;AACAD,QAAAA,QAAQ,CAACe,IAAT,CAAcb,OAAd;AACD;;AACDA,MAAAA,OAAO,GAAG,CAACK,UAAD,CAAV;AACAN,MAAAA,SAAS,GAAG,CAACS,IAAD,CAAZ;AACD,KAPD,MAOO;AACLT,MAAAA,SAAS,CAACc,IAAV,CAAeL,IAAf;AACAR,MAAAA,OAAO,CAACa,IAAR,CAAaR,UAAb;AACD;AACF;;AACD,MAAIN,SAAJ,EAAeF,KAAK,CAACgB,IAAN,CAAWd,SAAX;AACf,MAAIC,OAAO,CAACL,MAAZ,EAAoBG,QAAQ,CAACe,IAAT,CAAcb,OAAd;AAEpB,SAAO;AAACH,IAAAA,KAAK,EAALA,KAAD;AAAQH,IAAAA,KAAK,EAAEI,QAAf;AAAyBF,IAAAA,IAAI,EAAEJ,IAAI,CAACI;AAApC,GAAP;AACD;;AASM,SAASkB,OAAT,CAAiBlB,IAAjB,EAAiCmB,EAAjC,EAA6CC,EAA7C,EAAyDC,IAAzD,EAA6E;AAClF,OAAK,IAAIC,CAAC,GAAG,CAAR,EAAWC,EAAE,GAAGvB,IAAI,CAACD,MAA1B,EAAkCuB,CAAC,GAAGC,EAAtC,EAA0CD,CAAC,IAAI,CAA/C,EAAkD;AAChDtB,IAAAA,IAAI,CAACsB,CAAD,CAAJ,GAAW,CAACtB,IAAI,CAACsB,CAAD,CAAJ,GAAUH,EAAX,IAAiB,GAAlB,GAAyBE,IAAzB,GAAgC,GAA1C;AACA,QAAMG,EAAE,GAAG,MAAO,CAACxB,IAAI,CAACsB,CAAC,GAAG,CAAL,CAAJ,GAAcF,EAAf,IAAqB,GAAtB,GAA6BC,IAA9C;AACArB,IAAAA,IAAI,CAACsB,CAAC,GAAG,CAAL,CAAJ,GAAe,MAAMG,IAAI,CAACC,EAAZ,GAAkBD,IAAI,CAACE,IAAL,CAAUF,IAAI,CAACG,GAAL,CAAUJ,EAAE,GAAGC,IAAI,CAACC,EAAX,GAAiB,GAA1B,CAAV,CAAlB,GAA8D,EAA5E;AACD;AACF;;AASM,SAASG,WAAT,CAAqBC,GAArB,EAAkCC,OAAlC,EAA+DC,GAA/D,EAAqF;AAC1F,MAAID,OAAO,IAAIC,GAAf,EAAoB;AAClB,QAAIF,GAAG,KAAK,CAAZ,EAAeC,OAAO,CAACE,EAAR,GAAaD,GAAG,CAACE,UAAJ,EAAb,CAAf,KACK,IAAIJ,GAAG,KAAK,CAAZ,EAAeK,OAAO,CAACH,GAAD,EAAMD,OAAN,CAAP,CAAf,KACA,IAAID,GAAG,KAAK,CAAZ,EAAeC,OAAO,CAACK,IAAR,GAAeJ,GAAG,CAACE,UAAJ,EAAf,CAAf,KACA,IAAIJ,GAAG,KAAK,CAAZ,EAAeC,OAAO,CAACM,SAAR,GAAoBL,GAAG,CAACM,GAAxB;AACrB;AACF;;AAMM,SAASH,OAAT,CAAiBH,GAAjB,EAAgCD,OAAhC,EAAkE;AACvE,MAAMQ,GAAG,GAAGP,GAAG,CAACE,UAAJ,KAAmBF,GAAG,CAACM,GAAnC;;AAEA,SAAON,GAAG,CAACM,GAAJ,GAAUC,GAAjB,EAAsB;AACpB,QAAMC,GAAG,GAAGT,OAAO,CAACU,KAAR,CAAcT,GAAG,CAACE,UAAJ,EAAd,CAAZ;;AACA,QAAMQ,KAAK,GAAGX,OAAO,CAACY,OAAR,CAAgBX,GAAG,CAACE,UAAJ,EAAhB,CAAd;;AACAH,IAAAA,OAAO,CAACa,UAAR,CAAmBJ,GAAnB,IAA0BE,KAA1B;AACD;AACF","sourcesContent":["import Protobuf from 'pbf';\nimport {getPolygonSignedArea} from '@math.gl/polygon';\nimport {MvtBinaryGeometry} from '../lib/types';\nimport VectorTileFeature from '../lib/binary-vector-tile/vector-tile-feature';\n\n/**\n * Classifies an array of rings into polygons with outer rings and holes\n * The function also detects holes which have zero area and\n * removes them. In doing so it modifies the input\n * `geom.data` array to remove the unneeded data\n *\n * @param geometry\n * @returns object\n */\n// eslint-disable-next-line max-statements\nexport function classifyRings(geom: MvtBinaryGeometry) {\n  const len = geom.lines.length;\n\n  if (len <= 1) {\n    return {\n      data: geom.data,\n      areas: [[getPolygonSignedArea(geom.data)]],\n      lines: [geom.lines]\n    };\n  }\n\n  const areas: any[] = [];\n  const polygons: any[] = [];\n  let ringAreas: number[] = [];\n  let polygon: number[] = [];\n  let ccw: boolean | undefined;\n  let offset = 0;\n\n  for (let endIndex: number, i = 0, startIndex: number; i < len; i++) {\n    startIndex = geom.lines[i] - offset;\n\n    endIndex = geom.lines[i + 1] - offset || geom.data.length;\n    const shape = geom.data.slice(startIndex, endIndex);\n    const area = getPolygonSignedArea(shape);\n\n    if (area === 0) {\n      // This polygon has no area, so remove it from the shape\n      // Remove the section from the data array\n      const before = geom.data.slice(0, startIndex);\n      const after = geom.data.slice(endIndex);\n      geom.data = before.concat(after);\n\n      // Need to offset any remaining indices as we have\n      // modified the data buffer\n      offset += endIndex - startIndex;\n\n      // Do not add this index to the output and process next shape\n      continue; // eslint-disable-line no-continue\n    }\n\n    if (ccw === undefined) ccw = area < 0;\n\n    if (ccw === area < 0) {\n      if (polygon.length) {\n        areas.push(ringAreas);\n        polygons.push(polygon);\n      }\n      polygon = [startIndex];\n      ringAreas = [area];\n    } else {\n      ringAreas.push(area);\n      polygon.push(startIndex);\n    }\n  }\n  if (ringAreas) areas.push(ringAreas);\n  if (polygon.length) polygons.push(polygon);\n\n  return {areas, lines: polygons, data: geom.data};\n}\n\n/**\n *\n * @param data\n * @param x0\n * @param y0\n * @param size\n */\nexport function project(data: number[], x0: number, y0: number, size: number): void {\n  for (let j = 0, jl = data.length; j < jl; j += 2) {\n    data[j] = ((data[j] + x0) * 360) / size - 180;\n    const y2 = 180 - ((data[j + 1] + y0) * 360) / size;\n    data[j + 1] = (360 / Math.PI) * Math.atan(Math.exp((y2 * Math.PI) / 180)) - 90;\n  }\n}\n\n/**\n * All code below is unchanged from the original Mapbox implemenation\n *\n * @param tag\n * @param feature\n * @param pbf\n */\nexport function readFeature(tag: number, feature?: VectorTileFeature, pbf?: Protobuf): void {\n  if (feature && pbf) {\n    if (tag === 1) feature.id = pbf.readVarint();\n    else if (tag === 2) readTag(pbf, feature);\n    else if (tag === 3) feature.type = pbf.readVarint();\n    else if (tag === 4) feature._geometry = pbf.pos;\n  }\n}\n\n/**\n * @param pbf\n * @param feature\n */\nexport function readTag(pbf: Protobuf, feature: VectorTileFeature): void {\n  const end = pbf.readVarint() + pbf.pos;\n\n  while (pbf.pos < end) {\n    const key = feature._keys[pbf.readVarint()];\n    const value = feature._values[pbf.readVarint()];\n    feature.properties[key] = value;\n  }\n}\n"],"file":"binary-util-functions.js"}
+{"version":3,"sources":["../../../src/helpers/binary-util-functions.ts"],"names":["classifyRings","geom","len","indices","length","type","data","areas","polygons","ringAreas","polygon","ccw","offset","endIndex","i","startIndex","shape","slice","area","before","after","concat","undefined","push","project","x0","y0","size","j","jl","y2","Math","PI","atan","exp","readFeature","tag","feature","pbf","id","readVarint","readTag","_geometry","pos","end","key","_keys","value","_values","properties"],"mappings":"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","sourcesContent":["import Protobuf from 'pbf';\nimport {getPolygonSignedArea} from '@math.gl/polygon';\nimport {FlatIndexedGeometry, FlatPolygon} from '@loaders.gl/schema';\nimport VectorTileFeature from '../lib/binary-vector-tile/vector-tile-feature';\n\n/**\n * Classifies an array of rings into polygons with outer rings and holes\n * The function also detects holes which have zero area and\n * removes them. In doing so it modifies the input\n * `geom.data` array to remove the unneeded data\n *\n * @param geometry\n * @returns object\n */\n// eslint-disable-next-line max-statements\nexport function classifyRings(geom: FlatIndexedGeometry): FlatPolygon {\n  const len = geom.indices.length;\n  const type = 'Polygon';\n\n  if (len <= 1) {\n    return {\n      type,\n      data: geom.data,\n      areas: [[getPolygonSignedArea(geom.data)]],\n      indices: [geom.indices]\n    };\n  }\n\n  const areas: any[] = [];\n  const polygons: any[] = [];\n  let ringAreas: number[] = [];\n  let polygon: number[] = [];\n  let ccw: boolean | undefined;\n  let offset = 0;\n\n  for (let endIndex: number, i = 0, startIndex: number; i < len; i++) {\n    startIndex = geom.indices[i] - offset;\n\n    endIndex = geom.indices[i + 1] - offset || geom.data.length;\n    const shape = geom.data.slice(startIndex, endIndex);\n    const area = getPolygonSignedArea(shape);\n\n    if (area === 0) {\n      // This polygon has no area, so remove it from the shape\n      // Remove the section from the data array\n      const before = geom.data.slice(0, startIndex);\n      const after = geom.data.slice(endIndex);\n      geom.data = before.concat(after);\n\n      // Need to offset any remaining indices as we have\n      // modified the data buffer\n      offset += endIndex - startIndex;\n\n      // Do not add this index to the output and process next shape\n      continue; // eslint-disable-line no-continue\n    }\n\n    if (ccw === undefined) ccw = area < 0;\n\n    if (ccw === area < 0) {\n      if (polygon.length) {\n        areas.push(ringAreas);\n        polygons.push(polygon);\n      }\n      polygon = [startIndex];\n      ringAreas = [area];\n    } else {\n      ringAreas.push(area);\n      polygon.push(startIndex);\n    }\n  }\n  if (ringAreas) areas.push(ringAreas);\n  if (polygon.length) polygons.push(polygon);\n\n  return {type, areas, indices: polygons, data: geom.data};\n}\n\n/**\n *\n * @param data\n * @param x0\n * @param y0\n * @param size\n */\nexport function project(data: number[], x0: number, y0: number, size: number): void {\n  for (let j = 0, jl = data.length; j < jl; j += 2) {\n    data[j] = ((data[j] + x0) * 360) / size - 180;\n    const y2 = 180 - ((data[j + 1] + y0) * 360) / size;\n    data[j + 1] = (360 / Math.PI) * Math.atan(Math.exp((y2 * Math.PI) / 180)) - 90;\n  }\n}\n\n/**\n * All code below is unchanged from the original Mapbox implemenation\n *\n * @param tag\n * @param feature\n * @param pbf\n */\nexport function readFeature(tag: number, feature?: VectorTileFeature, pbf?: Protobuf): void {\n  if (feature && pbf) {\n    if (tag === 1) feature.id = pbf.readVarint();\n    else if (tag === 2) readTag(pbf, feature);\n    else if (tag === 3) feature.type = pbf.readVarint();\n    else if (tag === 4) feature._geometry = pbf.pos;\n  }\n}\n\n/**\n * @param pbf\n * @param feature\n */\nexport function readTag(pbf: Protobuf, feature: VectorTileFeature): void {\n  const end = pbf.readVarint() + pbf.pos;\n\n  while (pbf.pos < end) {\n    const key = feature._keys[pbf.readVarint()];\n    const value = feature._values[pbf.readVarint()];\n    feature.properties[key] = value;\n  }\n}\n"],"file":"binary-util-functions.js"}