geojs 1.14.11 → 1.14.13

package/package.json

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

package/src/annotationLayer.js

@@ -678,10 +678,12 @@ var annotationLayer = function (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;
     }
@@ -701,11 +703,13 @@ var annotationLayer = function (arg) {
         m_keyHandler = Mousetrap(mapNode[0]);
       }
       if (m_mode) {
-        m_keyHandler.bind('esc', function () { m_this.mode(null); });
+        m_keyHandler.bind('esc', function () { m_this.mode(null, undefined, undefined, 'escape'); });
       } else {
         m_keyHandler.unbind('esc');
       }
+      let 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);
@@ -754,7 +758,7 @@ var annotationLayer = function (arg) {
         });
       }
       m_this.geoTrigger(geo_event.annotation.mode, {
-        mode: m_mode, oldMode: oldMode});
+        mode: m_mode, oldMode: oldMode, oldState: oldState, reason: reason});
       if (oldMode === m_this.modes.edit || oldMode === m_this.modes.cursor) {
         m_this.modified();
       }

package/src/event.js

@@ -746,9 +746,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';
 

package/src/feature.js

@@ -733,7 +733,6 @@ var feature = function (arg) {
     }
     if (m_visible !== val || direct) {
       m_visible = val;
-      m_this.modified();
       if (m_layer && m_layer.visible && !m_layer.visible()) {
         val = false;
       }

package/src/pointFeature.js

@@ -204,11 +204,6 @@ var pointFeature = function (arg) {
       // 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 (let idx = 0; idx < d.obj.length; idx += 1) {
-        d.__data[idx] = m_allData[d.obj[idx].index];
-      }
       data[didx] = d;
     }
 

package/src/svg/object.js

@@ -23,6 +23,7 @@ var svg_object = function (arg) {
   var m_id = 'svg-' + uniqueID(),
       s_exit = this._exit,
       m_this = this,
+      s_visible = this.visible,
       s_draw = this.draw;
 
   this._svgid = function () {
@@ -59,6 +60,26 @@ var svg_object = function (arg) {
     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;
 };
 

package/src/svg/svgRenderer.js

@@ -548,9 +548,16 @@ var svgRenderer = function (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;
@@ -566,6 +573,11 @@ var svgRenderer = function (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');
+      }
+    }
   };
 
   /**
@@ -580,6 +592,7 @@ var svgRenderer = function (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,
@@ -598,7 +611,7 @@ var svgRenderer = function (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) {