geojs 1.15.2 → 1.15.4

package/geo.js

@@ -26491,7 +26491,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.15.2";
+module.exports = "1.15.4";
 
 /***/ }),
 
@@ -71282,6 +71282,8 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
       uniformFunc = m_this.style.get('uniformLine'),
       uniformVal,
       uniform,
+      drop,
+      skipped,
       order = m_this.featureVertices(),
       orderk0,
       orderLen = order.length,
@@ -71356,10 +71358,13 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
       position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
       m_origin = new Float32Array(m_this.style.get('origin')(position));
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
+        var o0 = m_origin[0],
+          o1 = m_origin[1],
+          o2 = m_origin[2];
         for (i = 0; i < position.length; i += 3) {
-          position[i] -= m_origin[0];
-          position[i + 1] -= m_origin[1];
-          position[i + 2] -= m_origin[2];
+          position[i] -= o0;
+          position[i + 1] -= o1;
+          position[i + 2] -= o2;
         }
       }
       m_modelViewUniform.setOrigin(m_origin);
@@ -71399,11 +71404,12 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
         continue;
       }
       uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
+      drop = uniform === 'drop';
       d = data[i];
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
       maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
-      var skipped = 0;
+      skipped = 0;
       for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
         lidx = j;
         if (j === lineItem.length) {
@@ -71460,14 +71466,14 @@ 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]) {
+          if (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) {
+            if (drop && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
               strokeOpacityBuf[dest] = -1;
               continue;
             }
@@ -96222,6 +96228,8 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       uniform,
       indices,
       items = [],
+      itemsk,
+      itemsktri,
       target_gcs = m_this.gcs(),
       map_gcs = m_this.layer().map().gcs(),
       numPts = 0,
@@ -96335,11 +96343,13 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
     color = fillColorVal;
     fill = fillVal;
     for (k = 0; k < items.length; k += 1) {
-      n = items[k].triangles.length;
-      vertices = items[k].vertices;
-      item = items[k].item;
-      itemIndex = items[k].itemIndex;
-      original = items[k].original;
+      itemsk = items[k];
+      itemsktri = itemsk.triangles;
+      n = itemsktri.length;
+      vertices = itemsk.vertices;
+      item = itemsk.item;
+      itemIndex = itemsk.itemIndex;
+      original = itemsk.original;
       uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
       if (uniform) {
@@ -96356,7 +96366,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       if (!fill) {
         opacity = 0;
       }
-      if (uniform && onlyStyle && items[k].uniform && items[k].color && color.r === items[k].color.r && color.g === items[k].color.g && color.b === items[k].color.b && opacity === items[k].opacity) {
+      if (uniform && onlyStyle && itemsk.uniform && itemsk.color && color.r === itemsk.color.r && color.g === itemsk.color.g && color.b === itemsk.color.b && opacity === itemsk.opacity) {
         d += n;
         d3 += n * 3;
         continue;
@@ -96368,7 +96378,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillColor[d3 + 2] = color.b;
           fillOpacity[d] = opacity;
         } else {
-          j = items[k].triangles[i] * 3;
+          j = itemsktri[i] * 3;
           if (!onlyStyle) {
             posBuf[d3] = vertices[j] - m_origin[0];
             posBuf[d3 + 1] = vertices[j + 1] - m_origin[1];
@@ -96387,10 +96397,10 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillOpacity[d] = opacity;
         }
       }
-      if (uniform || items[k].uniform) {
-        items[k].uniform = uniform;
-        items[k].color = color;
-        items[k].opacity = opacity;
+      if (uniform || itemsk.uniform) {
+        itemsk.uniform = uniform;
+        itemsk.color = color;
+        itemsk.opacity = opacity;
       }
     }
     if (!onlyStyle) {
@@ -98031,7 +98041,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "23dc9d02000c6263f9fa495301f9d457bfb1f89e";
+module.exports = "da35de4852244121d7bfa904a6a1f9b5ab213a18";
 
 /***/ }),
 

package/geo.lean.js

@@ -23500,7 +23500,7 @@ module.exports = svg_tileLayer;
  * @constant
  * @type {string}
  */
-module.exports = "1.15.2";
+module.exports = "1.15.4";
 
 /***/ }),
 
@@ -43458,6 +43458,8 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
       uniformFunc = m_this.style.get('uniformLine'),
       uniformVal,
       uniform,
+      drop,
+      skipped,
       order = m_this.featureVertices(),
       orderk0,
       orderLen = order.length,
@@ -43532,10 +43534,13 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
       position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
       m_origin = new Float32Array(m_this.style.get('origin')(position));
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
+        var o0 = m_origin[0],
+          o1 = m_origin[1],
+          o2 = m_origin[2];
         for (i = 0; i < position.length; i += 3) {
-          position[i] -= m_origin[0];
-          position[i + 1] -= m_origin[1];
-          position[i + 2] -= m_origin[2];
+          position[i] -= o0;
+          position[i + 1] -= o1;
+          position[i + 2] -= o2;
         }
       }
       m_modelViewUniform.setOrigin(m_origin);
@@ -43575,11 +43580,12 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
         continue;
       }
       uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
