geojs 1.14.11 → 1.14.13

package/.github/workflows/commitlint.yml

@@ -5,7 +5,7 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: wagoid/commitlint-github-action@v6

package/.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-node@v4
       with:
         node-version: '20'
@@ -69,7 +69,7 @@ jobs:
   unpinned:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     # Don't pin version to test with the latest common version
     - uses: actions/setup-node@v4
       with:
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Import artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: website
         path: website/public
@@ -109,7 +109,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-node@v4
       with:
         node-version: 'lts/*'
@@ -117,7 +117,7 @@ jobs:
     - run: sudo apt-get install --yes --no-install-recommends optipng imagemagick build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev liblzma-dev
     - run: npm ci
     - name: Import artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: dist
         path: dist

package/geo.js

@@ -6430,7 +6430,6 @@ var _feature = function feature(arg) {
     }
     if (m_visible !== val || direct) {
       m_visible = val;
-      m_this.modified();
       if (m_layer && m_layer.visible && !m_layer.visible()) {
         val = false;
       }
@@ -10523,10 +10522,12 @@ var _annotationLayer = function annotationLayer(arg) {
    *    edited or used.
    * @param {object} [options] Additional options to pass when creating an
    *    annotation.
+   * @param {string} [reason] An optional reason to pass to the
+   *    `geo.event.annotation.mode` event.
    * @returns {string|null|this} The current mode or the layer.
    * @fires geo.event.annotation.mode
    */
-  this.mode = function (arg, editAnnotation, options) {
+  this.mode = function (arg, editAnnotation, options, reason) {
     if (arg === undefined) {
       return m_mode;
     }
@@ -10548,12 +10549,14 @@ var _annotationLayer = function annotationLayer(arg) {
       }
       if (m_mode) {
         m_keyHandler.bind('esc', function () {
-          m_this.mode(null);
+          m_this.mode(null, undefined, undefined, 'escape');
         });
       } else {
         m_keyHandler.unbind('esc');
       }
+      var oldState;
       if (m_this.currentAnnotation) {
+        oldState = m_this.currentAnnotation.state();
         switch (m_this.currentAnnotation.state()) {
           case geo_annotation.state.create:
             m_this.removeAnnotation(m_this.currentAnnotation);
@@ -10602,7 +10605,9 @@ var _annotationLayer = function annotationLayer(arg) {
       }
       m_this.geoTrigger(geo_event.annotation.mode, {
         mode: m_mode,
-        oldMode: oldMode
+        oldMode: oldMode,
+        oldState: oldState,
+        reason: reason
       });
       if (oldMode === m_this.modes.edit || oldMode === m_this.modes.cursor) {
         m_this.modified();
@@ -13258,9 +13263,16 @@ var _svgRenderer = function svgRenderer(arg) {
     return m_this;
   };
 
+  /**
+   * Schedule an update in the next render frame.
+   */
+  this._scheduleUpdate = function () {
+    m_this.layer().map().scheduleAnimationFrame(m_this._renderFrame);
+  };
+
   /**
    * Render all features that are marked as needing an update.  This should
-   * only be called duration an animation frame.
+   * only be called during an animation frame.
    */
   this._renderFrame = function () {
     var id;
@@ -13276,6 +13288,11 @@ var _svgRenderer = function svgRenderer(arg) {
         m_this._renderFeature(id);
       }
     }
+    for (id in m_features) {
+      if (m_features.hasOwnProperty(id) && ids[id] === undefined) {
+        m_this.select(id).attr('visibility', !m_features[id].visible || m_features[id].visible() ? 'visible' : 'hidden');
+      }
+    }
   };
 
   /**
@@ -13290,6 +13307,7 @@ var _svgRenderer = function svgRenderer(arg) {
     if (!m_features[id]) {
       return m_this;
     }
+    m_this.select(id).remove();
     var data = m_features[id].data,
       index = m_features[id].index,
       style = m_features[id].style,
@@ -13309,7 +13327,7 @@ var _svgRenderer = function svgRenderer(arg) {
     rendersel.attr('class', classes.concat([id]).join(' '));
     setStyles(rendersel, style);
     if (visible) {
-      rendersel.style('visibility', visible() ? 'visible' : 'hidden');
+      rendersel.attr('visibility', visible() ? 'visible' : 'hidden');
     }
     if (entries.size() && m_features[id].sortByZ) {
       selection.sort(function (a, b) {
@@ -26454,7 +26472,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.11";
+module.exports = "1.14.13";
 
 /***/ }),
 
@@ -28771,6 +28789,7 @@ var _svg_object = function svg_object(arg) {
   var m_id = 'svg-' + uniqueID(),
     s_exit = this._exit,
     m_this = this,
+    s_visible = this.visible,
     s_draw = this.draw;
   this._svgid = function () {
     return m_id;
@@ -28805,6 +28824,26 @@ var _svg_object = function svg_object(arg) {
     m_this.renderer()._removeFeature(m_this._svgid());
     s_exit();
   };
+
+  /**
+   * Get/Set the visibility of the feature.
+   *
+   * @param {boolean} [val] A boolean to change the visibility, or `undefined`
+   *    to return the visibility.
+   * @param {boolean} [direct] If `true`, when getting the visibility,
+   *    disregard the visibility of the parent layer, and when setting, refresh
+   *    the state regardless of whether it has changed or not.  Otherwise, the
+   *    functional visibility is returned, where both the feature and the layer
+   *    must be visible for a `true` result.
+   * @returns {boolean|this} Either the visibility (if getting) or the feature
+   *    (if setting).
+   */
+  this.visible = function (val, direct) {
+    if (val !== undefined && val !== s_visible(undefined, true) && m_this.renderer()) {
+      m_this.renderer()._scheduleUpdate();
+    }
+    return s_visible(val, direct);
+  };
   return this;
 };
 module.exports = _svg_object;
@@ -83033,9 +83072,15 @@ geo_event.annotation.state = 'geo_annotation_state';
  * @event geo.event.annotation.mode
  * @type {geo.event.base}
  * @property {string?} mode The new annotation mode.  This is one of the values
- *      from {@link geo.annotation.state}.
+ *      from {@link geo.annotationLayer.mode} or an annotation name.
  * @property {string?} oldMode The annotation mode before this change.  This is
+ *      one of the values from {@link geo.annotationLayer.mode} or an
+ *      annotation name.
+ * @property {string?} oldState If there was an active annotation before the
+ *      mode change, this is the annotation state before the change.  This is
  *      one of the values from {@link geo.annotation.state}.
+ * @property {string?} reason An optional string that was passed to the mode
+ *      change method.
  */
 geo_event.annotation.mode = 'geo_annotation_mode';
 
@@ -89675,12 +89720,6 @@ var _pointFeature = function pointFeature(arg) {
       var d = clusters[cidx];
       // mark the datum as a cluster for accessor methods
       d.__cluster = true;
-
-      // store all of the data objects for each point in the cluster as __data
-      d.__data = new Array(d.obj.length);
-      for (var idx = 0; idx < d.obj.length; idx += 1) {
-        d.__data[idx] = m_allData[d.obj[idx].index];
-      }
       data[didx] = d;
     }
 
@@ -97908,7 +97947,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
+module.exports = "f795280c0f9543f402b7e5240cc9b2698c80e89b";
 
 /***/ }),
 

package/geo.lean.js

@@ -6430,7 +6430,6 @@ var _feature = function feature(arg) {
     }
     if (m_visible !== val || direct) {
       m_visible = val;
-      m_this.modified();
       if (m_layer && m_layer.visible && !m_layer.visible()) {
         val = false;
       }
@@ -10523,10 +10522,12 @@ var _annotationLayer = function annotationLayer(arg) {
    *    edited or used.
    * @param {object} [options] Additional options to pass when creating an
    *    annotation.
+   * @param {string} [reason] An optional reason to pass to the
+   *    `geo.event.annotation.mode` event.
    * @returns {string|null|this} The current mode or the layer.
    * @fires geo.event.annotation.mode
    */
-  this.mode = function (arg, editAnnotation, options) {
+  this.mode = function (arg, editAnnotation, options, reason) {
     if (arg === undefined) {
       return m_mode;
     }
@@ -10548,12 +10549,14 @@ var _annotationLayer = function annotationLayer(arg) {
       }
       if (m_mode) {
         m_keyHandler.bind('esc', function () {
-          m_this.mode(null);
+          m_this.mode(null, undefined, undefined, 'escape');
         });
       } else {
         m_keyHandler.unbind('esc');
       }
+      var oldState;
       if (m_this.currentAnnotation) {
+        oldState = m_this.currentAnnotation.state();
         switch (m_this.currentAnnotation.state()) {
           case geo_annotation.state.create:
             m_this.removeAnnotation(m_this.currentAnnotation);
@@ -10602,7 +10605,9 @@ var _annotationLayer = function annotationLayer(arg) {
       }
       m_this.geoTrigger(geo_event.annotation.mode, {
         mode: m_mode,
-        oldMode: oldMode
+        oldMode: oldMode,
+        oldState: oldState,
+        reason: reason
       });
       if (oldMode === m_this.modes.edit || oldMode === m_this.modes.cursor) {
         m_this.modified();
@@ -13258,9 +13263,16 @@ var _svgRenderer = function svgRenderer(arg) {
     return m_this;
   };
 
+  /**
+   * Schedule an update in the next render frame.
+   */
+  this._scheduleUpdate = function () {
+    m_this.layer().map().scheduleAnimationFrame(m_this._renderFrame);
+  };
+
   /**
    * Render all features that are marked as needing an update.  This should
-   * only be called duration an animation frame.
+   * only be called during an animation frame.
    */
   this._renderFrame = function () {
     var id;
@@ -13276,6 +13288,11 @@ var _svgRenderer = function svgRenderer(arg) {
         m_this._renderFeature(id);
       }
     }
+    for (id in m_features) {
+      if (m_features.hasOwnProperty(id) && ids[id] === undefined) {
+        m_this.select(id).attr('visibility', !m_features[id].visible || m_features[id].visible() ? 'visible' : 'hidden');
+      }
+    }
   };
 
   /**
@@ -13290,6 +13307,7 @@ var _svgRenderer = function svgRenderer(arg) {
     if (!m_features[id]) {
       return m_this;
     }
+    m_this.select(id).remove();
     var data = m_features[id].data,
       index = m_features[id].index,
       style = m_features[id].style,
@@ -13309,7 +13327,7 @@ var _svgRenderer = function svgRenderer(arg) {
     rendersel.attr('class', classes.concat([id]).join(' '));
     setStyles(rendersel, style);
     if (visible) {
-      rendersel.style('visibility', visible() ? 'visible' : 'hidden');
+      rendersel.attr('visibility', visible() ? 'visible' : 'hidden');
     }
     if (entries.size() && m_features[id].sortByZ) {
       selection.sort(function (a, b) {
@@ -23463,7 +23481,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.11";
+module.exports = "1.14.13";
 
 /***/ }),
 
@@ -25780,6 +25798,7 @@ var _svg_object = function svg_object(arg) {
   var m_id = 'svg-' + uniqueID(),
     s_exit = this._exit,
     m_this = this,
+    s_visible = this.visible,
     s_draw = this.draw;
   this._svgid = function () {
     return m_id;
@@ -25814,6 +25833,26 @@ var _svg_object = function svg_object(arg) {
     m_this.renderer()._removeFeature(m_this._svgid());
     s_exit();
   };
+
+  /**
+   * Get/Set the visibility of the feature.
+   *
+   * @param {boolean} [val] A boolean to change the visibility, or `undefined`
+   *    to return the visibility.
+   * @param {boolean} [direct] If `true`, when getting the visibility,
+   *    disregard the visibility of the parent layer, and when setting, refresh
+   *    the state regardless of whether it has changed or not.  Otherwise, the
+   *    functional visibility is returned, where both the feature and the layer
+   *    must be visible for a `true` result.
+   * @returns {boolean|this} Either the visibility (if getting) or the feature
+   *    (if setting).
+   */
+  this.visible = function (val, direct) {
+    if (val !== undefined && val !== s_visible(undefined, true) && m_this.renderer()) {
+      m_this.renderer()._scheduleUpdate();
+    }
+    return s_visible(val, direct);
+  };
   return this;
 };
 module.exports = _svg_object;
@@ -55209,9 +55248,15 @@ geo_event.annotation.state = 'geo_annotation_state';
  * @event geo.event.annotation.mode
  * @type {geo.event.base}
  * @property {string?} mode The new annotation mode.  This is one of the values
- *      from {@link geo.annotation.state}.
+ *      from {@link geo.annotationLayer.mode} or an annotation name.
  * @property {string?} oldMode The annotation mode before this change.  This is
+ *      one of the values from {@link geo.annotationLayer.mode} or an
+ *      annotation name.
+ * @property {string?} oldState If there was an active annotation before the
+ *      mode change, this is the annotation state before the change.  This is
  *      one of the values from {@link geo.annotation.state}.
+ * @property {string?} reason An optional string that was passed to the mode
+ *      change method.
  */
 geo_event.annotation.mode = 'geo_annotation_mode';
 
@@ -61851,12 +61896,6 @@ var _pointFeature = function pointFeature(arg) {
       var d = clusters[cidx];
       // mark the datum as a cluster for accessor methods
       d.__cluster = true;
-
-      // store all of the data objects for each point in the cluster as __data
-      d.__data = new Array(d.obj.length);
-      for (var idx = 0; idx < d.obj.length; idx += 1) {
-        d.__data[idx] = m_allData[d.obj[idx].index];
-      }
       data[didx] = d;
     }
 
@@ -70094,7 +70133,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
+module.exports = "f795280c0f9543f402b7e5240cc9b2698c80e89b";
 
 /***/ }),