geojs 1.14.10 → 1.14.12

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;
       }
@@ -13258,9 +13257,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 +13282,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 +13301,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 +13321,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) {
@@ -22394,14 +22406,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
    */
   this.updateStyleFromArray = function (keyOrObject, styleArray, refresh) {
     var bufferedKeys = {
+      radius: 1,
       fillColor: 3,
       fillOpacity: 1,
-      radius: 1,
       strokeColor: 3,
       strokeOpacity: 1,
       strokeWidth: 1,
       symbolComputed: 1,
-      symbolValueComputed: 1
+      symbolValueComputed: 1,
+      rotation: 1
     };
     var needsRefresh, needsRender;
     if (typeof keyOrObject === 'string') {
@@ -22410,12 +22423,12 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
       keyOrObject = obj;
     }
     $.each(keyOrObject, function (key, styleArray) {
+      var sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
       if (m_this.visible() && m_actor && bufferedKeys[key] && !needsRefresh && !m_this.clustering()) {
-        var vpf, mapper, buffer, numPts, value, i, j, v, bpv, sbkey;
+        var vpf, mapper, buffer, numPts, value, i, j, v, bpv;
         bpv = bufferedKeys[key];
         numPts = m_this.data().length;
         mapper = m_actor.mapper();
-        sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
         buffer = mapper.getSourceBuffer(sbkey);
         vpf = m_this.verticesPerFeature();
         if (!buffer || !numPts || numPts * vpf * bpv !== buffer.length) {
@@ -22451,15 +22464,13 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
       } else {
         needsRefresh = true;
       }
-      if (key === sbkey) {
-        var mod = m_this.modified;
-        if (!needsRefresh) {
-          // don't allow modified to be adjusted if we don't need to refresh
-          m_this.modified = function () {};
-        }
-        s_updateStyleFromArray(key, styleArray, false);
-        m_this.modified = mod;
+      var mod = m_this.modified;
+      if (!needsRefresh && key === sbkey) {
+        // don't allow modified to be adjusted if we don't need to refresh
+        m_this.modified = function () {};
       }
+      s_updateStyleFromArray(key, styleArray, false);
+      m_this.modified = mod;
     });
     if (refresh) {
       if (m_this.visible() && needsRefresh) {
@@ -22505,15 +22516,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
         name: 'pos'
       }),
       attr = {
-        radius: 1,
         fillColor: 3,
         fillOpacity: 1,
+        radius: 1,
+        rotation: 1,
         strokeColor: 3,
         strokeOpacity: 1,
         strokeWidth: 1,
         symbol: 1,
-        symbolValue: 1,
-        rotation: 1
+        symbolValue: 1
       },
       uniforms = {
         pixelWidth: vgl.GL.FLOAT,
@@ -26455,7 +26466,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.10";
+module.exports = "1.14.12";
 
 /***/ }),
 
@@ -28772,6 +28783,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;
@@ -28806,6 +28818,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;
@@ -89676,12 +89708,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;
     }
 
@@ -97909,7 +97935,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "2491144d1392414c721b090477fd5a80894538c4";
+module.exports = "77d74f3f2551728136c961f0023bcf74e19e6fb0";
 
 /***/ }),
 
