geojs 1.12.6 → 1.12.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.12.6",
+  "version": "1.12.8",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -97,6 +97,11 @@
     "webpack-merge": "^6.0.1",
     "webpack-string-replacer": "^0.0.20"
   },
+  "overrides": {
+    "npm-run-all": {
+      "cross-spawn": "^7.0.5"
+    }
+  },
   "release": {
     "plugins": [
       "@semantic-release/commit-analyzer",

package/src/annotationLayer.js

@@ -496,8 +496,7 @@ var annotationLayer = function (arg) {
    * @fires geo.event.annotation.add
    */
   this.addAnnotation = function (annotation, gcs, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos < 0) {
+    if (m_annotationIds[annotation.id()] === undefined) {
       while (m_this.annotationById(annotation.id())) {
         annotation.newId();
       }
@@ -530,12 +529,14 @@ var annotationLayer = function (arg) {
    * @param {geo.annotation} annotation The annotation to remove.
    * @param {boolean} [update] If `false`, don't update the layer after removing
    *    the annotation.
+   * @param {int} [pos] The posiiton of the annotation in the annotation list,
+   *    if known.  This speeds up the process.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
    */
-  this.removeAnnotation = function (annotation, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos >= 0) {
+  this.removeAnnotation = function (annotation, update, pos) {
+    if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
+      pos = m_annotations.indexOf(annotation);
       if (annotation === m_this.currentAnnotation) {
         m_this.currentAnnotation = null;
       }
@@ -551,8 +552,9 @@ var annotationLayer = function (arg) {
       m_this.geoTrigger(geo_event.annotation.remove, {
         annotation: annotation
       });
+      return true;
     }
-    return pos >= 0;
+    return false;
   };
 
   /**
@@ -565,14 +567,13 @@ var annotationLayer = function (arg) {
    * @returns {number} The number of annotations that were removed.
    */
   this.removeAllAnnotations = function (skipCreating, update) {
-    var removed = 0, annotation, pos = 0;
-    while (pos < m_annotations.length) {
+    var removed = 0, annotation;
+    for (let pos = m_annotations.length - 1; pos >= 0; pos -= 1) {
       annotation = m_annotations[pos];
       if (skipCreating && annotation.state() === geo_annotation.state.create) {
-        pos += 1;
         continue;
       }
-      m_this.removeAnnotation(annotation, false);
+      m_this.removeAnnotation(annotation, false, pos);
       removed += 1;
     }
     if (removed && update !== false) {
@@ -814,7 +815,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/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/markerFeature.js

@@ -33,7 +33,7 @@ var pointFeature = require('./pointFeature');
  * @property {number|function} [strokeOffset=-1] The position of the stroke
  *   compared to the radius.  This can only be -1, 0, or 1 (the sign of the
  *   value is used).
- * @property {boolean|function} [radiusIncludeStroke=true] If truthy or
+ * @property {boolean|function} [radiusIncludesStroke=true] If truthy or
  *   undefined, the `radius` includes the `strokeWidth` based on the
  *   `strokeOffset`.  If defined and falsy, the radius does not include the
  *   `strokeWidth`.

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,7 +1010,7 @@ var util = {
           continue;
         }
         const copy = source[key];
-        if (copy && typeof copy === 'object' && copy && (copy.constructor === undefined || copy.constructor === Object || Array.isArray(copy))) {
+        if (copy && typeof copy === 'object' && (copy.constructor === Object || Array.isArray(copy))) {
           let src = target[key];
           if (!Array.isArray(copy)) {
             if (typeof src !== 'object' || Array.isArray(src)) {