globe.gl 2.34.5 → 2.34.6

package/dist/globe.gl.js

@@ -1,4 +1,4 @@
-// Version 2.34.5 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) :
@@ -48674,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;
   }
@@ -50453,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++; }
@@ -51780,7 +51780,7 @@ void main() {
           };
     };
 
-    return data ? v(data) : v;
+    return v(data) ;
   }
 
   function _arrayLikeToArray$3(r, a) {
@@ -72804,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
@@ -72903,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;
@@ -73055,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 : {
@@ -113844,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);
@@ -113879,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);
@@ -113954,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);
@@ -115565,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);
       });