@@ -103056,10 +103082,10 @@ function earcut(data, holeIndices) {
 
   // if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
   if (data.length > 80 * dim) {
-    minX = Infinity;
-    minY = Infinity;
-    var maxX = -Infinity;
-    var maxY = -Infinity;
+    minX = data[0];
+    minY = data[1];
+    var maxX = minX;
+    var maxY = minY;
     for (var i = dim; i < outerLen; i += dim) {
       var x = data[i];
       var y = data[i + 1];
@@ -103308,7 +103334,7 @@ function compareXYSlope(a, b) {
   return result;
 }
 
-// find a bridge between vertices that connects hole with an outer ring and and link it
+// find a bridge between vertices that connects hole with an outer ring and link it
 function eliminateHole(hole, outerNode) {
   var bridge = findHoleBridge(hole, outerNode);
   if (!bridge) {
@@ -103471,7 +103497,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
 // check if a diagonal between two polygon nodes is valid (lies in polygon interior)
 function isValidDiagonal(a, b) {
   return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
-  // dones't intersect other edges
+  // doesn't intersect other edges
   locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
   // locally visible
   area(a.prev, a, b.prev) || area(a, b.prev, b)) ||

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;
       }
@@ -13258,9 +13257,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 +13282,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 +13301,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 +13321,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) {
@@ -19393,14 +19405,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
    */
   this.updateStyleFromArray = function (keyOrObject, styleArray, refresh) {
     var bufferedKeys = {
+      radius: 1,
       fillColor: 3,
       fillOpacity: 1,
-      radius: 1,
       strokeColor: 3,
       strokeOpacity: 1,
       strokeWidth: 1,
       symbolComputed: 1,
-      symbolValueComputed: 1
+      symbolValueComputed: 1,
+      rotation: 1
     };
     var needsRefresh, needsRender;
     if (typeof keyOrObject === 'string') {
@@ -19409,12 +19422,12 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
       keyOrObject = obj;
     }
     $.each(keyOrObject, function (key, styleArray) {
+      var sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
       if (m_this.visible() && m_actor && bufferedKeys[key] && !needsRefresh && !m_this.clustering()) {
-        var vpf, mapper, buffer, numPts, value, i, j, v, bpv, sbkey;
+        var vpf, mapper, buffer, numPts, value, i, j, v, bpv;
         bpv = bufferedKeys[key];
         numPts = m_this.data().length;
         mapper = m_actor.mapper();
-        sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
         buffer = mapper.getSourceBuffer(sbkey);
         vpf = m_this.verticesPerFeature();
         if (!buffer || !numPts || numPts * vpf * bpv !== buffer.length) {
@@ -19450,15 +19463,13 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
       } else {
         needsRefresh = true;
       }
-      if (key === sbkey) {
-        var mod = m_this.modified;
-        if (!needsRefresh) {
-          // don't allow modified to be adjusted if we don't need to refresh
-          m_this.modified = function () {};
-        }
-        s_updateStyleFromArray(key, styleArray, false);
-        m_this.modified = mod;
+      var mod = m_this.modified;
+      if (!needsRefresh && key === sbkey) {
+        // don't allow modified to be adjusted if we don't need to refresh
+        m_this.modified = function () {};
       }
+      s_updateStyleFromArray(key, styleArray, false);
+      m_this.modified = mod;
     });
     if (refresh) {
       if (m_this.visible() && needsRefresh) {
@@ -19504,15 +19515,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
         name: 'pos'
       }),
       attr = {
-        radius: 1,
         fillColor: 3,
         fillOpacity: 1,
+        radius: 1,
+        rotation: 1,
         strokeColor: 3,
         strokeOpacity: 1,
         strokeWidth: 1,
         symbol: 1,
-        symbolValue: 1,
-        rotation: 1
+        symbolValue: 1
       },
       uniforms = {
         pixelWidth: vgl.GL.FLOAT,
@@ -23464,7 +23475,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.14.10";
+module.exports = "1.14.12";
 
 /***/ }),
 
@@ -25781,6 +25792,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;
@@ -25815,6 +25827,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;
@@ -61852,12 +61884,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;
     }
 
@@ -70095,7 +70121,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "2491144d1392414c721b090477fd5a80894538c4";
+module.exports = "77d74f3f2551728136c961f0023bcf74e19e6fb0";
 
 /***/ }),
 
@@ -75242,10 +75268,10 @@ function earcut(data, holeIndices) {
 
   // if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
   if (data.length > 80 * dim) {
-    minX = Infinity;
-    minY = Infinity;
-    var maxX = -Infinity;
-    var maxY = -Infinity;
+    minX = data[0];
+    minY = data[1];
+    var maxX = minX;
+    var maxY = minY;
     for (var i = dim; i < outerLen; i += dim) {
       var x = data[i];
       var y = data[i + 1];
@@ -75494,7 +75520,7 @@ function compareXYSlope(a, b) {
   return result;
 }
 
-// find a bridge between vertices that connects hole with an outer ring and and link it
+// find a bridge between vertices that connects hole with an outer ring and link it
 function eliminateHole(hole, outerNode) {
   var bridge = findHoleBridge(hole, outerNode);
   if (!bridge) {
@@ -75657,7 +75683,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
 // check if a diagonal between two polygon nodes is valid (lies in polygon interior)
 function isValidDiagonal(a, b) {
   return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
-  // dones't intersect other edges
+  // doesn't intersect other edges
   locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
   // locally visible
   area(a.prev, a, b.prev) || area(a, b.prev, b)) ||