@deck.gl/carto 8.10.0-alpha.6 → 9.0.0-alpha.3

package/dist/cartoVectorTile-worker.js

@@ -52,9 +52,9 @@
               maxY = y;
           }
           invSize = Math.max(maxX - minX, maxY - minY);
-          invSize = invSize !== 0 ? 1 / invSize : 0;
+          invSize = invSize !== 0 ? 32767 / invSize : 0;
         }
-        earcutLinked(outerNode, triangles, dim, minX, minY, invSize);
+        earcutLinked(outerNode, triangles, dim, minX, minY, invSize, 0);
         return triangles;
       }
       function linkedList(data, start, end, dim, clockwise) {
@@ -102,9 +102,9 @@
           prev = ear.prev;
           next = ear.next;
           if (invSize ? isEarHashed(ear, minX, minY, invSize) : isEar(ear)) {
-            triangles.push(prev.i / dim);
-            triangles.push(ear.i / dim);
-            triangles.push(next.i / dim);
+            triangles.push(prev.i / dim | 0);
+            triangles.push(ear.i / dim | 0);
+            triangles.push(next.i / dim | 0);
             removeNode(ear);
             ear = next.next;
             stop = next.next;
@@ -128,9 +128,11 @@
         var a = ear.prev, b = ear, c = ear.next;
         if (area(a, b, c) >= 0)
           return false;
-        var p = ear.next.next;
-        while (p !== ear.prev) {
-          if (pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+        var ax = a.x, bx = b.x, cx = c.x, ay = a.y, by = b.y, cy = c.y;
+        var x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx, y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy, x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx, y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy;
+        var p = c.next;
+        while (p !== a) {
+          if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
             return false;
           p = p.next;
         }
@@ -140,24 +142,25 @@
         var a = ear.prev, b = ear, c = ear.next;
         if (area(a, b, c) >= 0)
           return false;
-        var minTX = a.x < b.x ? a.x < c.x ? a.x : c.x : b.x < c.x ? b.x : c.x, minTY = a.y < b.y ? a.y < c.y ? a.y : c.y : b.y < c.y ? b.y : c.y, maxTX = a.x > b.x ? a.x > c.x ? a.x : c.x : b.x > c.x ? b.x : c.x, maxTY = a.y > b.y ? a.y > c.y ? a.y : c.y : b.y > c.y ? b.y : c.y;
-        var minZ = zOrder(minTX, minTY, minX, minY, invSize), maxZ = zOrder(maxTX, maxTY, minX, minY, invSize);
+        var ax = a.x, bx = b.x, cx = c.x, ay = a.y, by = b.y, cy = c.y;
+        var x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx, y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy, x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx, y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy;
+        var minZ = zOrder(x0, y0, minX, minY, invSize), maxZ = zOrder(x1, y1, minX, minY, invSize);
         var p = ear.prevZ, n = ear.nextZ;
         while (p && p.z >= minZ && n && n.z <= maxZ) {
-          if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+          if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
             return false;
           p = p.prevZ;
-          if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0)
+          if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0)
             return false;
           n = n.nextZ;
         }
         while (p && p.z >= minZ) {
-          if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+          if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
             return false;
           p = p.prevZ;
         }
         while (n && n.z <= maxZ) {
-          if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0)
+          if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0)
             return false;
           n = n.nextZ;
         }
@@ -168,9 +171,9 @@
         do {
           var a = p.prev, b = p.next.next;
           if (!equals(a, b) && intersects(a, p, p.next, b) && locallyInside(a, b) && locallyInside(b, a)) {
-            triangles.push(a.i / dim);
-            triangles.push(p.i / dim);
-            triangles.push(b.i / dim);
+            triangles.push(a.i / dim | 0);
+            triangles.push(p.i / dim | 0);
+            triangles.push(b.i / dim | 0);
             removeNode(p);
             removeNode(p.next);
             p = start = b;
@@ -188,8 +191,8 @@
               var c = splitPolygon(a, b);
               a = filterPoints(a, a.next);
               c = filterPoints(c, c.next);
-              earcutLinked(a, triangles, dim, minX, minY, invSize);
-              earcutLinked(c, triangles, dim, minX, minY, invSize);
+              earcutLinked(a, triangles, dim, minX, minY, invSize, 0);
+              earcutLinked(c, triangles, dim, minX, minY, invSize, 0);
               return;
             }
             b = b.next;
@@ -209,8 +212,7 @@
         }
         queue.sort(compareX);
         for (i = 0; i < queue.length; i++) {
-          eliminateHole(queue[i], outerNode);
-          outerNode = filterPoints(outerNode, outerNode.next);
+          outerNode = eliminateHole(queue[i], outerNode);
         }
         return outerNode;
       }
