geojs 1.12.6 → 1.12.8

package/.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
     - run: npm run setup-website
     - run: npm run ci-xvfb
     - run: npm run ci-build-website
-    - uses: codecov/codecov-action@v4
+    - uses: codecov/codecov-action@v5
       with:
         fail_ci_if_error: false
         verbose: true

package/geo.js

@@ -6876,8 +6876,7 @@ var _annotationLayer = function annotationLayer(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();
       }
@@ -6909,12 +6908,14 @@ var _annotationLayer = function annotationLayer(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;
       }
@@ -6930,8 +6931,9 @@ var _annotationLayer = function annotationLayer(arg) {
       m_this.geoTrigger(geo_event.annotation.remove, {
         annotation: annotation
       });
+      return true;
     }
-    return pos >= 0;
+    return false;
   };
 
   /**
@@ -6945,15 +6947,13 @@ var _annotationLayer = function annotationLayer(arg) {
    */
   this.removeAllAnnotations = function (skipCreating, update) {
     var removed = 0,
-      annotation,
-      pos = 0;
-    while (pos < m_annotations.length) {
+      annotation;
+    for (var 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) {
@@ -7200,7 +7200,7 @@ var _annotationLayer = function annotationLayer(arg) {
         datagcs,
         i,
         existing;
-      if ($.inArray(type, annotationList) < 0) {
+      if (!annotationList.includes(type)) {
         return;
       }
       options.style = options.style || {};
@@ -13550,7 +13550,7 @@ var _fetchQueue = function fetchQueue(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);
@@ -13621,7 +13621,7 @@ var _fetchQueue = function fetchQueue(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);
   };
 
   /**
@@ -13631,7 +13631,7 @@ var _fetchQueue = function fetchQueue(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;
@@ -21866,7 +21866,7 @@ var _mapInteractor = function mapInteractor(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) {
@@ -22528,7 +22528,7 @@ var pointFeature = __webpack_require__(7541);
  * @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`.
@@ -26876,8 +26876,8 @@ var _quadFeature = function quadFeature(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;
               }
@@ -26953,8 +26953,8 @@ var _quadFeature = function quadFeature(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;
               }
@@ -27185,7 +27185,6 @@ module.exports = _quadFeature;
 /***/ 1098:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var geo_action = __webpack_require__(8695);
 var util = __webpack_require__(1949);
 var widgets = {
@@ -27641,7 +27640,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);
           }
         });
@@ -28060,7 +28059,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "689846cc4aaa81643bd60b9d9afd9c8dd08bd8ff";
+module.exports = "af985cb0e0d8b7d7e3d98fff530ca23ae24cbcb8";
 
 /***/ }),
 
@@ -37436,7 +37435,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);
@@ -37984,7 +37983,7 @@ var util = {
           continue;
         }
         var 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))) {
           var src = target[key];
           if (!Array.isArray(copy)) {
             if (_typeof(src) !== 'object' || Array.isArray(src)) {
@@ -39933,7 +39932,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.6";
+module.exports = "1.12.8";
 
 /***/ }),
 

package/geo.lean.js

@@ -3875,8 +3875,7 @@ var _annotationLayer = function annotationLayer(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();
       }
@@ -3908,12 +3907,14 @@ var _annotationLayer = function annotationLayer(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;
       }
@@ -3929,8 +3930,9 @@ var _annotationLayer = function annotationLayer(arg) {
       m_this.geoTrigger(geo_event.annotation.remove, {
         annotation: annotation
       });
+      return true;
     }
-    return pos >= 0;
+    return false;
   };
 
   /**
@@ -3944,15 +3946,13 @@ var _annotationLayer = function annotationLayer(arg) {
    */
   this.removeAllAnnotations = function (skipCreating, update) {
     var removed = 0,
-      annotation,
-      pos = 0;
-    while (pos < m_annotations.length) {
+      annotation;
+    for (var 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) {
@@ -4199,7 +4199,7 @@ var _annotationLayer = function annotationLayer(arg) {
         datagcs,
         i,
         existing;
-      if ($.inArray(type, annotationList) < 0) {
+      if (!annotationList.includes(type)) {
         return;
       }
       options.style = options.style || {};
@@ -10549,7 +10549,7 @@ var _fetchQueue = function fetchQueue(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);
@@ -10620,7 +10620,7 @@ var _fetchQueue = function fetchQueue(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);
   };
 
   /**
@@ -10630,7 +10630,7 @@ var _fetchQueue = function fetchQueue(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;
@@ -18865,7 +18865,7 @@ var _mapInteractor = function mapInteractor(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) {
@@ -19527,7 +19527,7 @@ var pointFeature = __webpack_require__(7541);
  * @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`.
@@ -23875,8 +23875,8 @@ var _quadFeature = function quadFeature(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;
               }
@@ -23952,8 +23952,8 @@ var _quadFeature = function quadFeature(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;
               }
@@ -24184,7 +24184,6 @@ module.exports = _quadFeature;
 /***/ 1098:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var $ = __webpack_require__(5616);
 var geo_action = __webpack_require__(8695);
 var util = __webpack_require__(1949);
 var widgets = {
@@ -24640,7 +24639,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);
           }
         });
@@ -25059,7 +25058,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "689846cc4aaa81643bd60b9d9afd9c8dd08bd8ff";
+module.exports = "af985cb0e0d8b7d7e3d98fff530ca23ae24cbcb8";
 
 /***/ }),
 
@@ -34435,7 +34434,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);
@@ -34983,7 +34982,7 @@ var util = {
           continue;
         }
         var 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))) {
           var src = target[key];
           if (!Array.isArray(copy)) {
             if (_typeof(src) !== 'object' || Array.isArray(src)) {
@@ -36932,7 +36931,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.6";
+module.exports = "1.12.8";
 
 /***/ }),