geojs 1.8.9 → 1.8.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # GeoJS Change Log
 
+## Version 1.8.10
+
+### Improvements
+
+- Added a uniformLine property to speed up line rendering ([#1211](../../pull/1211))
+
+## Version 1.8.9
+
+### Bug Fixes
+
+- Fix a bug introduced in #1207 ([#1210](../../pull/1210))
+
 ## Version 1.8.8
 
 ### Improvements

package/geo.js

@@ -11490,6 +11490,7 @@ var geojsonReader = function geojsonReader(arg) {
       strokeOffset: 0,
       lineCap: 'butt',
       lineJoin: 'miter',
+      uniformLine: true,
       closed: false
     }, arg.lineStyle),
     polygonStyle: _objectSpread({
@@ -11499,7 +11500,8 @@ var geojsonReader = function geojsonReader(arg) {
       stroke: true,
       strokeColor: '#999999',
       strokeWidth: 2,
-      strokeOpacity: 1
+      strokeOpacity: 1,
+      uniformPolygon: true
     }, arg.polygonStyle)
   });
 
@@ -15141,6 +15143,9 @@ 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 {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.
@@ -15258,24 +15263,38 @@ var lineFeature = function lineFeature(arg) {
     var data = m_this.data(),
         line = m_this.line(),
         widthFunc = m_this.style.get('strokeWidth'),
+        widthVal = util.isFunction(m_this.style('strokeWidth')) ? undefined : widthFunc(),
         posFunc = m_this.position(),
         closedFunc = m_this.style.get('closed'),
+        closedVal = util.isFunction(m_this.style('closed')) ? undefined : closedFunc(),
+        uniformFunc = m_this.style.get('uniformLine'),
+        uniformVal = util.isFunction(m_this.style('uniformLine')) ? undefined : uniformFunc(),
         gcs = m_this.gcs(),
-        mapgcs = m_this.layer().map().gcs();
-    data.forEach(function (d, index) {
-      var closed = closedFunc(d, index),
-          last,
-          lasti,
-          lastr,
-          lastr2,
-          first,
-          record = [],
-          min,
-          max;
-      line(d, index).forEach(function (current, j) {
+        mapgcs = m_this.layer().map().gcs(),
+        onlyInvertedY = transform.onlyInvertedY(gcs, mapgcs);
+
+    for (var index = 0; index < data.length; index += 1) {
+      var d = data[index];
+      var closed = closedVal === undefined ? closedFunc(d, index) : closedVal;
+      var last = void 0,
+          lasti = void 0,
+          lastr = void 0,
+          lastr2 = void 0,
+          first = void 0,
+          min = void 0,
+          max = void 0,
+          width = void 0;
+      var record = [];
+      var uniform = uniformVal === undefined ? uniformFunc(d, index) : uniformVal;
+      var lineRecord = line(d, index);
+
+      for (var j = 0; j < lineRecord.length; j += 1) {
+        var current = lineRecord[j];
         var p = posFunc(current, j, d, index);
 
-        if (gcs !== mapgcs) {
+        if (onlyInvertedY) {
+          p.y = -p.y;
+        } else if (gcs !== mapgcs) {
           p = transform.transformCoordinates(gcs, mapgcs, p);
         }
 
@@ -15309,7 +15328,11 @@ var lineFeature = function lineFeature(arg) {
           max.y = p.y;
         }
 
-        var r = Math.ceil(widthFunc(current, j, d, index) / 2) + 2;
+        if (!uniform || !j) {
+          width = widthVal === undefined ? widthFunc(current, j, d, index) : widthVal;
+        }
+
+        var r = Math.ceil(width / 2) + 2;
 
         if (max.r === undefined || r > max.r) {
           max.r = r;
@@ -15341,7 +15364,7 @@ var lineFeature = function lineFeature(arg) {
             i: j
           };
         }
-      });
+      }
 
       if (closed && first && (last.x !== first.p.x || last.y !== first.p.y)) {
         record.push({
@@ -15357,7 +15380,8 @@ var lineFeature = function lineFeature(arg) {
       record.min = min;
       record.max = max;
       m_pointSearchInfo.push(record);
-    });
+    }
+
     return m_pointSearchInfo;
   };
   /**
@@ -24850,7 +24874,8 @@ var polygonFeature = function polygonFeature(arg) {
       strokeStyle: linePolyStyle(polyStyle.strokeStyle),
       strokeColor: linePolyStyle(polyStyle.strokeColor),
       strokeOffset: linePolyStyle(polyStyle.strokeOffset),
-      strokeOpacity: strokeOpacity
+      strokeOpacity: strokeOpacity,
+      uniformLine: linePolyStyle(polyStyle.uniformPolygon)
     });
     var data = m_this.data(),
         posVal = m_this.style('position');
@@ -27034,7 +27059,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "eacf9ad316c55bd4e941894ac51f0071b59d67f7";
+module.exports = "e13f6d922451bb86544884283bfb31843f58bd60";
 
 /***/ }),
 
@@ -39556,7 +39581,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.9";
+module.exports = "1.8.10";
 
 /***/ }),
 
@@ -40808,6 +40833,9 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         strokeOffsetVal,
         miterLimit = m_this.style.get('miterLimit')(data),
         antialiasing = m_this.style.get('antialiasing')(data) || 0,
+        uniformFunc = m_this.style.get('uniformLine'),
+        uniformVal,
+        uniform,
         order = m_this.featureVertices(),
         orderk0,
         prevkey,
@@ -40838,6 +40866,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
     strokeOffsetVal = util.isFunction(m_this.style('strokeOffset')) ? undefined : strokeOffsetFunc() || 0;
     strokeOpacityVal = util.isFunction(m_this.style('strokeOpacity')) ? undefined : strokeOpacityFunc();
     strokeWidthVal = util.isFunction(m_this.style('strokeWidth')) ? undefined : strokeWidthFunc();
+    uniformVal = util.isFunction(m_this.style('uniformLine')) ? undefined : uniformFunc();
 
     if (miterLimit !== undefined) {
       /* We impose a limit no matter what, since otherwise the growth is
@@ -40946,6 +40975,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         continue;
       }
 
+      uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
       d = data[i];
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
@@ -40975,13 +41005,27 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
           v.next = j + 1 < lineItem.length ? posIdx3 + 3 : closedVal ? j !== lidx ? firstPosIdx3 + 3 : firstPosIdx3 + 6 - closedVal * 3 : posIdx3;
         }
 
-        v.strokeWidth = strokeWidthVal === undefined ? strokeWidthFunc(lineItemData, lidx, d, i) : strokeWidthVal;
-        v.strokeColor = strokeColorVal === undefined ? strokeColorFunc(lineItemData, lidx, d, i) : strokeColorVal;
-        v.strokeOpacity = strokeOpacityVal === undefined ? strokeOpacityFunc(lineItemData, lidx, d, i) : strokeOpacityVal;
+        if (uniform && j > 0) {
+          if (j === 1) {
+            v.strokeWidth = vert[0].strokeWidth;
+            v.strokeColor = vert[0].strokeColor;
+            v.strokeOpacity = vert[0].strokeOpacity;
+          }
+        } else {
+          v.strokeWidth = strokeWidthVal === undefined ? strokeWidthFunc(lineItemData, lidx, d, i) : strokeWidthVal;
+          v.strokeColor = strokeColorVal === undefined ? strokeColorFunc(lineItemData, lidx, d, i) : strokeColorVal;
+          v.strokeOpacity = strokeOpacityVal === undefined ? strokeOpacityFunc(lineItemData, lidx, d, i) : strokeOpacityVal;
+        }
 
         if (updateFlags) {
           if (strokeOffsetVal !== 0) {
-            v.strokeOffset = (strokeOffsetVal === undefined ? strokeOffsetFunc(lineItemData, lidx, d, i) : strokeOffsetVal) || 0;
+            if (uniform && j > 0) {
+              if (j === 1) {
+                v.strokeOffset = vert[0].strokeOffset;
+              }
+            } else {
+              v.strokeOffset = (strokeOffsetVal === undefined ? strokeOffsetFunc(lineItemData, lidx, d, i) : strokeOffsetVal) || 0;
+            }
 
             if (v.strokeOffset) {
               /* we use 11 bits to store the offset, and we want to store values
@@ -43411,7 +43455,8 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         fillOpacityVal,
         fillFunc,
         fillVal,
-        uniformPolyFunc,
+        uniformFunc,
+        uniformVal,
         uniform,
         indices,
         items = [],
@@ -43439,7 +43484,8 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
     fillOpacityVal = util.isFunction(m_this.style('fillOpacity')) ? undefined : fillOpacityFunc();
     fillFunc = m_this.style.get('fill');
     fillVal = util.isFunction(m_this.style('fill')) ? undefined : fillFunc();
-    uniformPolyFunc = m_this.style.get('uniformPolygon');
+    uniformFunc = m_this.style.get('uniformPolygon');
+    uniformVal = util.isFunction(m_this.style('uniformPolygon')) ? undefined : uniformFunc();
 
     if (!onlyStyle) {
       posFunc = m_this.style.get('position');
@@ -43547,7 +43593,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
       item = items[k].item;
       itemIndex = items[k].itemIndex;
       original = items[k].original;
-      uniform = uniformPolyFunc(item, itemIndex);
+      uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
 
       if (uniform) {

package/geo.lean.js

@@ -11490,6 +11490,7 @@ var geojsonReader = function geojsonReader(arg) {
       strokeOffset: 0,
       lineCap: 'butt',
       lineJoin: 'miter',
+      uniformLine: true,
       closed: false
     }, arg.lineStyle),
     polygonStyle: _objectSpread({
@@ -11499,7 +11500,8 @@ var geojsonReader = function geojsonReader(arg) {
       stroke: true,
       strokeColor: '#999999',
       strokeWidth: 2,
-      strokeOpacity: 1
+      strokeOpacity: 1,
+      uniformPolygon: true
     }, arg.polygonStyle)
   });
 
@@ -15141,6 +15143,9 @@ 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 {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.
@@ -15258,24 +15263,38 @@ var lineFeature = function lineFeature(arg) {
     var data = m_this.data(),
         line = m_this.line(),
         widthFunc = m_this.style.get('strokeWidth'),
+        widthVal = util.isFunction(m_this.style('strokeWidth')) ? undefined : widthFunc(),
         posFunc = m_this.position(),
         closedFunc = m_this.style.get('closed'),
+        closedVal = util.isFunction(m_this.style('closed')) ? undefined : closedFunc(),
+        uniformFunc = m_this.style.get('uniformLine'),
+        uniformVal = util.isFunction(m_this.style('uniformLine')) ? undefined : uniformFunc(),
         gcs = m_this.gcs(),
-        mapgcs = m_this.layer().map().gcs();
-    data.forEach(function (d, index) {
-      var closed = closedFunc(d, index),
-          last,
-          lasti,
-          lastr,
-          lastr2,
-          first,
-          record = [],
-          min,
-          max;
-      line(d, index).forEach(function (current, j) {
+        mapgcs = m_this.layer().map().gcs(),
+        onlyInvertedY = transform.onlyInvertedY(gcs, mapgcs);
+
+    for (var index = 0; index < data.length; index += 1) {
+      var d = data[index];
+      var closed = closedVal === undefined ? closedFunc(d, index) : closedVal;
+      var last = void 0,
+          lasti = void 0,
+          lastr = void 0,
+          lastr2 = void 0,
+          first = void 0,
+          min = void 0,
+          max = void 0,
+          width = void 0;
+      var record = [];
+      var uniform = uniformVal === undefined ? uniformFunc(d, index) : uniformVal;
+      var lineRecord = line(d, index);
+
+      for (var j = 0; j < lineRecord.length; j += 1) {
+        var current = lineRecord[j];
         var p = posFunc(current, j, d, index);
 
-        if (gcs !== mapgcs) {
+        if (onlyInvertedY) {
+          p.y = -p.y;
+        } else if (gcs !== mapgcs) {
           p = transform.transformCoordinates(gcs, mapgcs, p);
         }
 
@@ -15309,7 +15328,11 @@ var lineFeature = function lineFeature(arg) {
           max.y = p.y;
         }
 
-        var r = Math.ceil(widthFunc(current, j, d, index) / 2) + 2;
+        if (!uniform || !j) {
+          width = widthVal === undefined ? widthFunc(current, j, d, index) : widthVal;
+        }
+
+        var r = Math.ceil(width / 2) + 2;
 
         if (max.r === undefined || r > max.r) {
           max.r = r;
@@ -15341,7 +15364,7 @@ var lineFeature = function lineFeature(arg) {
             i: j
           };
         }
-      });
+      }
 
       if (closed && first && (last.x !== first.p.x || last.y !== first.p.y)) {
         record.push({
@@ -15357,7 +15380,8 @@ var lineFeature = function lineFeature(arg) {
       record.min = min;
       record.max = max;
       m_pointSearchInfo.push(record);
-    });
+    }
+
     return m_pointSearchInfo;
   };
   /**
@@ -24850,7 +24874,8 @@ var polygonFeature = function polygonFeature(arg) {
       strokeStyle: linePolyStyle(polyStyle.strokeStyle),
       strokeColor: linePolyStyle(polyStyle.strokeColor),
       strokeOffset: linePolyStyle(polyStyle.strokeOffset),
-      strokeOpacity: strokeOpacity
+      strokeOpacity: strokeOpacity,
+      uniformLine: linePolyStyle(polyStyle.uniformPolygon)
     });
     var data = m_this.data(),
         posVal = m_this.style('position');
@@ -27034,7 +27059,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "eacf9ad316c55bd4e941894ac51f0071b59d67f7";
+module.exports = "e13f6d922451bb86544884283bfb31843f58bd60";
 
 /***/ }),
 
@@ -39556,7 +39581,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.9";
+module.exports = "1.8.10";
 
 /***/ }),
 
