globe.gl 2.34.3 → 2.34.5

package/dist/globe.gl.js

@@ -1,4 +1,4 @@
-// Version 2.34.3 globe.gl - https://github.com/vasturiano/globe.gl
+// Version 2.34.5 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) :
@@ -43,7 +43,7 @@
   function _arrayWithoutHoles$5(r) {
     if (Array.isArray(r)) return _arrayLikeToArray$7(r);
   }
-  function _defineProperty$3(e, r, t) {
+  function _defineProperty$2(e, r, t) {
     return (r = _toPropertyKey$4(r)) in e ? Object.defineProperty(e, r, {
       value: t,
       enumerable: !0,
@@ -57,7 +57,7 @@
   function _nonIterableSpread$5() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  function ownKeys$2(e, r) {
+  function ownKeys$1(e, r) {
     var t = Object.keys(e);
     if (Object.getOwnPropertySymbols) {
       var o = Object.getOwnPropertySymbols(e);
@@ -67,29 +67,29 @@
     }
     return t;
   }
-  function _objectSpread2$2(e) {
+  function _objectSpread2$1(e) {
     for (var r = 1; r < arguments.length; r++) {
       var t = null != arguments[r] ? arguments[r] : {};
-      r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) {
-        _defineProperty$3(e, r, t[r]);
-      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) {
+      r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) {
+        _defineProperty$2(e, r, t[r]);
+      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) {
         Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
       });
     }
     return e;
   }
-  function _objectWithoutProperties$3(e, t) {
+  function _objectWithoutProperties$2(e, t) {
     if (null == e) return {};
     var o,
       r,
-      i = _objectWithoutPropertiesLoose$3(e, t);
+      i = _objectWithoutPropertiesLoose$2(e, t);
     if (Object.getOwnPropertySymbols) {
       var s = Object.getOwnPropertySymbols(e);
       for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
     }
     return i;
   }
-  function _objectWithoutPropertiesLoose$3(r, e) {
+  function _objectWithoutPropertiesLoose$2(r, e) {
     if (null == r) return {};
     var t = {};
     for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
@@ -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;
 
@@ -29250,7 +29250,7 @@
 
   }
 
-  let _id$8 = 0;
+  let _id$9 = 0;
 
   class WebGLShaderCache {
 
@@ -29364,7 +29364,7 @@
 
   	constructor( code ) {
 
-  		this.id = _id$8 ++;
+  		this.id = _id$9 ++;
 
   		this.code = code;
   		this.usedTimes = 0;
@@ -40947,10 +40947,10 @@ void main() {
   function _arrayWithHoles$6(r) {
     if (Array.isArray(r)) return r;
   }
-  function _classCallCheck$3(a, n) {
+  function _classCallCheck$4(a, n) {
     if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
   }
-  function _createClass$3(e, r, t) {
+  function _createClass$4(e, r, t) {
     return Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
@@ -40993,14 +40993,14 @@ void main() {
     }
   }
 
-  var Prop = /*#__PURE__*/_createClass$3(function Prop(name, _ref) {
+  var Prop = /*#__PURE__*/_createClass$4(function Prop(name, _ref) {
     var _ref$default = _ref["default"],
       defaultVal = _ref$default === void 0 ? null : _ref$default,
       _ref$triggerUpdate = _ref.triggerUpdate,
       triggerUpdate = _ref$triggerUpdate === void 0 ? true : _ref$triggerUpdate,
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function (newVal, state) {} : _ref$onChange;
-    _classCallCheck$3(this, Prop);
+    _classCallCheck$4(this, Prop);
     this.name = name;
     this.defaultVal = defaultVal;
     this.triggerUpdate = triggerUpdate;
@@ -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
@@ -45293,10 +45312,10 @@ void main() {
   function _callSuper$2(t, o, e) {
     return o = _getPrototypeOf$3(o), _possibleConstructorReturn$2(t, _isNativeReflectConstruct$3() ? Reflect.construct(o, [], _getPrototypeOf$3(t).constructor) : o.apply(t, e));
   }
-  function _classCallCheck$2(a, n) {
+  function _classCallCheck$3(a, n) {
     if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
   }
-  function _createClass$2(e, r, t) {
+  function _createClass$3(e, r, t) {
     return Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
@@ -45461,7 +45480,7 @@ void main() {
       var _this;
       var radius = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       var resolution = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 5;
-      _classCallCheck$2(this, GeoJsonGeometry);
+      _classCallCheck$3(this, GeoJsonGeometry);
       _this = _callSuper$2(this, GeoJsonGeometry);
       _this.type = 'GeoJsonGeometry';
       _this.parameters = {
@@ -45623,7 +45642,7 @@ void main() {
       return _this;
     }
     _inherits$2(GeoJsonGeometry, _THREE$BufferGeometry);
-    return _createClass$2(GeoJsonGeometry);
+    return _createClass$3(GeoJsonGeometry);
   }(THREE$k.BufferGeometry); //
   function concatGroup(main, extra) {
     var prevVertCnt = Math.round(main.vertices.length / 3);
@@ -48629,6 +48648,36 @@ void main() {
   function _arrayWithoutHoles$4(r) {
     if (Array.isArray(r)) return _arrayLikeToArray$4(r);
   }
+  function _assertClassBrand$1(e, t, n) {
+    if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n;
+    throw new TypeError("Private element is not present on this object");
+  }
+  function _checkPrivateRedeclaration$1(e, t) {
+    if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object");
+  }
+  function _classCallCheck$2(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _classPrivateFieldGet2$1(s, a) {
+    return s.get(_assertClassBrand$1(s, a));
+  }
+  function _classPrivateFieldInitSpec$1(e, t, a) {
+    _checkPrivateRedeclaration$1(e, t), t.set(e, a);
+  }
+  function _classPrivateFieldSet2$1(s, a, r) {
+    return s.set(_assertClassBrand$1(s, a), r), r;
+  }
+  function _defineProperties$1(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey$3(o.key), o);
+    }
+  }
+  function _createClass$2(e, r, t) {
+    return r && _defineProperties$1(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
   function _iterableToArray$4(r) {
     if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
   }
@@ -48662,26 +48711,6 @@ void main() {
   function _nonIterableSpread$4() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  function _objectWithoutProperties$2(e, t) {
-    if (null == e) return {};
-    var o,
-      r,
-      i = _objectWithoutPropertiesLoose$2(e, t);
-    if (Object.getOwnPropertySymbols) {
-      var s = Object.getOwnPropertySymbols(e);
-      for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
-    }
-    return i;
-  }
-  function _objectWithoutPropertiesLoose$2(r, e) {
-    if (null == r) return {};
-    var t = {};
-    for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-      if (e.includes(n)) continue;
-      t[n] = r[n];
-    }
-    return t;
-  }
   function _slicedToArray$4(r, e) {
     return _arrayWithHoles$4(r) || _iterableToArrayLimit$4(r, e) || _unsupportedIterableToArray$4(r, e) || _nonIterableRest$4();
   }
@@ -48692,7 +48721,7 @@ void main() {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r );
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
@@ -48710,367 +48739,103 @@ void main() {
     }
   }
 
-  var index = (function () {
-    var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var keyAccessors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var multiItem = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-    var flattenKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    var keys = (keyAccessors instanceof Array ? keyAccessors.length ? keyAccessors : [undefined] : [keyAccessors]).map(function (key) {
-      return {
-        keyAccessor: key,
-        isProp: !(key instanceof Function)
-      };
-    });
-    var indexedResult = list.reduce(function (res, item) {
-      var iterObj = res;
-      var itemVal = item;
-      keys.forEach(function (_ref, idx) {
-        var keyAccessor = _ref.keyAccessor,
-          isProp = _ref.isProp;
-        var key;
-        if (isProp) {
-          var _itemVal = itemVal,
-            propVal = _itemVal[keyAccessor],
-            rest = _objectWithoutProperties$2(_itemVal, [keyAccessor].map(_toPropertyKey$3));
-          key = propVal;
-          itemVal = rest;
-        } else {
-          key = keyAccessor(itemVal, idx);
-        }
-        if (idx + 1 < keys.length) {
-          if (!iterObj.hasOwnProperty(key)) {
-            iterObj[key] = {};
-          }
-          iterObj = iterObj[key];
-        } else {
-          // Leaf key
-          if (multiItem) {
-            if (!iterObj.hasOwnProperty(key)) {
-              iterObj[key] = [];
-            }
-            iterObj[key].push(itemVal);
-          } else {
-            iterObj[key] = itemVal;
-          }
-        }
+  var _dataMap = /*#__PURE__*/new WeakMap();
+  var _objMap = /*#__PURE__*/new WeakMap();
+  var _id$8 = /*#__PURE__*/new WeakMap();
+  var _createObj = /*#__PURE__*/new WeakMap();
+  var _updateObj = /*#__PURE__*/new WeakMap();
+  var _removeObj = /*#__PURE__*/new WeakMap();
+  var DataBindMapper = /*#__PURE__*/function () {
+    function DataBindMapper() {
+      _classCallCheck$2(this, DataBindMapper);
+      _classPrivateFieldInitSpec$1(this, _dataMap, new Map());
+      _classPrivateFieldInitSpec$1(this, _objMap, new Map());
+      _classPrivateFieldInitSpec$1(this, _id$8, function (d) {
+        return d;
       });
-      return res;
-    }, {});
-    if (multiItem instanceof Function) {
-      // Reduce leaf multiple values
-      (function reduce(node) {
-        var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-        if (level === keys.length) {
-          Object.keys(node).forEach(function (k) {
-            return node[k] = multiItem(node[k]);
-          });
-        } else {
-          Object.values(node).forEach(function (child) {
-            return reduce(child, level + 1);
-          });
-        }
-      })(indexedResult); // IIFE
+      _classPrivateFieldInitSpec$1(this, _createObj, function () {
+        return {};
+      });
+      _classPrivateFieldInitSpec$1(this, _updateObj, function () {});
+      _classPrivateFieldInitSpec$1(this, _removeObj, function () {});
     }
-    var result = indexedResult;
-    if (flattenKeys) {
-      // flatten into array
-      result = [];
-      (function flatten(node) {
-        var accKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-        if (accKeys.length === keys.length) {
-          result.push({
-            keys: accKeys,
-            vals: node
-          });
-        } else {
-          Object.entries(node).forEach(function (_ref2) {
-            var _ref3 = _slicedToArray$4(_ref2, 2),
-              key = _ref3[0],
-              val = _ref3[1];
-            return flatten(val, [].concat(_toConsumableArray$4(accKeys), [key]));
-          });
-        }
-      })(indexedResult); //IIFE
-
-      if (keyAccessors instanceof Array && keyAccessors.length === 0 && result.length === 1) {
-        // clear keys if there's no key accessors (single result)
-        result[0].keys = [];
+    return _createClass$2(DataBindMapper, [{
+      key: "getObj",
+      value: function getObj(d) {
+        return _classPrivateFieldGet2$1(_dataMap, this).get(_classPrivateFieldGet2$1(_id$8, this).call(this, d));
       }
-    }
-    return result;
-  });
-
-  function _iterableToArrayLimit$3(arr, i) {
-    var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
-    if (null != _i) {
-      var _s,
-        _e,
-        _x,
-        _r,
-        _arr = [],
-        _n = !0,
-        _d = !1;
-      try {
-        if (_x = (_i = _i.call(arr)).next, 0 === i) ; else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
-      } catch (err) {
-        _d = !0, _e = err;
-      } finally {
-        try {
-          if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return;
-        } finally {
-          if (_d) throw _e;
-        }
+    }, {
+      key: "getData",
+      value: function getData(o) {
+        return _classPrivateFieldGet2$1(_objMap, this).get(o);
       }
-      return _arr;
-    }
-  }
-  function ownKeys$1(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$1(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = null != arguments[i] ? arguments[i] : {};
-      i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) {
-        _defineProperty$2(target, key, source[key]);
-      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-    return target;
-  }
-  function _defineProperty$2(obj, key, value) {
-    key = _toPropertyKey$2(key);
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
-  }
-  function _objectWithoutPropertiesLoose$1(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$1(source, excluded) {
-    if (source == null) return {};
-    var target = _objectWithoutPropertiesLoose$1(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;
-        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-        target[key] = source[key];
+    }, {
+      key: "entries",
+      value: function entries() {
+        return _toConsumableArray$4(_classPrivateFieldGet2$1(_objMap, this).entries()).map(function (_ref) {
+          var _ref2 = _slicedToArray$4(_ref, 2),
+            o = _ref2[0],
+            d = _ref2[1];
+          return [d, o];
+        });
       }
-    }
-    return target;
-  }
-  function _slicedToArray$3(arr, i) {
-    return _arrayWithHoles$3(arr) || _iterableToArrayLimit$3(arr, i) || _unsupportedIterableToArray$3(arr, i) || _nonIterableRest$3();
-  }
-  function _toConsumableArray$3(arr) {
-    return _arrayWithoutHoles$3(arr) || _iterableToArray$3(arr) || _unsupportedIterableToArray$3(arr) || _nonIterableSpread$3();
-  }
-  function _arrayWithoutHoles$3(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray$3(arr);
-  }
-  function _arrayWithHoles$3(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-  function _iterableToArray$3(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-  function _unsupportedIterableToArray$3(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray$3(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen);
-  }
-  function _arrayLikeToArray$3(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$3() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _nonIterableRest$3() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _toPrimitive$2(input, hint) {
-    if (typeof input !== "object" || input === null) return input;
-    var prim = input[Symbol.toPrimitive];
-    if (prim !== undefined) {
-      var res = prim.call(input, hint || "default");
-      if (typeof res !== "object") return res;
-      throw new TypeError("@@toPrimitive must return a primitive value.");
-    }
-    return (hint === "string" ? String : Number)(input);
-  }
-  function _toPropertyKey$2(arg) {
-    var key = _toPrimitive$2(arg, "string");
-    return typeof key === "symbol" ? key : String(key);
-  }
-
-  var _excluded$2 = ["createObj", "updateObj", "exitObj", "objBindAttr", "dataBindAttr"];
-  function diffArrays(prev, next, idAccessor) {
-    var result = {
-      enter: [],
-      update: [],
-      exit: []
-    };
-    if (!idAccessor) {
-      // use object references for comparison
-      var prevSet = new Set(prev);
-      var nextSet = new Set(next);
-      new Set([].concat(_toConsumableArray$3(prevSet), _toConsumableArray$3(nextSet))).forEach(function (item) {
-        var type = !prevSet.has(item) ? 'enter' : !nextSet.has(item) ? 'exit' : 'update';
-        result[type].push(type === 'update' ? [item, item] : item);
-      });
-    } else {
-      // compare by id (duplicate keys are ignored)
-      var prevById = index(prev, idAccessor, false);
-      var nextById = index(next, idAccessor, false);
-      var byId = Object.assign({}, prevById, nextById);
-      Object.entries(byId).forEach(function (_ref) {
-        var _ref2 = _slicedToArray$3(_ref, 2),
-          id = _ref2[0],
-          item = _ref2[1];
-        var type = !prevById.hasOwnProperty(id) ? 'enter' : !nextById.hasOwnProperty(id) ? 'exit' : 'update';
-        result[type].push(type === 'update' ? [prevById[id], nextById[id]] : item);
-      });
-    }
-    return result;
-  }
-  function dataBindDiff(data, existingObjs, _ref3) {
-    var _ref3$objBindAttr = _ref3.objBindAttr,
-      objBindAttr = _ref3$objBindAttr === void 0 ? '__obj' : _ref3$objBindAttr,
-      _ref3$dataBindAttr = _ref3.dataBindAttr,
-      dataBindAttr = _ref3$dataBindAttr === void 0 ? '__data' : _ref3$dataBindAttr,
-      idAccessor = _ref3.idAccessor,
-      _ref3$purge = _ref3.purge,
-      purge = _ref3$purge === void 0 ? false : _ref3$purge;
-    var isObjValid = function isObjValid(obj) {
-      return obj.hasOwnProperty(dataBindAttr);
-    };
-    var removeObjs = existingObjs.filter(function (obj) {
-      return !isObjValid(obj);
-    });
-    var prevD = existingObjs.filter(isObjValid).map(function (obj) {
-      return obj[dataBindAttr];
-    });
-    var nextD = data;
-    var diff = purge ? {
-      enter: nextD,
-      exit: prevD,
-      update: []
-    } // don't diff data in purge mode
-    : diffArrays(prevD, nextD, idAccessor);
-    diff.update = diff.update.map(function (_ref4) {
-      var _ref5 = _slicedToArray$3(_ref4, 2),
-        prevD = _ref5[0],
-        nextD = _ref5[1];
-      if (prevD !== nextD) {
-        // transfer obj to new data point (if different)
-        nextD[objBindAttr] = prevD[objBindAttr];
-        nextD[objBindAttr][dataBindAttr] = nextD;
+    }, {
+      key: "id",
+      value: function id(p) {
+        _classPrivateFieldSet2$1(_id$8, this, index$1(p));
+        return this;
       }
-      return nextD;
-    });
-    diff.exit = diff.exit.concat(removeObjs.map(function (obj) {
-      return _defineProperty$2({}, objBindAttr, obj);
-    }));
-    return diff;
-  }
-  function viewDigest(data, existingObjs,
-  // list
-  appendObj,
-  // item => {...} function
-  removeObj, // item => {...} function
-  _ref7) {
-    var _ref7$createObj = _ref7.createObj,
-      createObj = _ref7$createObj === void 0 ? function (d) {
-        return {};
-      } : _ref7$createObj,
-      _ref7$updateObj = _ref7.updateObj,
-      updateObj = _ref7$updateObj === void 0 ? function (obj, d) {} : _ref7$updateObj,
-      _ref7$exitObj = _ref7.exitObj,
-      exitObj = _ref7$exitObj === void 0 ? function (obj) {} : _ref7$exitObj,
-      _ref7$objBindAttr = _ref7.objBindAttr,
-      objBindAttr = _ref7$objBindAttr === void 0 ? '__obj' : _ref7$objBindAttr,
-      _ref7$dataBindAttr = _ref7.dataBindAttr,
-      dataBindAttr = _ref7$dataBindAttr === void 0 ? '__data' : _ref7$dataBindAttr,
-      dataDiffOptions = _objectWithoutProperties$1(_ref7, _excluded$2);
-    var _dataBindDiff = dataBindDiff(data, existingObjs, _objectSpread2$1({
-        objBindAttr: objBindAttr,
-        dataBindAttr: dataBindAttr
-      }, dataDiffOptions)),
-      enter = _dataBindDiff.enter,
-      update = _dataBindDiff.update,
-      exit = _dataBindDiff.exit;
-
-    // Remove exiting points
-    exit.forEach(function (d) {
-      var obj = d[objBindAttr];
-      delete d[objBindAttr]; // unbind obj
-
-      exitObj(obj);
-      removeObj(obj);
-    });
-    var newObjs = createObjs(enter);
-    var pointsData = [].concat(_toConsumableArray$3(enter), _toConsumableArray$3(update));
-    updateObjs(pointsData);
-
-    // Add new points
-    newObjs.forEach(appendObj);
-
-    //
-
-    function createObjs(data) {
-      var newObjs = [];
-      data.forEach(function (d) {
-        var obj = createObj(d);
-        if (obj) {
-          obj[dataBindAttr] = d;
-          d[objBindAttr] = obj;
-          newObjs.push(obj);
-        }
-      });
-      return newObjs;
-    }
-    function updateObjs(data) {
-      data.forEach(function (d) {
-        var obj = d[objBindAttr];
-        if (obj) {
-          obj[dataBindAttr] = d;
-          updateObj(obj, d);
-        }
-      });
-    }
-  }
+    }, {
+      key: "onCreateObj",
+      value: function onCreateObj(fn) {
+        _classPrivateFieldSet2$1(_createObj, this, fn);
+        return this;
+      }
+    }, {
+      key: "onUpdateObj",
+      value: function onUpdateObj(fn) {
+        _classPrivateFieldSet2$1(_updateObj, this, fn);
+        return this;
+      }
+    }, {
+      key: "onRemoveObj",
+      value: function onRemoveObj(fn) {
+        _classPrivateFieldSet2$1(_removeObj, this, fn);
+        return this;
+      }
+    }, {
+      key: "digest",
+      value: function digest(data) {
+        var _this = this;
+        data.filter(function (d) {
+          return !_classPrivateFieldGet2$1(_dataMap, _this).has(_classPrivateFieldGet2$1(_id$8, _this).call(_this, d));
+        }).forEach(function (d) {
+          var obj = _classPrivateFieldGet2$1(_createObj, _this).call(_this, d);
+          _classPrivateFieldGet2$1(_dataMap, _this).set(_classPrivateFieldGet2$1(_id$8, _this).call(_this, d), obj);
+          _classPrivateFieldGet2$1(_objMap, _this).set(obj, d);
+        });
+        var dataIdsMap = new Map(data.map(function (d) {
+          return [_classPrivateFieldGet2$1(_id$8, _this).call(_this, d), d];
+        }));
+        _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);
+            _classPrivateFieldGet2$1(_objMap, _this)["delete"](o);
+          } else {
+            _classPrivateFieldGet2$1(_updateObj, _this).call(_this, o, dataIdsMap.get(dId));
+          }
+        });
+        return this;
+      }
+    }, {
+      key: "clear",
+      value: function clear() {
+        this.digest([]);
+        return this;
+      }
+    }]);
+  }();
 
   function getDefaultExportFromCjs (x) {
   	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -52018,16 +51783,16 @@ void main() {
     return data ? v(data) : v;
   }
 
-  function _arrayLikeToArray$2(r, a) {
+  function _arrayLikeToArray$3(r, a) {
     (null == a || a > r.length) && (a = r.length);
     for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
     return n;
   }
-  function _arrayWithHoles$2(r) {
+  function _arrayWithHoles$3(r) {
     if (Array.isArray(r)) return r;
   }
-  function _arrayWithoutHoles$2(r) {
-    if (Array.isArray(r)) return _arrayLikeToArray$2(r);
+  function _arrayWithoutHoles$3(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray$3(r);
   }
   function _assertThisInitialized$2(e) {
     if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -52069,10 +51834,10 @@ void main() {
       return !!t;
     })();
   }
-  function _iterableToArray$2(r) {
+  function _iterableToArray$3(r) {
     if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
   }
-  function _iterableToArrayLimit$2(r, l) {
+  function _iterableToArrayLimit$3(r, l) {
     var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (null != t) {
       var e,
@@ -52096,10 +51861,10 @@ void main() {
       return a;
     }
   }
-  function _nonIterableRest$2() {
+  function _nonIterableRest$3() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  function _nonIterableSpread$2() {
+  function _nonIterableSpread$3() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
   function _possibleConstructorReturn$1(t, e) {
@@ -52112,17 +51877,17 @@ void main() {
       return t.__proto__ = e, t;
     }, _setPrototypeOf$2(t, e);
   }
-  function _slicedToArray$2(r, e) {
-    return _arrayWithHoles$2(r) || _iterableToArrayLimit$2(r, e) || _unsupportedIterableToArray$2(r, e) || _nonIterableRest$2();
+  function _slicedToArray$3(r, e) {
+    return _arrayWithHoles$3(r) || _iterableToArrayLimit$3(r, e) || _unsupportedIterableToArray$3(r, e) || _nonIterableRest$3();
   }
-  function _toConsumableArray$2(r) {
-    return _arrayWithoutHoles$2(r) || _iterableToArray$2(r) || _unsupportedIterableToArray$2(r) || _nonIterableSpread$2();
+  function _toConsumableArray$3(r) {
+    return _arrayWithoutHoles$3(r) || _iterableToArray$3(r) || _unsupportedIterableToArray$3(r) || _nonIterableSpread$3();
   }
-  function _unsupportedIterableToArray$2(r, a) {
+  function _unsupportedIterableToArray$3(r, a) {
     if (r) {
-      if ("string" == typeof r) return _arrayLikeToArray$2(r, a);
+      if ("string" == typeof r) return _arrayLikeToArray$3(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) : void 0;
+      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$3(r, a) : void 0;
     }
   }
 
@@ -52133,17 +51898,17 @@ void main() {
     var contour = interpolateContourPoints(polygon, resolution);
     var edgePoints = merge(contour);
     var innerPoints = getInnerGeoPoints(polygon, resolution);
-    var points = [].concat(_toConsumableArray$2(edgePoints), _toConsumableArray$2(innerPoints));
+    var points = [].concat(_toConsumableArray$3(edgePoints), _toConsumableArray$3(innerPoints));
     var boundariesGeojson = {
       type: 'Polygon',
       coordinates: polygon
     };
     var _geoBounds = geoBounds(boundariesGeojson),
-      _geoBounds2 = _slicedToArray$2(_geoBounds, 2),
-      _geoBounds2$ = _slicedToArray$2(_geoBounds2[0], 2),
+      _geoBounds2 = _slicedToArray$3(_geoBounds, 2),
+      _geoBounds2$ = _slicedToArray$3(_geoBounds2[0], 2),
       minLng = _geoBounds2$[0],
       minLat = _geoBounds2$[1],
-      _geoBounds2$2 = _slicedToArray$2(_geoBounds2[1], 2),
+      _geoBounds2$2 = _slicedToArray$3(_geoBounds2[1], 2),
       maxLng = _geoBounds2$2[0],
       maxLat = _geoBounds2$2[1];
     var crossesPoleOrAntimeridian = minLng > maxLng // crosses antimeridian
@@ -52155,7 +51920,7 @@ void main() {
       // Use d3-geo-voronoi. Slowest, but most accurate for polygons that cross poles or anti-meridian
       var vt = geoVoronoi(points).triangles(); // geoDelaunay generates more triangles than needed
       var pntMap = new Map(points.map(function (_ref2, idx) {
-        var _ref3 = _slicedToArray$2(_ref2, 2),
+        var _ref3 = _slicedToArray$3(_ref2, 2),
           lng = _ref3[0],
           lat = _ref3[1];
         return ["".concat(lng, "-").concat(lat), idx];
@@ -52166,7 +51931,7 @@ void main() {
 
         var inds = [];
         triangle.forEach(function (_ref4) {
-          var _ref5 = _slicedToArray$2(_ref4, 2),
+          var _ref5 = _slicedToArray$3(_ref4, 2),
             lng = _ref5[0],
             lat = _ref5[1];
           var k = "".concat(lng, "-").concat(lat);
@@ -52213,7 +51978,7 @@ void main() {
           });
           if (!pointInside(triangleCentroid, boundariesGeojson, crossesPoleOrAntimeridian)) return 1; // continue
         }
-        (_indices2 = indices).push.apply(_indices2, _toConsumableArray$2(inds));
+        (_indices2 = indices).push.apply(_indices2, _toConsumableArray$3(inds));
       };
       for (var i = 0, len = delaunay.triangles.length; i < len; i += 3) {
         if (_loop(i)) continue;
@@ -52228,7 +51993,7 @@ void main() {
       return d[1];
     }), [0, 1]);
     var uvs = points.map(function (_ref6) {
-      var _ref7 = _slicedToArray$2(_ref6, 2),
+      var _ref7 = _slicedToArray$3(_ref6, 2),
         lng = _ref7[0],
         lat = _ref7[1];
       return [lngUvScale(lng), latUvScale(lat)];
@@ -52272,11 +52037,11 @@ void main() {
       coordinates: polygon
     };
     var _geoBounds3 = geoBounds(boundariesGeojson),
-      _geoBounds4 = _slicedToArray$2(_geoBounds3, 2),
-      _geoBounds4$ = _slicedToArray$2(_geoBounds4[0], 2),
+      _geoBounds4 = _slicedToArray$3(_geoBounds3, 2),
+      _geoBounds4$ = _slicedToArray$3(_geoBounds4[0], 2),
       minLng = _geoBounds4$[0],
       minLat = _geoBounds4$[1],
-      _geoBounds4$2 = _slicedToArray$2(_geoBounds4[1], 2),
+      _geoBounds4$2 = _slicedToArray$3(_geoBounds4[1], 2),
       maxLng = _geoBounds4$2[0],
       maxLat = _geoBounds4$2[1];
 
@@ -52346,12 +52111,12 @@ void main() {
 
   // support both modes for backwards threejs compatibility
   var setAttributeFn = new THREE$j.BufferGeometry().setAttribute ? 'setAttribute' : 'addAttribute';
-  var ConicPolygonBufferGeometry = /*#__PURE__*/function (_THREE$BufferGeometry) {
-    function ConicPolygonBufferGeometry(polygonGeoJson, startHeight, endHeight, closedBottom, closedTop, includeSides, curvatureResolution) {
+  var ConicPolygonGeometry = /*#__PURE__*/function (_THREE$BufferGeometry) {
+    function ConicPolygonGeometry(polygonGeoJson, startHeight, endHeight, closedBottom, closedTop, includeSides, curvatureResolution) {
       var _this;
-      _classCallCheck$1(this, ConicPolygonBufferGeometry);
-      _this = _callSuper$1(this, ConicPolygonBufferGeometry);
-      _this.type = 'ConicPolygonBufferGeometry';
+      _classCallCheck$1(this, ConicPolygonGeometry);
+      _this = _callSuper$1(this, ConicPolygonGeometry);
+      _this.type = 'ConicPolygonGeometry';
       _this.parameters = {
         polygonGeoJson: polygonGeoJson,
         startHeight: startHeight,
@@ -52409,7 +52174,7 @@ void main() {
       function generateVertices(polygon, altitude) {
         var coords3d = polygon.map(function (coords) {
           return coords.map(function (_ref) {
-            var _ref2 = _slicedToArray$2(_ref, 2),
+            var _ref2 = _slicedToArray$3(_ref, 2),
               lng = _ref2[0],
               lat = _ref2[1];
             return polar2Cartesian$1(lat, lng, altitude);
@@ -52462,8 +52227,8 @@ void main() {
       }
       return _this;
     }
-    _inherits$1(ConicPolygonBufferGeometry, _THREE$BufferGeometry);
-    return _createClass$1(ConicPolygonBufferGeometry);
+    _inherits$1(ConicPolygonGeometry, _THREE$BufferGeometry);
+    return _createClass$1(ConicPolygonGeometry);
   }(THREE$j.BufferGeometry); //
   function polar2Cartesian$1(lat, lng) {
     var r = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -52477,6 +52242,188 @@ void main() {
     ];
   }
 
+  function _arrayLikeToArray$2(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _arrayWithHoles$2(r) {
+    if (Array.isArray(r)) return r;
+  }
+  function _arrayWithoutHoles$2(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray$2(r);
+  }
+  function _iterableToArray$2(r) {
+    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+  }
+  function _iterableToArrayLimit$2(r, l) {
+    var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (null != t) {
+      var e,
+        n,
+        i,
+        u,
+        a = [],
+        f = !0,
+        o = !1;
+      try {
+        if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+      } catch (r) {
+        o = !0, n = r;
+      } finally {
+        try {
+          if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+        } finally {
+          if (o) throw n;
+        }
+      }
+      return a;
+    }
+  }
+  function _nonIterableRest$2() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _nonIterableSpread$2() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _objectWithoutProperties$1(e, t) {
+    if (null == e) return {};
+    var o,
+      r,
+      i = _objectWithoutPropertiesLoose$1(e, t);
+    if (Object.getOwnPropertySymbols) {
+      var s = Object.getOwnPropertySymbols(e);
+      for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    }
+    return i;
+  }
+  function _objectWithoutPropertiesLoose$1(r, e) {
+    if (null == r) return {};
+    var t = {};
+    for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+      if (e.includes(n)) continue;
+      t[n] = r[n];
+    }
+    return t;
+  }
+  function _slicedToArray$2(r, e) {
+    return _arrayWithHoles$2(r) || _iterableToArrayLimit$2(r, e) || _unsupportedIterableToArray$2(r, e) || _nonIterableRest$2();
+  }
+  function _toConsumableArray$2(r) {
+    return _arrayWithoutHoles$2(r) || _iterableToArray$2(r) || _unsupportedIterableToArray$2(r) || _nonIterableSpread$2();
+  }
+  function _toPrimitive$2(t, r) {
+    if ("object" != typeof t || !t) return t;
+    var e = t[Symbol.toPrimitive];
+    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.");
+    }
+    return (String )(t);
+  }
+  function _toPropertyKey$2(t) {
+    var i = _toPrimitive$2(t, "string");
+    return "symbol" == typeof i ? i : i + "";
+  }
+  function _unsupportedIterableToArray$2(r, a) {
+    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) : void 0;
+    }
+  }
+
+  var index = (function () {
+    var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var keyAccessors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var multiItem = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    var flattenKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    var keys = (keyAccessors instanceof Array ? keyAccessors.length ? keyAccessors : [undefined] : [keyAccessors]).map(function (key) {
+      return {
+        keyAccessor: key,
+        isProp: !(key instanceof Function)
+      };
+    });
+    var indexedResult = list.reduce(function (res, item) {
+      var iterObj = res;
+      var itemVal = item;
+      keys.forEach(function (_ref, idx) {
+        var keyAccessor = _ref.keyAccessor,
+          isProp = _ref.isProp;
+        var key;
+        if (isProp) {
+          var _itemVal = itemVal,
+            propVal = _itemVal[keyAccessor],
+            rest = _objectWithoutProperties$1(_itemVal, [keyAccessor].map(_toPropertyKey$2));
+          key = propVal;
+          itemVal = rest;
+        } else {
+          key = keyAccessor(itemVal, idx);
+        }
+        if (idx + 1 < keys.length) {
+          if (!iterObj.hasOwnProperty(key)) {
+            iterObj[key] = {};
+          }
+          iterObj = iterObj[key];
+        } else {
+          // Leaf key
+          if (multiItem) {
+            if (!iterObj.hasOwnProperty(key)) {
+              iterObj[key] = [];
+            }
+            iterObj[key].push(itemVal);
+          } else {
+            iterObj[key] = itemVal;
+          }
+        }
+      });
+      return res;
+    }, {});
+    if (multiItem instanceof Function) {
+      // Reduce leaf multiple values
+      (function reduce(node) {
+        var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+        if (level === keys.length) {
+          Object.keys(node).forEach(function (k) {
+            return node[k] = multiItem(node[k]);
+          });
+        } else {
+          Object.values(node).forEach(function (child) {
+            return reduce(child, level + 1);
+          });
+        }
+      })(indexedResult); // IIFE
+    }
+    var result = indexedResult;
+    if (flattenKeys) {
+      // flatten into array
+      result = [];
+      (function flatten(node) {
+        var accKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+        if (accKeys.length === keys.length) {
+          result.push({
+            keys: accKeys,
+            vals: node
+          });
+        } else {
+          Object.entries(node).forEach(function (_ref2) {
+            var _ref3 = _slicedToArray$2(_ref2, 2),
+              key = _ref3[0],
+              val = _ref3[1];
+            return flatten(val, [].concat(_toConsumableArray$2(accKeys), [key]));
+          });
+        }
+      })(indexedResult); //IIFE
+
+      if (keyAccessors instanceof Array && keyAccessors.length === 0 && result.length === 1) {
+        // clear keys if there's no key accessors (single result)
+        result[0].keys = [];
+      }
+    }
+    return result;
+  });
+
   // @ts-nocheck
   var libh3 = function (libh3) {
     libh3 = libh3 || {};
@@ -69466,6 +69413,15 @@ void main() {
       writable: !0
     }) : e[r] = t, e;
   }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
   function _getPrototypeOf$1(t) {
     return _getPrototypeOf$1 = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
       return t.__proto__ || Object.getPrototypeOf(t);
@@ -69581,6 +69537,16 @@ void main() {
   function _slicedToArray$1(r, e) {
     return _arrayWithHoles$1(r) || _iterableToArrayLimit$1(r, e) || _unsupportedIterableToArray$1(r, e) || _nonIterableRest$1();
   }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf$1(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf$1(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toConsumableArray$1(r) {
     return _arrayWithoutHoles$1(r) || _iterableToArray$1(r) || _unsupportedIterableToArray$1(r) || _nonIterableSpread$1();
   }
@@ -69709,22 +69675,16 @@ void main() {
     Mesh: Mesh,
     ShaderMaterial: ShaderMaterial
   };
-  var fragmentShader = "\nuniform vec3 color;\nuniform float coefficient;\nuniform float power;\nvarying vec3 vVertexNormal;\nvarying vec3 vVertexWorldPosition;\nvoid main() {\n  vec3 worldCameraToVertex = vVertexWorldPosition - cameraPosition;\n  vec3 viewCameraToVertex\t= (viewMatrix * vec4(worldCameraToVertex, 0.0)).xyz;\n  viewCameraToVertex = normalize(viewCameraToVertex);\n  float intensity\t= pow(\n    coefficient + dot(vVertexNormal, viewCameraToVertex),\n    power\n  );\n  gl_FragColor = vec4(color, intensity);\n}";
-  var vertexShader = "\nvarying vec3 vVertexWorldPosition;\nvarying vec3 vVertexNormal;\nvoid main() {\n  vVertexNormal\t= normalize(normalMatrix * normal);\n  vVertexWorldPosition = (modelMatrix * vec4(position, 1.0)).xyz;\n  gl_Position\t= projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}\n";
-  var defaultOptions = {
-    backside: true,
-    coefficient: 0.5,
-    color: 'gold',
-    size: 2,
-    power: 1
-  };
+  var vertexShader = "\nuniform float hollowRadius;\n\nvarying vec3 vVertexWorldPosition;\nvarying vec3 vVertexNormal;\nvarying float vCameraDistanceToObjCenter;\nvarying float vVertexAngularDistanceToHollowRadius;\n\nvoid main() {    \n  vVertexNormal\t= normalize(normalMatrix * normal);\n  vVertexWorldPosition = (modelMatrix * vec4(position, 1.0)).xyz;\n  \n  vec4 objCenterViewPosition = modelViewMatrix * vec4(0.0, 0.0, 0.0, 1.0);\n  vCameraDistanceToObjCenter = length(objCenterViewPosition);\n  \n  float edgeAngle = atan(hollowRadius / vCameraDistanceToObjCenter);\n  float vertexAngle = acos(dot(normalize(modelViewMatrix * vec4(position, 1.0)), normalize(objCenterViewPosition)));\n  vVertexAngularDistanceToHollowRadius = vertexAngle - edgeAngle;\n\n  gl_Position\t= projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n}";
+  var fragmentShader = "\nuniform vec3 color;\nuniform float coefficient;\nuniform float power;\nuniform float hollowRadius;\n\nvarying vec3 vVertexNormal;\nvarying vec3 vVertexWorldPosition;\nvarying float vCameraDistanceToObjCenter;\nvarying float vVertexAngularDistanceToHollowRadius;\n\nvoid main() {\n  if (vCameraDistanceToObjCenter < hollowRadius) discard; // inside the hollowRadius\n  if (vVertexAngularDistanceToHollowRadius < 0.0) discard; // frag position is within the hollow radius\n\n  vec3 worldCameraToVertex = vVertexWorldPosition - cameraPosition;\n  vec3 viewCameraToVertex\t= (viewMatrix * vec4(worldCameraToVertex, 0.0)).xyz;\n  viewCameraToVertex = normalize(viewCameraToVertex);\n  float intensity\t= pow(\n    coefficient + dot(vVertexNormal, viewCameraToVertex),\n    power\n  );\n  gl_FragColor = vec4(color, intensity);\n}";
 
   // Based off: http://stemkoski.blogspot.fr/2013/07/shaders-in-threejs-glow-and-halo.html
-  function createGlowMaterial(coefficient, color, power) {
+  function createGlowMaterial(coefficient, color, power, hollowRadius) {
     return new THREE$h.ShaderMaterial({
       depthWrite: false,
-      fragmentShader: fragmentShader,
       transparent: true,
+      vertexShader: vertexShader,
+      fragmentShader: fragmentShader,
       uniforms: {
         coefficient: {
           value: coefficient
@@ -69734,13 +69694,14 @@ void main() {
         },
         power: {
           value: power
+        },
+        hollowRadius: {
+          value: hollowRadius
         }
-      },
-      vertexShader: vertexShader
+      }
     });
   }
   function createGlowGeometry(geometry, size) {
-    // expect BufferGeometry
     var glowGeometry = geometry.clone();
 
     // Resize vertex positions according to normals
@@ -69753,20 +69714,34 @@ void main() {
     glowGeometry.setAttribute('position', new THREE$h.BufferAttribute(position, 3));
     return glowGeometry;
   }
-  function createGlowMesh(geometry) {
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultOptions;
-    var backside = options.backside,
-      coefficient = options.coefficient,
-      color = options.color,
-      size = options.size,
-      power = options.power;
-    var glowGeometry = createGlowGeometry(geometry, size);
-    var glowMaterial = createGlowMaterial(coefficient, color, power);
-    if (backside) {
-      glowMaterial.side = THREE$h.BackSide;
+  var GlowMesh = /*#__PURE__*/function (_THREE$Mesh) {
+    function GlowMesh(geometry) {
+      var _this;
+      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref$color = _ref.color,
+        color = _ref$color === void 0 ? 'gold' : _ref$color,
+        _ref$size = _ref.size,
+        size = _ref$size === void 0 ? 2 : _ref$size,
+        _ref$coefficient = _ref.coefficient,
+        coefficient = _ref$coefficient === void 0 ? 0.5 : _ref$coefficient,
+        _ref$power = _ref.power,
+        power = _ref$power === void 0 ? 1 : _ref$power,
+        _ref$hollowRadius = _ref.hollowRadius,
+        hollowRadius = _ref$hollowRadius === void 0 ? 0 : _ref$hollowRadius,
+        _ref$backside = _ref.backside,
+        backside = _ref$backside === void 0 ? true : _ref$backside;
+      _classCallCheck(this, GlowMesh);
+      _this = _callSuper(this, GlowMesh);
+      var glowGeometry = createGlowGeometry(geometry, size);
+      var glowMaterial = createGlowMaterial(coefficient, color, power, hollowRadius);
+      backside && (glowMaterial.side = THREE$h.BackSide);
+      _this.geometry = glowGeometry;
+      _this.material = glowMaterial;
+      return _this;
     }
-    return new THREE$h.Mesh(glowGeometry, glowMaterial);
-  }
+    _inherits(GlowMesh, _THREE$Mesh);
+    return _createClass(GlowMesh);
+  }(THREE$h.Mesh);
 
   var THREE$g = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
@@ -69900,13 +69875,12 @@ void main() {
           emptyObject(state.atmosphereObj);
         }
         if (state.atmosphereColor && state.atmosphereAltitude) {
-          var obj = state.atmosphereObj = createGlowMesh(state.globeObj.geometry, {
-            backside: true,
+          var obj = state.atmosphereObj = new GlowMesh(state.globeObj.geometry, {
             color: state.atmosphereColor,
             size: GLOBE_RADIUS * state.atmosphereAltitude,
-            power: 3.5,
-            // dispersion
-            coefficient: 0.1
+            hollowRadius: GLOBE_RADIUS,
+            coefficient: 0.1,
+            power: 3.5 // dispersion
           });
           obj.visible = !!state.showAtmosphere;
           obj.__globeObjType = 'atmosphere'; // Add object type
@@ -69984,28 +69958,69 @@ void main() {
     return res;
   }
 
-  function threeDigest(data, scene) {
-    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var _ref = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
-      _ref$removeDelay = _ref.removeDelay,
-      removeDelay = _ref$removeDelay === void 0 ? 0 : _ref$removeDelay;
-    return viewDigest(data, scene.children, function (obj) {
-      return scene.add(obj);
-    }, function (obj) {
-      var removeFn = function removeFn() {
-        scene.remove(obj);
-        emptyObject(obj);
-        obj && obj.hasOwnProperty('__data') && delete obj.__data.__currentTargetD;
-      };
-      removeDelay ? setTimeout(removeFn, removeDelay) : removeFn();
-    }, _objectSpread2({
-      objBindAttr: '__threeObj'
-    }, options));
-  }
+  var _dataBindAttr = /*#__PURE__*/new WeakMap();
+  var _objBindAttr = /*#__PURE__*/new WeakMap();
+  var _removeDelay = /*#__PURE__*/new WeakMap();
+  var ThreeDigest = /*#__PURE__*/function (_DataBindMapper) {
+    function ThreeDigest(scene) {
+      var _this;
+      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref$dataBindAttr = _ref.dataBindAttr,
+        dataBindAttr = _ref$dataBindAttr === void 0 ? '__data' : _ref$dataBindAttr,
+        _ref$objBindAttr = _ref.objBindAttr,
+        objBindAttr = _ref$objBindAttr === void 0 ? '__threeObj' : _ref$objBindAttr,
+        _ref$removeDelay = _ref.removeDelay,
+        removeDelay = _ref$removeDelay === void 0 ? 0 : _ref$removeDelay;
+      _classCallCheck(this, ThreeDigest);
+      _this = _callSuper(this, ThreeDigest);
+      _defineProperty$1(_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);
+      _classPrivateFieldSet2(_removeDelay, _this, removeDelay);
+      _this.onRemoveObj(function () {});
+      return _this;
+    }
+    _inherits(ThreeDigest, _DataBindMapper);
+    return _createClass(ThreeDigest, [{
+      key: "onCreateObj",
+      value: function onCreateObj(fn) {
+        var _this2 = this;
+        _superPropGet(ThreeDigest, "onCreateObj", this)([function (d) {
+          var obj = fn(d);
+          d[_classPrivateFieldGet2(_objBindAttr, _this2)] = obj;
+          obj[_classPrivateFieldGet2(_dataBindAttr, _this2)] = d;
+          _this2.scene.add(obj);
+          return obj;
+        }]);
+        return this;
+      }
+    }, {
+      key: "onRemoveObj",
+      value: function onRemoveObj(fn) {
+        var _this3 = this;
+        _superPropGet(ThreeDigest, "onRemoveObj", this)([function (obj, dId) {
+          var d = _superPropGet(ThreeDigest, "getData", _this3)([obj]);
+          fn(obj, dId);
+          var removeFn = function removeFn() {
+            _this3.scene.remove(obj);
+            emptyObject(obj);
+            delete d[_classPrivateFieldGet2(_objBindAttr, _this3)];
+          };
+          _classPrivateFieldGet2(_removeDelay, _this3) ? setTimeout(removeFn, _classPrivateFieldGet2(_removeDelay, _this3)) : removeFn();
+        }]);
+        return this;
+      }
+    }]);
+  }(DataBindMapper);
 
   var THREE$e = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
     BufferGeometry: BufferGeometry,
+    Color: Color$1,
     CylinderGeometry: CylinderGeometry,
     Matrix4: Matrix4,
     Mesh: Mesh,
@@ -70064,8 +70079,11 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjPoint'
+      });
     },
-    update: function update(state) {
+    update: function update(state, changedProps) {
       // Data accessors
       var latAccessor = index$1(state.pointLat);
       var lngAccessor = index$1(state.pointLng);
@@ -70080,18 +70098,16 @@ void main() {
       var pxPerDeg = 2 * Math.PI * GLOBE_RADIUS / 360;
       var pointMaterials = {}; // indexed by color
 
-      var scene = state.pointsMerge ? new THREE$e.Object3D() : state.scene; // use fake scene if merging points
+      if (!state.pointsMerge && changedProps.hasOwnProperty('pointsMerge')) {
+        emptyObject(state.scene); // Empty trailing merged objects
+      }
+      state.dataMapper.scene = state.pointsMerge ? new THREE$e.Object3D() : state.scene; // use fake scene if merging points
 
-      threeDigest(state.pointsData, scene, {
-        createObj: createObj,
-        updateObj: updateObj
-      });
+      state.dataMapper.onCreateObj(createObj).onUpdateObj(updateObj).digest(state.pointsData);
       if (state.pointsMerge) {
         // merge points into a single mesh
         var pointsGeometry = !state.pointsData.length ? new THREE$e.BufferGeometry() : (BufferGeometryUtils$2.mergeGeometries || BufferGeometryUtils$2.mergeBufferGeometries)(state.pointsData.map(function (d) {
-          var obj = d.__threeObj;
-          d.__threeObj = undefined; // unbind merged points
-
+          var obj = state.dataMapper.getObj(d);
           var geom = obj.geometry.clone();
 
           // apply mesh world transform to vertices
@@ -70111,6 +70127,7 @@ void main() {
         points.__globeObjType = 'points'; // Add object type
         points.__data = state.pointsData; // Attach obj data
 
+        state.dataMapper.clear(); // Unbind merged points
         emptyObject(state.scene);
         state.scene.add(points);
       }
@@ -70250,6 +70267,7 @@ void main() {
     Line: Line,
     Mesh: Mesh,
     NormalBlending: NormalBlending,
+    QuadraticBezierCurve3: QuadraticBezierCurve3,
     ShaderMaterial: ShaderMaterial,
     TubeGeometry: TubeGeometry,
     Vector3: Vector3
@@ -70329,25 +70347,46 @@ void main() {
       },
       _destructor: function _destructor(state) {
         var _state$ticker3;
+        state.sharedMaterial.dispose();
         (_state$ticker3 = state.ticker) === null || _state$ticker3 === void 0 || _state$ticker3.dispose();
       }
     },
-    init: function init(threeObj, state, _ref) {
+    stateInit: function stateInit(_ref) {
       var tweenGroup = _ref.tweenGroup;
+      return {
+        tweenGroup: tweenGroup,
+        ticker: new FrameTicker$2(),
+        sharedMaterial: new THREE$d.ShaderMaterial(_objectSpread2(_objectSpread2({}, dashedLineShaders()), {}, {
+          transparent: true,
+          blending: THREE$d.NormalBlending
+        }))
+      };
+    },
+    init: function init(threeObj, state) {
       // Clear the scene
       emptyObject(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
-      state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjArc'
+      }).onCreateObj(function () {
+        var obj = new THREE$d.Group(); // populated in updateObj
+
+        obj.__globeObjType = 'arc'; // Add object type
+        return obj;
+      });
 
       // Kick-off dash animations
-      state.ticker = new FrameTicker$2();
       state.ticker.onTick.add(function (_, timeDelta) {
-        state.arcsData.filter(function (d) {
-          return d.__threeObj && d.__threeObj.children.length && d.__threeObj.children[0].material && d.__threeObj.children[0].__dashAnimateStep;
-        }).forEach(function (d) {
-          var obj = d.__threeObj.children[0];
+        state.dataMapper.entries().map(function (_ref2) {
+          var _ref3 = _slicedToArray$1(_ref2, 2),
+            obj = _ref3[1];
+          return obj;
+        }).filter(function (o) {
+          return o.children.length && o.children[0].material && o.children[0].__dashAnimateStep;
+        }).forEach(function (o) {
+          var obj = o.children[0];
           var step = obj.__dashAnimateStep * timeDelta;
           var curTranslate = obj.material.uniforms.dashTranslate.value % 1e9; // reset after 1B loops
           obj.material.uniforms.dashTranslate.value = curTranslate + step;
@@ -70368,118 +70407,106 @@ void main() {
       var dashGapAccessor = index$1(state.arcDashGap);
       var dashInitialGapAccessor = index$1(state.arcDashInitialGap);
       var dashAnimateTimeAccessor = index$1(state.arcDashAnimateTime);
-      var sharedMaterial = new THREE$d.ShaderMaterial(_objectSpread2(_objectSpread2({}, dashedLineShaders()), {}, {
-        transparent: true,
-        blending: THREE$d.NormalBlending
-      }));
-      threeDigest(state.arcsData, state.scene, {
-        createObj: function createObj() {
-          var obj = new THREE$d.Group(); // populated in updateObj
+      state.dataMapper.onUpdateObj(function (group, arc) {
+        var stroke = strokeAccessor(arc);
+        var useTube = stroke !== null && stroke !== undefined;
+        if (!group.children.length || useTube !== (group.children[0].type === 'Mesh')) {
+          // create or swap object types
+          emptyObject(group);
+          var _obj = useTube ? new THREE$d.Mesh() : new THREE$d.Line(new THREE$d.BufferGeometry());
+          _obj.material = state.sharedMaterial.clone(); // Separate material instance per object to have dedicated uniforms (but shared shaders)
+
+          group.add(_obj);
+        }
+        var obj = group.children[0];
 
-          obj.__globeObjType = 'arc'; // Add object type
-          return obj;
-        },
-        updateObj: function updateObj(group, arc) {
-          var stroke = strokeAccessor(arc);
-          var useTube = stroke !== null && stroke !== undefined;
-          if (!group.children.length || useTube !== (group.children[0].type === 'Mesh')) {
-            // create or swap object types
-            emptyObject(group);
-            var _obj = useTube ? new THREE$d.Mesh() : new THREE$d.Line(new THREE$d.BufferGeometry());
-            _obj.material = sharedMaterial.clone(); // Separate material instance per object to have dedicated uniforms (but shared shaders)
-
-            group.add(_obj);
+        // set dash uniforms
+        Object.assign(obj.material.uniforms, {
+          dashSize: {
+            value: dashLengthAccessor(arc)
+          },
+          gapSize: {
+            value: dashGapAccessor(arc)
+          },
+          dashOffset: {
+            value: dashInitialGapAccessor(arc)
           }
-          var obj = group.children[0];
-
-          // set dash uniforms
-          Object.assign(obj.material.uniforms, {
-            dashSize: {
-              value: dashLengthAccessor(arc)
-            },
-            gapSize: {
-              value: dashGapAccessor(arc)
-            },
-            dashOffset: {
-              value: dashInitialGapAccessor(arc)
-            }
-          });
+        });
 
-          // set dash animation step
-          var dashAnimateTime = dashAnimateTimeAccessor(arc);
-          obj.__dashAnimateStep = dashAnimateTime > 0 ? 1000 / dashAnimateTime : 0; // per second
+        // set dash animation step
+        var dashAnimateTime = dashAnimateTimeAccessor(arc);
+        obj.__dashAnimateStep = dashAnimateTime > 0 ? 1000 / dashAnimateTime : 0; // per second
 
-          // calculate vertex colors (to create gradient)
-          var vertexColorArray = calcColorVertexArray(colorAccessor(arc),
-          // single, array of colors or interpolator
-          state.arcCurveResolution,
-          // numSegments
-          useTube ? state.arcCircularResolution + 1 : 1 // num vertices per segment
-          );
+        // calculate vertex colors (to create gradient)
+        var vertexColorArray = calcColorVertexArray(colorAccessor(arc),
+        // single, array of colors or interpolator
+        state.arcCurveResolution,
+        // numSegments
+        useTube ? state.arcCircularResolution + 1 : 1 // num vertices per segment
+        );
 
-          // calculate vertex relative distances (for dashed lines)
-          var vertexRelDistanceArray = calcVertexRelDistances(state.arcCurveResolution,
-          // numSegments
-          useTube ? state.arcCircularResolution + 1 : 1,
-          // num vertices per segment
-          true // run from end to start, to animate in the correct direction
-          );
-          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 curve = calcCurve(curveD);
-            if (useTube) {
-              obj.geometry && obj.geometry.dispose();
-              obj.geometry = new THREE$d.TubeGeometry(curve, state.arcCurveResolution, stroke / 2, state.arcCircularResolution);
-              obj.geometry.setAttribute('color', vertexColorArray);
-              obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
-            } else {
-              obj.geometry.setFromPoints(curve.getPoints(state.arcCurveResolution));
-            }
-          };
-          var targetD = {
-            stroke: stroke,
-            alt: altitudeAccessor(arc),
-            altAutoScale: +altitudeAutoScaleAccessor(arc),
-            startLat: +startLatAccessor(arc),
-            startLng: +startLngAccessor(arc),
-            endLat: +endLatAccessor(arc),
-            endLng: +endLngAccessor(arc)
-          };
-          var currentTargetD = arc.__currentTargetD || Object.assign({}, targetD, {
-            altAutoScale: -1e-3
-          });
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.arcsTransitionDuration || state.arcsTransitionDuration < 0) {
-              // set final position
-              applyUpdate(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.arcsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
-            }
+        // calculate vertex relative distances (for dashed lines)
+        var vertexRelDistanceArray = calcVertexRelDistances(state.arcCurveResolution,
+        // numSegments
+        useTube ? state.arcCircularResolution + 1 : 1,
+        // num vertices per segment
+        true // run from end to start, to animate in the correct direction
+        );
+        obj.geometry.setAttribute('color', vertexColorArray);
+        obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
+        var applyUpdate = function applyUpdate(td) {
+          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();
+            obj.geometry = new THREE$d.TubeGeometry(curve, state.arcCurveResolution, stroke / 2, state.arcCircularResolution);
+            obj.geometry.setAttribute('color', vertexColorArray);
+            obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
+          } else {
+            obj.geometry.setFromPoints(curve.getPoints(state.arcCurveResolution));
+          }
+        };
+        var targetD = {
+          stroke: stroke,
+          alt: altitudeAccessor(arc),
+          altAutoScale: +altitudeAutoScaleAccessor(arc),
+          startLat: +startLatAccessor(arc),
+          startLng: +startLngAccessor(arc),
+          endLat: +endLatAccessor(arc),
+          endLng: +endLngAccessor(arc)
+        };
+        var currentTargetD = group.__currentTargetD || Object.assign({}, targetD, {
+          altAutoScale: -1e-3
+        });
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.arcsTransitionDuration || state.arcsTransitionDuration < 0) {
+            // set final position
+            applyUpdate(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.arcsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
           }
         }
-      });
+      }).digest(state.arcsData);
 
       //
 
-      function calcCurve(_ref2) {
-        var alt = _ref2.alt,
-          altAutoScale = _ref2.altAutoScale,
-          startLat = _ref2.startLat,
-          startLng = _ref2.startLng,
-          endLat = _ref2.endLat,
-          endLng = _ref2.endLng;
-        var getVec = function getVec(_ref3) {
-          var _ref4 = _slicedToArray$1(_ref3, 3),
-            lng = _ref4[0],
-            lat = _ref4[1],
-            alt = _ref4[2];
+      function calcCurve(_ref4) {
+        var alt = _ref4.alt,
+          altAutoScale = _ref4.altAutoScale,
+          startLat = _ref4.startLat,
+          startLng = _ref4.startLng,
+          endLat = _ref4.endLat,
+          endLng = _ref4.endLng;
+        var getVec = function getVec(_ref5) {
+          var _ref6 = _slicedToArray$1(_ref5, 3),
+            lng = _ref6[0],
+            lat = _ref6[1],
+            alt = _ref6[2];
           var _polar2Cartesian = polar2Cartesian(lat, lng, alt),
             x = _polar2Cartesian.x,
             y = _polar2Cartesian.y,
@@ -70581,6 +70608,7 @@ void main() {
   var THREE$c = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
     BufferGeometry: BufferGeometry,
+    Color: Color$1,
     DoubleSide: DoubleSide,
     Mesh: Mesh,
     MeshLambertMaterial: MeshLambertMaterial,
@@ -70651,8 +70679,11 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjHexbin'
+      });
     },
-    update: function update(state) {
+    update: function update(state, changedProps) {
       // Accessors
       var latAccessor = index$1(state.hexBinPointLat);
       var lngAccessor = index$1(state.hexBinPointLng);
@@ -70680,20 +70711,18 @@ void main() {
       });
       var hexMaterials = {}; // indexed by color
 
-      var scene = state.hexBinMerge ? new THREE$c.Object3D() : state.scene; // use fake scene if merging hex points
+      if (!state.hexBinMerge && changedProps.hasOwnProperty('hexBinMerge')) {
+        emptyObject(state.scene); // Empty trailing merged objects
+      }
+      state.dataMapper.scene = state.hexBinMerge ? new THREE$c.Object3D() : state.scene; // use fake scene if merging hex points
 
-      threeDigest(hexBins, scene, {
-        createObj: createObj,
-        updateObj: updateObj,
-        idAccessor: function idAccessor(d) {
-          return d.h3Idx;
-        }
-      });
+      state.dataMapper.id(function (d) {
+        return d.h3Idx;
+      }).onCreateObj(createObj).onUpdateObj(updateObj).digest(hexBins);
       if (state.hexBinMerge) {
         // merge points into a single mesh
         var hexPointsGeometry = !hexBins.length ? new THREE$c.BufferGeometry() : (BufferGeometryUtils$1.mergeGeometries || BufferGeometryUtils$1.mergeBufferGeometries)(hexBins.map(function (d) {
-          var obj = d.__threeObj;
-          d.__threeObj = undefined; // unbind merged points
+          var obj = state.dataMapper.getObj(d);
 
           // use non-indexed geometry so that groups can be colored separately, otherwise different groups share vertices
           var geom = obj.geometry.toNonIndexed();
@@ -70712,15 +70741,20 @@ void main() {
           }), 4));
           return geom;
         }));
-        var hexPoints = new THREE$c.Mesh(hexPointsGeometry, applyShaderExtensionToMaterial(new THREE$c.MeshLambertMaterial({
+        var hexMaterial = new THREE$c.MeshLambertMaterial({
           color: 0xffffff,
           transparent: true,
           vertexColors: true,
           side: THREE$c.DoubleSide
-        }), invisibleUndergroundShaderExtend));
+        });
+        hexMaterial.onBeforeCompile = function (shader) {
+          hexMaterial.userData.shader = invisibleUndergroundShaderExtend(shader);
+        };
+        var hexPoints = new THREE$c.Mesh(hexPointsGeometry, hexMaterial);
         hexPoints.__globeObjType = 'hexBinPoints'; // Add object type
         hexPoints.__data = hexBins; // Attach obj data
 
+        state.dataMapper.clear(); // Unbind merged points
         emptyObject(state.scene);
         state.scene.add(hexPoints);
       }
@@ -70766,7 +70800,7 @@ void main() {
         });
         var topCurvatureResolution = state.hexTopCurvatureResolution;
         obj.geometry && obj.geometry.dispose();
-        obj.geometry = new ConicPolygonBufferGeometry([geoJson], 0, GLOBE_RADIUS, false, true, true, topCurvatureResolution);
+        obj.geometry = new ConicPolygonGeometry([geoJson], 0, GLOBE_RADIUS, false, true, true, topCurvatureResolution);
         var targetD = {
           alt: +altitudeAccessor(d)
         };
@@ -70974,6 +71008,16 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjHeatmap'
+      }).onCreateObj(function () {
+        var obj = new THREE$b.Mesh(new THREE$b.SphereGeometry(GLOBE_RADIUS), applyShaderExtensionToMaterial(new THREE$b.MeshLambertMaterial({
+          vertexColors: true,
+          transparent: true
+        }), setRadiusShaderExtend));
+        obj.__globeObjType = 'heatmap'; // Add object type
+        return obj;
+      });
     },
     update: function update(state) {
       // Accessors
@@ -70986,133 +71030,123 @@ void main() {
       var saturationAccessor = index$1(state.heatmapColorSaturation);
       var baseAltitudeAccessor = index$1(state.heatmapBaseAltitude);
       var topAltitudeAccessor = index$1(state.heatmapTopAltitude);
-      threeDigest(state.heatmapsData, state.scene, {
-        createObj: function createObj() {
-          var obj = new THREE$b.Mesh(new THREE$b.SphereGeometry(GLOBE_RADIUS), applyShaderExtensionToMaterial(new THREE$b.MeshLambertMaterial({
-            vertexColors: true,
-            transparent: true
-          }), setRadiusShaderExtend));
-          obj.__globeObjType = 'heatmap'; // Add object type
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          // Accessors
-          var bandwidth = bandwidthAccessor(d);
-          var colorFn = colorFnAccessor(d);
-          var saturation = saturationAccessor(d);
-          var baseAlt = baseAltitudeAccessor(d);
-          var topAlt = topAltitudeAccessor(d);
-          var pnts = pointsAccessor(d).map(function (pnt) {
-            var lat = latPntAccessor(pnt);
-            var lng = lngPntAccessor(pnt);
-            var _polar2Cartesian = polar2Cartesian(lat, lng),
-              x = _polar2Cartesian.x,
-              y = _polar2Cartesian.y,
-              z = _polar2Cartesian.z;
-            return {
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        // Accessors
+        var bandwidth = bandwidthAccessor(d);
+        var colorFn = colorFnAccessor(d);
+        var saturation = saturationAccessor(d);
+        var baseAlt = baseAltitudeAccessor(d);
+        var topAlt = topAltitudeAccessor(d);
+        var pnts = pointsAccessor(d).map(function (pnt) {
+          var lat = latPntAccessor(pnt);
+          var lng = lngPntAccessor(pnt);
+          var _polar2Cartesian = polar2Cartesian(lat, lng),
+            x = _polar2Cartesian.x,
+            y = _polar2Cartesian.y,
+            z = _polar2Cartesian.z;
+          return {
+            x: x,
+            y: y,
+            z: z,
+            lat: lat,
+            lng: lng,
+            weight: weightPntAccessor(pnt)
+          };
+        });
+
+        // Check resolution
+        var resolution = Math.max(MIN_RESOLUTION, bandwidth / RES_BW_FACTOR);
+        var equatorNumSegments = Math.ceil(360 / (resolution || -1));
+        if (obj.geometry.parameters.widthSegments !== equatorNumSegments) {
+          obj.geometry.dispose();
+          obj.geometry = new THREE$b.SphereGeometry(GLOBE_RADIUS, equatorNumSegments, equatorNumSegments / 2);
+        }
+
+        // Get vertex polar coordinates
+        var vertexCoords = bufferAttr2Array(obj.geometry.getAttribute('position'));
+        var vertexGeoCoords = vertexCoords.map(function (_ref2) {
+          var _ref3 = _slicedToArray$1(_ref2, 3),
+            x = _ref3[0],
+            y = _ref3[1],
+            z = _ref3[2];
+          var _cartesian2Polar = cartesian2Polar({
               x: x,
               y: y,
-              z: z,
-              lat: lat,
-              lng: lng,
-              weight: weightPntAccessor(pnt)
-            };
-          });
-
-          // Check resolution
-          var resolution = Math.max(MIN_RESOLUTION, bandwidth / RES_BW_FACTOR);
-          var equatorNumSegments = Math.ceil(360 / (resolution || -1));
-          if (obj.geometry.parameters.widthSegments !== equatorNumSegments) {
-            obj.geometry.dispose();
-            obj.geometry = new THREE$b.SphereGeometry(GLOBE_RADIUS, equatorNumSegments, equatorNumSegments / 2);
-          }
+              z: z
+            }),
+            lng = _cartesian2Polar.lng,
+            lat = _cartesian2Polar.lat;
+          return [lng, lat];
+        });
 
-          // Get vertex polar coordinates
-          var vertexCoords = bufferAttr2Array(obj.geometry.getAttribute('position'));
-          var vertexGeoCoords = vertexCoords.map(function (_ref2) {
-            var _ref3 = _slicedToArray$1(_ref2, 3),
-              x = _ref3[0],
-              y = _ref3[1],
-              z = _ref3[2];
-            var _cartesian2Polar = cartesian2Polar({
-                x: x,
-                y: y,
-                z: z
-              }),
-              lng = _cartesian2Polar.lng,
-              lat = _cartesian2Polar.lat;
-            return [lng, lat];
+        // Compute KDE
+        var pntsOctree = new PointsOctree(pnts, bandwidth * BW_RADIUS_INFLUENCE);
+        var kdeVals = vertexGeoCoords.map(function (vxCoords, idx) {
+          var _vertexCoords$idx = _slicedToArray$1(vertexCoords[idx], 3),
+            x = _vertexCoords$idx[0],
+            y = _vertexCoords$idx[1],
+            z = _vertexCoords$idx[2];
+          return getGeoKDE(vxCoords, pntsOctree.getNearPoints(x, y, z), {
+            latAccessor: function latAccessor(d) {
+              return d.lat;
+            },
+            lngAccessor: function lngAccessor(d) {
+              return d.lng;
+            },
+            weightAccessor: function weightAccessor(d) {
+              return d.weight;
+            },
+            bandwidth: bandwidth
           });
+        });
 
-          // Compute KDE
-          var pntsOctree = new PointsOctree(pnts, bandwidth * BW_RADIUS_INFLUENCE);
-          var kdeVals = vertexGeoCoords.map(function (vxCoords, idx) {
-            var _vertexCoords$idx = _slicedToArray$1(vertexCoords[idx], 3),
-              x = _vertexCoords$idx[0],
-              y = _vertexCoords$idx[1],
-              z = _vertexCoords$idx[2];
-            return getGeoKDE(vxCoords, pntsOctree.getNearPoints(x, y, z), {
-              latAccessor: function latAccessor(d) {
-                return d.lat;
-              },
-              lngAccessor: function lngAccessor(d) {
-                return d.lng;
-              },
-              weightAccessor: function weightAccessor(d) {
-                return d.weight;
-              },
-              bandwidth: bandwidth
-            });
-          });
+        // Animations
+        var colors = _toConsumableArray$1(new Array(NUM_COLORS)).map(function (_, idx) {
+          return color2ShaderArr(colorFn(idx / (NUM_COLORS - 1)));
+        });
+        var applyUpdate = function applyUpdate(td) {
+          var _obj$__currentTargetD = obj.__currentTargetD = td,
+            kdeVals = _obj$__currentTargetD.kdeVals,
+            topAlt = _obj$__currentTargetD.topAlt,
+            saturation = _obj$__currentTargetD.saturation;
+          var maxVal = max$2(kdeVals.map(Math.abs)) || 1e-15;
+
+          // Set vertex colors
+          var colorScale = quantize([0, maxVal / saturation], colors);
+          obj.geometry.setAttribute('color', array2BufferAttr(kdeVals.map(function (v) {
+            return colorScale(Math.abs(v));
+          }), 4));
 
-          // Animations
-          var colors = _toConsumableArray$1(new Array(NUM_COLORS)).map(function (_, idx) {
-            return color2ShaderArr(colorFn(idx / (NUM_COLORS - 1)));
-          });
-          var applyUpdate = function applyUpdate(td) {
-            var _obj$__currentTargetD = obj.__currentTargetD = td,
-              kdeVals = _obj$__currentTargetD.kdeVals,
-              topAlt = _obj$__currentTargetD.topAlt,
-              saturation = _obj$__currentTargetD.saturation;
-            var maxVal = max$2(kdeVals.map(Math.abs)) || 1e-15;
-
-            // Set vertex colors
-            var colorScale = quantize([0, maxVal / saturation], colors);
-            obj.geometry.setAttribute('color', array2BufferAttr(kdeVals.map(function (v) {
-              return colorScale(Math.abs(v));
-            }), 4));
-
-            // Set altitudes
-            var rScale = linear([0, maxVal], [GLOBE_RADIUS * (1 + baseAlt), GLOBE_RADIUS * (1 + (topAlt || baseAlt))]);
-            obj.geometry.setAttribute('r', array2BufferAttr(kdeVals.map(rScale)));
-          };
-          var targetD = {
-            kdeVals: kdeVals,
-            topAlt: topAlt,
-            saturation: saturation
-          };
-          var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
-            kdeVals: kdeVals.map(function () {
-              return 0;
-            }),
-            topAlt: !topAlt ? topAlt : baseAlt,
-            saturation: 0.5
-          });
-          // do not interpolate between different length arrays
-          currentTargetD.kdeVals.length !== kdeVals.length && (currentTargetD.kdeVals = kdeVals.slice());
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.heatmapsTransitionDuration || state.heatmapsTransitionDuration < 0) {
-              // set final position
-              applyUpdate(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.heatmapsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
-            }
+          // Set altitudes
+          var rScale = linear([0, maxVal], [GLOBE_RADIUS * (1 + baseAlt), GLOBE_RADIUS * (1 + (topAlt || baseAlt))]);
+          obj.geometry.setAttribute('r', array2BufferAttr(kdeVals.map(rScale)));
+        };
+        var targetD = {
+          kdeVals: kdeVals,
+          topAlt: topAlt,
+          saturation: saturation
+        };
+        var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
+          kdeVals: kdeVals.map(function () {
+            return 0;
+          }),
+          topAlt: !topAlt ? topAlt : baseAlt,
+          saturation: 0.5
+        });
+        // do not interpolate between different length arrays
+        currentTargetD.kdeVals.length !== kdeVals.length && (currentTargetD.kdeVals = kdeVals.slice());
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.heatmapsTransitionDuration || state.heatmapsTransitionDuration < 0) {
+            // set final position
+            applyUpdate(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.heatmapsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
           }
         }
-      });
+      }).digest(state.heatmapsData);
     }
   });
 
@@ -71170,6 +71204,33 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjPolygon'
+      }).id(function (d) {
+        return d.id;
+      }).onCreateObj(function () {
+        var obj = new THREE$a.Group();
+        obj.__defaultSideMaterial = applyShaderExtensionToMaterial(new THREE$a.MeshBasicMaterial({
+          side: THREE$a.DoubleSide,
+          depthWrite: true
+        }), invisibleUndergroundShaderExtend);
+        obj.__defaultCapMaterial = new THREE$a.MeshBasicMaterial({
+          side: THREE$a.DoubleSide,
+          depthWrite: true
+        });
+
+        // conic geometry
+        obj.add(new THREE$a.Mesh(undefined, [obj.__defaultSideMaterial,
+        // side material
+        obj.__defaultCapMaterial // cap material
+        ]));
+
+        // polygon stroke
+        obj.add(new THREE$a.LineSegments(undefined, new THREE$a.LineBasicMaterial()));
+        obj.__globeObjType = 'polygon'; // Add object type
+
+        return obj;
+      });
     },
     update: function update(state) {
       // Data accessors
@@ -71212,117 +71273,89 @@ void main() {
           console.warn("Unsupported GeoJson geometry type: ".concat(geoJson.type, ". Skipping geometry..."));
         }
       });
-      threeDigest(singlePolygons, state.scene, {
-        idAccessor: function idAccessor(d) {
-          return d.id;
-        },
-        createObj: function createObj() {
-          var obj = new THREE$a.Group();
-          obj.__defaultSideMaterial = applyShaderExtensionToMaterial(new THREE$a.MeshBasicMaterial({
-            side: THREE$a.DoubleSide,
-            depthWrite: true
-          }), invisibleUndergroundShaderExtend);
-          obj.__defaultCapMaterial = new THREE$a.MeshBasicMaterial({
-            side: THREE$a.DoubleSide,
-            depthWrite: true
-          });
-
-          // conic geometry
-          obj.add(new THREE$a.Mesh(undefined, [obj.__defaultSideMaterial,
-          // side material
-          obj.__defaultCapMaterial // cap material
-          ]));
-
-          // polygon stroke
-          obj.add(new THREE$a.LineSegments(undefined, new THREE$a.LineBasicMaterial()));
-          obj.__globeObjType = 'polygon'; // Add object type
-
-          return obj;
-        },
-        updateObj: function updateObj(obj, _ref2) {
-          var coords = _ref2.coords,
-            capColor = _ref2.capColor,
-            capMaterial = _ref2.capMaterial,
-            sideColor = _ref2.sideColor,
-            sideMaterial = _ref2.sideMaterial,
-            strokeColor = _ref2.strokeColor,
-            altitude = _ref2.altitude,
-            capCurvatureResolution = _ref2.capCurvatureResolution;
-          var _obj$children = _slicedToArray$1(obj.children, 2),
-            conicObj = _obj$children[0],
-            strokeObj = _obj$children[1];
-
-          // hide stroke if no color set
-          var addStroke = !!strokeColor;
-          strokeObj.visible = addStroke;
-
-          // regenerate geometries if needed
-          if (!objMatch(conicObj.geometry.parameters || {}, {
-            polygonGeoJson: coords,
-            curvatureResolution: capCurvatureResolution
-          })) {
-            conicObj.geometry && conicObj.geometry.dispose();
-            conicObj.geometry = new ConicPolygonBufferGeometry(coords, 0, GLOBE_RADIUS, false, true, true, capCurvatureResolution);
-          }
-          if (addStroke && (!strokeObj.geometry.parameters || strokeObj.geometry.parameters.geoJson.coordinates !== coords || strokeObj.geometry.parameters.resolution !== capCurvatureResolution)) {
-            strokeObj.geometry && strokeObj.geometry.dispose();
-            strokeObj.geometry = new GeoJsonGeometry({
-              type: 'Polygon',
-              coordinates: coords
-            }, GLOBE_RADIUS, capCurvatureResolution);
-          }
+      state.dataMapper.onUpdateObj(function (obj, _ref2) {
+        var coords = _ref2.coords,
+          capColor = _ref2.capColor,
+          capMaterial = _ref2.capMaterial,
+          sideColor = _ref2.sideColor,
+          sideMaterial = _ref2.sideMaterial,
+          strokeColor = _ref2.strokeColor,
+          altitude = _ref2.altitude,
+          capCurvatureResolution = _ref2.capCurvatureResolution;
+        var _obj$children = _slicedToArray$1(obj.children, 2),
+          conicObj = _obj$children[0],
+          strokeObj = _obj$children[1];
+
+        // hide stroke if no color set
+        var addStroke = !!strokeColor;
+        strokeObj.visible = addStroke;
+
+        // regenerate geometries if needed
+        if (!objMatch(conicObj.geometry.parameters || {}, {
+          polygonGeoJson: coords,
+          curvatureResolution: capCurvatureResolution
+        })) {
+          conicObj.geometry && conicObj.geometry.dispose();
+          conicObj.geometry = new ConicPolygonGeometry(coords, 0, GLOBE_RADIUS, false, true, true, capCurvatureResolution);
+        }
+        if (addStroke && (!strokeObj.geometry.parameters || strokeObj.geometry.parameters.geoJson.coordinates !== coords || strokeObj.geometry.parameters.resolution !== capCurvatureResolution)) {
+          strokeObj.geometry && strokeObj.geometry.dispose();
+          strokeObj.geometry = new GeoJsonGeometry({
+            type: 'Polygon',
+            coordinates: coords
+          }, GLOBE_RADIUS, capCurvatureResolution);
+        }
 
-          // replace side/cap materials if defined
-          conicObj.material[0] = sideMaterial || obj.__defaultSideMaterial;
-          conicObj.material[1] = capMaterial || obj.__defaultCapMaterial;
+        // replace side/cap materials if defined
+        conicObj.material[0] = sideMaterial || obj.__defaultSideMaterial;
+        conicObj.material[1] = capMaterial || obj.__defaultCapMaterial;
 
-          // update default material colors
-          [!sideMaterial && sideColor, !capMaterial && capColor].forEach(function (color, materialIdx) {
-            if (!color) return; // skip custom materials
+        // update default material colors
+        [!sideMaterial && sideColor, !capMaterial && capColor].forEach(function (color, materialIdx) {
+          if (!color) return; // skip custom materials
 
-            // conic object
-            var material = conicObj.material[materialIdx];
-            var opacity = colorAlpha(color);
-            material.color.set(colorStr2Hex(color));
-            material.transparent = opacity < 1;
-            material.opacity = opacity;
-          });
-          if (addStroke) {
-            // stroke object
-            var material = strokeObj.material;
-            var opacity = colorAlpha(strokeColor);
-            material.color.set(colorStr2Hex(strokeColor));
-            material.transparent = opacity < 1;
-            material.opacity = opacity;
-          }
-          var targetD = {
-            alt: altitude
-          };
-          var applyUpdate = function applyUpdate(td) {
-            var _obj$__currentTargetD = obj.__currentTargetD = td,
-              alt = _obj$__currentTargetD.alt;
-            conicObj.scale.x = conicObj.scale.y = conicObj.scale.z = 1 + alt;
-            addStroke && (strokeObj.scale.x = strokeObj.scale.y = strokeObj.scale.z = 1 + alt + 1e-4); // stroke slightly above the conic mesh
-            setExtendedMaterialUniforms(obj.__defaultSideMaterial, function (uniforms) {
-              return uniforms.surfaceRadius.value = GLOBE_RADIUS / (alt + 1);
-            }); // update side material scale uniform
-          };
-          var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
-            alt: -1e-3
-          });
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.polygonsTransitionDuration || state.polygonsTransitionDuration < 0 || currentTargetD.alt === targetD.alt) {
-              // set final position
-              applyUpdate(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.polygonsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
-            }
+          // conic object
+          var material = conicObj.material[materialIdx];
+          var opacity = colorAlpha(color);
+          material.color.set(colorStr2Hex(color));
+          material.transparent = opacity < 1;
+          material.opacity = opacity;
+        });
+        if (addStroke) {
+          // stroke object
+          var material = strokeObj.material;
+          var opacity = colorAlpha(strokeColor);
+          material.color.set(colorStr2Hex(strokeColor));
+          material.transparent = opacity < 1;
+          material.opacity = opacity;
+        }
+        var targetD = {
+          alt: altitude
+        };
+        var applyUpdate = function applyUpdate(td) {
+          var _obj$__currentTargetD = obj.__currentTargetD = td,
+            alt = _obj$__currentTargetD.alt;
+          conicObj.scale.x = conicObj.scale.y = conicObj.scale.z = 1 + alt;
+          addStroke && (strokeObj.scale.x = strokeObj.scale.y = strokeObj.scale.z = 1 + alt + 1e-4); // stroke slightly above the conic mesh
+          setExtendedMaterialUniforms(obj.__defaultSideMaterial, function (uniforms) {
+            return uniforms.surfaceRadius.value = GLOBE_RADIUS / (alt + 1);
+          }); // update side material scale uniform
+        };
+        var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
+          alt: -1e-3
+        });
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.polygonsTransitionDuration || state.polygonsTransitionDuration < 0 || currentTargetD.alt === targetD.alt) {
+            // set final position
+            applyUpdate(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.polygonsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
           }
         }
-      });
+      }).digest(singlePolygons);
     }
   });
   function objMatch(obj, attrs) {
@@ -71342,6 +71375,7 @@ void main() {
   var THREE$9 = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
     BufferGeometry: BufferGeometry,
+    CircleGeometry: CircleGeometry,
     DoubleSide: DoubleSide,
     Mesh: Mesh,
     MeshLambertMaterial: MeshLambertMaterial,
@@ -71402,6 +71436,16 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjHexPolygon'
+      }).onCreateObj(function () {
+        var obj = new THREE$9.Mesh(undefined, new THREE$9.MeshLambertMaterial({
+          side: THREE$9.DoubleSide
+        }));
+        obj.__globeObjType = 'hexPolygon'; // Add object type
+
+        return obj;
+      });
     },
     update: function update(state) {
       // Accessors
@@ -71413,132 +71457,122 @@ void main() {
       var useDotsAccessor = index$1(state.hexPolygonUseDots);
       var curvatureResolutionAccessor = index$1(state.hexPolygonCurvatureResolution);
       var dotResolutionAccessor = index$1(state.hexPolygonDotResolution);
-      threeDigest(state.hexPolygonsData, state.scene, {
-        createObj: function createObj(d) {
-          var obj = new THREE$9.Mesh(undefined, new THREE$9.MeshLambertMaterial({
-            side: THREE$9.DoubleSide
-          }));
-          obj.__globeObjType = 'hexPolygon'; // Add object type
-
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          var geoJson = geoJsonAccessor(d);
-          var h3Res = resolutionAccessor(d);
-          var alt = altitudeAccessor(d);
-          var margin = Math.max(0, Math.min(1, +marginAccessor(d)));
-          var useDots = useDotsAccessor(d);
-          var curvatureResolution = curvatureResolutionAccessor(d);
-          var dotResolution = dotResolutionAccessor(d);
-
-          // update material
-          var color = colorAccessor(d);
-          var opacity = colorAlpha(color);
-          obj.material.color.set(colorStr2Hex(color));
-          obj.material.transparent = opacity < 1;
-          obj.material.opacity = opacity;
-          var targetD = {
-            alt: alt,
-            margin: margin,
-            curvatureResolution: curvatureResolution
-          };
-          var memD = {
-            geoJson: geoJson,
-            h3Res: h3Res
-          };
-          var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
-            alt: -1e-3
-          });
-          var currentMemD = obj.__currentMemD || memD;
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          }) || Object.keys(memD).some(function (k) {
-            return currentMemD[k] !== memD[k];
-          })) {
-            obj.__currentMemD = memD;
-            var h3Idxs = [];
-            if (geoJson.type === 'Polygon') {
-              polygonToCells(geoJson.coordinates, h3Res, true).forEach(function (idx) {
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        var geoJson = geoJsonAccessor(d);
+        var h3Res = resolutionAccessor(d);
+        var alt = altitudeAccessor(d);
+        var margin = Math.max(0, Math.min(1, +marginAccessor(d)));
+        var useDots = useDotsAccessor(d);
+        var curvatureResolution = curvatureResolutionAccessor(d);
+        var dotResolution = dotResolutionAccessor(d);
+
+        // update material
+        var color = colorAccessor(d);
+        var opacity = colorAlpha(color);
+        obj.material.color.set(colorStr2Hex(color));
+        obj.material.transparent = opacity < 1;
+        obj.material.opacity = opacity;
+        var targetD = {
+          alt: alt,
+          margin: margin,
+          curvatureResolution: curvatureResolution
+        };
+        var memD = {
+          geoJson: geoJson,
+          h3Res: h3Res
+        };
+        var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
+          alt: -1e-3
+        });
+        var currentMemD = obj.__currentMemD || memD;
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        }) || Object.keys(memD).some(function (k) {
+          return currentMemD[k] !== memD[k];
+        })) {
+          obj.__currentMemD = memD;
+          var h3Idxs = [];
+          if (geoJson.type === 'Polygon') {
+            polygonToCells(geoJson.coordinates, h3Res, true).forEach(function (idx) {
+              return h3Idxs.push(idx);
+            });
+          } else if (geoJson.type === 'MultiPolygon') {
+            geoJson.coordinates.forEach(function (coords) {
+              return polygonToCells(coords, h3Res, true).forEach(function (idx) {
                 return h3Idxs.push(idx);
               });
-            } else if (geoJson.type === 'MultiPolygon') {
-              geoJson.coordinates.forEach(function (coords) {
-                return polygonToCells(coords, h3Res, true).forEach(function (idx) {
-                  return h3Idxs.push(idx);
-                });
-              });
-            } else {
-              console.warn("Unsupported GeoJson geometry type: ".concat(geoJson.type, ". Skipping geometry..."));
-            }
-            var hexBins = h3Idxs.map(function (h3Idx) {
-              var hexCenter = cellToLatLng(h3Idx);
-              var hexGeoJson = cellToBoundary(h3Idx, true).reverse(); // correct polygon winding
-
-              // stitch longitudes at the anti-meridian
-              var centerLng = hexCenter[1];
-              hexGeoJson.forEach(function (d) {
-                var edgeLng = d[0];
-                if (Math.abs(centerLng - edgeLng) > 170) {
-                  // normalize large lng distances
-                  d[0] += centerLng > edgeLng ? 360 : -360;
-                }
-              });
-              return {
-                h3Idx: h3Idx,
-                hexCenter: hexCenter,
-                hexGeoJson: hexGeoJson
-              };
             });
-            var applyUpdate = function applyUpdate(td) {
-              var _obj$__currentTargetD = obj.__currentTargetD = td,
-                alt = _obj$__currentTargetD.alt,
-                margin = _obj$__currentTargetD.margin,
-                curvatureResolution = _obj$__currentTargetD.curvatureResolution;
-              obj.geometry && obj.geometry.dispose();
-              obj.geometry = !hexBins.length ? new THREE$9.BufferGeometry() : (BufferGeometryUtils.mergeGeometries || BufferGeometryUtils.mergeBufferGeometries)(hexBins.map(function (h) {
-                var _h$hexCenter = _slicedToArray$1(h.hexCenter, 2),
-                  clat = _h$hexCenter[0],
-                  clng = _h$hexCenter[1];
-                if (useDots) {
-                  var centerPos = polar2Cartesian(clat, clng, alt);
-                  var edgePos = polar2Cartesian(h.hexGeoJson[0][1], h.hexGeoJson[0][0], alt);
-                  var r = 0.85 * (1 - margin) * new THREE$9.Vector3(centerPos.x, centerPos.y, centerPos.z).distanceTo(new THREE$9.Vector3(edgePos.x, edgePos.y, edgePos.z));
-                  var geometry = new CircleGeometry(r, dotResolution);
-                  geometry.rotateX(deg2Rad$1(-clat));
-                  geometry.rotateY(deg2Rad$1(clng));
-                  geometry.translate(centerPos.x, centerPos.y, centerPos.z);
-                  return geometry;
-                } else {
-                  var relNum = function relNum(st, end, rat) {
-                    return st - (st - end) * rat;
-                  };
-
-                  // compute new geojson with relative margin
-                  var _geoJson = margin === 0 ? h.hexGeoJson : h.hexGeoJson.map(function (_ref2) {
-                    var _ref3 = _slicedToArray$1(_ref2, 2),
-                      elng = _ref3[0],
-                      elat = _ref3[1];
-                    return [[elng, clng], [elat, clat]].map(function (_ref4) {
-                      var _ref5 = _slicedToArray$1(_ref4, 2),
-                        st = _ref5[0],
-                        end = _ref5[1];
-                      return relNum(st, end, margin);
-                    });
-                  });
-                  return new ConicPolygonBufferGeometry([_geoJson], GLOBE_RADIUS, GLOBE_RADIUS * (1 + alt), false, true, false, curvatureResolution);
-                }
-              }));
+          } else {
+            console.warn("Unsupported GeoJson geometry type: ".concat(geoJson.type, ". Skipping geometry..."));
+          }
+          var hexBins = h3Idxs.map(function (h3Idx) {
+            var hexCenter = cellToLatLng(h3Idx);
+            var hexGeoJson = cellToBoundary(h3Idx, true).reverse(); // correct polygon winding
+
+            // stitch longitudes at the anti-meridian
+            var centerLng = hexCenter[1];
+            hexGeoJson.forEach(function (d) {
+              var edgeLng = d[0];
+              if (Math.abs(centerLng - edgeLng) > 170) {
+                // normalize large lng distances
+                d[0] += centerLng > edgeLng ? 360 : -360;
+              }
+            });
+            return {
+              h3Idx: h3Idx,
+              hexCenter: hexCenter,
+              hexGeoJson: hexGeoJson
             };
-            if (!state.hexPolygonsTransitionDuration || state.hexPolygonsTransitionDuration < 0) {
-              // set final position
-              applyUpdate(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.hexPolygonsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
-            }
+          });
+          var applyUpdate = function applyUpdate(td) {
+            var _obj$__currentTargetD = obj.__currentTargetD = td,
+              alt = _obj$__currentTargetD.alt,
+              margin = _obj$__currentTargetD.margin,
+              curvatureResolution = _obj$__currentTargetD.curvatureResolution;
+            obj.geometry && obj.geometry.dispose();
+            obj.geometry = !hexBins.length ? new THREE$9.BufferGeometry() : (BufferGeometryUtils.mergeGeometries || BufferGeometryUtils.mergeBufferGeometries)(hexBins.map(function (h) {
+              var _h$hexCenter = _slicedToArray$1(h.hexCenter, 2),
+                clat = _h$hexCenter[0],
+                clng = _h$hexCenter[1];
+              if (useDots) {
+                var centerPos = polar2Cartesian(clat, clng, alt);
+                var edgePos = polar2Cartesian(h.hexGeoJson[0][1], h.hexGeoJson[0][0], alt);
+                var r = 0.85 * (1 - margin) * new THREE$9.Vector3(centerPos.x, centerPos.y, centerPos.z).distanceTo(new THREE$9.Vector3(edgePos.x, edgePos.y, edgePos.z));
+                var geometry = new CircleGeometry(r, dotResolution);
+                geometry.rotateX(deg2Rad$1(-clat));
+                geometry.rotateY(deg2Rad$1(clng));
+                geometry.translate(centerPos.x, centerPos.y, centerPos.z);
+                return geometry;
+              } else {
+                var relNum = function relNum(st, end, rat) {
+                  return st - (st - end) * rat;
+                };
+
+                // compute new geojson with relative margin
+                var _geoJson = margin === 0 ? h.hexGeoJson : h.hexGeoJson.map(function (_ref2) {
+                  var _ref3 = _slicedToArray$1(_ref2, 2),
+                    elng = _ref3[0],
+                    elat = _ref3[1];
+                  return [[elng, clng], [elat, clat]].map(function (_ref4) {
+                    var _ref5 = _slicedToArray$1(_ref4, 2),
+                      st = _ref5[0],
+                      end = _ref5[1];
+                    return relNum(st, end, margin);
+                  });
+                });
+                return new ConicPolygonGeometry([_geoJson], GLOBE_RADIUS, GLOBE_RADIUS * (1 + alt), false, true, false, curvatureResolution);
+              }
+            }));
+          };
+          if (!state.hexPolygonsTransitionDuration || state.hexPolygonsTransitionDuration < 0) {
+            // set final position
+            applyUpdate(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.hexPolygonsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
           }
         }
-      });
+      }).digest(state.hexPolygonsData);
     }
   });
 
@@ -71657,22 +71691,42 @@ void main() {
         (_state$ticker3 = state.ticker) === null || _state$ticker3 === void 0 || _state$ticker3.dispose();
       }
     },
-    init: function init(threeObj, state, _ref) {
+    stateInit: function stateInit(_ref) {
       var tweenGroup = _ref.tweenGroup;
+      return {
+        tweenGroup: tweenGroup,
+        ticker: new FrameTicker$1(),
+        sharedMaterial: new THREE$7.ShaderMaterial(_objectSpread2(_objectSpread2({}, dashedLineShaders()), {}, {
+          transparent: true,
+          blending: THREE$7.NormalBlending
+        }))
+      };
+    },
+    init: function init(threeObj, state) {
       // Clear the scene
       emptyObject(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
-      state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjPath'
+      }).onCreateObj(function () {
+        var obj = new THREE$7.Group(); // populated in updateObj
+
+        obj.__globeObjType = 'path'; // Add object type
+        return obj;
+      });
 
       // Kick-off dash animations
-      state.ticker = new FrameTicker$1();
       state.ticker.onTick.add(function (_, timeDelta) {
-        state.pathsData.filter(function (d) {
-          return d.__threeObj && d.__threeObj.children.length && d.__threeObj.children[0].material && d.__threeObj.children[0].__dashAnimateStep;
-        }).forEach(function (d) {
-          var obj = d.__threeObj.children[0];
+        state.dataMapper.entries().map(function (_ref2) {
+          var _ref3 = _slicedToArray$1(_ref2, 2),
+            obj = _ref3[1];
+          return obj;
+        }).filter(function (o) {
+          return o.children.length && o.children[0].material && o.children[0].__dashAnimateStep;
+        }).forEach(function (o) {
+          var obj = o.children[0];
           var step = obj.__dashAnimateStep * timeDelta;
           if (obj.type === 'Line') {
             var curTranslate = obj.material.uniforms.dashTranslate.value % 1e9; // reset after 1B loops
@@ -71699,154 +71753,142 @@ void main() {
       var dashGapAccessor = index$1(state.pathDashGap);
       var dashInitialGapAccessor = index$1(state.pathDashInitialGap);
       var dashAnimateTimeAccessor = index$1(state.pathDashAnimateTime);
-      var sharedShaderMaterial = new THREE$7.ShaderMaterial(_objectSpread2(_objectSpread2({}, dashedLineShaders()), {}, {
-        transparent: true,
-        blending: THREE$7.NormalBlending
-      }));
-      threeDigest(state.pathsData, state.scene, {
-        createObj: function createObj() {
-          var obj = new THREE$7.Group(); // populated in updateObj
+      state.dataMapper.onUpdateObj(function (group, path) {
+        var stroke = strokeAccessor(path);
+        var useFatLine = stroke !== null && stroke !== undefined;
+        if (!group.children.length || useFatLine === (group.children[0].type === 'Line')) {
+          // create or swap object types
+          emptyObject(group);
+          var _obj = useFatLine ? new Line2(new LineGeometry(), new LineMaterial()) : new THREE$7.Line(new THREE$7.BufferGeometry(), state.sharedMaterial.clone() // Separate material instance per object to have dedicated uniforms (but shared shaders)
+          );
+          group.add(_obj);
+        }
+        var obj = group.children[0];
+        var points = calcPath(pointsAccessor(path), pointLatAccessor, pointLngAccessor, pointAltAccessor, state.pathResolution);
 
-          obj.__globeObjType = 'path'; // Add object type
-          return obj;
-        },
-        updateObj: function updateObj(group, path) {
-          var stroke = strokeAccessor(path);
-          var useFatLine = stroke !== null && stroke !== undefined;
-          if (!group.children.length || useFatLine === (group.children[0].type === 'Line')) {
-            // create or swap object types
-            emptyObject(group);
-            var _obj = useFatLine ? new Line2(new LineGeometry(), new LineMaterial()) : new THREE$7.Line(new THREE$7.BufferGeometry(), sharedShaderMaterial.clone() // Separate material instance per object to have dedicated uniforms (but shared shaders)
-            );
-            group.add(_obj);
-          }
-          var obj = group.children[0];
-          var points = calcPath(pointsAccessor(path), pointLatAccessor, pointLngAccessor, pointAltAccessor, state.pathResolution);
-
-          // set dash animation step
-          var dashAnimateTime = dashAnimateTimeAccessor(path);
-          obj.__dashAnimateStep = dashAnimateTime > 0 ? 1000 / dashAnimateTime : 0; // per second
-
-          if (!useFatLine) {
-            // set dash uniforms
-            Object.assign(obj.material.uniforms, {
-              dashSize: {
-                value: dashLengthAccessor(path)
-              },
-              gapSize: {
-                value: dashGapAccessor(path)
-              },
-              dashOffset: {
-                value: dashInitialGapAccessor(path)
-              }
-            });
+        // set dash animation step
+        var dashAnimateTime = dashAnimateTimeAccessor(path);
+        obj.__dashAnimateStep = dashAnimateTime > 0 ? 1000 / dashAnimateTime : 0; // per second
 
-            // calculate vertex colors (to create gradient)
-            var vertexColorArray = calcColorVertexArray(colorAccessor(path),
-            // single, array of colors or interpolator
-            points.length // numSegments
-            );
-
-            // calculate vertex relative distances (for dashed lines)
-            var vertexRelDistanceArray = calcVertexRelDistances(points.length,
-            // numSegments
-            1,
-            // num vertices per segment
-            true // run from end to start, to animate in the correct direction
-            );
-            obj.geometry.setAttribute('color', vertexColorArray);
-            obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
-          } else {
-            // fat lines
-            obj.material.resolution = state.rendererSize;
-            {
-              // set dash styling
-              var dashLength = dashLengthAccessor(path);
-              var dashGap = dashGapAccessor(path);
-              var dashInitialGap = dashInitialGapAccessor(path);
-              obj.material.dashed = dashGap > 0;
-
-              // temp hack to activate line dashes
-              obj.material.dashed ? obj.material.defines.USE_DASH = "" : delete obj.material.defines.USE_DASH;
-              if (obj.material.dashed) {
-                obj.material.dashScale = 1 / calcLineDistance(points); // dash sizes relative to full line length
-
-                obj.material.dashSize = dashLength;
-                obj.material.gapSize = dashGap;
-                obj.material.dashOffset = -dashInitialGap;
-              }
-            }
-            {
-              // set line colors
-              var colors = colorAccessor(path);
-              if (colors instanceof Array) {
-                // calculate vertex colors (to create gradient)
-                var _vertexColorArray = calcColorVertexArray(colorAccessor(path),
-                // single, array of colors or interpolator
-                points.length - 1,
-                // numSegments
-                1,
-                // num vertices per segment
-                false);
-                obj.geometry.setColors(_vertexColorArray.array);
-                obj.material.vertexColors = true;
-              } else {
-                // single color
-                var color = colors;
-                var opacity = colorAlpha(color);
-                obj.material.color = new THREE$7.Color(colorStr2Hex(color));
-                obj.material.transparent = opacity < 1;
-                obj.material.opacity = opacity;
-                obj.material.vertexColors = false;
-              }
+        if (!useFatLine) {
+          // set dash uniforms
+          Object.assign(obj.material.uniforms, {
+            dashSize: {
+              value: dashLengthAccessor(path)
+            },
+            gapSize: {
+              value: dashGapAccessor(path)
+            },
+            dashOffset: {
+              value: dashInitialGapAccessor(path)
             }
-            obj.material.needsUpdate = true;
-          }
+          });
 
-          // animate from start to finish by default
-          var pointsInterpolator = interpolateVectors(path.__currentTargetD && path.__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);
-            if (useFatLine) {
-              var _ref2;
-              obj.geometry.setPositions((_ref2 = []).concat.apply(_ref2, _toConsumableArray$1(kPoints.map(function (_ref3) {
-                var x = _ref3.x,
-                  y = _ref3.y,
-                  z = _ref3.z;
-                return [x, y, z];
-              }))));
-              obj.material.linewidth = stroke;
-
-              // necessary for dashed lines
-              obj.material.dashed && obj.computeLineDistances();
-            } else {
-              obj.geometry.setFromPoints(kPoints);
-              obj.geometry.computeBoundingSphere();
+          // calculate vertex colors (to create gradient)
+          var vertexColorArray = calcColorVertexArray(colorAccessor(path),
+          // single, array of colors or interpolator
+          points.length // numSegments
+          );
+
+          // calculate vertex relative distances (for dashed lines)
+          var vertexRelDistanceArray = calcVertexRelDistances(points.length,
+          // numSegments
+          1,
+          // num vertices per segment
+          true // run from end to start, to animate in the correct direction
+          );
+          obj.geometry.setAttribute('color', vertexColorArray);
+          obj.geometry.setAttribute('relDistance', vertexRelDistanceArray);
+        } else {
+          // fat lines
+          obj.material.resolution = state.rendererSize;
+          {
+            // set dash styling
+            var dashLength = dashLengthAccessor(path);
+            var dashGap = dashGapAccessor(path);
+            var dashInitialGap = dashInitialGapAccessor(path);
+            obj.material.dashed = dashGap > 0;
+
+            // temp hack to activate line dashes
+            obj.material.dashed ? obj.material.defines.USE_DASH = "" : delete obj.material.defines.USE_DASH;
+            if (obj.material.dashed) {
+              obj.material.dashScale = 1 / calcLineDistance(points); // dash sizes relative to full line length
+
+              obj.material.dashSize = dashLength;
+              obj.material.gapSize = dashGap;
+              obj.material.dashOffset = -dashInitialGap;
             }
-          };
-          var targetD = {
-            stroke: stroke,
-            interpolK: 1
-          };
-          var currentTargetD = Object.assign({}, path.__currentTargetD || targetD, {
-            interpolK: 0
-          });
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.pathTransitionDuration || state.pathTransitionDuration < 0) {
-              // set final position
-              applyUpdate(targetD);
+          }
+          {
+            // set line colors
+            var colors = colorAccessor(path);
+            if (colors instanceof Array) {
+              // calculate vertex colors (to create gradient)
+              var _vertexColorArray = calcColorVertexArray(colorAccessor(path),
+              // single, array of colors or interpolator
+              points.length - 1,
+              // numSegments
+              1,
+              // num vertices per segment
+              false);
+              obj.geometry.setColors(_vertexColorArray.array);
+              obj.material.vertexColors = true;
             } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.pathTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
+              // single color
+              var color = colors;
+              var opacity = colorAlpha(color);
+              obj.material.color = new THREE$7.Color(colorStr2Hex(color));
+              obj.material.transparent = opacity < 1;
+              obj.material.opacity = opacity;
+              obj.material.vertexColors = false;
             }
           }
+          obj.material.needsUpdate = true;
         }
-      });
+
+        // animate from start to finish by default
+        var pointsInterpolator = interpolateVectors(group.__currentTargetD && group.__currentTargetD.points || [points[0]], points);
+        var applyUpdate = function applyUpdate(td) {
+          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) {
+              var x = _ref5.x,
+                y = _ref5.y,
+                z = _ref5.z;
+              return [x, y, z];
+            }))));
+            obj.material.linewidth = stroke;
+
+            // necessary for dashed lines
+            obj.material.dashed && obj.computeLineDistances();
+          } else {
+            obj.geometry.setFromPoints(kPoints);
+            obj.geometry.computeBoundingSphere();
+          }
+        };
+        var targetD = {
+          stroke: stroke,
+          interpolK: 1
+        };
+        var currentTargetD = Object.assign({}, group.__currentTargetD || targetD, {
+          interpolK: 0
+        });
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.pathTransitionDuration || state.pathTransitionDuration < 0) {
+            // set final position
+            applyUpdate(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.pathTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
+          }
+        }
+      }).digest(state.pathsData);
 
       //
 
@@ -71891,11 +71933,11 @@ void main() {
           });
           return result;
         };
-        var getVec = function getVec(_ref4) {
-          var _ref5 = _slicedToArray$1(_ref4, 3),
-            lat = _ref5[0],
-            lng = _ref5[1],
-            alt = _ref5[2];
+        var getVec = function getVec(_ref6) {
+          var _ref7 = _slicedToArray$1(_ref6, 3),
+            lat = _ref7[0],
+            lng = _ref7[1],
+            alt = _ref7[2];
           var _polar2Cartesian = polar2Cartesian(lat, lng, alt),
             x = _polar2Cartesian.x,
             y = _polar2Cartesian.y,
@@ -72020,6 +72062,14 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjTile'
+      }).onCreateObj(function () {
+        var obj = new THREE$6.Mesh();
+        obj.__globeObjType = 'tile'; // Add object type
+
+        return obj;
+      });
     },
     update: function update(state) {
       // Data accessors
@@ -72031,60 +72081,52 @@ void main() {
       var useGlobeProjectionAccessor = index$1(state.tileUseGlobeProjection);
       var materialAccessor = index$1(state.tileMaterial);
       var curvatureResolutionAccessor = index$1(state.tileCurvatureResolution);
-      threeDigest(state.tilesData, state.scene, {
-        createObj: function createObj() {
-          var obj = new THREE$6.Mesh();
-          obj.__globeObjType = 'tile'; // Add object type
-
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          obj.material = materialAccessor(d); // set material
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        obj.material = materialAccessor(d); // set material
 
-          var useGlobeProjection = useGlobeProjectionAccessor(d);
-          var curvatureResolution = curvatureResolutionAccessor(d);
+        var useGlobeProjection = useGlobeProjectionAccessor(d);
+        var curvatureResolution = curvatureResolutionAccessor(d);
 
-          // animations
-          var applyPosition = function applyPosition(td) {
-            var _obj$__currentTargetD = obj.__currentTargetD = td,
-              lat = _obj$__currentTargetD.lat,
-              lng = _obj$__currentTargetD.lng,
-              alt = _obj$__currentTargetD.alt,
-              width = _obj$__currentTargetD.width,
-              height = _obj$__currentTargetD.height;
-            var rotLng = deg2Rad(lng);
-            var rotLat = deg2Rad(-lat);
-            obj.geometry && obj.geometry.dispose();
-            obj.geometry = new THREE$6.SphereGeometry(GLOBE_RADIUS * (1 + alt), Math.ceil(width / (curvatureResolution || -1)), Math.ceil(height / (curvatureResolution || -1)), deg2Rad(90 - width / 2) + (useGlobeProjection ? rotLng : 0), deg2Rad(width), deg2Rad(90 - height / 2) + (useGlobeProjection ? rotLat : 0), deg2Rad(height));
-            if (!useGlobeProjection) {
-              // rotate obj instead. order matters, rotate longitudinally first.
-              obj.setRotationFromEuler(new THREE$6.Euler(rotLat, rotLng, 0, 'YXZ'));
-            }
-          };
-          var targetD = {
-            lat: +latAccessor(d),
-            lng: +lngAccessor(d),
-            alt: +altitudeAccessor(d),
-            width: +widthAccessor(d),
-            height: +heightAccessor(d)
-          };
-          var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
-            width: 0,
-            height: 0
-          });
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.tilesTransitionDuration || state.tilesTransitionDuration < 0) {
-              // set final position
-              applyPosition(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.tilesTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyPosition).start());
-            }
+        // animations
+        var applyPosition = function applyPosition(td) {
+          var _obj$__currentTargetD = obj.__currentTargetD = td,
+            lat = _obj$__currentTargetD.lat,
+            lng = _obj$__currentTargetD.lng,
+            alt = _obj$__currentTargetD.alt,
+            width = _obj$__currentTargetD.width,
+            height = _obj$__currentTargetD.height;
+          var rotLng = deg2Rad(lng);
+          var rotLat = deg2Rad(-lat);
+          obj.geometry && obj.geometry.dispose();
+          obj.geometry = new THREE$6.SphereGeometry(GLOBE_RADIUS * (1 + alt), Math.ceil(width / (curvatureResolution || -1)), Math.ceil(height / (curvatureResolution || -1)), deg2Rad(90 - width / 2) + (useGlobeProjection ? rotLng : 0), deg2Rad(width), deg2Rad(90 - height / 2) + (useGlobeProjection ? rotLat : 0), deg2Rad(height));
+          if (!useGlobeProjection) {
+            // rotate obj instead. order matters, rotate longitudinally first.
+            obj.setRotationFromEuler(new THREE$6.Euler(rotLat, rotLng, 0, 'YXZ'));
+          }
+        };
+        var targetD = {
+          lat: +latAccessor(d),
+          lng: +lngAccessor(d),
+          alt: +altitudeAccessor(d),
+          width: +widthAccessor(d),
+          height: +heightAccessor(d)
+        };
+        var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
+          width: 0,
+          height: 0
+        });
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.tilesTransitionDuration || state.tilesTransitionDuration < 0) {
+            // set final position
+            applyPosition(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.tilesTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyPosition).start());
           }
         }
-      });
+      }).digest(state.tilesData);
     }
   });
   var deg2Rad = function deg2Rad(deg) {
@@ -72177,6 +72219,26 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      var circleGeometry = new THREE$5.CircleGeometry(1, 32);
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjLabel'
+      }).onCreateObj(function () {
+        var material = new THREE$5.MeshLambertMaterial();
+        material.side = DoubleSide;
+        var obj = new THREE$5.Group(); // container
+
+        obj.add(new THREE$5.Mesh(circleGeometry, material)); // dot
+        var textObj = new THREE$5.Mesh(undefined, material);
+        obj.add(textObj); // text
+
+        // text invisible bounding box (raycaster trap)
+        var bbObj = new THREE$5.Mesh();
+        bbObj.visible = false;
+        textObj.add(bbObj);
+        obj.__globeObjType = 'label'; // Add object type
+
+        return obj;
+      });
     },
     update: function update(state) {
       // Data accessors
@@ -72192,123 +72254,103 @@ void main() {
       var dotOrientationAccessor = index$1(state.labelDotOrientation);
       var orientations = new Set(['right', 'top', 'bottom']);
       var pxPerDeg = 2 * Math.PI * GLOBE_RADIUS / 360;
-      var circleGeometry = new THREE$5.CircleGeometry(1, 32);
-      threeDigest(state.labelsData, state.scene, {
-        createObj: function createObj() {
-          var material = new THREE$5.MeshLambertMaterial();
-          material.side = DoubleSide;
-          var obj = new THREE$5.Group(); // container
-
-          obj.add(new THREE$5.Mesh(circleGeometry, material)); // dot
-          var textObj = new THREE$5.Mesh(undefined, material);
-          obj.add(textObj); // text
-
-          // text invisible bounding box (raycaster trap)
-          var bbObj = new THREE$5.Mesh();
-          bbObj.visible = false;
-          textObj.add(bbObj);
-          obj.__globeObjType = 'label'; // Add object type
-
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          var _obj$children = _slicedToArray$1(obj.children, 2),
-            dotObj = _obj$children[0],
-            textObj = _obj$children[1];
-          var _textObj$children = _slicedToArray$1(textObj.children, 1),
-            bbObj = _textObj$children[0];
-
-          // update color
-          var color = colorAccessor(d);
-          var opacity = colorAlpha(color);
-          textObj.material.color.set(colorStr2Hex(color));
-          textObj.material.transparent = opacity < 1;
-          textObj.material.opacity = opacity;
-
-          // update dot
-          var includeDot = includeDotAccessor(d);
-          var dotOrient = dotOrientationAccessor(d);
-          !includeDot || !orientations.has(dotOrient) && (dotOrient = 'bottom');
-
-          // size dot
-          var dotR = includeDot ? +dotRadiusAccessor(d) * pxPerDeg : 1e-12;
-          dotObj.scale.x = dotObj.scale.y = dotR;
-
-          // create text geometry
-          var textHeight = +sizeAccessor(d) * pxPerDeg;
-          textObj.geometry && textObj.geometry.dispose();
-          textObj.geometry = new THREE$5.TextGeometry(textAccessor(d), {
-            font: state.font,
-            size: textHeight,
-            depth: 0,
-            height: 0,
-            curveSegments: state.labelResolution
-          });
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        var _obj$children = _slicedToArray$1(obj.children, 2),
+          dotObj = _obj$children[0],
+          textObj = _obj$children[1];
+        var _textObj$children = _slicedToArray$1(textObj.children, 1),
+          bbObj = _textObj$children[0];
+
+        // update color
+        var color = colorAccessor(d);
+        var opacity = colorAlpha(color);
+        textObj.material.color.set(colorStr2Hex(color));
+        textObj.material.transparent = opacity < 1;
+        textObj.material.opacity = opacity;
+
+        // update dot
+        var includeDot = includeDotAccessor(d);
+        var dotOrient = dotOrientationAccessor(d);
+        !includeDot || !orientations.has(dotOrient) && (dotOrient = 'bottom');
+
+        // size dot
+        var dotR = includeDot ? +dotRadiusAccessor(d) * pxPerDeg : 1e-12;
+        dotObj.scale.x = dotObj.scale.y = dotR;
+
+        // create text geometry
+        var textHeight = +sizeAccessor(d) * pxPerDeg;
+        textObj.geometry && textObj.geometry.dispose();
+        textObj.geometry = new THREE$5.TextGeometry(textAccessor(d), {
+          font: state.font,
+          size: textHeight,
+          depth: 0,
+          height: 0,
+          curveSegments: state.labelResolution
+        });
 
-          // update text convex hull/bounding box
-          bbObj.geometry && bbObj.geometry.dispose();
-          textObj.geometry.computeBoundingBox();
-          bbObj.geometry = _construct$1(THREE$5.BoxGeometry, _toConsumableArray$1(new THREE$5.Vector3().subVectors(textObj.geometry.boundingBox.max, textObj.geometry.boundingBox.min).toArray()));
-
-          // center text (otherwise anchor is on bottom-left)
-          dotOrient !== 'right' && textObj.geometry.center();
-          if (includeDot) {
-            // translate text
-            var padding = dotR + textHeight / 2;
-            dotOrient === 'right' && (textObj.position.x = padding);
-            textObj.position.y = {
-              right: -textHeight / 2,
-              // center vertically
-              top: padding + textHeight / 2,
-              bottom: -padding - textHeight / 2
-            }[dotOrient];
-          }
+        // update text convex hull/bounding box
+        bbObj.geometry && bbObj.geometry.dispose();
+        textObj.geometry.computeBoundingBox();
+        bbObj.geometry = _construct$1(THREE$5.BoxGeometry, _toConsumableArray$1(new THREE$5.Vector3().subVectors(textObj.geometry.boundingBox.max, textObj.geometry.boundingBox.min).toArray()));
+
+        // center text (otherwise anchor is on bottom-left)
+        dotOrient !== 'right' && textObj.geometry.center();
+        if (includeDot) {
+          // translate text
+          var padding = dotR + textHeight / 2;
+          dotOrient === 'right' && (textObj.position.x = padding);
+          textObj.position.y = {
+            right: -textHeight / 2,
+            // center vertically
+            top: padding + textHeight / 2,
+            bottom: -padding - textHeight / 2
+          }[dotOrient];
+        }
 
-          // animations
-          var applyPosition = function applyPosition(td) {
-            var _obj$__currentTargetD = obj.__currentTargetD = td,
-              lat = _obj$__currentTargetD.lat,
-              lng = _obj$__currentTargetD.lng,
-              alt = _obj$__currentTargetD.alt,
-              rot = _obj$__currentTargetD.rot,
-              scale = _obj$__currentTargetD.scale;
+        // animations
+        var applyPosition = function applyPosition(td) {
+          var _obj$__currentTargetD = obj.__currentTargetD = td,
+            lat = _obj$__currentTargetD.lat,
+            lng = _obj$__currentTargetD.lng,
+            alt = _obj$__currentTargetD.alt,
+            rot = _obj$__currentTargetD.rot,
+            scale = _obj$__currentTargetD.scale;
 
-            // position center
-            Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
+          // position center
+          Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
 
-            // rotate
-            obj.lookAt(state.scene.localToWorld(new THREE$5.Vector3(0, 0, 0))); // face globe (local) center
-            obj.rotateY(Math.PI); // face outwards
+          // rotate
+          obj.lookAt(state.scene.localToWorld(new THREE$5.Vector3(0, 0, 0))); // face globe (local) center
+          obj.rotateY(Math.PI); // face outwards
 
-            // rotate clockwise relative to lat parallel
-            obj.rotateZ(-rot * Math.PI / 180);
+          // rotate clockwise relative to lat parallel
+          obj.rotateZ(-rot * Math.PI / 180);
 
-            // scale it
-            obj.scale.x = obj.scale.y = obj.scale.z = scale;
-          };
-          var targetD = {
-            lat: +latAccessor(d),
-            lng: +lngAccessor(d),
-            alt: +altitudeAccessor(d),
-            rot: +rotationAccessor(d),
-            scale: 1
-          };
-          var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
-            scale: 1e-12
-          });
-          if (Object.keys(targetD).some(function (k) {
-            return currentTargetD[k] !== targetD[k];
-          })) {
-            if (!state.labelsTransitionDuration || state.labelsTransitionDuration < 0) {
-              // set final position
-              applyPosition(targetD);
-            } else {
-              // animate
-              state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.labelsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyPosition).start());
-            }
+          // scale it
+          obj.scale.x = obj.scale.y = obj.scale.z = scale;
+        };
+        var targetD = {
+          lat: +latAccessor(d),
+          lng: +lngAccessor(d),
+          alt: +altitudeAccessor(d),
+          rot: +rotationAccessor(d),
+          scale: 1
+        };
+        var currentTargetD = obj.__currentTargetD || Object.assign({}, targetD, {
+          scale: 1e-12
+        });
+        if (Object.keys(targetD).some(function (k) {
+          return currentTargetD[k] !== targetD[k];
+        })) {
+          if (!state.labelsTransitionDuration || state.labelsTransitionDuration < 0) {
+            // set final position
+            applyPosition(targetD);
+          } else {
+            // animate
+            state.tweenGroup.add(new Tween(currentTargetD).to(targetD, state.labelsTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyPosition).start());
           }
         }
-      });
+      }).digest(state.labelsData);
     }
   });
 
@@ -72416,6 +72458,14 @@ void main() {
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjRing',
+        removeDelay: 30000 // wait until all rings are gone
+      }).onCreateObj(function () {
+        var obj = new THREE$3.Group();
+        obj.__globeObjType = 'ring'; // Add object type
+        return obj;
+      });
       state.ticker = new FrameTicker();
       state.ticker.onTick.add(function (time) {
         if (!state.ringsData.length) return;
@@ -72426,10 +72476,14 @@ void main() {
         var maxRadiusAccessor = index$1(state.ringMaxRadius);
         var propagationSpeedAccessor = index$1(state.ringPropagationSpeed);
         var repeatPeriodAccessor = index$1(state.ringRepeatPeriod);
-        state.ringsData.filter(function (d) {
-          return d.__threeObj;
-        }).forEach(function (d) {
-          var obj = d.__threeObj;
+        state.dataMapper.entries().filter(function (_ref2) {
+          var _ref3 = _slicedToArray$1(_ref2, 2),
+            o = _ref3[1];
+          return o;
+        }).forEach(function (_ref4) {
+          var _ref5 = _slicedToArray$1(_ref4, 2),
+            d = _ref5[0],
+            obj = _ref5[1];
           if ((obj.__nextRingTime || 0) <= time) {
             // time to add a new ring
             var periodSecs = repeatPeriodAccessor(d) / 1000;
@@ -72461,8 +72515,8 @@ void main() {
             var maxAngle = maxRadius * Math.PI / 180; // in radians
             var propagationSpeed = propagationSpeedAccessor(d);
             var isReverse = propagationSpeed <= 0;
-            var updateFn = function updateFn(_ref2) {
-              var t = _ref2.t;
+            var updateFn = function updateFn(_ref6) {
+              var t = _ref6.t;
               var ang = (isReverse ? 1 - t : t) * maxAngle;
               circleObj.scale.x = circleObj.scale.y = curveR * Math.sin(ang);
               circleObj.position.z = curveR * (1 - Math.cos(ang));
@@ -72501,25 +72555,15 @@ void main() {
       var altitudeAccessor = index$1(state.ringAltitude);
       var globeCenter = state.scene.localToWorld(new THREE$3.Vector3(0, 0, 0)); // translate from local to world coords
 
-      threeDigest(state.ringsData, state.scene, {
-        createObj: function createObj() {
-          var obj = new THREE$3.Group();
-          obj.__globeObjType = 'ring'; // Add object type
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          var lat = latAccessor(d);
-          var lng = lngAccessor(d);
-          var alt = altitudeAccessor(d);
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        var lat = latAccessor(d);
+        var lng = lngAccessor(d);
+        var alt = altitudeAccessor(d);
 
-          // position & orientate inwards
-          Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
-          obj.lookAt(globeCenter);
-        }
-      }, {
-        removeDelay: 30000
-      } // wait until all rings are gone
-      );
+        // position & orientate inwards
+        Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
+        obj.lookAt(globeCenter);
+      }).digest(state.ringsData);
     }
   });
 
@@ -72560,9 +72604,12 @@ void main() {
     },
     methods: {
       updateObjVisibility: function updateObjVisibility(state, obj) {
+        if (!state.dataMapper) return;
         // default to all if no obj specified
-        var objs = obj ? [obj] : state.htmlElementsData.map(function (d) {
-          return d.__threeObj;
+        var objs = obj ? [obj] : state.dataMapper.entries().map(function (_ref) {
+          var _ref2 = _slicedToArray$1(_ref, 2),
+            o = _ref2[1];
+          return o;
         }).filter(function (d) {
           return d;
         });
@@ -72572,14 +72619,23 @@ void main() {
         });
       }
     },
-    init: function init(threeObj, state, _ref) {
-      var tweenGroup = _ref.tweenGroup;
+    init: function init(threeObj, state, _ref3) {
+      var tweenGroup = _ref3.tweenGroup;
       // Clear the scene
       emptyObject(threeObj);
 
       // Main three object to manipulate
       state.scene = threeObj;
       state.tweenGroup = tweenGroup;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjHtml'
+      }).onCreateObj(function (d) {
+        var elem = index$1(state.htmlElement)(d);
+        var obj = new THREE$2.CSS2DObject(elem);
+        obj.__globeObjType = 'html'; // Add object type
+
+        return obj;
+      });
     },
     update: function update(state, changedProps) {
       var _this = this;
@@ -72587,45 +72643,37 @@ void main() {
       var latAccessor = index$1(state.htmlLat);
       var lngAccessor = index$1(state.htmlLng);
       var altitudeAccessor = index$1(state.htmlAltitude);
-      var elemAccessor = index$1(state.htmlElement);
-      threeDigest(state.htmlElementsData, state.scene, {
-        // objs need to be recreated if this prop has changed
-        purge: changedProps.hasOwnProperty('htmlElement'),
-        createObj: function createObj(d) {
-          var elem = elemAccessor(d);
-          var obj = new THREE$2.CSS2DObject(elem);
-          obj.__globeObjType = 'html'; // Add object type
 
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          var applyUpdate = function applyUpdate(td) {
-            var _obj$__currentTargetD = obj.__currentTargetD = td,
-              alt = _obj$__currentTargetD.alt,
-              lat = _obj$__currentTargetD.lat,
-              lng = _obj$__currentTargetD.lng;
-            Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
-            _this.updateObjVisibility(obj);
-          };
-          var targetD = {
-            lat: +latAccessor(d),
-            lng: +lngAccessor(d),
-            alt: +altitudeAccessor(d)
-          };
-          if (!state.htmlTransitionDuration || state.htmlTransitionDuration < 0 || !obj.__currentTargetD) {
-            // set final position
-            applyUpdate(targetD);
-          } else {
-            // animate
-            state.tweenGroup.add(new Tween(obj.__currentTargetD).to(targetD, state.htmlTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
-          }
+      // objs need to be recreated if this prop has changed
+      changedProps.hasOwnProperty('htmlElement') && state.dataMapper.clear();
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        var applyUpdate = function applyUpdate(td) {
+          var _obj$__currentTargetD = obj.__currentTargetD = td,
+            alt = _obj$__currentTargetD.alt,
+            lat = _obj$__currentTargetD.lat,
+            lng = _obj$__currentTargetD.lng;
+          Object.assign(obj.position, polar2Cartesian(lat, lng, alt));
+          _this.updateObjVisibility(obj);
+        };
+        var targetD = {
+          lat: +latAccessor(d),
+          lng: +lngAccessor(d),
+          alt: +altitudeAccessor(d)
+        };
+        if (!state.htmlTransitionDuration || state.htmlTransitionDuration < 0 || !obj.__currentTargetD) {
+          // set final position
+          applyUpdate(targetD);
+        } else {
+          // animate
+          state.tweenGroup.add(new Tween(obj.__currentTargetD).to(targetD, state.htmlTransitionDuration).easing(Easing.Quadratic.InOut).onUpdate(applyUpdate).start());
         }
-      });
+      }).digest(state.htmlElementsData);
     }
   });
 
   var THREE$1 = window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
+    Euler: Euler,
     Group: Group$1,
     Mesh: Mesh,
     MeshLambertMaterial: MeshLambertMaterial,
@@ -72669,6 +72717,20 @@ void main() {
 
       // Main three object to manipulate
       state.scene = threeObj;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjObject'
+      }).onCreateObj(function (d) {
+        var obj = index$1(state.objectThreeObject)(d);
+        if (state.objectThreeObject === obj) {
+          // clone object if it's a shared object among all points
+          obj = obj.clone();
+        }
+        var g = new THREE$1.Group();
+        g.add(obj);
+        g.__globeObjType = 'object'; // Add object type
+
+        return g;
+      });
     },
     update: function update(state, changedProps) {
       // Data accessors
@@ -72677,33 +72739,19 @@ void main() {
       var altitudeAccessor = index$1(state.objectAltitude);
       var parallelAccessor = index$1(state.objectFacesSurface);
       var rotationAccessor = index$1(state.objectRotation);
-      var threeObjAccessor = index$1(state.objectThreeObject);
-      threeDigest(state.objectsData, state.scene, {
-        // objs need to be recreated if this prop has changed
-        purge: changedProps.hasOwnProperty('objectThreeObject'),
-        createObj: function createObj(d) {
-          var obj = threeObjAccessor(d);
-          if (state.objectThreeObject === obj) {
-            // clone object if it's a shared object among all points
-            obj = obj.clone();
-          }
-          var g = new THREE$1.Group();
-          g.add(obj);
-          g.__globeObjType = 'object'; // Add object type
 
-          return g;
-        },
-        updateObj: function updateObj(objG, d) {
-          var lat = +latAccessor(d);
-          var lng = +lngAccessor(d);
-          var alt = +altitudeAccessor(d);
-          Object.assign(objG.position, polar2Cartesian(lat, lng, alt));
-          parallelAccessor(d) ? objG.setRotationFromEuler(new Euler(deg2Rad$1(-lat), deg2Rad$1(lng), 0, 'YXZ')) : objG.rotation.set(0, 0, 0);
-          var obj = objG.children[0];
-          var rot = rotationAccessor(d);
-          rot && obj.setRotationFromEuler(new Euler(deg2Rad$1(rot.x || 0), deg2Rad$1(rot.y || 0), deg2Rad$1(rot.z || 0)));
-        }
-      });
+      // objs need to be recreated if this prop has changed
+      changedProps.hasOwnProperty('objectThreeObject') && state.dataMapper.clear();
+      state.dataMapper.onUpdateObj(function (objG, d) {
+        var lat = +latAccessor(d);
+        var lng = +lngAccessor(d);
+        var alt = +altitudeAccessor(d);
+        Object.assign(objG.position, polar2Cartesian(lat, lng, alt));
+        parallelAccessor(d) ? objG.setRotationFromEuler(new Euler(deg2Rad$1(-lat), deg2Rad$1(lng), 0, 'YXZ')) : objG.rotation.set(0, 0, 0);
+        var obj = objG.children[0];
+        var rot = rotationAccessor(d);
+        rot && obj.setRotationFromEuler(new Euler(deg2Rad$1(rot.x || 0), deg2Rad$1(rot.y || 0), deg2Rad$1(rot.z || 0)));
+      }).digest(state.objectsData);
     }
   });
 
@@ -72725,32 +72773,32 @@ void main() {
 
       // Main three object to manipulate
       state.scene = threeObj;
+      state.dataMapper = new ThreeDigest(threeObj, {
+        objBindAttr: '__threeObjCustom'
+      }).onCreateObj(function (d) {
+        var obj = index$1(state.customThreeObject)(d, GLOBE_RADIUS);
+        if (obj) {
+          if (state.customThreeObject === obj) {
+            // clone object if it's a shared object among all points
+            obj = obj.clone();
+          }
+          obj.__globeObjType = 'custom'; // Add object type
+        }
+        return obj;
+      });
     },
     update: function update(state, changedProps) {
       if (!state.customThreeObjectUpdate) {
         emptyObject(state.scene);
       } // Clear the existing objects to create all new, if there's no update method (brute-force)
 
-      var customObjectAccessor = index$1(state.customThreeObject);
       var customObjectUpdateAccessor = index$1(state.customThreeObjectUpdate);
-      threeDigest(state.customLayerData, state.scene, {
-        // objs need to be recreated if this prop has changed
-        purge: changedProps.hasOwnProperty('customThreeObject'),
-        createObj: function createObj(d) {
-          var obj = customObjectAccessor(d, GLOBE_RADIUS);
-          if (obj) {
-            if (state.customThreeObject === obj) {
-              // clone object if it's a shared object among all points
-              obj = obj.clone();
-            }
-            obj.__globeObjType = 'custom'; // Add object type
-          }
-          return obj;
-        },
-        updateObj: function updateObj(obj, d) {
-          return customObjectUpdateAccessor(obj, d, GLOBE_RADIUS);
-        }
-      });
+
+      // objs need to be recreated if this prop has changed
+      changedProps.hasOwnProperty('customThreeObject') && state.dataMapper.clear();
+      state.dataMapper.onUpdateObj(function (obj, d) {
+        return customObjectUpdateAccessor(obj, d, GLOBE_RADIUS);
+      }).digest(state.customLayerData);
     }
   });
 
@@ -115142,7 +115190,7 @@ var<${access}> ${name} : ${structName};`;
   }
 
   var _excluded = ["rendererConfig", "waitForGlobeReady"];
-  var THREE = _objectSpread2$2(_objectSpread2$2({}, window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
+  var THREE = _objectSpread2$1(_objectSpread2$1({}, window.THREE ? window.THREE // Prefer consumption from global THREE, if exists
   : {
     AmbientLight: AmbientLight,
     DirectionalLight: DirectionalLight,
@@ -115157,25 +115205,25 @@ var<${access}> ${name} : ${structName};`;
   // Expose config from ThreeGlobe
   var bindGlobe = linkKapsule('globe', threeGlobe);
   var linkedGlobeProps = Object.assign.apply(Object, _toConsumableArray$5(['globeImageUrl', 'bumpImageUrl', 'showGlobe', 'showGraticules', 'showAtmosphere', 'atmosphereColor', 'atmosphereAltitude', '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', 'heatmapsData', 'heatmapPoints', 'heatmapPointLat', 'heatmapPointLng', 'heatmapPointWeight', 'heatmapBandwidth', 'heatmapColorFn', 'heatmapColorSaturation', 'heatmapBaseAltitude', 'heatmapTopAltitude', 'heatmapsTransitionDuration', 'hexBinPointsData', 'hexBinPointLat', 'hexBinPointLng', 'hexBinPointWeight', 'hexBinResolution', 'hexMargin', 'hexTopCurvatureResolution', 'hexTopColor', 'hexSideColor', 'hexAltitude', 'hexBinMerge', 'hexTransitionDuration', 'hexPolygonsData', 'hexPolygonGeoJsonGeometry', 'hexPolygonColor', 'hexPolygonAltitude', 'hexPolygonResolution', 'hexPolygonMargin', 'hexPolygonUseDots', 'hexPolygonCurvatureResolution', 'hexPolygonDotResolution', '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', 'objectRotation', 'objectFacesSurface', 'objectThreeObject', 'customLayerData', 'customThreeObject', 'customThreeObjectUpdate'].map(function (p) {
-    return _defineProperty$3({}, p, bindGlobe.linkProp(p));
+    return _defineProperty$2({}, p, bindGlobe.linkProp(p));
   })));
   var linkedGlobeMethods = Object.assign.apply(Object, _toConsumableArray$5(['globeMaterial', 'getGlobeRadius', 'getCoords', 'toGeoCoords'].map(function (p) {
-    return _defineProperty$3({}, p, bindGlobe.linkMethod(p));
+    return _defineProperty$2({}, p, bindGlobe.linkMethod(p));
   })));
 
   // Expose config from renderObjs
   var bindRenderObjs = linkKapsule('renderObjs', threeRenderObjects);
   var linkedRenderObjsProps = Object.assign.apply(Object, _toConsumableArray$5(['width', 'height', 'backgroundColor', 'backgroundImageUrl', 'enablePointerInteraction'].map(function (p) {
-    return _defineProperty$3({}, p, bindRenderObjs.linkProp(p));
+    return _defineProperty$2({}, p, bindRenderObjs.linkProp(p));
   })));
   var linkedRenderObjsMethods = Object.assign.apply(Object, _toConsumableArray$5(['lights', 'postProcessingComposer'].map(function (p) {
-    return _defineProperty$3({}, p, bindRenderObjs.linkMethod(p));
+    return _defineProperty$2({}, p, bindRenderObjs.linkMethod(p));
   })));
 
   //
 
   var globe = index$2({
-    props: _objectSpread2$2(_objectSpread2$2({
+    props: _objectSpread2$1(_objectSpread2$1({
       onZoom: {
         triggerUpdate: false
       },
@@ -115340,7 +115388,7 @@ var<${access}> ${name} : ${structName};`;
         }
       }
     }, linkedGlobeProps), linkedRenderObjsProps),
-    methods: _objectSpread2$2(_objectSpread2$2({
+    methods: _objectSpread2$1(_objectSpread2$1({
       pauseAnimation: function pauseAnimation(state) {
         var _state$globe;
         if (state.animationFrameRequestId !== null) {
@@ -115462,8 +115510,8 @@ var<${access}> ${name} : ${structName};`;
       var rendererConfig = _ref6.rendererConfig,
         _ref6$waitForGlobeRea = _ref6.waitForGlobeReady,
         waitForGlobeReady = _ref6$waitForGlobeRea === void 0 ? true : _ref6$waitForGlobeRea,
-        globeInitConfig = _objectWithoutProperties$3(_ref6, _excluded);
-      var globe = new threeGlobe(_objectSpread2$2({
+        globeInitConfig = _objectWithoutProperties$2(_ref6, _excluded);
+      var globe = new threeGlobe(_objectSpread2$1({
         waitForGlobeReady: waitForGlobeReady
       }, globeInitConfig));
       return {