globe.gl 2.41.2 → 2.41.4

package/README.md

@@ -67,7 +67,7 @@ import Globe from 'globe.gl';
 ```
 or using a *script* tag
 ```html
-<script src="//unpkg.com/globe.gl"></script>
+<script src="//cdn.jsdelivr.net/npm/globe.gl"></script>
 ```
 then
 ```js

package/dist/globe.gl.d.ts

@@ -140,4 +140,5 @@ declare const Globe: {
   new(element: HTMLElement, configOptions?: ConfigOptions): GlobeInstance;
 }
 
-export { type ConfigOptions, type GlobeInstance, Globe as default };
+export { Globe as default };
+export type { ConfigOptions, GlobeInstance };

package/dist/globe.gl.js

@@ -1,4 +1,4 @@
-// Version 2.41.2 globe.gl - https://github.com/vasturiano/globe.gl
+// Version 2.41.4 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) :
@@ -51751,6 +51751,18 @@ void main() {
     return range;
   }
 
+  function sum$1(values, valueof) {
+    let sum = 0;
+    {
+      for (let value of values) {
+        if (value = +value) {
+          sum += value;
+        }
+      }
+    }
+    return sum;
+  }
+
   function initRange(domain, range) {
     switch (arguments.length) {
       case 0: break;
@@ -54467,7 +54479,7 @@ void main() {
   var coordinates = [null, null],
       object = {type: "LineString", coordinates: coordinates};
 
-  function geoDistance(a, b) {
+  function geoDistance$1(a, b) {
     coordinates[0] = a;
     coordinates[1] = b;
     return length$1(object);
@@ -54526,16 +54538,16 @@ void main() {
   }
 
   function containsPoint(coordinates, point) {
-    return geoDistance(coordinates, point) === 0;
+    return geoDistance$1(coordinates, point) === 0;
   }
 
   function containsLine(coordinates, point) {
     var ao, bo, ab;
     for (var i = 0, n = coordinates.length; i < n; i++) {
-      bo = geoDistance(coordinates[i], point);
+      bo = geoDistance$1(coordinates[i], point);
       if (bo === 0) return true;
       if (i > 0) {
-        ab = geoDistance(coordinates[i], coordinates[i - 1]);
+        ab = geoDistance$1(coordinates[i], coordinates[i - 1]);
         if (
           ab > 0 &&
           ao <= ab &&
@@ -56526,7 +56538,7 @@ void main() {
     var prevPnt = null;
     lineCoords.forEach(function (pnt) {
       if (prevPnt) {
-        var dist = geoDistance(pnt, prevPnt) * 180 / Math.PI;
+        var dist = geoDistance$1(pnt, prevPnt) * 180 / Math.PI;
         if (dist > maxDegDistance) {
           var geoInterpol = geoInterpolate(prevPnt, pnt);
           var altInterpol = prevPnt.length > 2 || pnt.length > 2 ? interpolateNumber(prevPnt[2] || 0, pnt[2] || 0) : null;
@@ -61562,7 +61574,7 @@ void main() {
       }
       if (!v.delaunay) return false;
       const _distances = v.delaunay.edges.map((e) =>
-          geoDistance(v.points[e[0]], v.points[e[1]])
+          geoDistance$1(v.points[e[0]], v.points[e[1]])
         ),
         _urquart = v.delaunay.urquhart(_distances);
       return {
@@ -61625,7 +61637,7 @@ void main() {
     v._found = undefined;
     v.find = function (x, y, radius) {
       v._found = v.delaunay.find(x, y, v._found);
-      if (!radius || geoDistance([x, y], v.points[v._found]) < radius)
+      if (!radius || geoDistance$1([x, y], v.points[v._found]) < radius)
         return v._found;
     };
 
@@ -61878,7 +61890,7 @@ void main() {
       var prevPnt;
       coords.forEach(function (pnt) {
         if (prevPnt) {
-          var dist = geoDistance(pnt, prevPnt) * 180 / Math.PI;
+          var dist = geoDistance$1(pnt, prevPnt) * 180 / Math.PI;
           if (dist > maxDistance) {
             var interpol = geoInterpolate(prevPnt, pnt);
             var tStep = 1 / Math.ceil(dist / maxDistance);
@@ -147683,7 +147695,7 @@ var<${access}> ${ name } : ${ structName };`;
     throw new TypeError("Private element is not present on this object");
   }
   function _assertThisInitialized$1(e) {
-    if (undefined === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return e;
   }
   function asyncGeneratorStep(n, t, e, r, o, a, c) {
@@ -147707,7 +147719,7 @@ var<${access}> ${ name } : ${ structName };`;
         function _throw(n) {
           asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
         }
-        _next(undefined);
+        _next(void 0);
       });
     };
   }
@@ -147868,7 +147880,7 @@ var<${access}> ${ name } : ${ structName };`;
   }
   function _possibleConstructorReturn(t, e) {
     if (e && ("object" == typeof e || "function" == typeof e)) return e;
-    if (undefined !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
     return _assertThisInitialized$1(t);
   }
   function _regeneratorRuntime() {
@@ -148071,7 +148083,7 @@ var<${access}> ${ name } : ${ structName };`;
     }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
       return this;
     }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
-      undefined === i && (i = Promise);
+      void 0 === i && (i = Promise);
       var a = new AsyncIterator(wrap(t, r, n, o), i);
       return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
         return t.done ? t.value : a.next();
@@ -148196,7 +148208,7 @@ var<${access}> ${ name } : ${ structName };`;
   function _toPrimitive$2(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
-    if (undefined !== e) {
+    if (void 0 !== e) {
       var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
@@ -148211,7 +148223,7 @@ var<${access}> ${ name } : ${ structName };`;
     if (r) {
       if ("string" == typeof r) return _arrayLikeToArray$2(r, a);
       var t = {}.toString.call(r).slice(8, -1);
-      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$2(r, a) : undefined;
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$2(r, a) : void 0;
     }
   }
 
@@ -148363,17 +148375,17 @@ var<${access}> ${ name } : ${ structName };`;
       var _this;
       var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         _ref$color = _ref.color,
-        color = _ref$color === undefined ? 'gold' : _ref$color,
+        color = _ref$color === void 0 ? 'gold' : _ref$color,
         _ref$size = _ref.size,
-        size = _ref$size === undefined ? 2 : _ref$size,
+        size = _ref$size === void 0 ? 2 : _ref$size,
         _ref$coefficient = _ref.coefficient,
-        coefficient = _ref$coefficient === undefined ? 0.5 : _ref$coefficient,
+        coefficient = _ref$coefficient === void 0 ? 0.5 : _ref$coefficient,
         _ref$power = _ref.power,
-        power = _ref$power === undefined ? 1 : _ref$power,
+        power = _ref$power === void 0 ? 1 : _ref$power,
         _ref$hollowRadius = _ref.hollowRadius,
-        hollowRadius = _ref$hollowRadius === undefined ? 0 : _ref$hollowRadius,
+        hollowRadius = _ref$hollowRadius === void 0 ? 0 : _ref$hollowRadius,
         _ref$backside = _ref.backside,
-        backside = _ref$backside === undefined ? true : _ref$backside;
+        backside = _ref$backside === void 0 ? true : _ref$backside;
       _classCallCheck(this, GlowMesh);
       _this = _callSuper(this, GlowMesh);
       var glowGeometry = createGlowGeometry(geometry, size);
@@ -148643,17 +148655,17 @@ var<${access}> ${ name } : ${ structName };`;
       var _this;
       var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         _ref$dataBindAttr = _ref.dataBindAttr,
-        dataBindAttr = _ref$dataBindAttr === undefined ? '__data' : _ref$dataBindAttr,
+        dataBindAttr = _ref$dataBindAttr === void 0 ? '__data' : _ref$dataBindAttr,
         _ref$objBindAttr = _ref.objBindAttr,
-        objBindAttr = _ref$objBindAttr === undefined ? '__threeObj' : _ref$objBindAttr,
+        objBindAttr = _ref$objBindAttr === void 0 ? '__threeObj' : _ref$objBindAttr,
         _ref$removeDelay = _ref.removeDelay,
-        removeDelay = _ref$removeDelay === undefined ? 0 : _ref$removeDelay;
+        removeDelay = _ref$removeDelay === void 0 ? 0 : _ref$removeDelay;
       _classCallCheck(this, ThreeDigest);
       _this = _callSuper(this, ThreeDigest);
-      _defineProperty$2(_this, "scene", undefined);
-      _classPrivateFieldInitSpec(_this, _dataBindAttr, undefined);
-      _classPrivateFieldInitSpec(_this, _objBindAttr, undefined);
-      _classPrivateFieldInitSpec(_this, _removeDelay, undefined);
+      _defineProperty$2(_this, "scene", void 0);
+      _classPrivateFieldInitSpec(_this, _dataBindAttr, void 0);
+      _classPrivateFieldInitSpec(_this, _objBindAttr, void 0);
+      _classPrivateFieldInitSpec(_this, _removeDelay, void 0);
       _this.scene = scene;
       _classPrivateFieldSet2(_dataBindAttr, _this, dataBindAttr);
       _classPrivateFieldSet2(_objBindAttr, _this, objBindAttr);
@@ -149014,16 +149026,16 @@ var<${access}> ${ name } : ${ structName };`;
     methods: {
       pauseAnimation: function pauseAnimation(state) {
         var _state$ticker;
-        (_state$ticker = state.ticker) === null || _state$ticker === undefined || _state$ticker.pause();
+        (_state$ticker = state.ticker) === null || _state$ticker === void 0 || _state$ticker.pause();
       },
       resumeAnimation: function resumeAnimation(state) {
         var _state$ticker2;
-        (_state$ticker2 = state.ticker) === null || _state$ticker2 === undefined || _state$ticker2.resume();
+        (_state$ticker2 = state.ticker) === null || _state$ticker2 === void 0 || _state$ticker2.resume();
       },
       _destructor: function _destructor(state) {
         var _state$ticker3;
         state.sharedMaterial.dispose();
-        (_state$ticker3 = state.ticker) === null || _state$ticker3 === undefined || _state$ticker3.dispose();
+        (_state$ticker3 = state.ticker) === null || _state$ticker3 === void 0 || _state$ticker3.dispose();
       }
     },
     stateInit: function stateInit(_ref) {
@@ -149195,7 +149207,7 @@ var<${access}> ${ name } : ${ structName };`;
         var altitude = alt;
         (altitude === null || altitude === undefined) && (
         // by default set altitude proportional to the great-arc distance
-        altitude = geoDistance(startPnt, endPnt) / 2 * altAutoScale);
+        altitude = geoDistance$1(startPnt, endPnt) / 2 * altAutoScale);
         if (altitude) {
           var interpolate = geoInterpolate(startPnt, endPnt);
           var _map = [0.25, 0.75].map(function (t) {
@@ -149213,7 +149225,7 @@ var<${access}> ${ name } : ${ structName };`;
         } else {
           // ground line
           var _alt = 0.001; // slightly above the ground to prevent occlusion
-          return calcSphereArc.apply(undefined, _toConsumableArray$1([[].concat(startPnt, [_alt]), [].concat(endPnt, [_alt])].map(getVec)));
+          return calcSphereArc.apply(void 0, _toConsumableArray$1([[].concat(startPnt, [_alt]), [].concat(endPnt, [_alt])].map(getVec)));
         }
 
         //
@@ -149524,13 +149536,64 @@ var<${access}> ${ name } : ${ structName };`;
     }
   });
 
+  var sq = function sq(x) {
+    return x * x;
+  };
   var toRad = function toRad(x) {
     return x * Math.PI / 180;
   };
+  function geoDistance(a, b) {
+    // on sphere surface, in radians
+    var sqrt = Math.sqrt;
+    var cos = Math.cos;
+    var hav = function hav(x) {
+      return sq(Math.sin(x / 2));
+    };
+    var latA = toRad(a[1]);
+    var latB = toRad(b[1]);
+    var lngA = toRad(a[0]);
+    var lngB = toRad(b[0]);
+
+    // Haversine formula
+    return 2 * Math.asin(sqrt(hav(latB - latA) + cos(latA) * cos(latB) * hav(lngB - lngA)));
+  }
+  var sqrt2PI = Math.sqrt(2 * Math.PI);
+  function gaussianKernel(x, bw) {
+    return Math.exp(-sq(x / bw) / 2) / (bw * sqrt2PI);
+  }
+  var getGeoKDE = function getGeoKDE(_ref) {
+    var _ref2 = _slicedToArray$2(_ref, 2),
+      lng = _ref2[0],
+      lat = _ref2[1];
+    var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      _ref3$lngAccessor = _ref3.lngAccessor,
+      lngAccessor = _ref3$lngAccessor === void 0 ? function (d) {
+        return d[0];
+      } : _ref3$lngAccessor,
+      _ref3$latAccessor = _ref3.latAccessor,
+      latAccessor = _ref3$latAccessor === void 0 ? function (d) {
+        return d[1];
+      } : _ref3$latAccessor,
+      _ref3$weightAccessor = _ref3.weightAccessor,
+      weightAccessor = _ref3$weightAccessor === void 0 ? function () {
+        return 1;
+      } : _ref3$weightAccessor,
+      bandwidth = _ref3.bandwidth;
+    var pnt = [lng, lat];
+    var bwRad = bandwidth * Math.PI / 180;
+    return sum$1(data.map(function (d) {
+      var weight = weightAccessor(d);
+      if (!weight) return 0;
+      var dist = geoDistance(pnt, [lngAccessor(d), latAccessor(d)]);
+      return gaussianKernel(dist, bwRad) * weight;
+    }));
+  };
 
   // use WebGPU to accelerate computation of kde vals per every coord pair
   var computeGeoKde = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(vertexGeoCoords) {
+      var _navigator;
       var data,
         _ref5,
         _ref5$lngAccessor,
@@ -149575,13 +149638,27 @@ var<${access}> ${ name } : ${ structName };`;
         while (1) switch (_context.prev = _context.next) {
           case 0:
             data = _args.length > 1 && _args[1] !== undefined ? _args[1] : [];
-            _ref5 = _args.length > 2 && _args[2] !== undefined ? _args[2] : {}, _ref5$lngAccessor = _ref5.lngAccessor, lngAccessor = _ref5$lngAccessor === undefined ? function (d) {
+            _ref5 = _args.length > 2 && _args[2] !== undefined ? _args[2] : {}, _ref5$lngAccessor = _ref5.lngAccessor, lngAccessor = _ref5$lngAccessor === void 0 ? function (d) {
               return d[0];
-            } : _ref5$lngAccessor, _ref5$latAccessor = _ref5.latAccessor, latAccessor = _ref5$latAccessor === undefined ? function (d) {
+            } : _ref5$lngAccessor, _ref5$latAccessor = _ref5.latAccessor, latAccessor = _ref5$latAccessor === void 0 ? function (d) {
               return d[1];
-            } : _ref5$latAccessor, _ref5$weightAccessor = _ref5.weightAccessor, weightAccessor = _ref5$weightAccessor === undefined ? function () {
+            } : _ref5$latAccessor, _ref5$weightAccessor = _ref5.weightAccessor, weightAccessor = _ref5$weightAccessor === void 0 ? function () {
               return 1;
             } : _ref5$weightAccessor, bandwidth = _ref5.bandwidth;
+            if ((_navigator = navigator) !== null && _navigator !== void 0 && _navigator.gpu) {
+              _context.next = 5;
+              break;
+            }
+            console.warn('WebGPU not enabled in browser. Please consider enabling it to improve performance.');
+            return _context.abrupt("return", vertexGeoCoords.map(function (coords) {
+              return getGeoKDE(coords, data, {
+                lngAccessor: lngAccessor,
+                latAccessor: latAccessor,
+                weightAccessor: weightAccessor,
+                bandwidth: bandwidth
+              });
+            }));
+          case 5:
             BW_RADIUS_INFLUENCE = 4; // multiplier of bandwidth to set max radius of point influence (exclude points to improve performance)
             Fn$1 = Fn, If$1 = If, uniform$1 = uniform, storage$1 = storage, _float = float, instanceIndex$1 = instanceIndex, Loop$1 = Loop, sqrt$1 = sqrt, sin$1 = sin, cos$1 = cos, asin$1 = asin, exp$1 = exp, negate$1 = negate;
             sCoords = storage$1(new StorageInstancedBufferAttribute(new Float32Array(vertexGeoCoords.flat().map(toRad)), 2), 'vec2', vertexGeoCoords.length);
@@ -149633,18 +149710,18 @@ var<${access}> ${ name } : ${ structName };`;
             });
             computeNode = computeShaderFn().compute(vertexGeoCoords.length);
             renderer = new WebGPURenderer();
-            _context.next = 22;
+            _context.next = 25;
             return renderer.computeAsync(computeNode);
-          case 22:
+          case 25:
             _context.t0 = Array;
             _context.t1 = Float32Array;
-            _context.next = 26;
+            _context.next = 29;
             return renderer.getArrayBufferAsync(res);
-          case 26:
+          case 29:
             _context.t2 = _context.sent;
             _context.t3 = new _context.t1(_context.t2);
             return _context.abrupt("return", _context.t0.from.call(_context.t0, _context.t3));
-          case 29:
+          case 32:
           case "end":
             return _context.stop();
         }
@@ -150022,14 +150099,18 @@ var<${access}> ${ name } : ${ structName };`;
         // hide stroke if no color set
         var addStroke = !!strokeColor;
         strokeObj.visible = addStroke;
+        var hasCap = !!(capColor || capMaterial);
+        var hasSide = !!(sideColor || sideMaterial);
 
         // regenerate geometries if needed
         if (!objMatch(conicObj.geometry.parameters || {}, {
           polygonGeoJson: coords,
-          curvatureResolution: capCurvatureResolution
+          curvatureResolution: capCurvatureResolution,
+          closedTop: hasCap,
+          includeSides: hasSide
         })) {
           conicObj.geometry && conicObj.geometry.dispose();
-          conicObj.geometry = new ConicPolygonGeometry(coords, 0, GLOBE_RADIUS, false, true, true, capCurvatureResolution);
+          conicObj.geometry = new ConicPolygonGeometry(coords, 0, GLOBE_RADIUS, false, hasCap, hasSide, capCurvatureResolution);
         }
         if (addStroke && (!strokeObj.geometry.parameters || strokeObj.geometry.parameters.geoJson.coordinates !== coords || strokeObj.geometry.parameters.resolution !== capCurvatureResolution)) {
           strokeObj.geometry && strokeObj.geometry.dispose();
@@ -150038,14 +150119,19 @@ var<${access}> ${ name } : ${ structName };`;
             coordinates: coords
           }, GLOBE_RADIUS, capCurvatureResolution);
         }
+        var sideIdx = hasSide ? 0 : -1;
+        var capIdx = !hasCap ? -1 : hasSide ? 1 : 0;
 
         // replace side/cap materials if defined
-        conicObj.material[0] = sideMaterial || obj.__defaultSideMaterial;
-        conicObj.material[1] = capMaterial || obj.__defaultCapMaterial;
+        sideIdx >= 0 && (conicObj.material[sideIdx] = sideMaterial || obj.__defaultSideMaterial);
+        capIdx >= 0 && (conicObj.material[capIdx] = capMaterial || obj.__defaultCapMaterial);
 
         // update default material colors
-        [!sideMaterial && sideColor, !capMaterial && capColor].forEach(function (color, materialIdx) {
-          if (!color) return; // skip custom materials
+        [[!sideMaterial && sideColor, sideIdx], [!capMaterial && capColor, capIdx]].forEach(function (_ref3) {
+          var _ref4 = _slicedToArray$2(_ref3, 2),
+            color = _ref4[0],
+            materialIdx = _ref4[1];
+          if (!color || materialIdx < 0) return; // skip custom or hidden materials
 
           // conic object
           var material = conicObj.material[materialIdx];
@@ -150097,10 +150183,10 @@ var<${access}> ${ name } : ${ structName };`;
         return a === b;
       };
     };
-    return Object.entries(attrs).every(function (_ref3) {
-      var _ref4 = _slicedToArray$2(_ref3, 2),
-        k = _ref4[0],
-        v = _ref4[1];
+    return Object.entries(attrs).every(function (_ref5) {
+      var _ref6 = _slicedToArray$2(_ref5, 2),
+        k = _ref6[0],
+        v = _ref6[1];
       return obj.hasOwnProperty(k) && compFn(k)(obj[k], v);
     });
   }
@@ -150318,7 +150404,7 @@ var<${access}> ${ name } : ${ structName };`;
       return [].concat(_toConsumableArray$1(arr), _toConsumableArray$1(Array(length - arr.length).fill(repeatItem)));
     };
     var arrLength = Math.max(fromPnts.length, toPnts.length);
-    var interpolator = interpolateArray.apply(undefined, _toConsumableArray$1([fromPnts, toPnts].map(function (pnts) {
+    var interpolator = interpolateArray.apply(void 0, _toConsumableArray$1([fromPnts, toPnts].map(function (pnts) {
       return pnts.map(function (_ref) {
         var x = _ref.x,
           y = _ref.y,
@@ -150412,15 +150498,15 @@ var<${access}> ${ name } : ${ structName };`;
     methods: {
       pauseAnimation: function pauseAnimation(state) {
         var _state$ticker;
-        (_state$ticker = state.ticker) === null || _state$ticker === undefined || _state$ticker.pause();
+        (_state$ticker = state.ticker) === null || _state$ticker === void 0 || _state$ticker.pause();
       },
       resumeAnimation: function resumeAnimation(state) {
         var _state$ticker2;
-        (_state$ticker2 = state.ticker) === null || _state$ticker2 === undefined || _state$ticker2.resume();
+        (_state$ticker2 = state.ticker) === null || _state$ticker2 === void 0 || _state$ticker2.resume();
       },
       _destructor: function _destructor(state) {
         var _state$ticker3;
-        (_state$ticker3 = state.ticker) === null || _state$ticker3 === undefined || _state$ticker3.dispose();
+        (_state$ticker3 = state.ticker) === null || _state$ticker3 === void 0 || _state$ticker3.dispose();
       }
     },
     stateInit: function stateInit(_ref) {
@@ -151054,15 +151140,15 @@ var<${access}> ${ name } : ${ structName };`;
     methods: {
       pauseAnimation: function pauseAnimation(state) {
         var _state$ticker;
-        (_state$ticker = state.ticker) === null || _state$ticker === undefined || _state$ticker.pause();
+        (_state$ticker = state.ticker) === null || _state$ticker === void 0 || _state$ticker.pause();
       },
       resumeAnimation: function resumeAnimation(state) {
         var _state$ticker2;
-        (_state$ticker2 = state.ticker) === null || _state$ticker2 === undefined || _state$ticker2.resume();
+        (_state$ticker2 = state.ticker) === null || _state$ticker2 === void 0 || _state$ticker2.resume();
       },
       _destructor: function _destructor(state) {
         var _state$ticker3;
-        (_state$ticker3 = state.ticker) === null || _state$ticker3 === undefined || _state$ticker3.dispose();
+        (_state$ticker3 = state.ticker) === null || _state$ticker3 === void 0 || _state$ticker3.dispose();
       }
     },
     init: function init(threeObj, state, _ref) {
@@ -151744,13 +151830,13 @@ var<${access}> ${ name } : ${ structName };`;
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-        return polar2Cartesian.apply(undefined, args);
+        return polar2Cartesian.apply(void 0, args);
       },
       toGeoCoords: function toGeoCoords(state) {
         for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
           args[_key2 - 1] = arguments[_key2];
         }
-        return cartesian2Polar.apply(undefined, args);
+        return cartesian2Polar.apply(void 0, args);
       },
       setPointOfView: function setPointOfView(state, camera) {
         var globalPov = camera instanceof THREE$j.Camera ? camera.position : camera; // for backwards compatibility
@@ -151793,7 +151879,7 @@ var<${access}> ${ name } : ${ structName };`;
         }
         state.pausableLayers.forEach(function (l) {
           var _l$pauseAnimation;
-          return (_l$pauseAnimation = l.pauseAnimation) === null || _l$pauseAnimation === undefined ? undefined : _l$pauseAnimation.call(l);
+          return (_l$pauseAnimation = l.pauseAnimation) === null || _l$pauseAnimation === void 0 ? void 0 : _l$pauseAnimation.call(l);
         });
         return this;
       },
@@ -151803,7 +151889,7 @@ var<${access}> ${ name } : ${ structName };`;
         }
         state.pausableLayers.forEach(function (l) {
           var _l$resumeAnimation;
-          return (_l$resumeAnimation = l.resumeAnimation) === null || _l$resumeAnimation === undefined ? undefined : _l$resumeAnimation.call(l);
+          return (_l$resumeAnimation = l.resumeAnimation) === null || _l$resumeAnimation === void 0 ? void 0 : _l$resumeAnimation.call(l);
         });
         return this;
       },
@@ -151859,9 +151945,9 @@ var<${access}> ${ name } : ${ structName };`;
     },
     init: function init(threeObj, state, _ref17) {
       var _ref17$animateIn = _ref17.animateIn,
-        animateIn = _ref17$animateIn === undefined ? true : _ref17$animateIn,
+        animateIn = _ref17$animateIn === void 0 ? true : _ref17$animateIn,
         _ref17$waitForGlobeRe = _ref17.waitForGlobeReady,
-        waitForGlobeReady = _ref17$waitForGlobeRe === undefined ? true : _ref17$waitForGlobeRe;
+        waitForGlobeReady = _ref17$waitForGlobeRe === void 0 ? true : _ref17$waitForGlobeRe;
       // Clear the scene
       emptyObject(threeObj);
 
@@ -158716,7 +158802,7 @@ var<${access}> ${ name } : ${ structName };`;
       },
       toGlobeCoords: function toGlobeCoords(state, x, y) {
         var globeIntersects = state.renderObjs.intersectingObjects(x, y).find(function (d) {
-          return d.object.__globeObjType === 'globe';
+          return (d.object.__globeObjType || d.object.parent.__globeObjType) === 'globe';
         });
         if (!globeIntersects) return null; // coords outside globe