@@ -218,11 +220,13 @@
         return a.x - b.x;
       }
       function eliminateHole(hole, outerNode) {
-        outerNode = findHoleBridge(hole, outerNode);
-        if (outerNode) {
-          var b = splitPolygon(outerNode, hole);
-          filterPoints(b, b.next);
+        var bridge = findHoleBridge(hole, outerNode);
+        if (!bridge) {
+          return outerNode;
         }
+        var bridgeReverse = splitPolygon(bridge, hole);
+        filterPoints(bridgeReverse, bridgeReverse.next);
+        return filterPoints(bridge, bridge.next);
       }
       function findHoleBridge(hole, outerNode) {
         var p = outerNode, hx = hole.x, hy = hole.y, qx = -Infinity, m;
@@ -231,21 +235,15 @@
             var x = p.x + (hy - p.y) * (p.next.x - p.x) / (p.next.y - p.y);
             if (x <= hx && x > qx) {
               qx = x;
-              if (x === hx) {
-                if (hy === p.y)
-                  return p;
-                if (hy === p.next.y)
-                  return p.next;
-              }
               m = p.x < p.next.x ? p : p.next;
+              if (x === hx)
+                return m;
             }
           }
           p = p.next;
         } while (p !== outerNode);
         if (!m)
           return null;
-        if (hx === qx)
-          return m;
         var stop = m, mx = m.x, my = m.y, tanMin = Infinity, tan;
         p = m;
         do {
@@ -266,7 +264,7 @@
       function indexCurve(start, minX, minY, invSize) {
         var p = start;
         do {
-          if (p.z === null)
+          if (p.z === 0)
             p.z = zOrder(p.x, p.y, minX, minY, invSize);
           p.prevZ = p.prev;
           p.nextZ = p.next;
@@ -319,8 +317,8 @@
         return list;
       }
       function zOrder(x, y, minX, minY, invSize) {
-        x = 32767 * (x - minX) * invSize;
-        y = 32767 * (y - minY) * invSize;
+        x = (x - minX) * invSize | 0;
+        y = (y - minY) * invSize | 0;
         x = (x | x << 8) & 16711935;
         x = (x | x << 4) & 252645135;
         x = (x | x << 2) & 858993459;
@@ -341,7 +339,7 @@
         return leftmost;
       }
       function pointInTriangle(ax, ay, bx, by, cx, cy, px, py) {
-        return (cx - px) * (ay - py) - (ax - px) * (cy - py) >= 0 && (ax - px) * (by - py) - (bx - px) * (ay - py) >= 0 && (bx - px) * (cy - py) - (cx - px) * (by - py) >= 0;
+        return (cx - px) * (ay - py) >= (ax - px) * (cy - py) && (ax - px) * (by - py) >= (bx - px) * (ay - py) && (bx - px) * (cy - py) >= (cx - px) * (by - py);
       }
       function isValidDiagonal(a, b) {
         return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (area(a.prev, a, b.prev) || area(a, b.prev, b)) || equals(a, b) && area(a.prev, a, a.next) > 0 && area(b.prev, b, b.next) > 0);
@@ -435,7 +433,7 @@
         this.y = y;
         this.prev = null;
         this.next = null;
-        this.z = null;
+        this.z = 0;
         this.prevZ = null;
         this.nextZ = null;
         this.steiner = false;
@@ -1223,7 +1221,7 @@
     }
   });
 
-  // ../../node_modules/@loaders.gl/worker-utils/dist/esm/lib/worker-utils/get-transfer-list.js
+  // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
   function getTransferList(object) {
     let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
     let transfers = arguments.length > 2 ? arguments[2] : void 0;
@@ -1260,46 +1258,54 @@
     return false;
   }
 
