globe.gl 2.34.4 → 2.34.6

package/dist/globe.gl.js

@@ -1,4 +1,4 @@
-// Version 2.34.4 globe.gl - https://github.com/vasturiano/globe.gl
+// Version 2.34.6 globe.gl - https://github.com/vasturiano/globe.gl
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -17445,7 +17445,7 @@
 
   	}
 
-  	queue.sort( compareX$1 );
+  	queue.sort( compareX );
 
   	// process holes from left to right
   	for ( i = 0; i < queue.length; i ++ ) {
@@ -17458,7 +17458,7 @@
 
   }
 
-  function compareX$1( a, b ) {
+  function compareX( a, b ) {
 
   	return a.x - b.x;
 
@@ -42394,16 +42394,16 @@ void main() {
       // now make sure we don't have other points inside the potential ear
       const ax = a.x, bx = b.x, cx = c.x, ay = a.y, by = b.y, cy = c.y;
 
-      // triangle bbox; min & max are calculated like this for speed
-      const 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
+      const x0 = Math.min(ax, bx, cx),
+          y0 = Math.min(ay, by, cy),
+          x1 = Math.max(ax, bx, cx),
+          y1 = Math.max(ay, by, cy);
 
       let 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) &&
+              pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, p.x, p.y) &&
               area(p.prev, p, p.next) >= 0) return false;
           p = p.next;
       }
