globe.gl 2.26.5 → 2.26.7

package/dist/globe.gl.module.js

@@ -9,15 +9,12 @@ import TWEEN from '@tweenjs/tween.js';
 function styleInject(css, ref) {
   if (ref === void 0) ref = {};
   var insertAt = ref.insertAt;
-
   if (!css || typeof document === 'undefined') {
     return;
   }
-
   var head = document.head || document.getElementsByTagName('head')[0];
   var style = document.createElement('style');
   style.type = 'text/css';
-
   if (insertAt === 'top') {
     if (head.firstChild) {
       head.insertBefore(style, head.firstChild);
@@ -27,7 +24,6 @@ function styleInject(css, ref) {
   } else {
     head.appendChild(style);
   }
-
   if (style.styleSheet) {
     style.styleSheet.cssText = css;
   } else {
@@ -40,17 +36,14 @@ styleInject(css_248z);
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
-
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     enumerableOnly && (symbols = symbols.filter(function (sym) {
       return Object.getOwnPropertyDescriptor(object, sym).enumerable;
     })), keys.push.apply(keys, symbols);
   }
-
   return keys;
 }
-
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = null != arguments[i] ? arguments[i] : {};
@@ -60,10 +53,8 @@ function _objectSpread2(target) {
       Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
     });
   }
-
   return target;
 }
-
 function _defineProperty(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
@@ -75,35 +66,26 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
-
   return obj;
 }
-
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
   var sourceKeys = Object.keys(source);
   var key, i;
-
   for (i = 0; i < sourceKeys.length; i++) {
     key = sourceKeys[i];
     if (excluded.indexOf(key) >= 0) continue;
     target[key] = source[key];
   }
-
   return target;
 }
