geojs 1.14.1 → 1.14.2

package/geo.js

@@ -26745,6 +26745,11 @@ var _quadFeature = function quadFeature(arg) {
             coordbasis.y = 1 - coordbasis.y;
           }
           if (coordbasis) {
+            if (quad.crop && quad.crop.x !== undefined && quad.crop.y !== undefined && (coordbasis.x >= quad.crop.x || coordbasis.y >= quad.crop.y)) {
+              indices.pop();
+              found.pop();
+              return;
+            }
             extra[quad.idx] = {
               basis: coordbasis,
               _quad: quad
@@ -28164,7 +28169,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "81c2c67b6f61c4292a790edab5e583c82095b099";
+module.exports = "8e2a6bf94ba85a370a33f2144165d89dd6061439";
 
 /***/ }),
 
@@ -32855,6 +32860,8 @@ var _trackFeature = function trackFeature(arg) {
           highidx = testidx;
         }
       }
+      // todo: if we want non-linear travel between points, we would adjust
+      // fl and fh here
       var fh = (time - lowt) / (hight - lowt),
         fl = 1 - fh;
       return {
@@ -40049,7 +40056,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.1";
+module.exports = "1.14.2";
 
 /***/ }),
 
@@ -76675,14 +76682,14 @@ function isEar(ear) {
     by = b.y,
     cy = c.y;
 
-  // triangle bbox; min & max are calculated like this for speed
-  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;
+  // triangle bbox
+  var x0 = Math.min(ax, bx, cx),
+    y0 = Math.min(ay, by, cy),
+    x1 = Math.max(ax, bx, cx),
+    y1 = Math.max(ay, 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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.next;
   }
   return true;
@@ -76700,11 +76707,11 @@ function isEarHashed(ear, minX, minY, invSize) {
     by = b.y,
     cy = c.y;
 
-  // triangle bbox; min & max are calculated like this for speed
-  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;
+  // triangle bbox
+  var x0 = Math.min(ax, bx, cx),
+    y0 = Math.min(ay, by, cy),
+    x1 = Math.max(ax, bx, cx),
+    y1 = Math.max(ay, by, cy);
 
   // z-order range for the current triangle bbox;
   var minZ = zOrder(x0, y0, minX, minY, invSize),
@@ -76714,21 +76721,21 @@ function isEarHashed(ear, minX, minY, invSize) {
 
   // look for points inside the triangle in both directions
   while (p && p.z >= minZ && n && n.z <= maxZ) {
-    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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.prevZ;
-    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;
+    if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
     n = n.nextZ;
   }
 
   // look for remaining points in decreasing z-order
   while (p && p.z >= minZ) {
-    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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.prevZ;
   }
 
   // look for remaining points in increasing z-order
   while (n && n.z <= maxZ) {
-    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;
+    if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
     n = n.nextZ;
   }
   return true;
@@ -76789,7 +76796,7 @@ function eliminateHoles(data, holeIndices, outerNode, dim) {
     if (list === list.next) list.steiner = true;
     queue.push(getLeftmost(list));
   }
-  queue.sort(compareX);
+  queue.sort(compareXYSlope);
 
   // process holes from left to right
   for (var _i2 = 0; _i2 < queue.length; _i2++) {
@@ -76797,8 +76804,19 @@ function eliminateHoles(data, holeIndices, outerNode, dim) {
   }
   return outerNode;
 }
-function compareX(a, b) {
-  return a.x - b.x;
+function compareXYSlope(a, b) {
+  var result = a.x - b.x;
+  // when the left-most point of 2 holes meet at a vertex, sort the holes counterclockwise so that when we find
+  // the bridge to the outer shell is always the point that they meet at.
+  if (result === 0) {
+    result = a.y - b.y;
+    if (result === 0) {
+      var aSlope = (a.next.y - a.y) / (a.next.x - a.x);
+      var bSlope = (b.next.y - b.y) / (b.next.x - b.x);
+      result = aSlope - bSlope;
+    }
+  }
+  return result;
 }
 
 // find a bridge between vertices that connects hole with an outer ring and and link it
@@ -76824,8 +76842,10 @@ function findHoleBridge(hole, outerNode) {
 
   // find a segment intersected by a ray from the hole's leftmost point to the left;
   // segment's endpoint with lesser x will be potential connection point
+  // unless they intersect at a vertex, then choose the vertex
+  if (equals(hole, p)) return p;
   do {
-    if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
+    if (equals(hole, p.next)) return p.next;else if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
       var x = p.x + (hy - p.y) * (p.next.x - p.x) / (p.next.y - p.y);
       if (x <= hx && x > qx) {
         qx = x;
@@ -76954,6 +76974,11 @@ function pointInTriangle(ax, ay, bx, by, cx, cy, px, py) {
   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);
 }
 
+// check if a point lies within a convex triangle but false if its equal to the first point of the triangle
+function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
+  return !(ax === px && ay === py) && pointInTriangle(ax, ay, bx, by, cx, cy, px, py);
+}
+
 // check if a diagonal between two polygon nodes is valid (lies in polygon interior)
 function isValidDiagonal(a, b) {
   return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (

package/geo.lean.js

@@ -23744,6 +23744,11 @@ var _quadFeature = function quadFeature(arg) {
             coordbasis.y = 1 - coordbasis.y;
           }
           if (coordbasis) {
+            if (quad.crop && quad.crop.x !== undefined && quad.crop.y !== undefined && (coordbasis.x >= quad.crop.x || coordbasis.y >= quad.crop.y)) {
+              indices.pop();
+              found.pop();
+              return;
+            }
             extra[quad.idx] = {
               basis: coordbasis,
               _quad: quad
@@ -25163,7 +25168,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "81c2c67b6f61c4292a790edab5e583c82095b099";
+module.exports = "8e2a6bf94ba85a370a33f2144165d89dd6061439";
 
 /***/ }),
 
@@ -29854,6 +29859,8 @@ var _trackFeature = function trackFeature(arg) {
           highidx = testidx;
         }
       }
+      // todo: if we want non-linear travel between points, we would adjust
+      // fl and fh here
       var fh = (time - lowt) / (hight - lowt),
         fl = 1 - fh;
       return {
@@ -37048,7 +37055,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.1";
+module.exports = "1.14.2";
 
 /***/ }),
 
@@ -73694,14 +73701,14 @@ function isEar(ear) {
     by = b.y,
     cy = c.y;
 
-  // triangle bbox; min & max are calculated like this for speed
-  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;
+  // triangle bbox
+  var x0 = Math.min(ax, bx, cx),
+    y0 = Math.min(ay, by, cy),
+    x1 = Math.max(ax, bx, cx),
+    y1 = Math.max(ay, 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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.next;
   }
   return true;
@@ -73719,11 +73726,11 @@ function isEarHashed(ear, minX, minY, invSize) {
     by = b.y,
     cy = c.y;
 
-  // triangle bbox; min & max are calculated like this for speed
-  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;
+  // triangle bbox
+  var x0 = Math.min(ax, bx, cx),
+    y0 = Math.min(ay, by, cy),
+    x1 = Math.max(ax, bx, cx),
+    y1 = Math.max(ay, by, cy);
 
   // z-order range for the current triangle bbox;
   var minZ = zOrder(x0, y0, minX, minY, invSize),
@@ -73733,21 +73740,21 @@ function isEarHashed(ear, minX, minY, invSize) {
 
   // look for points inside the triangle in both directions
   while (p && p.z >= minZ && n && n.z <= maxZ) {
-    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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.prevZ;
-    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;
+    if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
     n = n.nextZ;
   }
 
   // look for remaining points in decreasing z-order
   while (p && p.z >= minZ) {
-    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;
+    if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
     p = p.prevZ;
   }
 
   // look for remaining points in increasing z-order
   while (n && n.z <= maxZ) {
-    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;
+    if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
     n = n.nextZ;
   }
   return true;
@@ -73808,7 +73815,7 @@ function eliminateHoles(data, holeIndices, outerNode, dim) {
     if (list === list.next) list.steiner = true;
     queue.push(getLeftmost(list));
   }
-  queue.sort(compareX);
+  queue.sort(compareXYSlope);
 
   // process holes from left to right
   for (var _i2 = 0; _i2 < queue.length; _i2++) {
@@ -73816,8 +73823,19 @@ function eliminateHoles(data, holeIndices, outerNode, dim) {
   }
   return outerNode;
 }
-function compareX(a, b) {
-  return a.x - b.x;
+function compareXYSlope(a, b) {
+  var result = a.x - b.x;
+  // when the left-most point of 2 holes meet at a vertex, sort the holes counterclockwise so that when we find
+  // the bridge to the outer shell is always the point that they meet at.
+  if (result === 0) {
+    result = a.y - b.y;
+    if (result === 0) {
+      var aSlope = (a.next.y - a.y) / (a.next.x - a.x);
+      var bSlope = (b.next.y - b.y) / (b.next.x - b.x);
+      result = aSlope - bSlope;
+    }
+  }
+  return result;
 }
 
 // find a bridge between vertices that connects hole with an outer ring and and link it
@@ -73843,8 +73861,10 @@ function findHoleBridge(hole, outerNode) {
 
   // find a segment intersected by a ray from the hole's leftmost point to the left;
   // segment's endpoint with lesser x will be potential connection point
+  // unless they intersect at a vertex, then choose the vertex
+  if (equals(hole, p)) return p;
   do {
-    if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
+    if (equals(hole, p.next)) return p.next;else if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
       var x = p.x + (hy - p.y) * (p.next.x - p.x) / (p.next.y - p.y);
       if (x <= hx && x > qx) {
         qx = x;
@@ -73973,6 +73993,11 @@ function pointInTriangle(ax, ay, bx, by, cx, cy, px, py) {
   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);
 }
 
+// check if a point lies within a convex triangle but false if its equal to the first point of the triangle
+function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
+  return !(ax === px && ay === py) && pointInTriangle(ax, ay, bx, by, cx, cy, px, py);
+}
+
 // check if a diagonal between two polygon nodes is valid (lies in polygon interior)
 function isValidDiagonal(a, b) {
   return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (