geojs 1.9.2 → 1.9.3

package/geo.lean.js

@@ -3725,6 +3725,17 @@ var textFeature = __webpack_require__(9757);
  *    style object.
  */
 
+/**
+ * @typedef {geo.util.polyop.spec} geo.util.polyop.annotationLayerSpec
+ * @extends {geo.util.polyop.spec}
+ * @property {string} [keepAnnotations='exact'] Determine which annotations are
+ *   present after a boolean operation.  `'exact'` replaces modified
+ *   annotations with the results; unmodified annotations are left as is.
+ *   `'all'` replaces all annotations, so unchanged annotations may be
+ *   converted to polygonAnnotations.  `'none'` discards all existing
+ *   annotations and only keeps modified results.
+ */
+
 /**
  * Layer to handle direct interactions with different features.  Annotations
  * (features) can be created by calling mode(<name of feature>) or cancelled
@@ -5192,8 +5203,8 @@ var annotationLayer = function annotationLayer(arg) {
    * Replace appropriate annotations with a list of polygons.
    *
    * @param {geo.polygonList} poly A list of polygons.
-   * @param {geo.util.polyop.spec} [opts] This contains annotationIndices and
-   *   correspondence used to track annotations.
+   * @param {geo.util.polyop.annotationLayerSpec} [opts] This contains
+   *   annotationIndices and correspondence used to track annotations.
    * @returns {this}
    */
 
@@ -15578,9 +15589,12 @@ var util = __webpack_require__(4634);
  *   divided by the sine of half the angle between segments, then a bevel join
  *   is used instead.  This is a single value that applies to all lines.  If a
  *   function, it is called with `(data)`.
- * @property {boolean|function} [uniformLine=false] Boolean indicating if each
- *   line has a uniform style (uniform stroke color, opacity, and width).  Can
- *   vary by line.
+ * @property {boolean|string|function} [uniformLine=false] Boolean indicating
+ *   if each line has a uniform style (uniform stroke color, opacity, and
+ *   width).  Can vary by line.  A value of `'drop'` will modify rendered
+ *   vertex order by dropping duplicates and setting later values to zero
+ *   opacity.  This can be faster but makes it so updating the style array
+ *   can no longer be used.
  * @property {number|function} [antialiasing] Antialiasing distance in pixels.
  *   Values must be non-negative.  A value greater than 1 will produce a
  *   visible gradient.  This is a single value that applies to all lines.
@@ -27563,7 +27577,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "c77ab7869ca682dfc42f6a12a7ad2121687e94b8";
+module.exports = "965d40f46507df035bc01450d2bd15c3ed06368d";
 
 /***/ }),
 
@@ -33441,7 +33455,9 @@ var trackFeature = function trackFeature(arg) {
       position: util.identityFunction,
       time: function time(d, i) {
         return d.t !== undefined ? d.t : i;
-      }
+      },
+      uniformLine: 'drop',
+      closed: false
     }, arg.style === undefined ? {} : arg.style);
     var markerStyle = $.extend(true, {}, {
       rotateWithMap: true,
@@ -40683,7 +40699,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.9.2";
+module.exports = "1.9.3";
 
 /***/ }),
 
@@ -42082,6 +42098,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
       maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
+      var skipped = 0;
 
       for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
         lidx = j;
@@ -42148,9 +42165,20 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         }
 
         if (j) {
+          if (uniform === 'drop' && j > 1 && position[vert[0].pos] === position[vert[1].pos] && position[vert[0].pos + 1] === position[vert[1].pos + 1]) {
+            skipped += 1;
+            continue;
+          }
           /* zero out the z position.  This can be changed if we handle it in
            * the shader. */
+
+
           for (k = 0; k < orderLen; k += 1, dest += 1, dest3 += 3) {
+            if (uniform === 'drop' && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
+              strokeOpacityBuf[dest] = -1;
+              continue;
+            }
+
             orderk0 = order[k][0];
             v1 = vert[orderk0];
             v2 = vert[1 - orderk0];
@@ -42193,6 +42221,12 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
           }
         }
       }
+
+      if (skipped) {
+        for (k = 0; k < skipped * orderLen; k += 1, dest += 1, dest3 += 3) {
+          strokeOpacityBuf[dest] = -1;
+        }
+      }
     }
 
     if (!onlyStyle) {