@@ -40808,6 +40833,9 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         strokeOffsetVal,
         miterLimit = m_this.style.get('miterLimit')(data),
         antialiasing = m_this.style.get('antialiasing')(data) || 0,
+        uniformFunc = m_this.style.get('uniformLine'),
+        uniformVal,
+        uniform,
         order = m_this.featureVertices(),
         orderk0,
         prevkey,
@@ -40838,6 +40866,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
     strokeOffsetVal = util.isFunction(m_this.style('strokeOffset')) ? undefined : strokeOffsetFunc() || 0;
     strokeOpacityVal = util.isFunction(m_this.style('strokeOpacity')) ? undefined : strokeOpacityFunc();
     strokeWidthVal = util.isFunction(m_this.style('strokeWidth')) ? undefined : strokeWidthFunc();
+    uniformVal = util.isFunction(m_this.style('uniformLine')) ? undefined : uniformFunc();
 
     if (miterLimit !== undefined) {
       /* We impose a limit no matter what, since otherwise the growth is
@@ -40946,6 +40975,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         continue;
       }
 
+      uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
       d = data[i];
       closedVal = closed[i];
       firstPosIdx3 = posIdx3;
@@ -40975,13 +41005,27 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
           v.next = j + 1 < lineItem.length ? posIdx3 + 3 : closedVal ? j !== lidx ? firstPosIdx3 + 3 : firstPosIdx3 + 6 - closedVal * 3 : posIdx3;
         }
 
-        v.strokeWidth = strokeWidthVal === undefined ? strokeWidthFunc(lineItemData, lidx, d, i) : strokeWidthVal;
-        v.strokeColor = strokeColorVal === undefined ? strokeColorFunc(lineItemData, lidx, d, i) : strokeColorVal;
-        v.strokeOpacity = strokeOpacityVal === undefined ? strokeOpacityFunc(lineItemData, lidx, d, i) : strokeOpacityVal;
+        if (uniform && j > 0) {
+          if (j === 1) {
+            v.strokeWidth = vert[0].strokeWidth;
+            v.strokeColor = vert[0].strokeColor;
+            v.strokeOpacity = vert[0].strokeOpacity;
+          }
+        } else {
+          v.strokeWidth = strokeWidthVal === undefined ? strokeWidthFunc(lineItemData, lidx, d, i) : strokeWidthVal;
+          v.strokeColor = strokeColorVal === undefined ? strokeColorFunc(lineItemData, lidx, d, i) : strokeColorVal;
+          v.strokeOpacity = strokeOpacityVal === undefined ? strokeOpacityFunc(lineItemData, lidx, d, i) : strokeOpacityVal;
+        }
 
         if (updateFlags) {
           if (strokeOffsetVal !== 0) {
-            v.strokeOffset = (strokeOffsetVal === undefined ? strokeOffsetFunc(lineItemData, lidx, d, i) : strokeOffsetVal) || 0;
+            if (uniform && j > 0) {
+              if (j === 1) {
+                v.strokeOffset = vert[0].strokeOffset;
+              }
+            } else {
+              v.strokeOffset = (strokeOffsetVal === undefined ? strokeOffsetFunc(lineItemData, lidx, d, i) : strokeOffsetVal) || 0;
+            }
 
             if (v.strokeOffset) {
               /* we use 11 bits to store the offset, and we want to store values
@@ -43411,7 +43455,8 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         fillOpacityVal,
         fillFunc,
         fillVal,
-        uniformPolyFunc,
+        uniformFunc,
+        uniformVal,
         uniform,
         indices,
         items = [],
@@ -43439,7 +43484,8 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
     fillOpacityVal = util.isFunction(m_this.style('fillOpacity')) ? undefined : fillOpacityFunc();
     fillFunc = m_this.style.get('fill');
     fillVal = util.isFunction(m_this.style('fill')) ? undefined : fillFunc();
-    uniformPolyFunc = m_this.style.get('uniformPolygon');
+    uniformFunc = m_this.style.get('uniformPolygon');
+    uniformVal = util.isFunction(m_this.style('uniformPolygon')) ? undefined : uniformFunc();
 
     if (!onlyStyle) {
       posFunc = m_this.style.get('position');
@@ -43547,7 +43593,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
       item = items[k].item;
       itemIndex = items[k].itemIndex;
       original = items[k].original;
-      uniform = uniformPolyFunc(item, itemIndex);
+      uniform = uniformVal === undefined ? uniformFunc(item, itemIndex) : uniformVal;
       opacity = fillOpacityVal;
 
       if (uniform) {