-  // ../../node_modules/@loaders.gl/worker-utils/dist/esm/lib/worker-farm/worker-body.js
-  function getParentPort() {
+  // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-farm/worker-body.js
+  async function getParentPort() {
     let parentPort;
     try {
       eval("globalThis.parentPort = require('worker_threads').parentPort");
       parentPort = globalThis.parentPort;
     } catch {
+      try {
+        eval("globalThis.workerThreadsPromise = import('worker_threads')");
+        const workerThreads = await globalThis.workerThreadsPromise;
+        parentPort = workerThreads.parentPort;
+      } catch (error) {
+        console.error(error.message);
+      }
     }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
-    static inWorkerThread() {
-      return typeof self !== "undefined" || Boolean(getParentPort());
+    static async inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(await getParentPort());
     }
     static set onmessage(onMessage) {
-      function handleMessage(message) {
-        const parentPort3 = getParentPort();
+      async function handleMessage(message) {
+        const parentPort2 = await getParentPort();
         const {
           type,
           payload
-        } = parentPort3 ? message : message.data;
+        } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
-      const parentPort2 = getParentPort();
-      if (parentPort2) {
-        parentPort2.on("message", handleMessage);
-        parentPort2.on("exit", () => console.debug("Node worker closing"));
-      } else {
-        globalThis.onmessage = handleMessage;
-      }
+      getParentPort().then((parentPort2) => {
+        if (parentPort2) {
+          parentPort2.on("message", handleMessage);
+          parentPort2.on("exit", () => console.debug("Node worker closing"));
+        } else {
+          globalThis.onmessage = handleMessage;
+        }
+      });
     }
-    static addEventListener(onMessage) {
+    static async addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
       if (!onMessageWrapper) {
-        onMessageWrapper = (message) => {
+        onMessageWrapper = async (message) => {
           if (!isKnownMessage(message)) {
             return;
           }
-          const parentPort3 = getParentPort();
+          const parentPort3 = await getParentPort();
           const {
             type,
             payload
@@ -1307,31 +1313,31 @@
           onMessage(type, payload);
         };
       }
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.addEventListener("message", onMessageWrapper);
       }
     }
-    static removeEventListener(onMessage) {
+    static async removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.removeEventListener("message", onMessageWrapper);
       }
     }
-    static postMessage(type, payload) {
+    static async postMessage(type, payload) {
       const data = {
         source: "loaders.gl",
         type,
         payload
       };
       const transferList = getTransferList(payload);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         parentPort2.postMessage(data, transferList);
       } else {
@@ -1347,10 +1353,10 @@
     return type === "message" && data && typeof data.source === "string" && data.source.startsWith("loaders.gl");
   }
 
-  // ../../node_modules/@loaders.gl/loader-utils/dist/esm/lib/worker-loader-utils/create-loader-worker.js
+  // ../../node_modules/@loaders.gl/loader-utils/dist/lib/worker-loader-utils/create-loader-worker.js
   var requestId = 0;
-  function createLoaderWorker(loader) {
-    if (!WorkerBody.inWorkerThread()) {
+  async function createLoaderWorker(loader) {
+    if (!await WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
@@ -1368,7 +1374,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", {
@@ -1385,7 +1391,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id2 = requestId++;
       const onMessage = (type, payload2) => {
@@ -1430,7 +1436,7 @@
       data = textDecoder.decode(arrayBuffer);
       parser = loader.parseTextSync;
     } else {
-      throw new Error("Could not load data with ".concat(loader.name, " loader"));
+      throw new Error(`Could not load data with ${loader.name} loader`);
     }
     options = {
       ...options,
@@ -1662,7 +1668,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "8.10.0-alpha.6" : "latest";
+  var VERSION = true ? "9.0.0-alpha.3" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {
@@ -1698,7 +1704,7 @@
     }
   }
   function triangulate(polygons) {
-    const { polygonIndices, positions, primitivePolygonIndices } = polygons;
+    const { polygonIndices, primitivePolygonIndices } = polygons;
     const triangles = [];
     let rangeStart = 0;
     for (let i = 0; i < polygonIndices.value.length - 1; i++) {