-
 function _objectWithoutProperties(source, excluded) {
   if (source == null) return {};
-
   var target = _objectWithoutPropertiesLoose(source, excluded);
-
   var key, i;
-
   if (Object.getOwnPropertySymbols) {
     var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
     for (i = 0; i < sourceSymbolKeys.length; i++) {
       key = sourceSymbolKeys[i];
       if (excluded.indexOf(key) >= 0) continue;
@@ -111,22 +93,17 @@ function _objectWithoutProperties(source, excluded) {
       target[key] = source[key];
     }
   }
-
   return target;
 }
-
 function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
-
 function _arrayWithoutHoles(arr) {
   if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
-
 function _iterableToArray(iter) {
   if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -135,15 +112,11 @@ function _unsupportedIterableToArray(o, minLen) {
   if (n === "Map" || n === "Set") return Array.from(o);
   if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
-
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
   return arr2;
 }
-
 function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
@@ -166,11 +139,9 @@ function linkKapsule (kapsulePropName, kapsuleType) {
       // link method pass-through
       return function (state) {
         var kapsuleInstance = state[kapsulePropName];
-
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-
         var returnVal = kapsuleInstance[method].apply(kapsuleInstance, args);
         return returnVal === kapsuleInstance ? this // chain based on the parent object, not the inner kapsule
         : returnVal;
@@ -180,7 +151,6 @@ function linkKapsule (kapsulePropName, kapsuleType) {
 }
 
 var _excluded = ["rendererConfig", "waitForGlobeReady"];
-
 var THREE = _objectSpread2(_objectSpread2({}, window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
 : {
   AmbientLight: AmbientLight,
@@ -189,23 +159,28 @@ var THREE = _objectSpread2(_objectSpread2({}, window.THREE ? window.THREE // Pre
 }), {}, {
   CSS2DRenderer: CSS2DRenderer
 });
-// Expose config from ThreeGlobe
 
+//
+
+// Expose config from ThreeGlobe
 var bindGlobe = linkKapsule('globe', ThreeGlobe);
 var linkedGlobeProps = Object.assign.apply(Object, _toConsumableArray(['globeImageUrl', 'bumpImageUrl', 'showGlobe', 'showGraticules', 'showAtmosphere', 'atmosphereColor', 'atmosphereAltitude', 'globeMaterial', 'onGlobeReady', 'pointsData', 'pointLat', 'pointLng', 'pointColor', 'pointAltitude', 'pointRadius', 'pointResolution', 'pointsMerge', 'pointsTransitionDuration', 'arcsData', 'arcStartLat', 'arcStartLng', 'arcEndLat', 'arcEndLng', 'arcColor', 'arcAltitude', 'arcAltitudeAutoScale', 'arcStroke', 'arcCurveResolution', 'arcCircularResolution', 'arcDashLength', 'arcDashGap', 'arcDashInitialGap', 'arcDashAnimateTime', 'arcsTransitionDuration', 'polygonsData', 'polygonGeoJsonGeometry', 'polygonCapColor', 'polygonCapMaterial', 'polygonSideColor', 'polygonSideMaterial', 'polygonStrokeColor', 'polygonAltitude', 'polygonCapCurvatureResolution', 'polygonsTransitionDuration', 'pathsData', 'pathPoints', 'pathPointLat', 'pathPointLng', 'pathPointAlt', 'pathResolution', 'pathColor', 'pathStroke', 'pathDashLength', 'pathDashGap', 'pathDashInitialGap', 'pathDashAnimateTime', 'pathTransitionDuration', 'hexBinPointsData', 'hexBinPointLat', 'hexBinPointLng', 'hexBinPointWeight', 'hexBinResolution', 'hexMargin', 'hexTopCurvatureResolution', 'hexTopColor', 'hexSideColor', 'hexAltitude', 'hexBinMerge', 'hexTransitionDuration', 'hexPolygonsData', 'hexPolygonGeoJsonGeometry', 'hexPolygonColor', 'hexPolygonAltitude', 'hexPolygonResolution', 'hexPolygonMargin', 'hexPolygonCurvatureResolution', 'hexPolygonsTransitionDuration', 'tilesData', 'tileLat', 'tileLng', 'tileAltitude', 'tileWidth', 'tileHeight', 'tileUseGlobeProjection', 'tileMaterial', 'tileCurvatureResolution', 'tilesTransitionDuration', 'ringsData', 'ringLat', 'ringLng', 'ringAltitude', 'ringColor', 'ringResolution', 'ringMaxRadius', 'ringPropagationSpeed', 'ringRepeatPeriod', 'labelsData', 'labelLat', 'labelLng', 'labelAltitude', 'labelRotation', 'labelText', 'labelSize', 'labelTypeFace', 'labelColor', 'labelResolution', 'labelIncludeDot', 'labelDotRadius', 'labelDotOrientation', 'labelsTransitionDuration', 'htmlElementsData', 'htmlLat', 'htmlLng', 'htmlAltitude', 'htmlElement', 'htmlTransitionDuration', 'objectsData', 'objectLat', 'objectLng', 'objectAltitude', 'objectThreeObject', 'customLayerData', 'customThreeObject', 'customThreeObjectUpdate'].map(function (p) {
   return _defineProperty({}, p, bindGlobe.linkProp(p));
 })));
 var linkedGlobeMethods = Object.assign.apply(Object, _toConsumableArray(['getGlobeRadius', 'getCoords', 'toGeoCoords'].map(function (p) {
   return _defineProperty({}, p, bindGlobe.linkMethod(p));
-}))); // Expose config from renderObjs
+})));
 
+// Expose config from renderObjs
 var bindRenderObjs = linkKapsule('renderObjs', ThreeRenderObjects);
 var linkedRenderObjsProps = Object.assign.apply(Object, _toConsumableArray(['width', 'height', 'backgroundColor', 'backgroundImageUrl', 'enablePointerInteraction'].map(function (p) {
   return _defineProperty({}, p, bindRenderObjs.linkProp(p));
 })));
 var linkedRenderObjsMethods = Object.assign.apply(Object, _toConsumableArray(['postProcessingComposer'].map(function (p) {
   return _defineProperty({}, p, bindRenderObjs.linkMethod(p));
-}))); //
+})));
+
+//
 
 var globe = Kapsule({
   props: _objectSpread2(_objectSpread2({
@@ -370,14 +345,12 @@ var globe = Kapsule({
         cancelAnimationFrame(state.animationFrameRequestId);
         state.animationFrameRequestId = null;
       }
-
       return this;
     },
     resumeAnimation: function resumeAnimation(state) {
       if (state.animationFrameRequestId === null) {
         this._animationCycle();
       }
-
       return this;
     },
     _animationCycle: function _animationCycle(state) {
@@ -388,8 +361,9 @@ var globe = Kapsule({
     pointOfView: function pointOfView(state) {
       var geoCoords = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var transitionDuration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-      var curGeoCoords = getGeoCoords(); // Getter
+      var curGeoCoords = getGeoCoords();
 
+      // Getter
       if (geoCoords.lat === undefined && geoCoords.lng === undefined && geoCoords.altitude === undefined) {
         return curGeoCoords;
       } else {
@@ -407,38 +381,32 @@ var globe = Kapsule({
           while (curGeoCoords.lng - finalGeoCoords.lng > 180) {
             curGeoCoords.lng -= 360;
           }
-
           while (curGeoCoords.lng - finalGeoCoords.lng < -180) {
             curGeoCoords.lng += 360;
           }
-
           new TWEEN.Tween(curGeoCoords).to(finalGeoCoords, transitionDuration).easing(TWEEN.Easing.Cubic.InOut).onUpdate(setCameraPos).start();
         }
-
         return this;
-      } //
+      }
 
+      //
 
       function getGeoCoords() {
         return state.globe.toGeoCoords(state.renderObjs.cameraPosition());
       }
-
       function setCameraPos(_ref5) {
         var lat = _ref5.lat,
-            lng = _ref5.lng,
-            altitude = _ref5.altitude;
+          lng = _ref5.lng,
+          altitude = _ref5.altitude;
         state.renderObjs.cameraPosition(state.globe.getCoords(lat, lng, altitude));
       }
     },
     getScreenCoords: function getScreenCoords(state) {
       var _state$globe;
-
       for (var _len = arguments.length, geoCoords = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         geoCoords[_key - 1] = arguments[_key];
       }
-
       var cartesianCoords = (_state$globe = state.globe).getCoords.apply(_state$globe, geoCoords);
-
       return state.renderObjs.getScreenCoords(cartesianCoords.x, cartesianCoords.y, cartesianCoords.z);
     },
     toGlobeCoords: function toGlobeCoords(state, x, y) {
@@ -448,9 +416,8 @@ var globe = Kapsule({
       if (!globeIntersects) return null; // coords outside globe
 
       var _state$globe$toGeoCoo = state.globe.toGeoCoords(globeIntersects.point),
-          lat = _state$globe$toGeoCoo.lat,
-          lng = _state$globe$toGeoCoo.lng;
-
+        lat = _state$globe$toGeoCoo.lat,
+        lng = _state$globe$toGeoCoo.lng;
       return {
         lat: lat,
         lng: lng
@@ -489,10 +456,9 @@ var globe = Kapsule({
   }, linkedGlobeMethods), linkedRenderObjsMethods),
   stateInit: function stateInit(_ref6) {
     var rendererConfig = _ref6.rendererConfig,
-        _ref6$waitForGlobeRea = _ref6.waitForGlobeReady,
-        waitForGlobeReady = _ref6$waitForGlobeRea === void 0 ? true : _ref6$waitForGlobeRea,
-        globeInitConfig = _objectWithoutProperties(_ref6, _excluded);
-
+      _ref6$waitForGlobeRea = _ref6.waitForGlobeReady,
+      waitForGlobeReady = _ref6$waitForGlobeRea === void 0 ? true : _ref6$waitForGlobeRea,
+      globeInitConfig = _objectWithoutProperties(_ref6, _excluded);
     var globe = new ThreeGlobe(_objectSpread2({
       waitForGlobeReady: waitForGlobeReady
     }, globeInitConfig));
@@ -503,33 +469,35 @@ var globe = Kapsule({
         rendererConfig: rendererConfig,
         waitForLoadComplete: waitForGlobeReady,
         extraRenderers: [new THREE.CSS2DRenderer()] // Used in HTML elements layer
-
       }).skyRadius(globe.getGlobeRadius() * 500).showNavInfo(false)
     };
   },
   init: function init(domNode, state) {
     var _this = this;
-
     // Wipe DOM
-    domNode.innerHTML = ''; // Add relative container
+    domNode.innerHTML = '';
 
+    // Add relative container
     domNode.appendChild(state.container = document.createElement('div'));
-    state.container.style.position = 'relative'; // Add renderObjs
+    state.container.style.position = 'relative';
 
+    // Add renderObjs
     var roDomNode = document.createElement('div');
     state.container.appendChild(roDomNode);
-    state.renderObjs(roDomNode); // inject renderer size on three-globe
+    state.renderObjs(roDomNode);
 
-    state.globe.rendererSize(state.renderObjs.renderer().getSize(new THREE.Vector2())); // set initial distance
+    // inject renderer size on three-globe
+    state.globe.rendererSize(state.renderObjs.renderer().getSize(new THREE.Vector2()));
 
+    // set initial distance
     this.pointOfView({
       altitude: 2.5
-    }); // calibrate orbit controls
+    });
 
+    // calibrate orbit controls
     var globeR = state.globe.getGlobeRadius();
     var controls = state.renderObjs.controls();
     controls.minDistance = globeR * 1.01; // just above the surface
-
     controls.maxDistance = globeR * 100;
     controls.enablePan = false;
     controls.enableDamping = true;
@@ -539,26 +507,23 @@ var globe = Kapsule({
     controls.addEventListener('change', function () {
       // adjust controls speed based on altitude
       var pov = _this.pointOfView();
-
       controls.rotateSpeed = pov.altitude * 0.2; // Math.pow(pov.altitude + 1, 2) * 0.025;
-
       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
 
+      // Update three-globe pov when camera moves, for proper hiding of elements
       state.globe.setPointOfView(state.renderObjs.camera().position);
       state.onZoom && state.onZoom(pov);
-    }); // config renderObjs
+    });
 
+    // config renderObjs
     var getGlobeObj = function getGlobeObj(object) {
-      var obj = object; // recurse up object chain until finding the globe object
-
+      var obj = object;
+      // recurse up object chain until finding the globe object
       while (obj && !obj.hasOwnProperty('__globeObjType')) {
         obj = obj.parent;
       }
-
       return obj;
     };
-
     var dataAccessors = {
       point: function point(d) {
         return d;
@@ -591,16 +556,16 @@ var globe = Kapsule({
         return d;
       }
     };
-    state.renderObjs.objects([// Populate scene
+    state.renderObjs.objects([
+    // Populate scene
     new THREE.AmbientLight(0xbbbbbb), new THREE.DirectionalLight(0xffffff, 0.6), state.globe]).hoverOrderComparator(function (a, b) {
       var aObj = getGlobeObj(a);
-      var bObj = getGlobeObj(b); // de-prioritize background / non-globe objects
+      var bObj = getGlobeObj(b);
 
+      // de-prioritize background / non-globe objects
       var isBackground = function isBackground(o) {
         return !o;
       }; // || o.__globeObjType === 'globe' || o.__globeObjType === 'atmosphere';
-
-
       return isBackground(aObj) - isBackground(bObj);
     }).tooltipContent(function (obj) {
       var objAccessors = {
@@ -645,34 +610,32 @@ var globe = Kapsule({
         object: state.onObjectClick,
         custom: state.onCustomLayerClick
       };
-      var hoverObj = getGlobeObj(obj); // ignore non-recognised obj types
+      var hoverObj = getGlobeObj(obj);
 
+      // ignore non-recognised obj types
       hoverObj && !hoverObjFns.hasOwnProperty(hoverObj.__globeObjType) && (hoverObj = null);
-
       if (hoverObj !== state.hoverObj) {
         var prevObjType = state.hoverObj ? state.hoverObj.__globeObjType : null;
         var prevObjData = state.hoverObj ? dataAccessors[prevObjType](state.hoverObj.__data) : null;
         var objType = hoverObj ? hoverObj.__globeObjType : null;
         var objData = hoverObj ? dataAccessors[objType](hoverObj.__data) : null;
-
         if (prevObjType && prevObjType !== objType) {
           // Hover out
           hoverObjFns[prevObjType] && hoverObjFns[prevObjType](null, prevObjData);
         }
-
         if (objType) {
           // Hover in
           hoverObjFns[objType] && hoverObjFns[objType](objData, prevObjType === objType ? prevObjData : null);
-        } // set pointer if hovered object is clickable
-
+        }
 
+        // set pointer if hovered object is clickable
         state.renderObjs.renderer().domElement.classList[objType && clickObjFns[objType] ? 'add' : 'remove']('clickable');
         state.hoverObj = hoverObj;
       }
     }).onClick(function (obj, ev, point) {
       if (!obj) return; // ignore background clicks
-      // Handle click events on objects
 
+      // Handle click events on objects
       var objFns = {
         globe: state.onGlobeClick,
         point: state.onPointClick,
@@ -688,15 +651,14 @@ var globe = Kapsule({
       };
       var globeObj = getGlobeObj(obj);
       var objType = globeObj.__globeObjType;
-
       if (globeObj && objFns.hasOwnProperty(objType) && objFns[objType]) {
-        var args = [ev]; // include click coords
+        var args = [ev];
 
+        // include click coords
         if (objType === 'globe') {
           var _this$toGeoCoords = _this.toGeoCoords(point),
-              lat = _this$toGeoCoords.lat,
-              lng = _this$toGeoCoords.lng;
-
+            lat = _this$toGeoCoords.lat,
+            lng = _this$toGeoCoords.lng;
           args.unshift({
             lat: lat,
             lng: lng
@@ -704,14 +666,13 @@ var globe = Kapsule({
         } else {
           args.push(_this.toGeoCoords(point));
         }
-
         dataAccessors.hasOwnProperty(objType) && args.unshift(dataAccessors[objType](globeObj.__data));
         objFns[objType].apply(objFns, args);
       }
     }).onRightClick(function (obj, ev, point) {
       if (!obj) return; // ignore background clicks
-      // Handle right-click events
 
+      // Handle right-click events
       var objFns = {
         globe: state.onGlobeRightClick,
         point: state.onPointRightClick,
@@ -727,15 +688,14 @@ var globe = Kapsule({
       };
       var globeObj = getGlobeObj(obj);
       var objType = globeObj.__globeObjType;
-
       if (globeObj && objFns.hasOwnProperty(objType) && objFns[objType]) {
-        var args = [ev]; // include click coords
+        var args = [ev];
 
+        // include click coords
         if (objType === 'globe') {
           var _this$toGeoCoords2 = _this.toGeoCoords(point),
-              lat = _this$toGeoCoords2.lat,
-              lng = _this$toGeoCoords2.lng;
-
+            lat = _this$toGeoCoords2.lat,
+            lng = _this$toGeoCoords2.lng;
           args.unshift({
             lat: lat,
             lng: lng
@@ -743,13 +703,14 @@ var globe = Kapsule({
         } else {
           args.push(_this.toGeoCoords(point));
         }
-
         dataAccessors.hasOwnProperty(objType) && args.unshift(dataAccessors[objType](globeObj.__data));
         objFns[objType].apply(objFns, args);
       }
-    }); //
-    // Kick-off renderer
+    });
 
+    //
+
+    // Kick-off renderer
     this._animationCycle();
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "globe.gl",
-  "version": "2.26.5",
+  "version": "2.26.7",
   "description": "UI component for Globe Data Visualization using ThreeJS/WebGL",
   "unpkg": "dist/globe.gl.min.js",
   "jsdelivr": "dist/globe.gl.min.js",
@@ -34,7 +34,7 @@
   "homepage": "https://github.com/vasturiano/globe.gl",
   "scripts": {
     "build": "rimraf dist && rollup -c",
-    "dev": "rollup -w -c rollup.config.dev.js",
+    "dev": "rollup -w -c rollup.config.dev.mjs",
     "prepare": "npm run build"
   },
   "files": [
@@ -50,19 +50,19 @@
     "three-render-objects": "^1.27"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.19.6",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-    "@babel/preset-env": "^7.18.10",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "postcss": "^8.4.16",
+    "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+    "@babel/preset-env": "^7.19.4",
+    "@rollup/plugin-babel": "^6.0.2",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "postcss": "^8.4.18",
     "rimraf": "^3.0.2",
-    "rollup": "^2.78.1",
-    "rollup-plugin-dts": "^4.2.2",
+    "rollup": "^3.2.5",
+    "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.4"
   }
 }