@@ -42420,11 +42420,11 @@ void main() {
 
       const ax = a.x, bx = b.x, cx = c.x, ay = a.y, by = b.y, cy = c.y;
 
-      // triangle bbox; min & max are calculated like this for speed
-      const 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
+      const 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;
       const minZ = zOrder(x0, y0, minX, minY, invSize),
@@ -42436,25 +42436,25 @@ void main() {
       // 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;
+              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;
+              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;
+              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;
+              pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
           n = n.nextZ;
       }
 
@@ -42522,7 +42522,7 @@ void main() {
           queue.push(getLeftmost(list));
       }
 
-      queue.sort(compareX);
+      queue.sort(compareXYSlope);
 
       // process holes from left to right
       for (let i = 0; i < queue.length; i++) {
@@ -42532,8 +42532,19 @@ void main() {
       return outerNode;
   }
 
-  function compareX(a, b) {
-      return a.x - b.x;
+  function compareXYSlope(a, b) {
+      let 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) {
+              const aSlope = (a.next.y - a.y) / (a.next.x - a.x);
+              const 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
@@ -42560,8 +42571,11 @@ void main() {
 
       // 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$1(hole, p)) return p;
       do {
-          if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
+          if (equals$1(hole, p.next)) return p.next;
+          else if (hy <= p.y && hy >= p.next.y && p.next.y !== p.y) {
               const x = p.x + (hy - p.y) * (p.next.x - p.x) / (p.next.y - p.y);
               if (x <= hx && x > qx) {
                   qx = x;
@@ -42717,6 +42731,11 @@ void main() {
              (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) && // dones't intersect other edges
@@ -48655,7 +48674,7 @@ void main() {
     }
   }
   function _createClass$2(e, r, t) {
-    return r && _defineProperties$1(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties$1(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -48798,10 +48817,7 @@ void main() {
         var dataIdsMap = new Map(data.map(function (d) {
           return [_classPrivateFieldGet2$1(_id$8, _this).call(_this, d), d];
         }));
-        _classPrivateFieldGet2$1(_dataMap, this).entries().forEach(function (_ref3) {
-          var _ref4 = _slicedToArray$4(_ref3, 2),
-            dId = _ref4[0],
-            o = _ref4[1];
+        _classPrivateFieldGet2$1(_dataMap, this).forEach(function (o, dId) {
           if (!dataIdsMap.has(dId)) {
             _classPrivateFieldGet2$1(_removeObj, _this).call(_this, o, dId);
             _classPrivateFieldGet2$1(_dataMap, _this)["delete"](dId);
@@ -50437,7 +50453,7 @@ void main() {
 
               if (v1 === 0 && v2 === 0) {
                   if ((u2 <= 0 && u1 >= 0) || (u1 <= 0 && u2 >= 0)) { return 0 }
-              } else if ((v2 >= 0 && v1 < 0) || (v2 < 0 && v1 >= 0)) {
+              } else if ((v2 >= 0 && v1 <= 0) || (v2 <= 0 && v1 >= 0)) {
                   f = orient2d(u1, u2, v1, v2, 0, 0);
                   if (f === 0) { return 0 }
                   if ((f > 0 && v2 > 0 && v1 <= 0) || (f < 0 && v2 <= 0 && v1 > 0)) { k++; }
@@ -51764,7 +51780,7 @@ void main() {
           };
     };
 
-    return data ? v(data) : v;
+    return v(data) ;
   }
 
   function _arrayLikeToArray$3(r, a) {
@@ -69993,7 +70009,6 @@ void main() {
             _this3.scene.remove(obj);
             emptyObject(obj);
             delete d[_classPrivateFieldGet2(_objBindAttr, _this3)];
-            delete d.__currentTargetD;
           };
           _classPrivateFieldGet2(_removeDelay, _this3) ? setTimeout(removeFn, _classPrivateFieldGet2(_removeDelay, _this3)) : removeFn();
         }]);
@@ -70440,9 +70455,9 @@ void main() {
         obj.geometry.setAttribute('color', vertexColorArray);
         obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
         var applyUpdate = function applyUpdate(td) {
-          var _arc$__currentTargetD = arc.__currentTargetD = td,
-            stroke = _arc$__currentTargetD.stroke,
-            curveD = _objectWithoutProperties(_arc$__currentTargetD, _excluded$1);
+          var _group$__currentTarge = group.__currentTargetD = td,
+            stroke = _group$__currentTarge.stroke,
+            curveD = _objectWithoutProperties(_group$__currentTarge, _excluded$1);
           var curve = calcCurve(curveD);
           if (useTube) {
             obj.geometry && obj.geometry.dispose();
@@ -70462,7 +70477,7 @@ void main() {
           endLat: +endLatAccessor(arc),
           endLng: +endLngAccessor(arc)
         };
-        var currentTargetD = arc.__currentTargetD || Object.assign({}, targetD, {
+        var currentTargetD = group.__currentTargetD || Object.assign({}, targetD, {
           altAutoScale: -1e-3
         });
         if (Object.keys(targetD).some(function (k) {
@@ -71832,12 +71847,12 @@ void main() {
         }
 
         // animate from start to finish by default
-        var pointsInterpolator = interpolateVectors(path.__currentTargetD && path.__currentTargetD.points || [points[0]], points);
+        var pointsInterpolator = interpolateVectors(group.__currentTargetD && group.__currentTargetD.points || [points[0]], points);
         var applyUpdate = function applyUpdate(td) {
-          var _path$__currentTarget = path.__currentTargetD = td,
-            stroke = _path$__currentTarget.stroke,
-            interpolK = _path$__currentTarget.interpolK;
-          var kPoints = path.__currentTargetD.points = pointsInterpolator(interpolK);
+          var _group$__currentTarge = group.__currentTargetD = td,
+            stroke = _group$__currentTarge.stroke,
+            interpolK = _group$__currentTarge.interpolK;
+          var kPoints = group.__currentTargetD.points = pointsInterpolator(interpolK);
           if (useFatLine) {
             var _ref4;
             obj.geometry.setPositions((_ref4 = []).concat.apply(_ref4, _toConsumableArray$1(kPoints.map(function (_ref5) {
@@ -71859,7 +71874,7 @@ void main() {
           stroke: stroke,
           interpolK: 1
         };
-        var currentTargetD = Object.assign({}, path.__currentTargetD || targetD, {
+        var currentTargetD = Object.assign({}, group.__currentTargetD || targetD, {
           interpolK: 0
         });
         if (Object.keys(targetD).some(function (k) {
@@ -72538,7 +72553,8 @@ void main() {
       var latAccessor = index$1(state.ringLat);
       var lngAccessor = index$1(state.ringLng);
       var altitudeAccessor = index$1(state.ringAltitude);
-      var globeCenter = new THREE$3.Vector3(0, 0, 0);
+      var globeCenter = state.scene.localToWorld(new THREE$3.Vector3(0, 0, 0)); // translate from local to world coords
+
       state.dataMapper.onUpdateObj(function (obj, d) {
         var lat = latAccessor(d);
         var lng = lngAccessor(d);
@@ -72788,6 +72804,7 @@ void main() {
 
   var THREE$i = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
+    Camera: Camera,
     Group: Group$1,
     Vector2: Vector2,
     Vector3: Vector3
@@ -72887,10 +72904,13 @@ void main() {
         }
         return cartesian2Polar.apply(void 0, args);
       },
-      setPointOfView: function setPointOfView(state, globalPov, globePos) {
+      setPointOfView: function setPointOfView(state, camera) {
         var isBehindGlobe = undefined;
-        if (globalPov) {
+        if (state.scene && camera) {
+          var globalPov = camera instanceof THREE$i.Camera ? camera.position : camera; // for backwards compatibility
           var globeRadius = getGlobeRadius();
+          var globePos = new THREE$i.Vector3();
+          state.scene.getWorldPosition(globePos);
           var pov = globePos ? globalPov.clone().sub(globePos) : globalPov; // convert to local vector
 
           var povDist, povEdgeDist, povEdgeAngle;
@@ -73039,29 +73059,29 @@ void main() {
   function fromKapsule (kapsule) {
     var baseClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Object;
     var initKapsuleWithSelf = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var FromKapsule = /*#__PURE__*/function (_baseClass) {
-      function FromKapsule() {
+    var Globe = /*#__PURE__*/function (_baseClass) {
+      function Globe() {
         var _this;
-        _classCallCheck(this, FromKapsule);
+        _classCallCheck(this, Globe);
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        _this = _callSuper(this, FromKapsule, [].concat(args));
+        _this = _callSuper(this, Globe, [].concat(args));
         _this.__kapsuleInstance = _construct$1(kapsule, [].concat(_toConsumableArray$1(initKapsuleWithSelf ? [_this] : []), args));
         return _this;
       }
-      _inherits(FromKapsule, _baseClass);
-      return _createClass(FromKapsule);
+      _inherits(Globe, _baseClass);
+      return _createClass(Globe);
     }(baseClass); // attach kapsule props/methods to class prototype
     Object.keys(kapsule()).forEach(function (m) {
-      return FromKapsule.prototype[m] = function () {
+      return Globe.prototype[m] = function () {
         var _this$__kapsuleInstan;
         var returnVal = (_this$__kapsuleInstan = this.__kapsuleInstance)[m].apply(_this$__kapsuleInstan, arguments);
         return returnVal === this.__kapsuleInstance ? this // chain based on this class, not the kapsule obj
         : returnVal;
       };
     });
-    return FromKapsule;
+    return Globe;
   }
 
   var three$1 = window.THREE ? window.THREE : {
@@ -113828,9 +113848,7 @@ var<${access}> ${name} : ${structName};`;
    * }
    */
   function hsl(value, saturation, lightness) {
-    if (typeof value === 'number' && typeof saturation === 'number' && typeof lightness === 'number') {
-      return hslToHex(value, saturation, lightness);
-    } else if (typeof value === 'object' && saturation === undefined && lightness === undefined) {
+    if (typeof value === 'object' && saturation === undefined && lightness === undefined) {
       return hslToHex(value.hue, value.saturation, value.lightness);
     }
     throw new PolishedError(1);
@@ -113863,9 +113881,7 @@ var<${access}> ${name} : ${structName};`;
    * }
    */
   function hsla(value, saturation, lightness, alpha) {
-    if (typeof value === 'number' && typeof saturation === 'number' && typeof lightness === 'number' && typeof alpha === 'number') {
-      return alpha >= 1 ? hslToHex(value, saturation, lightness) : "rgba(" + hslToRgb(value, saturation, lightness) + "," + alpha + ")";
-    } else if (typeof value === 'object' && saturation === undefined && lightness === undefined && alpha === undefined) {
+    if (typeof value === 'object' && saturation === undefined && lightness === undefined && alpha === undefined) {
       return value.alpha >= 1 ? hslToHex(value.hue, value.saturation, value.lightness) : "rgba(" + hslToRgb(value.hue, value.saturation, value.lightness) + "," + value.alpha + ")";
     }
     throw new PolishedError(2);
@@ -113938,12 +113954,7 @@ var<${access}> ${name} : ${structName};`;
    * }
    */
   function rgba(firstValue, secondValue, thirdValue, fourthValue) {
-    if (typeof firstValue === 'string' && typeof secondValue === 'number') {
-      var rgbValue = parseToRgb(firstValue);
-      return "rgba(" + rgbValue.red + "," + rgbValue.green + "," + rgbValue.blue + "," + secondValue + ")";
-    } else if (typeof firstValue === 'number' && typeof secondValue === 'number' && typeof thirdValue === 'number' && typeof fourthValue === 'number') {
-      return fourthValue >= 1 ? rgb(firstValue, secondValue, thirdValue) : "rgba(" + firstValue + "," + secondValue + "," + thirdValue + "," + fourthValue + ")";
-    } else if (typeof firstValue === 'object' && secondValue === undefined && thirdValue === undefined && fourthValue === undefined) {
+    if (typeof firstValue === 'object' && secondValue === undefined && thirdValue === undefined && fourthValue === undefined) {
       return firstValue.alpha >= 1 ? rgb(firstValue.red, firstValue.green, firstValue.blue) : "rgba(" + firstValue.red + "," + firstValue.green + "," + firstValue.blue + "," + firstValue.alpha + ")";
     }
     throw new PolishedError(7);
@@ -115549,7 +115560,7 @@ var<${access}> ${name} : ${structName};`;
         controls.zoomSpeed = (pov.altitude + 1) * 0.1; // Math.sqrt(pov.altitude) * 0.2;
 
         // Update three-globe pov when camera moves, for proper hiding of elements
-        state.globe.setPointOfView(state.renderObjs.camera().position);
+        state.globe.setPointOfView(state.renderObjs.camera());
         state.onZoom && state.onZoom(pov);
       });