geojs 1.12.5 → 1.12.6

package/geo.js

@@ -3043,7 +3043,6 @@ module.exports = geo_action;
 /***/ 6978:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var geo_event = __webpack_require__(6409);
 var geo_action = __webpack_require__(8695);
 var transform = __webpack_require__(5325);
@@ -3159,7 +3158,7 @@ var _annotation = function annotation(type, args) {
     return new _annotation(type, args);
   }
   var m_this = this,
-    m_options = $.extend(true, {}, this.constructor.defaults, args || {}),
+    m_options = util.deepMerge({}, this.constructor.defaults, args || {}),
     m_id = m_options.annotationId;
   delete m_options.annotationId;
   if (m_id === undefined || m_options.layer && m_options.layer.annotationById(m_id)) {
@@ -3589,12 +3588,12 @@ var _annotation = function annotation(type, args) {
     var coordinatesSet;
     if (arg2 === undefined) {
       coordinatesSet = arg1[m_this._coordinateOption] !== undefined;
-      m_options = $.extend(true, m_options, arg1);
+      m_options = util.deepMerge(m_options, arg1);
       /* For style objects, re-extend them without recursion.  This allows
        * setting colors without an opacity field, for instance. */
       ['style', 'createStyle', 'editStyle', 'editHandleStyle', 'labelStyle', 'highlightStyle', 'cursorStyle'].forEach(function (key) {
         if (arg1[key] !== undefined) {
-          $.extend(m_options[key], arg1[key]);
+          Object.assign(m_options[key], arg1[key]);
         }
       });
     } else {
@@ -3657,7 +3656,7 @@ var _annotation = function annotation(type, args) {
       m_options[styleType] = {};
     }
     if (arg2 === undefined) {
-      m_options[styleType] = $.extend(true, m_options[styleType], arg1);
+      m_options[styleType] = util.deepMerge(m_options[styleType], arg1);
     } else {
       m_options[styleType][arg1] = arg2;
     }
@@ -3719,13 +3718,13 @@ var _annotation = function annotation(type, args) {
     /* for some states, fall back to the general style if they don't specify a
      * value explicitly. */
     if (state === annotationState.edit || state === annotationState.highlight) {
-      return $.extend({}, m_options.style, m_options[state + 'Style']);
+      return Object.assign({}, m_options.style, m_options[state + 'Style']);
     }
     if (state === annotationState.create) {
-      return $.extend({}, m_options.style, m_options.editStyle, m_options[state + 'Style']);
+      return Object.assign({}, m_options.style, m_options.editStyle, m_options[state + 'Style']);
     }
     if (state === annotationState.cursor) {
-      return $.extend({}, m_options.style, m_options.editStyle, m_options.createStyle, m_options[state + 'Style']);
+      return Object.assign({}, m_options.style, m_options.editStyle, m_options.createStyle, m_options[state + 'Style']);
     }
     return m_options[state + 'Style'] || m_options.style || {};
   };
@@ -3979,12 +3978,12 @@ var _annotation = function annotation(type, args) {
    */
   this._addEditHandles = function (features, vertices, opts, isOpen) {
     var editPoints,
-      style = $.extend({}, defaultEditHandleStyle, m_this.editHandleStyle()),
+      style = Object.assign({}, defaultEditHandleStyle, m_this.editHandleStyle()),
       handles = util.ensureFunction(style.handles)() || {},
       selected = m_this._editHandle && m_this._editHandle.handle && m_this._editHandle.handle.selected ? m_this._editHandle.handle : undefined;
     /* opts specify which handles are allowed.  They must be allowed by the
      * original opts object and by the editHandleStyle.handle object. */
-    opts = $.extend({}, opts);
+    opts = Object.assign({}, opts);
     Object.keys(handles).forEach(function (key) {
       if (handles[key] === false) {
         opts[key] = false;
@@ -4000,7 +3999,7 @@ var _annotation = function annotation(type, args) {
     vertexList.forEach(function (vert, vidx) {
       vert.forEach(function (pt, idx) {
         if (opts.vertex !== false) {
-          editPoints.push($.extend({}, pt, {
+          editPoints.push(Object.assign({}, pt, {
             type: 'vertex',
             index: idx,
             vindex: vidx,
@@ -4009,7 +4008,7 @@ var _annotation = function annotation(type, args) {
           }));
         }
         if (opts.edge !== false && idx !== vert.length - 1 && (pt.x !== vert[idx + 1].x || pt.y !== vert[idx + 1].y)) {
-          editPoints.push($.extend({
+          editPoints.push(Object.assign({
             x: (pt.x + vert[idx + 1].x) / 2,
             y: (pt.y + vert[idx + 1].y) / 2
           }, {
@@ -4021,7 +4020,7 @@ var _annotation = function annotation(type, args) {
           }));
         }
         if (opts.edge !== false && !isOpen && idx === vert.length - 1 && (pt.x !== vert[0].x || pt.y !== vert[0].y)) {
-          editPoints.push($.extend({
+          editPoints.push(Object.assign({
             x: (pt.x + vert[0].x) / 2,
             y: (pt.y + vert[0].y) / 2
           }, {
@@ -4035,14 +4034,14 @@ var _annotation = function annotation(type, args) {
       });
     });
     if (opts.center !== false) {
-      editPoints.push($.extend({}, util.centerFromPerimeter(m_this._coordinates()), {
+      editPoints.push(Object.assign({}, util.centerFromPerimeter(m_this._coordinates()), {
         type: 'center',
         style: style,
         editHandle: true
       }));
     }
     if (opts.rotate !== false) {
-      editPoints.push($.extend(m_this._rotateHandlePosition(style.rotateHandleOffset, style.rotateHandleRotation + (selected && selected.type === 'rotate' ? m_this._editHandle.amountRotated : 0)), {
+      editPoints.push(Object.assign(m_this._rotateHandlePosition(style.rotateHandleOffset, style.rotateHandleRotation + (selected && selected.type === 'rotate' ? m_this._editHandle.amountRotated : 0)), {
         type: 'rotate',
         style: style,
         editHandle: true
@@ -4052,7 +4051,7 @@ var _annotation = function annotation(type, args) {
       }
     }
     if (opts.resize !== false) {
-      editPoints.push($.extend(m_this._rotateHandlePosition(style.resizeHandleOffset, style.resizeHandleRotation), {
+      editPoints.push(Object.assign(m_this._rotateHandlePosition(style.resizeHandleOffset, style.resizeHandleRotation), {
         type: 'resize',
         style: style,
         editHandle: true
@@ -4600,10 +4599,10 @@ module.exports = {
 /***/ 9894:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var markerFeature = __webpack_require__(2225);
+var util = __webpack_require__(642);
 var ellipseAnnotation = __webpack_require__(3656);
 
 /**
@@ -4624,7 +4623,7 @@ var _circleAnnotation = function circleAnnotation(args, annotationName) {
   if (!(this instanceof _circleAnnotation)) {
     return new _circleAnnotation(args, annotationName);
   }
-  args = $.extend(true, {}, this.constructor.defaults, args, {
+  args = util.deepMerge({}, this.constructor.defaults, args, {
     constraint: 1
   });
   ellipseAnnotation.call(this, args, annotationName || 'circle');
@@ -4634,7 +4633,7 @@ inherit(_circleAnnotation, ellipseAnnotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_circleAnnotation.defaults = $.extend({}, ellipseAnnotation.defaults, {});
+_circleAnnotation.defaults = Object.assign({}, ellipseAnnotation.defaults, {});
 var circleRequiredFeatures = {};
 circleRequiredFeatures[markerFeature.capabilities.feature] = true;
 registerAnnotation('circle', _circleAnnotation, circleRequiredFeatures);
@@ -4645,10 +4644,10 @@ module.exports = _circleAnnotation;
 /***/ 3656:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var markerFeature = __webpack_require__(2225);
+var util = __webpack_require__(642);
 var annotationState = (__webpack_require__(6978).state);
 var rectangleAnnotation = __webpack_require__(4019);
 
@@ -4670,7 +4669,7 @@ var _ellipseAnnotation = function ellipseAnnotation(args, annotationName) {
   if (!(this instanceof _ellipseAnnotation)) {
     return new _ellipseAnnotation(args, annotationName);
   }
-  args = $.extend(true, {}, this.constructor.defaults, args);
+  args = util.deepMerge({}, this.constructor.defaults, args);
   rectangleAnnotation.call(this, args, annotationName || 'ellipse');
   var m_this = this;
 
@@ -4695,7 +4694,7 @@ var _ellipseAnnotation = function ellipseAnnotation(args, annotationName) {
         marker: {
           x: (opt.corners[0].x + opt.corners[1].x + opt.corners[2].x + opt.corners[3].x) / 4,
           y: (opt.corners[0].y + opt.corners[1].y + opt.corners[2].y + opt.corners[3].y) / 4,
-          style: $.extend({}, style, {
+          style: Object.assign({}, style, {
             radius: radius,
             symbolValue: aspect,
             rotation: rotation,
@@ -4766,7 +4765,7 @@ inherit(_ellipseAnnotation, rectangleAnnotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_ellipseAnnotation.defaults = $.extend({}, rectangleAnnotation.defaults, {});
+_ellipseAnnotation.defaults = Object.assign({}, rectangleAnnotation.defaults, {});
 var ellipseRequiredFeatures = {};
 ellipseRequiredFeatures[markerFeature.capabilities.feature] = true;
 registerAnnotation('ellipse', _ellipseAnnotation, ellipseRequiredFeatures);
@@ -4804,10 +4803,10 @@ module.exports = {
 /***/ 2612:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var lineFeature = __webpack_require__(9281);
+var util = __webpack_require__(642);
 var annotation = (__webpack_require__(6978).annotation);
 var annotationState = (__webpack_require__(6978).state);
 var continuousVerticesActions = (__webpack_require__(6978).continuousVerticesActions);
@@ -4843,7 +4842,7 @@ var _lineAnnotation = function lineAnnotation(args) {
   if (!(this instanceof _lineAnnotation)) {
     return new _lineAnnotation(args);
   }
-  args = $.extend(true, {}, this.constructor.defaults, {
+  args = util.deepMerge({}, this.constructor.defaults, {
     style: {
       line: function line(d) {
         /* Return an array that has the same number of items as we have
@@ -5124,7 +5123,7 @@ inherit(_lineAnnotation, annotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_lineAnnotation.defaults = $.extend({}, annotation.defaults, {
+_lineAnnotation.defaults = Object.assign({}, annotation.defaults, {
   style: {
     strokeColor: {
       r: 0,
@@ -5163,7 +5162,6 @@ module.exports = _lineAnnotation;
 /***/ 400:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var util = __webpack_require__(642);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
@@ -5204,7 +5202,7 @@ var _pointAnnotation = function pointAnnotation(args) {
   if (!(this instanceof _pointAnnotation)) {
     return new _pointAnnotation(args);
   }
-  args = $.extend(true, {}, this.constructor.defaults, args);
+  args = util.deepMerge({}, this.constructor.defaults, args);
   args.position = args.position || (args.coordinates ? args.coordinates[0] : undefined);
   delete args.coordinates;
   annotation.call(this, 'point', args);
@@ -5231,7 +5229,7 @@ var _pointAnnotation = function pointAnnotation(args) {
           if (opt.style.scaled === true) {
             opt.style.scaled = m_this.layer().map().zoom();
           }
-          style = $.extend({}, style, {
+          style = Object.assign({}, style, {
             radius: function radius() {
               var radius = opt.style.radius,
                 zoom = m_this.layer().map().zoom();
@@ -5347,7 +5345,7 @@ inherit(_pointAnnotation, annotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_pointAnnotation.defaults = $.extend({}, annotation.defaults, {
+_pointAnnotation.defaults = Object.assign({}, annotation.defaults, {
   style: {
     fill: true,
     fillColor: {
@@ -5400,7 +5398,6 @@ module.exports = _pointAnnotation;
 /***/ 1920:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var lineFeature = __webpack_require__(9281);
@@ -5445,7 +5442,7 @@ var _polygonAnnotation = function polygonAnnotation(args) {
   if (!(this instanceof _polygonAnnotation)) {
     return new _polygonAnnotation(args);
   }
-  args = $.extend(true, {}, this.constructor.defaults, {
+  args = util.deepMerge({}, this.constructor.defaults, {
     style: {
       polygon: function polygon(d) {
         return d.polygon;
@@ -5767,7 +5764,7 @@ inherit(_polygonAnnotation, annotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_polygonAnnotation.defaults = $.extend({}, annotation.defaults, {
+_polygonAnnotation.defaults = Object.assign({}, annotation.defaults, {
   style: {
     fill: true,
     fillColor: {
@@ -5838,12 +5835,12 @@ module.exports = _polygonAnnotation;
 /***/ 4019:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var geo_event = __webpack_require__(6409);
 var geo_action = __webpack_require__(8695);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var polygonFeature = __webpack_require__(6645);
+var util = __webpack_require__(642);
 var annotation = (__webpack_require__(6978).annotation);
 var annotationState = (__webpack_require__(6978).state);
 var annotationActionOwner = (__webpack_require__(6978).annotationActionOwner);
@@ -5887,7 +5884,7 @@ var _rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
   if (!(this instanceof _rectangleAnnotation)) {
     return new _rectangleAnnotation(args, annotationName);
   }
-  args = $.extend(true, {}, this.constructor.defaults, args);
+  args = util.deepMerge({}, this.constructor.defaults, args);
   args.corners = args.corners || args.coordinates || [];
   delete args.coordinates;
   annotation.call(this, annotationName || 'rectangle', args);
@@ -6080,7 +6077,7 @@ var _rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
         x: c0.x,
         y: c2.y
       };
-    corners[2] = $.extend({}, evt.mapgcs);
+    corners[2] = Object.assign({}, evt.mapgcs);
     corners[1] = map.displayToGcs(c1, null);
     corners[3] = map.displayToGcs(c3, null);
     if (this._selectionConstraint) {
@@ -6139,10 +6136,10 @@ var _rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
       return 'done';
     }
     if (evt.buttonsDown.left) {
-      corners.push($.extend({}, evt.mapgcs));
-      corners.push($.extend({}, evt.mapgcs));
-      corners.push($.extend({}, evt.mapgcs));
-      corners.push($.extend({}, evt.mapgcs));
+      corners.push(Object.assign({}, evt.mapgcs));
+      corners.push(Object.assign({}, evt.mapgcs));
+      corners.push(Object.assign({}, evt.mapgcs));
+      corners.push(Object.assign({}, evt.mapgcs));
       return true;
     }
   };
@@ -6242,7 +6239,7 @@ inherit(_rectangleAnnotation, annotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_rectangleAnnotation.defaults = $.extend({}, annotation.defaults, {
+_rectangleAnnotation.defaults = Object.assign({}, annotation.defaults, {
   style: {
     fill: true,
     fillColor: {
@@ -6298,10 +6295,10 @@ module.exports = _rectangleAnnotation;
 /***/ 5229:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var registerAnnotation = (__webpack_require__(1098).registerAnnotation);
 var polygonFeature = __webpack_require__(6645);
+var util = __webpack_require__(642);
 var rectangleAnnotation = __webpack_require__(4019);
 
 /**
@@ -6322,7 +6319,7 @@ var _squareAnnotation = function squareAnnotation(args, annotationName) {
   if (!(this instanceof _squareAnnotation)) {
     return new _squareAnnotation(args, annotationName);
   }
-  args = $.extend(true, {}, this.constructor.defaults, args, {
+  args = util.deepMerge({}, this.constructor.defaults, args, {
     constraint: 1
   });
   rectangleAnnotation.call(this, args, annotationName || 'square');
@@ -6332,7 +6329,7 @@ inherit(_squareAnnotation, rectangleAnnotation);
 /**
  * This object contains the default options to initialize the class.
  */
-_squareAnnotation.defaults = $.extend({}, rectangleAnnotation.defaults, {});
+_squareAnnotation.defaults = Object.assign({}, rectangleAnnotation.defaults, {});
 var squareRequiredFeatures = {};
 squareRequiredFeatures[polygonFeature.capabilities.feature] = true;
 registerAnnotation('square', _squareAnnotation, squareRequiredFeatures);
@@ -6523,7 +6520,7 @@ var _annotationLayer = function annotationLayer(arg) {
       keys: [key, 'label' + key.charAt(0).toUpperCase() + key.slice(1), key.replace(/([A-Z])/g, '-$1').toLowerCase(), 'label-' + key.replace(/([A-Z])/g, '-$1').toLowerCase()]
     };
   });
-  m_options = $.extend(true, {}, {
+  m_options = util.deepMerge({}, {
     dblClickTime: 300,
     adjacentPointProximity: 5,
     // in pixels, 0 is exact
@@ -6831,7 +6828,7 @@ var _annotationLayer = function annotationLayer(arg) {
       return m_options[arg1];
     }
     if (arg2 === undefined) {
-      m_options = $.extend(true, m_options, arg1);
+      m_options = util.deepMerge(m_options, arg1);
     } else {
       m_options[arg1] = arg2;
     }
@@ -7082,7 +7079,7 @@ var _annotationLayer = function annotationLayer(arg) {
       }
       m_this.map().interactor().removeAction(undefined, undefined, geo_annotation.actionOwner);
       if (createAnnotation) {
-        options = $.extend({}, options || {}, {
+        options = Object.assign({}, options || {}, {
           state: geo_annotation.state.create,
           layer: m_this
         });
@@ -7198,7 +7195,7 @@ var _annotationLayer = function annotationLayer(arg) {
     gcs = gcs === null ? map.gcs() : gcs === undefined ? map.ingcs() : gcs;
     $.each(dataList, function (data_idx, data) {
       var type = (data.properties || {}).annotationType || feature.featureType,
-        options = $.extend({}, data.properties || {}),
+        options = Object.assign({}, data.properties || {}),
         position,
         datagcs,
         i,
@@ -10617,7 +10614,6 @@ var _choroplethFeature = function choroplethFeature(arg) {
   }
   arg = arg || {};
   feature.call(this, arg);
-  var $ = __webpack_require__(5616);
   var ensureFunction = (__webpack_require__(642).ensureFunction);
   delete arg.layer;
   delete arg.renderer;
@@ -10627,7 +10623,7 @@ var _choroplethFeature = function choroplethFeature(arg) {
   var d3 = (__webpack_require__(2493).d3),
     m_this = this,
     s_init = this._init,
-    m_choropleth = $.extend({}, {
+    m_choropleth = Object.assign({}, {
       colorRange: [{
         r: 0.07514311,
         g: 0.468049805,
@@ -10738,7 +10734,7 @@ var _choroplethFeature = function choroplethFeature(arg) {
       return m_choropleth[arg1];
     }
     if (arg2 === undefined) {
-      choropleth = $.extend({}, m_choropleth, arg1);
+      choropleth = Object.assign({}, m_choropleth, arg1);
       m_choropleth = choropleth;
     } else {
       m_choropleth[arg1] = arg2; //if you pass in accessor for prop
@@ -10970,7 +10966,6 @@ var _contourFeature = function contourFeature(arg) {
   if (!(this instanceof _contourFeature)) {
     return new _contourFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var util = __webpack_require__(642);
   var meshUtil = __webpack_require__(5905);
   arg = arg || {};
@@ -11002,7 +10997,7 @@ var _contourFeature = function contourFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       opacity: 1.0,
       value: function value(d, i) {
         return util.isNonNullFinite(d) ? d : m_this.position()(d, i).z;
@@ -11018,7 +11013,7 @@ var _contourFeature = function contourFeature(arg) {
       }
     }, arg.style === undefined ? {} : arg.style);
     m_this.style(defaultStyle);
-    m_this.contour($.extend({}, {
+    m_this.contour(Object.assign({}, {
       minColor: 'black',
       minOpacity: 0,
       maxColor: 'black',
@@ -12527,7 +12522,7 @@ var _feature = function feature(arg) {
     } else if (typeof arg1 === 'string' && arg2 === undefined) {
       return m_style[arg1];
     } else if (arg2 === undefined) {
-      m_style = $.extend({}, m_style, arg1);
+      m_style = Object.assign({}, m_style, arg1);
       m_this.modified();
       return m_this;
     } else {
@@ -12926,7 +12921,7 @@ var _feature = function feature(arg) {
     if (!m_layer) {
       throw new Error('Feature requires a valid layer');
     }
-    m_style = $.extend({}, {
+    m_style = Object.assign({}, {
       opacity: 1.0
     }, arg.style === undefined ? {} : arg.style);
     m_this._bindMouseHandlers();
@@ -14360,7 +14355,6 @@ var _graphFeature = function graphFeature(arg) {
   }
   arg = arg || {};
   feature.call(this, arg);
-  var $ = __webpack_require__(5616);
   var util = __webpack_require__(642);
   var registry = __webpack_require__(1098);
   var m_this = this,
@@ -14384,7 +14378,7 @@ var _graphFeature = function graphFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend(true, {}, {
+    var defaultStyle = util.deepMerge({}, {
       nodes: {
         radius: 5.0,
         fill: true,
@@ -14684,7 +14678,6 @@ var _gridFeature = function gridFeature(arg) {
   if (!(this instanceof _gridFeature)) {
     return new _gridFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var util = __webpack_require__(642);
   var meshUtil = __webpack_require__(5905);
   arg = arg || {};
@@ -14716,7 +14709,7 @@ var _gridFeature = function gridFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       opacity: 1.0,
       value: function value(d, i) {
         return util.isNonNullFinite(d) ? d : m_this.position()(d, i).z;
@@ -14732,7 +14725,7 @@ var _gridFeature = function gridFeature(arg) {
       }
     }, arg.style === undefined ? {} : arg.style);
     m_this.style(defaultStyle);
-    m_this.grid($.extend({}, {
+    m_this.grid(Object.assign({}, {
       minColor: 'black',
       minOpacity: 0,
       maxColor: 'black',
@@ -14791,7 +14784,6 @@ module.exports = _gridFeature;
 /***/ 9163:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var feature = __webpack_require__(1275);
 var transform = __webpack_require__(5325);
@@ -15026,7 +15018,7 @@ var _heatmapFeature = function heatmapFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       radius: 10,
       blurRadius: 10,
       gaussian: true,
@@ -15274,7 +15266,7 @@ $.htmlPrefilter = function (html) {
   return html.replace(rxhtmlTag, '<$1></$2>');
 };
 __webpack_require__(7605);
-module.exports = $.extend({
+module.exports = Object.assign({
   annotationLayer: __webpack_require__(2075),
   camera: __webpack_require__(3578),
   choroplethFeature: __webpack_require__(3561),
@@ -15674,7 +15666,6 @@ var _isolineFeature = function isolineFeature(arg) {
   if (!(this instanceof _isolineFeature)) {
     return new _isolineFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var transform = __webpack_require__(5325);
   var geo_event = __webpack_require__(6409);
   var textFeature = __webpack_require__(6546);
@@ -16149,7 +16140,7 @@ var _isolineFeature = function isolineFeature(arg) {
    *    properties if there are no labels.
    */
   this.lastLabelPositions = function () {
-    return $.extend({}, m_lastLabelPositions);
+    return Object.assign({}, m_lastLabelPositions);
   };
 
   /**
@@ -16318,7 +16309,7 @@ var _isolineFeature = function isolineFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       opacity: 1.0,
       value: function value(d, i) {
         return m_this.position()(d, i).z;
@@ -16343,7 +16334,7 @@ var _isolineFeature = function isolineFeature(arg) {
       fontSize: '12px'
     }, arg.style === undefined ? {} : arg.style);
     m_this.style(defaultStyle);
-    m_this.isoline($.extend({}, {
+    m_this.isoline(Object.assign({}, {
       count: 15,
       autofit: true,
       levels: [5, 5],
@@ -16925,7 +16916,7 @@ var _layer = function layer(arg) {
     m_map.node().append(m_node);
 
     /* Pass along the arguments, but not the map reference */
-    var options = $.extend({}, arg);
+    var options = Object.assign({}, arg);
     delete options.map;
     if (m_renderer) {
       m_this._canvas(m_renderer.canvas());
@@ -17207,7 +17198,6 @@ var _lineFeature = function lineFeature(arg) {
   if (!(this instanceof _lineFeature)) {
     return new _lineFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   arg = arg || {};
   feature.call(this, arg);
 
@@ -17671,7 +17661,7 @@ var _lineFeature = function lineFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       strokeWidth: 1.0,
       // Default to gold color for lines
       strokeColor: {
@@ -18085,7 +18075,7 @@ var _map2 = function map(arg) {
    * @returns {geo.geoPosition}
    */
   this.origin = function () {
-    return $.extend({}, m_origin);
+    return Object.assign({}, m_origin);
   };
 
   /**
@@ -18345,7 +18335,7 @@ var _map2 = function map(arg) {
   this.center = function (coordinates, gcs, ignoreDiscreteZoom, ignoreClampBounds) {
     var center;
     if (coordinates === undefined) {
-      center = $.extend({}, m_this.worldToGcs(m_center, gcs));
+      center = Object.assign({}, m_this.worldToGcs(m_center, gcs));
       return center;
     }
 
@@ -18659,7 +18649,7 @@ var _map2 = function map(arg) {
     if (typeof readerOrName === 'string') {
       opts = opts || {};
       if (!opts.layer) {
-        opts.layer = m_this.createLayer('feature', $.extend({}, opts));
+        opts.layer = m_this.createLayer('feature', Object.assign({}, opts));
       }
       opts.renderer = opts.layer.renderer().api();
       m_fileReader = registry.createFileReader(readerOrName, opts);
@@ -18817,7 +18807,7 @@ var _map2 = function map(arg) {
    */
   this.zoomRange = function (arg, noRefresh) {
     if (arg === undefined) {
-      return $.extend({}, m_validZoomRange);
+      return Object.assign({}, m_validZoomRange);
     }
     if (arg.max !== undefined) {
       m_validZoomRange.max = arg.max;
@@ -18885,11 +18875,11 @@ var _map2 = function map(arg) {
       /* The queued transition needs to combine the current transition's
        * endpoint, any other queued transition, and the new transition to be
        * complete. */
-      var transitionEnd = $.extend(true, {}, m_transition.end);
+      var transitionEnd = util.deepMerge({}, m_transition.end);
       if (transitionEnd.center && m_gcs !== m_ingcs) {
         transitionEnd.center = transform.transformCoordinates(m_gcs, m_ingcs, transitionEnd.center);
       }
-      m_queuedTransition = $.extend({}, transitionEnd || {}, m_queuedTransition || {}, opts);
+      m_queuedTransition = Object.assign({}, transitionEnd || {}, m_queuedTransition || {}, opts);
       return m_this;
     }
 
@@ -18938,13 +18928,13 @@ var _map2 = function map(arg) {
     };
     if (opts.center) {
       gcs = gcs === null ? m_gcs : gcs === undefined ? m_ingcs : gcs;
-      opts = $.extend(true, {}, opts);
+      opts = util.deepMerge({}, opts);
       opts.center = util.normalizeCoordinates(opts.center);
       if (gcs !== m_gcs) {
         opts.center = transform.transformCoordinates(gcs, m_gcs, opts.center);
       }
     }
-    opts = $.extend(true, {}, defaultOpts, opts);
+    opts = util.deepMerge({}, defaultOpts, opts);
     m_transition = {
       start: {
         center: m_this.center(undefined, null),
@@ -19511,7 +19501,7 @@ var _map2 = function map(arg) {
     /* if asked to wait, return a Deferred that will do so, calling the
      * screenshot function without waiting once it is done. */
     if (opts.wait) {
-      var optsWithoutWait = $.extend({}, opts, {
+      var optsWithoutWait = Object.assign({}, opts, {
         wait: false
       });
       defer = $.Deferred();
@@ -19979,7 +19969,7 @@ var _map2 = function map(arg) {
       dy,
       maxBounds = m_maxBounds;
     if (rotation) {
-      maxBounds = $.extend({}, m_maxBounds);
+      maxBounds = Object.assign({}, m_maxBounds);
       /* When rotated, expand the maximum bounds so that they will allow the
        * corners to be visible.  We know the rotated bounding box, plus the
        * original maximum bounds.  To fit the corners of the maximum bounds, we
@@ -20173,7 +20163,7 @@ var _map2 = function map(arg) {
   m_zoom = this._fix_zoom(m_zoom);
   m_rotation = fix_rotation(m_rotation);
   // Now update to the correct center and zoom level
-  this.center($.extend({}, arg.center || m_center), undefined);
+  this.center(Object.assign({}, arg.center || m_center), undefined);
   if (arg.interactor !== null) {
     this.interactor(arg.interactor || mapInteractor({
       discreteZoom: m_discreteZoom
@@ -20400,7 +20390,7 @@ var _mapInteractor = function mapInteractor(args) {
   }
 
   // copy the options object with defaults
-  m_options = $.extend(true, {}, {
+  m_options = util.deepMerge({}, {
     throttle: 30,
     discreteZoom: false,
     /* There should only be one action with any specific combination of event
@@ -20649,13 +20639,13 @@ var _mapInteractor = function mapInteractor(args) {
   /* We don't want to merge the original arrays with arrays passed in the args,
    * so override that as necessary for actions. */
   if (args && args.actions) {
-    m_options.actions = $.extend(true, [], args.actions);
+    m_options.actions = util.deepMerge([], args.actions);
   }
   if (args && args.momentum && args.momentum.actions) {
-    m_options.momentum.actions = $.extend(true, [], args.momentum.actions);
+    m_options.momentum.actions = util.deepMerge([], args.momentum.actions);
   }
   if (args && args.keyboard && args.keyboard.actions !== undefined) {
-    m_options.keyboard.actions = $.extend(true, {}, args.keyboard.actions);
+    m_options.keyboard.actions = util.deepMerge({}, args.keyboard.actions);
   }
 
   // default mouse object
@@ -21168,9 +21158,9 @@ var _mapInteractor = function mapInteractor(args) {
    */
   this.options = function (opts) {
     if (opts === undefined) {
-      return $.extend({}, m_options);
+      return Object.assign({}, m_options);
     }
-    $.extend(m_options, opts);
+    Object.assign(m_options, opts);
 
     // reset event handlers for new options
     m_this._connectEvents();
@@ -21327,7 +21317,7 @@ var _mapInteractor = function mapInteractor(args) {
       display: display,
       gcs: gcs,
       mouse: mouse,
-      origin: $.extend({}, m_state.origin)
+      origin: Object.assign({}, m_state.origin)
     };
   };
 
@@ -21399,7 +21389,7 @@ var _mapInteractor = function mapInteractor(args) {
       m_this._setClickMaybe({
         x: m_mouse.page.x,
         y: m_mouse.page.y,
-        buttons: $.extend({}, m_mouse.buttons)
+        buttons: Object.assign({}, m_mouse.buttons)
       });
       if (m_options.click.duration > 0) {
         m_clickMaybeTimeout = window.setTimeout(function () {
@@ -21429,7 +21419,7 @@ var _mapInteractor = function mapInteractor(args) {
       m_state = {
         action: action,
         actionRecord: actionRecord,
-        origin: $.extend(true, {}, m_mouse),
+        origin: util.deepMerge({}, m_mouse),
         initialZoom: map.zoom(),
         initialRotation: map.rotation(),
         initialEventRotation: evt.rotation,
@@ -21962,7 +21952,7 @@ var _mapInteractor = function mapInteractor(args) {
     function accum(dz, org) {
       var map = m_this.map(),
         zoom;
-      origin = $.extend(true, {}, org);
+      origin = util.deepMerge({}, org);
       deltaZ += dz;
       if (targetZoom === undefined) {
         startZoom = targetZoom = map.zoom();
@@ -22256,7 +22246,7 @@ var _mapInteractor = function mapInteractor(args) {
    * @returns {object} The current mouse state.
    */
   this.mouse = function () {
-    return $.extend(true, {}, m_mouse);
+    return util.deepMerge({}, m_mouse);
   };
 
   /**
@@ -22269,7 +22259,7 @@ var _mapInteractor = function mapInteractor(args) {
    */
   this.keyboard = function (newValue) {
     if (newValue === undefined) {
-      return $.extend(true, {}, m_options.keyboard || {});
+      return util.deepMerge({}, m_options.keyboard || {});
     }
     return m_this.options({
       keyboard: newValue
@@ -22282,7 +22272,7 @@ var _mapInteractor = function mapInteractor(args) {
    * @returns {geo.interactorState}
    */
   this.state = function () {
-    return $.extend(true, {}, m_state);
+    return util.deepMerge({}, m_state);
   };
 
   /**
@@ -22579,7 +22569,6 @@ var _markerFeature = function markerFeature(arg) {
   }
   arg = arg || {};
   pointFeature.call(this, arg);
-  var $ = __webpack_require__(5616);
   var timestamp = __webpack_require__(77);
   var util = __webpack_require__(642);
   var KDBush = __webpack_require__(4279);
@@ -22966,8 +22955,8 @@ var _markerFeature = function markerFeature(arg) {
    * @returns {this}
    */
   this._init = function (arg) {
-    arg = $.extend(true, {}, {
-      style: $.extend({}, {
+    arg = util.deepMerge({}, {
+      style: Object.assign({}, {
         radius: 6.25,
         radiusIncludesStroke: true,
         strokeColor: {
@@ -23207,7 +23196,6 @@ var _meshFeature = function meshFeature(arg) {
   if (!(this instanceof _meshFeature)) {
     return new _meshFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var util = __webpack_require__(642);
   arg = arg || {};
   feature.call(this, arg);
@@ -23237,7 +23225,7 @@ var _meshFeature = function meshFeature(arg) {
       return m_mesh[specOrProperty];
     }
     if (value === undefined) {
-      var mesh = $.extend({}, {
+      var mesh = Object.assign({}, {
         gridWidth: function gridWidth() {
           if (specOrProperty.gridHeight) {
             return Math.floor(m_this.data().length / specOrProperty.gridHeight);
@@ -23663,7 +23651,7 @@ var _meshFeature = function meshFeature(arg) {
 
     /* Initialize from arguments */
     arg = arg || {};
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       position: function position(d) {
         return Array.isArray(d) ? {
           x: d[0],
@@ -23980,11 +23968,11 @@ module.exports = _object;
 /***/ 4880:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var tileLayer = __webpack_require__(9264);
 var registry = __webpack_require__(1098);
 var quadFeature = __webpack_require__(3842);
+var util = __webpack_require__(642);
 
 /**
  * Object specification for an OSM layer.
@@ -24017,10 +24005,10 @@ var _osmLayer = function osmLayer(arg) {
   }
   arg = arg || {};
   if (arg.mapOpacity !== undefined && arg.opacity === undefined) {
-    arg = $.extend({}, arg);
+    arg = Object.assign({}, arg);
     arg.opacity = arg.mapOpacity;
   }
-  arg = $.extend(true, {}, this.constructor.defaults, _osmLayer.tileSources[this.constructor.defaults.source] || {}, _osmLayer.tileSources[arg.source] || {},
+  arg = util.deepMerge({}, this.constructor.defaults, _osmLayer.tileSources[this.constructor.defaults.source] || {}, _osmLayer.tileSources[arg.source] || {},
   // don't name the layer based on the source
   {
     name: ''
@@ -24094,7 +24082,7 @@ var _osmLayer = function osmLayer(arg) {
 /**
  * This object contains the default options used to initialize the osmLayer.
  */
-_osmLayer.defaults = $.extend({}, tileLayer.defaults, {
+_osmLayer.defaults = Object.assign({}, tileLayer.defaults, {
   tileOffset: function tileOffset(level) {
     var s = Math.pow(2, level - 1) * 256;
     return {
@@ -24245,7 +24233,6 @@ module.exports = _osmLayer;
 /***/ 2266:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var feature = __webpack_require__(1275);
 
@@ -24324,7 +24311,7 @@ var _pathFeature = function pathFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       strokeWidth: 1,
       strokeColor: {
         r: 1.0,
@@ -24633,7 +24620,7 @@ var _pixelmapFeature = function pixelmapFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       color: function color(d, idx) {
         return {
           r: (idx & 0xFF) / 255,
@@ -24693,12 +24680,12 @@ module.exports = _pixelmapFeature;
 /***/ 534:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var tileLayer = __webpack_require__(9264);
 var registry = __webpack_require__(1098);
 var quadFeature = __webpack_require__(3842);
 var pixelmapFeature = __webpack_require__(7761);
+var util = __webpack_require__(642);
 
 /**
  * Object specification for a pixelmap layer.
@@ -24740,7 +24727,7 @@ var _pixelmapLayer = function pixelmapLayer(arg) {
     argdata = arg.data;
     delete arg.data;
   }
-  arg = $.extend(true, {}, this.constructor.defaults, arg);
+  arg = util.deepMerge({}, this.constructor.defaults, arg);
   tileLayer.call(this, arg);
   var s_init = this._init,
     m_pixelmapFeature,
@@ -24825,7 +24812,7 @@ var _pixelmapLayer = function pixelmapLayer(arg) {
  * This object contains the default options used to initialize the
  * pixelmapLayer.
  */
-_pixelmapLayer.defaults = $.extend({}, tileLayer.defaults, {
+_pixelmapLayer.defaults = Object.assign({}, tileLayer.defaults, {
   features: [quadFeature.capabilities.image, pixelmapFeature.capabilities.lookup],
   tileOffset: function tileOffset(level) {
     var s = Math.pow(2, level - 1) * 256;
@@ -24933,7 +24920,6 @@ var _pointFeature = function pointFeature(arg) {
   }
   arg = arg || {};
   feature.call(this, arg);
-  var $ = __webpack_require__(5616);
   var timestamp = __webpack_require__(77);
   var ClusterGroup = __webpack_require__(5966);
   var geo_event = __webpack_require__(6409);
@@ -25011,7 +24997,7 @@ var _pointFeature = function pointFeature(arg) {
       radiusInGcsAtZoom = Math.pow(Math.pow(offset.y - center.y, 2) + Math.pow(offset.x - center.x, 2), 0.5),
       zoom = map.zoom(),
       radiusInGcsAtZoom0 = radiusInGcsAtZoom * Math.pow(2, zoom);
-    opts = $.extend({}, opts, {
+    opts = Object.assign({}, opts, {
       radius: radiusInGcsAtZoom0
     });
     m_clusterTree = new ClusterGroup(opts);
@@ -25415,7 +25401,7 @@ var _pointFeature = function pointFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend(true, {}, {
+    var defaultStyle = util.deepMerge({}, {
       radius: 5.0,
       stroke: true,
       strokeColor: {
@@ -25500,7 +25486,6 @@ module.exports = _pointFeature;
 /***/ 6645:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var inherit = __webpack_require__(4626);
 var feature = __webpack_require__(1275);
 var transform = __webpack_require__(5325);
@@ -26336,7 +26321,7 @@ var _polygonFeature = function polygonFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       // default style
       fill: true,
       fillColor: {
@@ -27133,7 +27118,7 @@ var _quadFeature = function quadFeature(arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
     m_cacheQuads = arg.cacheQuads !== false;
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       color: {
         r: 1.0,
         g: 1,
@@ -27202,6 +27187,7 @@ module.exports = _quadFeature;
 
 var $ = __webpack_require__(5616);
 var geo_action = __webpack_require__(8695);
+var util = __webpack_require__(1949);
 var widgets = {
   dom: {}
 };
@@ -27213,7 +27199,7 @@ var featureCapabilities = {};
 var fileReaders = {};
 var rendererLayerAdjustments = {};
 var annotations = {};
-var util = {};
+var registry = {};
 
 /**
  * Register a new file reader type.
@@ -27223,7 +27209,7 @@ var util = {};
  *      exists, the class creation function is replaced.
  * @param {function} func Class creation function.
  */
-util.registerFileReader = function (name, func) {
+registry.registerFileReader = function (name, func) {
   fileReaders[name] = func;
 };
 
@@ -27236,7 +27222,7 @@ util.registerFileReader = function (name, func) {
  * @returns {geo.fileReader|null} The new reader or null if no such name is
  *      registered.
  */
-util.createFileReader = function (name, opts) {
+registry.createFileReader = function (name, opts) {
   if (fileReaders.hasOwnProperty(name)) {
     return fileReaders[name](opts);
   }
@@ -27251,7 +27237,7 @@ util.createFileReader = function (name, opts) {
  *      exists, the class creation function is replaced.
  * @param {function} func Class creation function.
  */
-util.registerRenderer = function (name, func) {
+registry.registerRenderer = function (name, func) {
   renderers[name] = func;
 };
 
@@ -27267,7 +27253,7 @@ util.registerRenderer = function (name, func) {
  * @returns {geo.renderer|null} The new renderer or null if no such name is
  *      registered.
  */
-util.createRenderer = function (name, layer, canvas, options) {
+registry.createRenderer = function (name, layer, canvas, options) {
   if (renderers.hasOwnProperty(name)) {
     var ren = renderers[name]({
       layer: layer,
@@ -27292,7 +27278,7 @@ util.createRenderer = function (name, layer, canvas, options) {
  * @returns {string|null|false} The name of the renderer that should be used
  *      or false if no valid renderer can be determined.
  */
-util.checkRenderer = function (name, noFallback) {
+registry.checkRenderer = function (name, noFallback) {
   if (name === null) {
     return name;
   }
@@ -27304,7 +27290,7 @@ util.checkRenderer = function (name, noFallback) {
     if (!ren.fallback || noFallback) {
       return false;
     }
-    var fallback = util.checkRenderer(ren.fallback(), true);
+    var fallback = registry.checkRenderer(ren.fallback(), true);
     if (fallback !== false) {
       console.warn(name + ' renderer is unavailable, using ' + fallback + ' renderer instead');
     }
@@ -27331,12 +27317,12 @@ util.checkRenderer = function (name, noFallback) {
  * @returns {string|null|false} The name of the renderer that should be used
  *      or false if no valid renderer can be determined.
  */
-util.rendererForFeatures = function (featureList) {
+registry.rendererForFeatures = function (featureList) {
   var preferredRenderers = ['webgl', 'canvas', 'svg', 'vtkjs', null];
   var renderer, ridx, feature, fidx, capability, available;
   for (ridx = 0; ridx < preferredRenderers.length; ridx += 1) {
     renderer = preferredRenderers[ridx];
-    if (util.checkRenderer(renderer, true) === false) {
+    if (registry.checkRenderer(renderer, true) === false) {
       continue;
     }
     if (!featureList) {
@@ -27388,7 +27374,7 @@ util.rendererForFeatures = function (featureList) {
  * @returns {object} if this feature replaces an existing one, this was the
  *      feature that was replaced.  In this case, a warning is issued.
  */
-util.registerFeature = function (category, name, func, capabilities) {
+registry.registerFeature = function (category, name, func, capabilities) {
   if (!(category in features)) {
     features[category] = {};
     featureCapabilities[category] = {};
@@ -27414,7 +27400,7 @@ util.registerFeature = function (category, name, func, capabilities) {
  * @returns {geo.feature|null} The new feature or null if no such name is
  *      registered.
  */
-util.createFeature = function (name, layer, renderer, arg) {
+registry.createFeature = function (name, layer, renderer, arg) {
   var category = renderer.api(),
     options = {
       layer: layer,
@@ -27422,7 +27408,7 @@ util.createFeature = function (name, layer, renderer, arg) {
     };
   if (category in features && name in features[category]) {
     if (arg !== undefined) {
-      $.extend(true, options, arg);
+      util.deepMerge(options, arg);
     }
     var feature = features[category][name](options);
     if (layer.gcs === undefined) {
@@ -27449,7 +27435,7 @@ util.createFeature = function (name, layer, renderer, arg) {
  * @returns {object} if this layer adjustment replaces an existing one, this
  *      was the value that was replaced.  In this case, a warning is issued.
  */
-util.registerLayerAdjustment = function (category, name, func) {
+registry.registerLayerAdjustment = function (category, name, func) {
   if (!(category in rendererLayerAdjustments)) {
     rendererLayerAdjustments[category] = {};
   }
@@ -27469,7 +27455,7 @@ util.registerLayerAdjustment = function (category, name, func) {
  * @param {string} name Name of the layer or adjustment.
  * @param {object} layer Instantiated layer object.
  */
-util.adjustLayerForRenderer = function (name, layer) {
+registry.adjustLayerForRenderer = function (name, layer) {
   var rendererName = layer.rendererName();
   if (rendererName) {
     if (rendererLayerAdjustments && rendererLayerAdjustments[rendererName] && rendererLayerAdjustments[rendererName][name]) {
@@ -27488,7 +27474,7 @@ util.adjustLayerForRenderer = function (name, layer) {
  * @param {string[]} [defaultFeatures] An optional list of feature capabilities
  *      that are required to use this layer.
  */
-util.registerLayer = function (name, func, defaultFeatures) {
+registry.registerLayer = function (name, func, defaultFeatures) {
   layers[name] = func;
   layerDefaultFeatures[name] = defaultFeatures;
 };
@@ -27503,7 +27489,7 @@ util.registerLayer = function (name, func, defaultFeatures) {
  * @returns {geo.layer|null} The new layer or null if no such name is
  *      registered.
  */
-util.createLayer = function (name, map, arg) {
+registry.createLayer = function (name, map, arg) {
   // Default renderer is webgl
   var options = {
       map: map
@@ -27516,7 +27502,7 @@ util.createLayer = function (name, map, arg) {
     if (arg !== undefined) {
       var argdata = arg.data;
       delete arg.data;
-      $.extend(true, options, arg);
+      util.deepMerge(options, arg);
       if (argdata) {
         options.data = argdata;
       }
@@ -27541,7 +27527,7 @@ util.createLayer = function (name, map, arg) {
  * @returns {object} If this widget replaces an existing one, this was the
  *      value that was replaced.  In this case, a warning is issued.
  */
-util.registerWidget = function (category, name, func) {
+registry.registerWidget = function (category, name, func) {
   if (!(category in widgets)) {
     widgets[category] = {};
   }
@@ -27562,13 +27548,13 @@ util.registerWidget = function (category, name, func) {
  * @param {object} arg Options for the new widget.
  * @returns {geo.widget} The new widget.
  */
-util.createWidget = function (name, layer, arg) {
+registry.createWidget = function (name, layer, arg) {
   var options = {
     layer: layer
   };
   if (name in widgets.dom) {
     if (arg !== undefined) {
-      $.extend(true, options, arg);
+      util.deepMerge(options, arg);
     }
     return widgets.dom[name](options);
   }
@@ -27589,7 +27575,7 @@ util.createWidget = function (name, layer, arg) {
  * @returns {object} if this annotation replaces an existing one, this was the
  *      value that was replaced.  In this case, a warning is issued.
  */
-util.registerAnnotation = function (name, func, features) {
+registry.registerAnnotation = function (name, func, features) {
   var old = annotations[name];
   if (old) {
     console.warn('The ' + name + ' annotation is already registered');
@@ -27610,7 +27596,7 @@ util.registerAnnotation = function (name, func, features) {
  * @param {object} options The options for the annotation.
  * @returns {object} the new annotation.
  */
-util.createAnnotation = function (name, options) {
+registry.createAnnotation = function (name, options) {
   if (!annotations[name]) {
     console.warn('The ' + name + ' annotation is not registered');
     return;
@@ -27625,7 +27611,7 @@ util.createAnnotation = function (name, options) {
  * @alias geo.listAnnotations
  * @returns {string[]} A list of registered annotations.
  */
-util.listAnnotations = function () {
+registry.listAnnotations = function () {
   return Object.keys(annotations);
 };
 
@@ -27643,7 +27629,7 @@ util.listAnnotations = function () {
  * @returns {string[]} a list of features needed for the specified annotations.
  *   There may be duplicates in the list.
  */
-util.featuresForAnnotations = function (annotationList) {
+registry.featuresForAnnotations = function (annotationList) {
   var features = [];
   var annList = Array.isArray(annotationList) ? annotationList : Object.keys(annotationList);
   annList.forEach(function (ann) {
@@ -27679,8 +27665,8 @@ util.featuresForAnnotations = function (annotationList) {
  * @returns {string|null|false} the name of the renderer that should be used or
  *   false if no valid renderer can be determined.
  */
-util.rendererForAnnotations = function (annotationList) {
-  return util.rendererForFeatures(util.featuresForAnnotations(annotationList));
+registry.rendererForAnnotations = function (annotationList) {
+  return registry.rendererForFeatures(registry.featuresForAnnotations(annotationList));
 };
 
 /**
@@ -27689,7 +27675,7 @@ util.rendererForAnnotations = function (annotationList) {
  *
  * @namespace geo.registries
  */
-util.registries = {
+registry.registries = {
   annotations: annotations,
   features: features,
   featureCapabilities: featureCapabilities,
@@ -27698,7 +27684,7 @@ util.registries = {
   renderers: renderers,
   widgets: widgets
 };
-module.exports = util;
+module.exports = registry;
 
 /***/ }),
 
@@ -28074,7 +28060,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "1fd3450e4c094c4475819ff627ee93484c684c3c";
+module.exports = "689846cc4aaa81643bd60b9d9afd9c8dd08bd8ff";
 
 /***/ }),
 
@@ -28388,7 +28374,6 @@ var _svg_pathFeature = function svg_pathFeature(arg) {
   if (!(this instanceof _svg_pathFeature)) {
     return new _svg_pathFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var object = __webpack_require__(5005);
   var timestamp = __webpack_require__(77);
   arg = arg || {};
@@ -28436,7 +28421,7 @@ var _svg_pathFeature = function svg_pathFeature(arg) {
     m_style.id = m_this._svgid();
     m_style.append = 'path';
     m_style.classes = ['svgPathFeature'];
-    m_style.style = $.extend({
+    m_style.style = Object.assign({
       fill: function fill() {
         return false;
       },
@@ -30078,7 +30063,6 @@ var _textFeature = function textFeature(arg) {
   }
   arg = arg || {};
   feature.call(this, arg);
-  var $ = __webpack_require__(5616);
 
   /**
    * @private
@@ -30131,7 +30115,7 @@ var _textFeature = function textFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       font: 'bold 16px sans-serif',
       textAlign: 'center',
       textBaseline: 'middle',
@@ -30617,6 +30601,7 @@ module.exports = _tileCache;
 
 var inherit = __webpack_require__(4626);
 var featureLayer = __webpack_require__(6498);
+var util = __webpack_require__(642);
 
 /**
  * Object specification for a tile layer.
@@ -30801,7 +30786,7 @@ var _tileLayer = function tileLayer(arg) {
   var fetchQueue = __webpack_require__(5938);
   var adjustLayerForRenderer = (__webpack_require__(1098).adjustLayerForRenderer);
   var Tile = __webpack_require__(5289);
-  arg = $.extend(true, {}, this.constructor.defaults, arg || {});
+  arg = util.deepMerge({}, this.constructor.defaults, arg || {});
   if (!arg.cacheSize) {
     // this size should be sufficient for a 4k display
     // where display size is (w, h), minimum tile dimension is ts, and total
@@ -30842,7 +30827,7 @@ var _tileLayer = function tileLayer(arg) {
     m_this = this;
 
   // copy the options into a private variable
-  this._options = $.extend(true, {}, arg);
+  this._options = util.deepMerge({}, arg);
 
   // set the layer attribution text
   this.attribution(arg.attribution);
@@ -30892,7 +30877,7 @@ var _tileLayer = function tileLayer(arg) {
    */
   Object.defineProperty(this, 'options', {
     get: function get() {
-      return $.extend({}, m_this._options);
+      return Object.assign({}, m_this._options);
     }
   });
 
@@ -30917,7 +30902,7 @@ var _tileLayer = function tileLayer(arg) {
    */
   Object.defineProperty(this, 'activeTiles', {
     get: function get() {
-      return $.extend({}, m_this._activeTiles); // copy on output
+      return Object.assign({}, m_this._activeTiles); // copy on output
     }
   });
 
@@ -32590,7 +32575,6 @@ var _trackFeature = function trackFeature(arg) {
   if (!(this instanceof _trackFeature)) {
     return new _trackFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   var transform = __webpack_require__(5325);
   arg = arg || {};
   feature.call(this, arg);
@@ -33023,7 +33007,7 @@ var _trackFeature = function trackFeature(arg) {
       m_styles[styleType] = {};
     }
     if (arg2 === undefined) {
-      m_styles[styleType] = $.extend(true, m_styles[styleType], arg1);
+      m_styles[styleType] = util.deepMerge(m_styles[styleType], arg1);
     } else {
       m_styles[styleType][arg1] = arg2;
     }
@@ -33370,7 +33354,7 @@ var _trackFeature = function trackFeature(arg) {
   this._init = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
-    var style = $.extend(true, {}, {
+    var style = util.deepMerge({}, {
       track: util.identityFunction,
       position: util.identityFunction,
       time: function time(d, i) {
@@ -33379,25 +33363,25 @@ var _trackFeature = function trackFeature(arg) {
       uniformLine: 'drop',
       closed: false
     }, arg.style === undefined ? {} : arg.style);
-    var markerStyle = $.extend(true, {}, {
+    var markerStyle = util.deepMerge({}, {
       rotateWithMap: true,
       rotation: function rotation(d, i) {
         return -m_tracks.endPosition[i].angle || 0;
       }
     }, arg.markerStyle === undefined ? {} : arg.markerStyle);
-    var textStyle = $.extend(true, {}, {
+    var textStyle = util.deepMerge({}, {
       rotateWithMap: true,
       rotation: function rotation(d, i) {
         return m_tracks.endPosition[i].angle !== undefined ? -m_tracks.endPosition[i].angle + Math.PI / 2 : 0;
       }
     }, arg.textStyle === undefined ? {} : arg.textStyle);
-    var pastStyle = $.extend(true, {}, {
+    var pastStyle = util.deepMerge({}, {
       strokeOpacity: 0.25
     }, arg.pastStyle === undefined ? {} : arg.pastStyle);
-    var currentStyle = $.extend(true, {}, {
+    var currentStyle = util.deepMerge({}, {
       // defaults go here
     }, arg.currentStyle === undefined ? {} : arg.currentStyle);
-    var futureStyle = $.extend(true, {}, {
+    var futureStyle = util.deepMerge({}, {
       strokeOpacity: 0.25
     }, arg.futureStyle === undefined ? {} : arg.futureStyle);
     ['track', 'position', 'time'].forEach(function (key) {
@@ -35321,7 +35305,7 @@ var _scaleWidget = function scaleWidget(arg) {
   var d3 = (__webpack_require__(2493).d3);
   var m_this = this,
     s_exit = this._exit,
-    m_options = $.extend({}, {
+    m_options = Object.assign({}, {
       scale: 1,
       maxWidth: 200,
       maxHeight: arg.orientation === 'left' || arg.orientation === 'right' ? 200 : 20,
@@ -35531,7 +35515,7 @@ var _scaleWidget = function scaleWidget(arg) {
    */
   this.options = function (arg1, arg2) {
     if (arg1 === undefined) {
-      var result = $.extend({}, m_options);
+      var result = Object.assign({}, m_options);
       result.position = m_this.position(undefined, true);
       return result;
     }
@@ -35539,7 +35523,7 @@ var _scaleWidget = function scaleWidget(arg) {
       return arg1 === 'position' ? m_this.position(undefined, true) : m_options[arg1];
     }
     if (arg2 === undefined) {
-      m_options = $.extend(true, m_options, arg1);
+      m_options = util.deepMerge(m_options, arg1);
     } else {
       m_options[arg1] = arg2;
     }
@@ -36190,7 +36174,6 @@ module.exports = _uiLayer;
 
 var inherit = __webpack_require__(4626);
 var sceneObject = __webpack_require__(5402);
-var $ = __webpack_require__(5616);
 
 /**
  * @typedef {object} geo.gui.widget.position
@@ -36354,7 +36337,7 @@ var _widget = function widget(arg) {
       if (m_position.hasOwnProperty('x') && m_position.hasOwnProperty('y')) {
         m_this.layer().geoOn(geo_event.pan, m_this.repositionEvent);
       }
-      m_this.reposition($.extend(clearPosition, m_this.position()));
+      m_this.reposition(Object.assign(clearPosition, m_this.position()));
       return m_this;
     }
     if (m_position.hasOwnProperty('x') && m_position.hasOwnProperty('y') && !actualValue) {
@@ -36577,7 +36560,7 @@ function C(opts) {
   var DistanceGrid = __webpack_require__(7235);
 
   // store the options
-  this._opts = $.extend({
+  this._opts = Object.assign({
     maxZoom: 18,
     radius: 5
   }, opts);
@@ -37507,7 +37490,7 @@ var util = {
    * @example <caption>The returned objects can be modified or
    *    extended.</caption>
    * var results = pixelCoordinateParams('#map', 10000, 9000);
-   * var map = geo.map($.extend(results.map, {clampZoom: false}));
+   * var map = geo.map(Object.assign(results.map, {clampZoom: false}));
    * map.createLayer('osm', results.layer);
    *
    * @param {string?} node DOM selector for the map container.
@@ -37978,6 +37961,46 @@ var util = {
       return '&#' + code.toString(10) + ';';
     });
   },
+  /**
+   * Recursively merge two objects.  This is intended to replace
+   * util.deepMerge(target, ...sources).
+   *
+   * @param {object} target target object to modify.
+   * @param {object} sources object(s) to merge into the target.
+   * @returns {object} The merged object.
+   * @member geo.util
+   */
+  deepMerge: function deepMerge(target) {
+    for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      sources[_key - 1] = arguments[_key];
+    }
+    for (var _i = 0, _sources = sources; _i < _sources.length; _i++) {
+      var source = _sources[_i];
+      if (source === null || source === undefined) {
+        continue;
+      }
+      for (var key in source) {
+        if (key === '__proto__' || target === source[key]) {
+          continue;
+        }
+        var copy = source[key];
+        if (copy && _typeof(copy) === 'object' && copy && (copy.constructor === undefined || copy.constructor === Object || Array.isArray(copy))) {
+          var src = target[key];
+          if (!Array.isArray(copy)) {
+            if (_typeof(src) !== 'object' || Array.isArray(src)) {
+              src = {};
+            }
+          } else if (!Array.isArray(src)) {
+            src = [];
+          }
+          target[key] = util.deepMerge(src, copy);
+        } else if (copy !== undefined) {
+          target[key] = copy;
+        }
+      }
+    }
+    return target;
+  },
   /**
    * Check svg image and html img tags.  If the source is set, load images
    * explicitly and convert them to local data:image references.
@@ -38692,7 +38715,6 @@ __webpack_require__(5637), __webpack_require__(208), __webpack_require__(269), /
  *    information.
  */
 function createColoredMesh(feature, elementValues) {
-  var $ = __webpack_require__(5616);
   var util = __webpack_require__(642);
   var mesh = feature.mesh,
     valueFunc = feature.style.get('value'),
@@ -38720,14 +38742,14 @@ function createColoredMesh(feature, elementValues) {
   result.stepped = stepped === undefined || stepped ? true : false;
   /* Create the min/max colors and the color array */
   result.colorMap = [];
-  result.minColor = $.extend({
+  result.minColor = Object.assign({
     a: mesh.get('minOpacity')(result) || 0
   }, util.convertColor(mesh.get('minColor')(result)));
-  result.maxColor = $.extend({
+  result.maxColor = Object.assign({
     a: mesh.get('maxOpacity')(result) || 0
   }, util.convertColor(mesh.get('maxColor')(result)));
   mesh.get('colorRange')(result).forEach(function (clr, idx) {
-    result.colorMap.push($.extend({
+    result.colorMap.push(Object.assign({
       a: opacityRange && opacityRange[idx] !== undefined ? opacityRange[idx] : 1
     }, util.convertColor(clr)));
   });
@@ -38786,7 +38808,6 @@ module.exports = {
 
 /* eslint-disable camelcase */
 
-var $ = __webpack_require__(5616);
 var webglRenderer = __webpack_require__(7945);
 var _renderWindow, _supported;
 module.exports = {};
@@ -38935,7 +38956,7 @@ module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
         renderers = m_this.renderers(),
         wsize = m_this.windowSize(),
         wpos = m_this.windowPosition();
-      m_context = $.extend({}, vgl.GL, default_context);
+      m_context = Object.assign({}, vgl.GL, default_context);
       for (i = 0; i < renderers.length; i += 1) {
         if (renderers[i].width() > wsize[0] || renderers[i].width() === 0 || renderers[i].height() > wsize[1] || renderers[i].height() === 0) {
           renderers[i].resize(wpos[0], wpos[1], wsize[0], wsize[1]);
@@ -39817,7 +39838,6 @@ var _vectorFeature = function vectorFeature(arg) {
   if (!(this instanceof _vectorFeature)) {
     return new _vectorFeature(arg);
   }
-  var $ = __webpack_require__(5616);
   arg = arg || {};
   feature.call(this, arg);
 
@@ -39874,7 +39894,7 @@ var _vectorFeature = function vectorFeature(arg) {
    */
   this._init = function (arg) {
     s_init.call(m_this, arg);
-    var defaultStyle = $.extend({}, {
+    var defaultStyle = Object.assign({}, {
       strokeColor: 'black',
       strokeWidth: 2.0,
       strokeOpacity: 1.0,
@@ -39913,7 +39933,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.5";
+module.exports = "1.12.6";
 
 /***/ }),