geojs 1.12.4 → 1.12.6

package/src/map.js

@@ -332,7 +332,7 @@ var map = function (arg) {
    * @returns {geo.geoPosition}
    */
   this.origin = function () {
-    return $.extend({}, m_origin);
+    return Object.assign({}, m_origin);
   };
 
   /**
@@ -594,7 +594,7 @@ var map = function (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;
     }
 
@@ -901,7 +901,7 @@ var map = function (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);
@@ -1060,7 +1060,7 @@ var map = function (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;
@@ -1130,12 +1130,12 @@ var map = function (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(
+      m_queuedTransition = Object.assign(
         {}, transitionEnd || {}, m_queuedTransition || {}, opts);
       return m_this;
     }
@@ -1188,13 +1188,13 @@ var map = function (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: {
@@ -1756,7 +1756,7 @@ var map = function (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, {wait: false});
+      var optsWithoutWait = Object.assign({}, opts, {wait: false});
       defer = $.Deferred();
 
       var waitForRAF = function () {
@@ -2228,7 +2228,7 @@ var map = function (arg) {
     }
     var dx, 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
@@ -2417,7 +2417,7 @@ var map = function (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}));

package/src/mapInteractor.js

@@ -175,8 +175,7 @@ var mapInteractor = function (args) {
   }
 
   // copy the options object with defaults
-  m_options = $.extend(
-    true,
+  m_options = util.deepMerge(
     {},
     {
       throttle: 30,
@@ -390,13 +389,13 @@ var mapInteractor = function (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
@@ -882,9 +881,9 @@ var mapInteractor = function (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();
@@ -1039,7 +1038,7 @@ var mapInteractor = function (args) {
       display: display,
       gcs: gcs,
       mouse: mouse,
-      origin: $.extend({}, m_state.origin)
+      origin: Object.assign({}, m_state.origin)
     };
   };
 
@@ -1119,7 +1118,7 @@ var mapInteractor = function (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 () {
@@ -1153,7 +1152,7 @@ var mapInteractor = function (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,
@@ -1686,7 +1685,7 @@ var mapInteractor = function (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();
@@ -2004,7 +2003,7 @@ var mapInteractor = function (args) {
    * @returns {object} The current mouse state.
    */
   this.mouse = function () {
-    return $.extend(true, {}, m_mouse);
+    return util.deepMerge({}, m_mouse);
   };
 
   /**
@@ -2017,7 +2016,7 @@ var mapInteractor = function (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});
   };
@@ -2028,7 +2027,7 @@ var mapInteractor = function (args) {
    * @returns {geo.interactorState}
    */
   this.state = function () {
-    return $.extend(true, {}, m_state);
+    return util.deepMerge({}, m_state);
   };
 
   /**

package/src/markerFeature.js

@@ -74,7 +74,6 @@ var markerFeature = function (arg) {
   arg = arg || {};
   pointFeature.call(this, arg);
 
-  var $ = require('jquery');
   var timestamp = require('./timestamp');
   var util = require('./util');
   var KDBush = require('kdbush');
@@ -404,11 +403,10 @@ var markerFeature = function (arg) {
    * @returns {this}
    */
   this._init = function (arg) {
-    arg = $.extend(
-      true,
+    arg = util.deepMerge(
       {},
       {
-        style: $.extend(
+        style: Object.assign(
           {},
           {
             radius: 6.25,

package/src/meshFeature.js

@@ -112,7 +112,6 @@ var meshFeature = function (arg) {
     return new meshFeature(arg);
   }
 
-  var $ = require('jquery');
   var util = require('./util');
 
   arg = arg || {};
@@ -145,7 +144,7 @@ var meshFeature = function (arg) {
       return m_mesh[specOrProperty];
     }
     if (value === undefined) {
-      var mesh = $.extend(
+      var mesh = Object.assign(
         {},
         {
           gridWidth: function () {
@@ -552,7 +551,7 @@ var meshFeature = function (arg) {
 
     /* Initialize from arguments */
     arg = arg || {};
-    var style = $.extend({}, {
+    var style = Object.assign({}, {
       position: (d) => Array.isArray(d) ? {x: d[0], y: d[1], z: d[2] || 0} : d
     }, arg.style || {});
 

package/src/osmLayer.js

@@ -1,8 +1,8 @@
-var $ = require('jquery');
 var inherit = require('./inherit');
 var tileLayer = require('./tileLayer');
 var registry = require('./registry');
 var quadFeature = require('./quadFeature');
+var util = require('./util');
 
 /**
  * Object specification for an OSM layer.
@@ -37,11 +37,10 @@ var osmLayer = function (arg) {
   }
   arg = arg || {};
   if (arg.mapOpacity !== undefined && arg.opacity === undefined) {
-    arg = $.extend({}, arg);
+    arg = Object.assign({}, arg);
     arg.opacity = arg.mapOpacity;
   }
-  arg = $.extend(
-    true,
+  arg = util.deepMerge(
     {},
     this.constructor.defaults,
     osmLayer.tileSources[this.constructor.defaults.source] || {},
@@ -118,7 +117,7 @@ var osmLayer = function (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 (level) {
     var s = Math.pow(2, level - 1) * 256;
     return {x: s, y: s};

package/src/pathFeature.js

@@ -1,4 +1,3 @@
-var $ = require('jquery');
 var inherit = require('./inherit');
 var feature = require('./feature');
 
@@ -79,7 +78,7 @@ var pathFeature = function (arg) {
   this._init = function (arg) {
     s_init.call(m_this, arg);
 
-    var defaultStyle = $.extend(
+    var defaultStyle = Object.assign(
       {},
       {
         strokeWidth: 1,

package/src/pixelmapFeature.js

@@ -274,7 +274,7 @@ var pixelmapFeature = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
 
-    var style = $.extend(
+    var style = Object.assign(
       {},
       {
         color: function (d, idx) {

package/src/pixelmapLayer.js

@@ -1,9 +1,9 @@
-var $ = require('jquery');
 var inherit = require('./inherit');
 var tileLayer = require('./tileLayer');
 var registry = require('./registry');
 var quadFeature = require('./quadFeature');
 var pixelmapFeature = require('./pixelmapFeature');
+var util = require('./util');
 
 /**
  * Object specification for a pixelmap layer.
@@ -47,8 +47,7 @@ var pixelmapLayer = function (arg) {
     argdata = arg.data;
     delete arg.data;
   }
-  arg = $.extend(
-    true,
+  arg = util.deepMerge(
     {},
     this.constructor.defaults,
     arg);
@@ -136,7 +135,7 @@ var pixelmapLayer = function (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 (level) {
     var s = Math.pow(2, level - 1) * 256;

package/src/pointFeature.js

@@ -76,7 +76,6 @@ var pointFeature = function (arg) {
   arg = arg || {};
   feature.call(this, arg);
 
-  var $ = require('jquery');
   var timestamp = require('./timestamp');
   var ClusterGroup = require('./util/clustering');
   var geo_event = require('./event');
@@ -150,7 +149,7 @@ var pointFeature = function (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, {radius: radiusInGcsAtZoom0});
+    opts = Object.assign({}, opts, {radius: radiusInGcsAtZoom0});
     m_clusterTree = new ClusterGroup(opts);
 
     m_allData.forEach(function (d, i) {
@@ -497,8 +496,7 @@ var pointFeature = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
 
-    var defaultStyle = $.extend(
-      true,
+    var defaultStyle = util.deepMerge(
       {},
       {
         radius: 5.0,

package/src/polygonFeature.js

@@ -1,4 +1,3 @@
-var $ = require('jquery');
 var inherit = require('./inherit');
 var feature = require('./feature');
 var transform = require('./transform');
@@ -763,7 +762,7 @@ var polygonFeature = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
 
-    var style = $.extend(
+    var style = Object.assign(
       {},
       {
         // default style

package/src/quadFeature.js

@@ -712,7 +712,7 @@ var quadFeature = function (arg) {
 
     m_cacheQuads = (arg.cacheQuads !== false);
 
-    var style = $.extend(
+    var style = Object.assign(
       {},
       {
         color: { r: 1.0, g: 1, b: 1 },

package/src/registry.js

@@ -1,5 +1,6 @@
 var $ = require('jquery');
 var geo_action = require('./action');
+var util = require('./util/common');
 
 var widgets = {
   dom: {}
@@ -12,7 +13,7 @@ var featureCapabilities = {};
 var fileReaders = {};
 var rendererLayerAdjustments = {};
 var annotations = {};
-var util = {};
+var registry = {};
 
 /**
  * Register a new file reader type.
@@ -22,7 +23,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;
 };
 
@@ -35,7 +36,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);
   }
@@ -50,7 +51,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;
 };
 
@@ -66,7 +67,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, canvas: canvas, options: options}
@@ -89,7 +90,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;
   }
@@ -101,7 +102,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');
@@ -129,13 +130,13 @@ 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) {
@@ -189,7 +190,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] = {};
@@ -216,12 +217,12 @@ 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, renderer: renderer};
   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) {
@@ -248,7 +249,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] = {};
   }
@@ -269,7 +270,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 &&
@@ -290,7 +291,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;
 };
@@ -305,7 +306,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},
       layer = null;
@@ -317,7 +318,7 @@ util.createLayer = function (name, map, arg) {
     if (arg !== undefined) {
       const argdata = arg.data;
       delete arg.data;
-      $.extend(true, options, arg);
+      util.deepMerge(options, arg);
       if (argdata) {
         options.data = argdata;
       }
@@ -342,7 +343,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] = {};
   }
@@ -364,14 +365,14 @@ 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);
@@ -394,7 +395,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');
@@ -412,7 +413,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;
@@ -427,7 +428,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);
 };
 
@@ -445,7 +446,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);
@@ -483,8 +484,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));
 };
 
 /**
@@ -493,7 +494,7 @@ util.rendererForAnnotations = function (annotationList) {
  *
  * @namespace geo.registries
  */
-util.registries = {
+registry.registries = {
   annotations: annotations,
   features: features,
   featureCapabilities: featureCapabilities,
@@ -503,4 +504,4 @@ util.registries = {
   widgets: widgets
 };
 
-module.exports = util;
+module.exports = registry;

package/src/svg/pathFeature.js

@@ -18,7 +18,6 @@ var svg_pathFeature = function (arg) {
     return new svg_pathFeature(arg);
   }
 
-  var $ = require('jquery');
   var object = require('./object');
   var timestamp = require('../timestamp');
 
@@ -73,7 +72,7 @@ var svg_pathFeature = function (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 () { return false; },
       fillColor: {r: 0, g: 0, b: 0}
     }, s_style);

package/src/textFeature.js

@@ -94,8 +94,6 @@ var textFeature = function (arg) {
   arg = arg || {};
   feature.call(this, arg);
 
-  var $ = require('jquery');
-
   /**
    * @private
    */
@@ -149,7 +147,7 @@ var textFeature = function (arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
 
-    var style = $.extend(
+    var style = Object.assign(
       {},
       {
         font: 'bold 16px sans-serif',