+      drop = uniform === 'drop';
       d = data[i];
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
       maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
-      var skipped = 0;
+      skipped = 0;
       for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
         lidx = j;
         if (j === lineItem.length) {
@@ -43636,14 +43642,14 @@ 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]) {
+          if (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) {
+            if (drop && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
               strokeOpacityBuf[dest] = -1;
               continue;
             }
@@ -68408,6 +68414,8 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       uniform,
       indices,
       items = [],
+      itemsk,
+      itemsktri,
       target_gcs = m_this.gcs(),
       map_gcs = m_this.layer().map().gcs(),
       numPts = 0,
@@ -68521,11 +68529,13 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
     color = fillColorVal;
     fill = fillVal;
     for (k = 0; k < items.length; k += 1) {
-      n = items[k].triangles.length;
-      vertices = items[k].vertices;
-      item = items[k].item;
-      itemIndex = items[k].itemIndex;
-      original = items[k].original;
+      itemsk = items[k];
+      itemsktri = itemsk.triangles;
+      n = itemsktri.length;
+      vertices = itemsk.vertices;
+      item = itemsk.item;
+      itemIndex = itemsk.itemIndex;
+      original = itemsk.original;
       uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
       if (uniform) {
@@ -68542,7 +68552,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
       if (!fill) {
         opacity = 0;
       }
-      if (uniform && onlyStyle && items[k].uniform && items[k].color && color.r === items[k].color.r && color.g === items[k].color.g && color.b === items[k].color.b && opacity === items[k].opacity) {
+      if (uniform && onlyStyle && itemsk.uniform && itemsk.color && color.r === itemsk.color.r && color.g === itemsk.color.g && color.b === itemsk.color.b && opacity === itemsk.opacity) {
         d += n;
         d3 += n * 3;
         continue;
@@ -68554,7 +68564,7 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillColor[d3 + 2] = color.b;
           fillOpacity[d] = opacity;
         } else {
-          j = items[k].triangles[i] * 3;
+          j = itemsktri[i] * 3;
           if (!onlyStyle) {
             posBuf[d3] = vertices[j] - m_origin[0];
             posBuf[d3 + 1] = vertices[j + 1] - m_origin[1];
@@ -68573,10 +68583,10 @@ var _webgl_polygonFeature = function webgl_polygonFeature(arg) {
           fillOpacity[d] = opacity;
         }
       }
-      if (uniform || items[k].uniform) {
-        items[k].uniform = uniform;
-        items[k].color = color;
-        items[k].opacity = opacity;
+      if (uniform || itemsk.uniform) {
+        itemsk.uniform = uniform;
+        itemsk.color = color;
+        itemsk.opacity = opacity;
       }
     }
     if (!onlyStyle) {
@@ -70217,7 +70227,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
  * @constant
  * @type {string}
  */
-module.exports = "23dc9d02000c6263f9fa495301f9d457bfb1f89e";
+module.exports = "da35de4852244121d7bfa904a6a1f9b5ab213a18";
 
 /***/ }),