geojs 1.12.7 → 1.12.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.12.7",
+  "version": "1.12.9",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/annotation/lineAnnotation.js

@@ -42,8 +42,7 @@ var lineAnnotation = function (args) {
       line: function (d) {
         /* Return an array that has the same number of items as we have
          * vertices. */
-        return Array.apply(null, Array(m_this.options('vertices').length)).map(
-          function () { return d; });
+        return Array(m_this.options('vertices').length).fill(d);
       },
       position: function (d, i) {
         return m_this.options('vertices')[i];
@@ -53,8 +52,7 @@ var lineAnnotation = function (args) {
       line: function (d) {
         /* Return an array that has the same number of items as we have
          * vertices. */
-        return Array.apply(null, Array(m_this.options('vertices').length)).map(
-          function () { return d; });
+        return Array(m_this.options('vertices').length).fill(d);
       },
       position: function (d, i) {
         return m_this.options('vertices')[i];

package/src/annotation/polygonAnnotation.js

@@ -43,7 +43,9 @@ var polygonAnnotation = function (args) {
     return new polygonAnnotation(args);
   }
 
-  args = util.deepMerge({}, this.constructor.defaults, {
+  var m_this = this;
+
+  args = util.deepMerge({
     style: {
       polygon: function (d) { return d.polygon; }
     },
@@ -52,12 +54,11 @@ var polygonAnnotation = function (args) {
         const coord = m_this._coordinates();
         /* Return an array that has the same number of items as we have
          * vertices. */
-        return Array.apply(null, Array((coord.outer || coord).length)).map(
-          function () { return d; });
+        return Array((coord.outer || coord).length).fill(d);
       },
       position: function (d, i) {
         if (d.x !== undefined) {
-          return d.x;
+          return d;
         }
         return m_this.options('vertices')[i];
       }
@@ -65,13 +66,12 @@ var polygonAnnotation = function (args) {
     cursorStyle: {
       position: util.identityFunction
     }
-  }, args);
+  }, this.constructor.defaults, args);
   args.vertices = args.vertices || args.coordinates || [];
   delete args.coordinates;
   annotation.call(this, 'polygon', args);
 
-  var m_this = this,
-      s_actions = this.actions,
+  var s_actions = this.actions,
       s_state = this.state;
 
   /**

package/src/annotationLayer.js

@@ -491,18 +491,22 @@ var annotationLayer = function (arg) {
    *    gcs, `null` to use the map gcs, or any other transform.
    * @param {boolean} [update] If `false`, don't update the layer after adding
    *    the annotation.
+   * @param {boolean} [trigger] If `false`, do trigger add_before and add
+   *    events.
    * @returns {this} The current layer.
    * @fires geo.event.annotation.add_before
    * @fires geo.event.annotation.add
    */
-  this.addAnnotation = function (annotation, gcs, update) {
+  this.addAnnotation = function (annotation, gcs, update, trigger) {
     if (m_annotationIds[annotation.id()] === undefined) {
       while (m_this.annotationById(annotation.id())) {
         annotation.newId();
       }
-      m_this.geoTrigger(geo_event.annotation.add_before, {
-        annotation: annotation
-      });
+      if (trigger !== false) {
+        m_this.geoTrigger(geo_event.annotation.add_before, {
+          annotation: annotation
+        });
+      }
       m_annotations.push(annotation);
       m_annotationIds[annotation.id()] = annotation;
       annotation.layer(m_this);
@@ -516,8 +520,43 @@ var annotationLayer = function (arg) {
         m_this.modified();
         m_this.draw();
       }
+      if (trigger !== false) {
+        m_this.geoTrigger(geo_event.annotation.add, {
+          annotation: annotation
+        });
+      }
+    }
+    return m_this;
+  };
+
+  /**
+   * Add multiple annotations to the layer.  The annotations could be in any
+   * state.
+   *
+   * @param {geo.annotation[]} annotations The annotations to add.
+   * @param {string|geo.transform|null} [gcs] `undefined` to use the interface
+   *    gcs, `null` to use the map gcs, or any other transform.
+   * @param {boolean} [update] If `false`, don't update the layer after adding
+   *    the annotation.
+   * @returns {this} The current layer.
+   * @fires geo.event.annotation.add_before
+   * @fires geo.event.annotation.add
+   */
+  this.addMultipleAnnotations = function (annotations, gcs, update) {
+    const added = [];
+    m_this.geoTrigger(geo_event.annotation.add_before, {
+      annotations: annotations
+    });
+    for (let i = 0; i < annotations.length; i += 1) {
+      const annotation = annotations[i];
+      if (m_annotationIds[annotation.id()] === undefined) {
+        this.addAnnotation(annotation, gcs, update, false);
+        added.push(annotation);
+      }
+    }
+    if (added.length) {
       m_this.geoTrigger(geo_event.annotation.add, {
-        annotation: annotation
+        annotations: added
       });
     }
     return m_this;
@@ -536,7 +575,7 @@ var annotationLayer = function (arg) {
    */
   this.removeAnnotation = function (annotation, update, pos) {
     if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
-      pos = $.inArray(annotation, m_annotations);
+      pos = m_annotations.indexOf(annotation);
       if (annotation === m_this.currentAnnotation) {
         m_this.currentAnnotation = null;
       }
@@ -815,7 +854,7 @@ var annotationLayer = function (arg) {
       var type = (data.properties || {}).annotationType || feature.featureType,
           options = Object.assign({}, data.properties || {}),
           position, datagcs, i, existing;
-      if ($.inArray(type, annotationList) < 0) {
+      if (!annotationList.includes(type)) {
         return;
       }
       options.style = options.style || {};

package/src/event.js

@@ -656,20 +656,23 @@ geo_event.camera.viewport = 'geo_camera_viewport';
 geo_event.annotation = {};
 
 /**
- * Triggered when an annotation has been added.
+ * Triggered when or more multiple annotations have been added.
  *
  * @event geo.event.annotation.add
  * @type {geo.event.base}
- * @property {geo.annotation} annotation The annotation that was added.
+ * @property {geo.annotation} [annotation] The annotation that was added.
+ * @property {geo.annotation} [annotations] The annotations that were added.
  */
 geo_event.annotation.add = 'geo_annotation_add';
 
 /**
- * Triggered when an annotation is about to be added.
+ * Triggered when one or multiple annotations are about to be added.
  *
  * @event geo.event.annotation.add_before
  * @type {geo.event.base}
- * @property {geo.annotation} annotation The annotation that will be added.
+ * @property {geo.annotation} [annotation] The annotation that will be added.
+ * @property {geo.annotation[]} [annotations] The annotations that will be
+ *   added.
  */
 geo_event.annotation.add_before = 'geo_annotation_add_before';
 

package/src/fetchQueue.js

@@ -144,7 +144,7 @@ var fetchQueue = function (options) {
    */
   this.add = function (defer, callback, atEnd) {
     if (defer.__fetchQueue) {
-      var pos = $.inArray(defer, m_this._queue);
+      var pos = m_this._queue.indexOf(defer);
       if (pos >= 0) {
         // m_this._queue.splice(pos, 1);
         m_this._addToQueue(defer, atEnd, pos);
@@ -215,7 +215,7 @@ var fetchQueue = function (options) {
    * @returns {number} -1 if not in the queue, or the position in the queue.
    */
   this.get = function (defer) {
-    return $.inArray(defer, m_this._queue);
+    return m_this._queue.indexOf(defer);
   };
 
   /**
@@ -225,7 +225,7 @@ var fetchQueue = function (options) {
    * @returns {boolean} `true` if the object was removed.
    */
   this.remove = function (defer) {
-    var pos = $.inArray(defer, m_this._queue);
+    var pos = m_this._queue.indexOf(defer);
     if (pos >= 0) {
       m_this._queue.splice(pos, 1);
       return true;

package/src/mapInteractor.js

@@ -1598,8 +1598,7 @@ var mapInteractor = function (args) {
     clearState();
 
     // if momentum is enabled, start the action here
-    if (m_options.momentum.enabled &&
-            $.inArray(oldAction, m_options.momentum.actions) >= 0) {
+    if (m_options.momentum.enabled && m_options.momentum.actions.includes(oldAction)) {
       var t = (new Date()).valueOf();
       var dt = t - m_mouse.time + m_mouse.deltaTime;
       if (t - m_mouse.time < m_options.momentum.stopTime) {

package/src/quadFeature.js

@@ -466,8 +466,8 @@ var quadFeature = function (arg) {
             prev_onload = image.onload;
             image.onload = function () {
               if (previewColor !== undefined) {
-                if ($.inArray(quad, clrQuads) >= 0) {
-                  clrQuads.splice($.inArray(quad, clrQuads), 1);
+                if (clrQuads.includes(quad)) {
+                  clrQuads.splice(clrQuads.indexOf(quad), 1);
                 }
                 delete quadinfo.clrquad;
               }
@@ -544,8 +544,8 @@ var quadFeature = function (arg) {
             prev_onload = video.onloadeddata;
             video.onloadeddata = function () {
               if (previewColor !== undefined) {
-                if ($.inArray(quad, clrQuads) >= 0) {
-                  clrQuads.splice($.inArray(quad, clrQuads), 1);
+                if (clrQuads.includes(quad)) {
+                  clrQuads.splice(clrQuads.indexOf(quad), 1);
                 }
                 delete quadinfo.clrquad;
               }

package/src/registry.js

@@ -1,4 +1,3 @@
-var $ = require('jquery');
 var geo_action = require('./action');
 var util = require('./util/common');
 
@@ -460,7 +459,7 @@ registry.featuresForAnnotations = function (annotationList) {
         features.push(feature);
       } else {
         annotationList[ann].forEach(function (state) {
-          if ($.inArray(state, annotations[ann].features[feature]) >= 0) {
+          if (annotations[ann].features[feature].includes(state)) {
             features.push(feature);
           }
         });

package/src/util/common.js

@@ -464,7 +464,7 @@ var util = {
     do {
       found = util.hasAction(actions, action, name, owner);
       if (found) {
-        actions.splice($.inArray(found, actions), 1);
+        actions.splice(actions.indexOf(found), 1);
         removed += 1;
       }
     } while (found);
@@ -1010,16 +1010,16 @@ var util = {
           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 (copy && typeof copy === 'object' && (copy.constructor === Object || Array.isArray(copy))) {
+          let value = target[key];
           if (!Array.isArray(copy)) {
-            if (typeof src !== 'object' || Array.isArray(src)) {
-              src = {};
+            if (typeof value !== 'object' || Array.isArray(value)) {
+              value = {};
             }
-          } else if (!Array.isArray(src)) {
-            src = [];
+          } else if (!Array.isArray(value)) {
+            value = [];
           }
-          target[key] = util.deepMerge(src, copy);
+          target[key] = util.deepMerge(value, copy);
         } else if (copy !== undefined) {
           target[key] = copy;
         }