geojs 1.12.7 → 1.12.9

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/CHANGELOG.md

@@ -1,5 +1,47 @@
 # GeoJS Change Log
 
+## Version 1.12.9
+
+### Performance Improvements
+
+- Add addMultipleAnnotations method ([#1351](../../pull/1351))
+
+## Version 1.12.8
+
+### Performance Improvements
+
+- Switch to more native functions ([#1345](../../pull/1345))
+
+## Version 1.12.7
+
+### Performance Improvements
+
+- Make adding and removing annotations somewhat more efficient ([#1343](../../pull/1343))
+
+## Version 1.12.6
+
+### Performance Improvements
+
+- Stop using jquery extend ([#1342](../../pull/1342))
+
+## Version 1.12.5
+
+### Bug Fixes
+
+- Change how webpack builds some libraries ([#1341](../../pull/1341))
+
+## Version 1.12.4
+
+### Performance Improvements
+
+- Speed up adding annotations ([#1340](../../pull/1340))
+
+## Version 1.12.3
+
+### Bug Fixes
+
+- Improve encoding html for screenshots ([#1334](../../pull/1334))
+
 ## Version 1.12.2
 
 ### Improvements

package/geo.js

@@ -4847,9 +4847,7 @@ var _lineAnnotation = function lineAnnotation(args) {
       line: function line(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 position(d, i) {
         return m_this.options('vertices')[i];
@@ -4859,9 +4857,7 @@ var _lineAnnotation = function lineAnnotation(args) {
       line: function line(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 position(d, i) {
         return m_this.options('vertices')[i];
@@ -5442,7 +5438,8 @@ var _polygonAnnotation = function polygonAnnotation(args) {
   if (!(this instanceof _polygonAnnotation)) {
     return new _polygonAnnotation(args);
   }
-  args = util.deepMerge({}, this.constructor.defaults, {
+  var m_this = this;
+  args = util.deepMerge({
     style: {
       polygon: function polygon(d) {
         return d.polygon;
@@ -5453,13 +5450,11 @@ var _polygonAnnotation = function polygonAnnotation(args) {
         var 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 position(d, i) {
         if (d.x !== undefined) {
-          return d.x;
+          return d;
         }
         return m_this.options('vertices')[i];
       }
@@ -5467,12 +5462,11 @@ var _polygonAnnotation = function polygonAnnotation(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;
 
   /**
@@ -6871,18 +6865,22 @@ var _annotationLayer = function annotationLayer(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);
@@ -6895,8 +6893,43 @@ var _annotationLayer = function annotationLayer(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) {
+    var added = [];
+    m_this.geoTrigger(geo_event.annotation.add_before, {
+      annotations: annotations
+    });
+    for (var i = 0; i < annotations.length; i += 1) {
+      var 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;
@@ -6915,7 +6948,7 @@ var _annotationLayer = function annotationLayer(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;
       }
@@ -7200,7 +7233,7 @@ var _annotationLayer = function annotationLayer(arg) {
         datagcs,
         i,
         existing;
-      if ($.inArray(type, annotationList) < 0) {
+      if (!annotationList.includes(type)) {
         return;
       }
       options.style = options.style || {};
@@ -11841,20 +11874,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';
 
@@ -13550,7 +13586,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 +13657,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 +13667,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 +21902,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) {
@@ -26876,8 +26912,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 +26989,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 +27221,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 +27676,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 +28095,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "62002290dca8a13aae8b6efc44341c14b02b427e";
+module.exports = "540466ba3aa5e442250a9eb78abbf8f62e824a51";
 
 /***/ }),
 
@@ -37436,7 +37471,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,16 +38019,16 @@ var util = {
           continue;
         }
         var copy = source[key];
-        if (copy && _typeof(copy) === 'object' && copy && (copy.constructor === undefined || copy.constructor === Object || Array.isArray(copy))) {
-          var src = target[key];
+        if (copy && _typeof(copy) === 'object' && (copy.constructor === Object || Array.isArray(copy))) {
+          var 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;
         }
@@ -39933,7 +39968,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.7";
+module.exports = "1.12.9";
 
 /***/ }),
 
@@ -67368,7 +67403,7 @@ __webpack_require__.d(__webpack_exports__, {
   defs('EPSG:4269', "+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees");
   defs('EPSG:3857', "+title=WGS 84 / Pseudo-Mercator +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs");
   // UTM WGS84
-  for (var i = 0; i <= 60; ++i) {
+  for (var i = 1; i <= 60; ++i) {
     defs('EPSG:' + (32600 + i), "+proj=utm +zone=" + i + " +datum=WGS84 +units=m");
     defs('EPSG:' + (32700 + i), "+proj=utm +zone=" + i + " +south +datum=WGS84 +units=m");
   }
@@ -68643,7 +68678,7 @@ var datums = {
     ellipse: "bessel",
     datumName: "Hermannskogel"
   },
-  militargeographische_institut: {
+  mgi: {
     towgs84: "577.326,90.129,463.919,5.137,1.474,5.297,2.4232",
     ellipse: "bessel",
     datumName: "Militar-Geographische Institut",