geojs 1.12.4 → 1.12.6

package/src/tileLayer.js

@@ -1,5 +1,6 @@
 var inherit = require('./inherit');
 var featureLayer = require('./featureLayer');
+var util = require('./util');
 
 /**
  * Object specification for a tile layer.
@@ -194,7 +195,7 @@ var tileLayer = function (arg) {
   var adjustLayerForRenderer = require('./registry').adjustLayerForRenderer;
   var Tile = require('./tile');
 
-  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
@@ -236,7 +237,7 @@ var tileLayer = function (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);
@@ -282,7 +283,7 @@ var tileLayer = function (arg) {
    * @name geo.tileLayer#options
    */
   Object.defineProperty(this, 'options', {get: function () {
-    return $.extend({}, m_this._options);
+    return Object.assign({}, m_this._options);
   }});
 
   /**
@@ -303,7 +304,7 @@ var tileLayer = function (arg) {
    * @name geo.tileLayer#activeTiles
    */
   Object.defineProperty(this, 'activeTiles', {get: function () {
-    return $.extend({}, m_this._activeTiles); // copy on output
+    return Object.assign({}, m_this._activeTiles); // copy on output
   }});
 
   /**

package/src/trackFeature.js

@@ -66,7 +66,6 @@ var trackFeature = function (arg) {
     return new trackFeature(arg);
   }
 
-  var $ = require('jquery');
   var transform = require('./transform');
 
   arg = arg || {};
@@ -480,7 +479,7 @@ var trackFeature = function (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;
     }
@@ -810,8 +809,7 @@ var trackFeature = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
 
-    var style = $.extend(
-      true,
+    var style = util.deepMerge(
       {},
       {
         track: util.identityFunction,
@@ -822,8 +820,7 @@ var trackFeature = function (arg) {
       },
       arg.style === undefined ? {} : arg.style
     );
-    var markerStyle = $.extend(
-      true,
+    var markerStyle = util.deepMerge(
       {},
       {
         rotateWithMap: true,
@@ -831,8 +828,7 @@ var trackFeature = function (arg) {
       },
       arg.markerStyle === undefined ? {} : arg.markerStyle
     );
-    var textStyle = $.extend(
-      true,
+    var textStyle = util.deepMerge(
       {},
       {
         rotateWithMap: true,
@@ -840,24 +836,21 @@ var trackFeature = function (arg) {
       },
       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

package/src/ui/scaleWidget.js

@@ -93,7 +93,7 @@ var scaleWidget = function (arg) {
 
   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,
@@ -299,7 +299,7 @@ var scaleWidget = function (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;
     }
@@ -307,7 +307,7 @@ var scaleWidget = function (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;
     }

package/src/ui/widget.js

@@ -1,6 +1,5 @@
 var inherit = require('../inherit');
 var sceneObject = require('../sceneObject');
-var $ = require('jquery');
 
 /**
  * @typedef {object} geo.gui.widget.position
@@ -164,7 +163,7 @@ var widget = function (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) {

package/src/util/clustering.js

@@ -144,7 +144,7 @@ function C(opts) {
   var DistanceGrid = require('./distanceGrid');
 
   // store the options
-  this._opts = $.extend({
+  this._opts = Object.assign({
     maxZoom: 18,
     radius: 5
   }, opts);

package/src/util/common.js

@@ -522,7 +522,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.
@@ -991,6 +991,43 @@ var util = {
     });
   },
 
+  /**
+   * 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 (target, ...sources) {
+    for (const source of sources) {
+      if (source === null || source === undefined) {
+        continue;
+      }
+      for (const key in source) {
+        if (key === '__proto__' || target === source[key]) {
+          continue;
+        }
+        const copy = source[key];
+        if (copy && typeof copy === 'object' && copy && (copy.constructor === undefined || copy.constructor === Object || Array.isArray(copy))) {
+          let 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.

package/src/util/mesh.js

@@ -35,7 +35,6 @@
  *    information.
  */
 function createColoredMesh(feature, elementValues) {
-  var $ = require('jquery');
   var util = require('../util');
 
   var mesh = feature.mesh,
@@ -62,14 +61,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)));
   });

package/src/util/mockVGL.js

@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 
-var $ = require('jquery');
 var webglRenderer = require('../webgl/webglRenderer');
 
 var _renderWindow, _supported;
@@ -152,7 +151,7 @@ module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
           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]) ||

package/src/vectorFeature.js

@@ -52,8 +52,6 @@ var vectorFeature = function (arg) {
     return new vectorFeature(arg);
   }
 
-  var $ = require('jquery');
-
   arg = arg || {};
   feature.call(this, arg);
 
@@ -112,7 +110,7 @@ var vectorFeature = function (arg) {
   this._init = function (arg) {
     s_init.call(m_this, arg);
 
-    var defaultStyle = $.extend(
+    var defaultStyle = Object.assign(
       {},
       {
         strokeColor: 'black',