@antv/l7-layers 2.16.1 → 2.16.2

package/es/core/CommonStyleAttribute.js

@@ -0,0 +1,66 @@
+import { AttributeType, gl } from '@antv/l7-core';
+export function getCommonStyleAttributeOptions(name) {
+  switch (name) {
+    case 'stroke':
+      return {
+        name: 'stroke',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Stroke',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 4,
+          update: function update(feature) {
+            var _feature$stroke = feature.stroke,
+              stroke = _feature$stroke === void 0 ? [1, 1, 1, 1] : _feature$stroke;
+            return stroke;
+          }
+        }
+      };
+    case 'opacity':
+      return {
+        name: 'opacity',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Opacity',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.STATIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 1,
+          update: function update(feature) {
+            var _feature$opacity = feature.opacity,
+              op = _feature$opacity === void 0 ? 1 : _feature$opacity;
+            return [op];
+          }
+        }
+      };
+    case 'offsets':
+      return {
+        name: 'offsets',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Offsets',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.STATIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 2,
+          update: function update(feature) {
+            var epo = feature.offsets;
+            return epo;
+          }
+        }
+      };
+    default:
+      return undefined;
+  }
+}

package/es/core/LayerPickService.js

@@ -4,25 +4,21 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { TYPES } from '@antv/l7-core';
 import { lngLatInExtent } from '@antv/l7-utils';
-
 var BaseLayerPickService = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
     _classCallCheck(this, BaseLayerPickService);
-
     this.layer = layer;
   }
-
   _createClass(BaseLayerPickService, [{
     key: "pickRender",
     value: function pickRender(target) {
       var container = this.layer.getContainer();
       var layerService = container.get(TYPES.ILayerService);
-      var layer = this.layer; // 瓦片图层的拾取绘制
-
+      var layer = this.layer;
+      // 瓦片图层的拾取绘制
       if (layer.tileLayer) {
         return layer.tileLayer.pickRender(target);
       }
-
       layer.hooks.beforePickingEncode.call();
       layerService.renderTileLayerMask(layer);
       layer.renderModels({
@@ -35,11 +31,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function pick(layer, target) {
       var container = this.layer.getContainer();
       var pickingService = container.get(TYPES.IPickingService);
-
       if (layer.type === 'RasterLayer') {
         return this.pickRasterLayer(layer, target);
       }
-
       this.pickRender(target);
       return pickingService.pickFromPickingFBO(layer, target);
     }
@@ -60,7 +54,6 @@ var BaseLayerPickService = /*#__PURE__*/function () {
         rasterValue: null
       };
       var adviceTarget = parent ? parent : layer;
-
       if (isPick) {
         var rasterValue = this.readRasterValue(layer, extent, mapService, target.x, target.y);
         layerTarget.rasterValue = rasterValue;
@@ -79,24 +72,24 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     key: "readRasterValue",
     value: function readRasterValue(layer, bbox, mapService, x, y) {
       var rasterData = layer.getSource().data.dataArray[0];
-
       var _bbox = _slicedToArray(bbox, 4),
-          _bbox$ = _bbox[0],
-          minLng = _bbox$ === void 0 ? 0 : _bbox$,
-          _bbox$2 = _bbox[1],
-          minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-          _bbox$3 = _bbox[2],
-          maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-          _bbox$4 = _bbox[3],
-          maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
-
+        _bbox$ = _bbox[0],
+        minLng = _bbox$ === void 0 ? 0 : _bbox$,
+        _bbox$2 = _bbox[1],
+        minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
+        _bbox$3 = _bbox[2],
+        maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
+        _bbox$4 = _bbox[3],
+        maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
       var tileXY = mapService.lngLatToContainer([minLng, minLat]);
       var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
       var tilePixelWidth = tileMaxXY.x - tileXY.x;
       var tilePixelHeight = tileXY.y - tileMaxXY.y;
-      var pos = [(x - tileXY.x) / tilePixelWidth, // x
+      var pos = [(x - tileXY.x) / tilePixelWidth,
+      // x
       (y - tileMaxXY.y) / tilePixelHeight // y
       ];
+
       var tileWidth = rasterData.width || 1;
       var tileHeight = rasterData.height || 1;
       var indexX = Math.floor(pos[0] * tileWidth);
@@ -108,13 +101,12 @@ var BaseLayerPickService = /*#__PURE__*/function () {
   }, {
     key: "selectFeature",
     value: function selectFeature(pickedColors) {
-      var layer = this.layer; // @ts-ignore
-
+      var layer = this.layer;
+      // @ts-ignore
       var _pickedColors = _slicedToArray(pickedColors, 3),
-          r = _pickedColors[0],
-          g = _pickedColors[1],
-          b = _pickedColors[2];
-
+        r = _pickedColors[0],
+        g = _pickedColors[1],
+        b = _pickedColors[2];
       layer.hooks.beforeSelect.call([r, g, b]);
     }
   }, {
@@ -122,10 +114,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function highlightPickedFeature(pickedColors) {
       // @ts-ignore
       var _pickedColors2 = _slicedToArray(pickedColors, 3),
-          r = _pickedColors2[0],
-          g = _pickedColors2[1],
-          b = _pickedColors2[2];
-
+        r = _pickedColors2[0],
+        g = _pickedColors2[1],
+        b = _pickedColors2[2];
       this.layer.hooks.beforeHighlight.call([r, g, b]);
     }
   }, {
@@ -134,8 +125,6 @@ var BaseLayerPickService = /*#__PURE__*/function () {
       return this.layer.getSource().getFeatureById(pickedFeatureIdx);
     }
   }]);
-
   return BaseLayerPickService;
 }();
-
 export { BaseLayerPickService as default };

package/es/core/TextureService.js

@@ -2,28 +2,23 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { TYPES } from '@antv/l7-core';
 import { generateCatRamp, generateColorRamp, generateCustomRamp, generateLinearRamp, generateQuantizeRamp } from '@antv/l7-utils';
-
 var TextureService = /*#__PURE__*/function () {
   function TextureService(layer) {
     _classCallCheck(this, TextureService);
-
     this.layer = layer;
     var container = this.layer.getContainer();
     this.rendererService = container.get(TYPES.IRendererService);
   }
-
   _createClass(TextureService, [{
     key: "getColorTexture",
     value: function getColorTexture(colorRamp, domain) {
       // TODO 支持传入图片
       var currentkey = this.getTextureKey(colorRamp, domain);
-
       if (this.key === currentkey) {
         return this.colorTexture;
       } else {
         this.createColorTexture(colorRamp, domain);
       }
-
       this.key = currentkey;
       return this.colorTexture;
     }
@@ -51,7 +46,6 @@ var TextureService = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$colorTexture;
-
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
     }
   }, {
@@ -60,16 +54,12 @@ var TextureService = /*#__PURE__*/function () {
       switch (colorRamp.type) {
         case 'cat':
           return generateCatRamp(colorRamp);
-
         case 'quantize':
           return generateQuantizeRamp(colorRamp);
-
         case 'custom':
           return generateCustomRamp(colorRamp, domain);
-
         case 'linear':
           return generateLinearRamp(colorRamp, domain);
-
         default:
           return generateColorRamp(colorRamp);
       }
@@ -78,12 +68,9 @@ var TextureService = /*#__PURE__*/function () {
     key: "getTextureKey",
     value: function getTextureKey(colorRamp, domain) {
       var _colorRamp$positions;
-
       return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
-
   return TextureService;
 }();
-
 export { TextureService as default };

package/es/core/interface.d.ts

@@ -1,6 +1,5 @@
-import { IAnimateOption, IMapService, ITexture2D } from '@antv/l7-core';
+import { IAnimateOption, IMapService, ITexture2D, StyleAttributeField, StyleAttributeOption } from '@antv/l7-core';
 import { IColorRamp } from '@antv/l7-utils';
-import { styleOffset } from '../core/BaseModel';
 import { anchorType } from '../utils/symbol-layout';
 export declare enum lineStyleType {
     'solid' = 0,
@@ -91,7 +90,7 @@ export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
         dir: string;
     };
     lightEnable: boolean;
-    offsets?: styleOffset;
+    offsets?: [number, number];
     unit?: SizeUnitType;
     rotation?: number;
     speed?: number;
@@ -227,4 +226,15 @@ export interface IRasterTerrainLayerStyleOptions extends IBaseRasterLayerStyleOp
     bScaler?: number;
     offset?: number;
 }
+export interface IFlowLineStyleOptions extends IBaseLayerStyleOptions {
+    gapWidth?: number;
+    offsets?: [number, number];
+    stroke?: string;
+    strokeOpacity?: number;
+    strokeWidth?: number;
+}
+export interface IStyleEncodeAttributeOptions {
+    field: StyleAttributeField;
+    values?: StyleAttributeOption;
+}
 export {};

package/es/core/interface.js

@@ -1,37 +1,30 @@
-export var lineStyleType;
-
-(function (lineStyleType) {
+export var lineStyleType = /*#__PURE__*/function (lineStyleType) {
   lineStyleType[lineStyleType["solid"] = 0] = "solid";
   lineStyleType[lineStyleType["dash"] = 1] = "dash";
-})(lineStyleType || (lineStyleType = {}));
-
-export var LinearDir;
-
-(function (LinearDir) {
+  return lineStyleType;
+}({});
+export var LinearDir = /*#__PURE__*/function (LinearDir) {
   LinearDir["VERTICAL"] = "vertical";
   LinearDir["HORIZONTAL"] = "horizontal";
-})(LinearDir || (LinearDir = {}));
+  return LinearDir;
+}({});
+export var TextureBlend = /*#__PURE__*/function (TextureBlend) {
+  TextureBlend["NORMAL"] = "normal";
+  TextureBlend["REPLACE"] = "replace";
+  return TextureBlend;
+}({});
 
-export var TextureBlend;
 /**
  * 基础图层类型定义
  */
 
-(function (TextureBlend) {
-  TextureBlend["NORMAL"] = "normal";
-  TextureBlend["REPLACE"] = "replace";
-})(TextureBlend || (TextureBlend = {}));
-
-export var SizeUnitType;
-
-(function (SizeUnitType) {
+export var SizeUnitType = /*#__PURE__*/function (SizeUnitType) {
   SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
   SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
-})(SizeUnitType || (SizeUnitType = {}));
-
-export var CanvasUpdateType;
-
-(function (CanvasUpdateType) {
+  return SizeUnitType;
+}({});
+export var CanvasUpdateType = /*#__PURE__*/function (CanvasUpdateType) {
   CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
-})(CanvasUpdateType || (CanvasUpdateType = {}));
+  return CanvasUpdateType;
+}({});

package/es/core/shape/Path.js

@@ -1,47 +1,40 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 var _geometryShape;
-
-export var ShapeType3D;
-
-(function (ShapeType3D) {
+export var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
   ShapeType3D["HEXAGONCOLUMN"] = "hexagonColumn";
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
-})(ShapeType3D || (ShapeType3D = {}));
-
-export var ShapeType2D;
-/**
- * 生成规则多边形顶点个数
- * @param pointCount  顶点个数 3 => 三角形
- * @param start 顶点起始角度 调整图形的方向
- */
-
-(function (ShapeType2D) {
+  return ShapeType3D;
+}({});
+export var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
   ShapeType2D["CIRCLE"] = "circle";
   ShapeType2D["SQUARE"] = "square";
   ShapeType2D["TRIANGLE"] = "triangle";
   ShapeType2D["HEXAGON"] = "hexagon";
   ShapeType2D["PENTAGON"] = "pentagon";
-})(ShapeType2D || (ShapeType2D = {}));
+  return ShapeType2D;
+}({});
 
+/**
+ * 生成规则多边形顶点个数
+ * @param pointCount  顶点个数 3 => 三角形
+ * @param start 顶点起始角度 调整图形的方向
+ */
 export function polygonPath(pointCount) {
   var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var step = Math.PI * 2 / pointCount;
   var line = [];
-
   for (var i = 0; i < pointCount; i++) {
     line.push(step * i + start * Math.PI / 12);
   }
-
   var path = line.map(function (t) {
     var x = Math.sin(t + Math.PI / 4);
     var y = Math.cos(t + Math.PI / 4);
     return [x, y, 0];
-  }); // path.push(path[0]);
-
+  });
+  // path.push(path[0]);
   return path;
 }
 export function circle() {

package/es/core/shape/extrude.js

@@ -2,7 +2,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { lngLatToMeters } from '@antv/l7-utils';
 import earcut from 'earcut';
 import { vec3 } from 'gl-matrix';
-
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
  * @param paths 路径数据组
@@ -11,18 +10,16 @@ import { vec3 } from 'gl-matrix';
 export default function extrudePolygon(path) {
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
-
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-
   var n = path[0].length;
   var flattengeo = earcut.flatten(path);
   var vertices = flattengeo.vertices,
-      dimensions = flattengeo.dimensions;
+    dimensions = flattengeo.dimensions;
   var positions = [];
-  var indexArray = []; // 设置顶部z值
-
+  var indexArray = [];
+  // 设置顶部z值
   for (var j = 0; j < vertices.length / dimensions; j++) {
     if (dimensions === 2) {
       positions.push(vertices[j * 2], vertices[j * 2 + 1], 1);
@@ -30,29 +27,23 @@ export default function extrudePolygon(path) {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1);
     }
   }
-
   var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, _toConsumableArray(triangles));
-
-  var _loop = function _loop(i) {
+  var _loop = function _loop() {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
-
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
-
     var indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
     indexArray.push.apply(indexArray, _toConsumableArray([0, 2, 1, 2, 3, 1].map(function (v) {
       return v + indexOffset;
     })));
   };
-
   for (var i = 0; i < n; i++) {
-    _loop(i);
+    _loop();
   }
-
   return {
     positions: positions,
     index: indexArray
@@ -70,72 +61,72 @@ export function extrude_PolygonNormal(path) {
   var needFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
-
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-
   var n = path[0].length;
   var flattengeo = earcut.flatten(path);
   var vertices = flattengeo.vertices,
-      dimensions = flattengeo.dimensions;
+    dimensions = flattengeo.dimensions;
   var positions = [];
   var indexArray = [];
-  var normals = []; // 设置顶部z值 position uv
-
+  var normals = [];
+  // 设置顶部z值 position uv
   for (var j = 0; j < vertices.length / dimensions; j++) {
-    if (dimensions === 2) {
-      positions.push(vertices[j * 2], vertices[j * 2 + 1], 1, -1, -1);
-    } else {
-      positions.push(vertices[j * 3], vertices[j * 3 + 1], 1, -1, -1);
-    }
+    positions.push(vertices[j * dimensions],
+    // x
+    vertices[j * dimensions + 1],
+    // y
+    1,
+    // z
+    -1,
+    // 顶部uv
+    -1 // 顶部uv
+    );
 
     normals.push(0, 0, 1);
   }
-
   var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, _toConsumableArray(triangles));
-
-  var _loop2 = function _loop2(i) {
+  // 设置侧面
+  var _loop2 = function _loop2() {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
-
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
-
     var indexOffset = positions.length / 5;
-    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1, 0, prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
+    // 侧面四顶点
+    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1,
+    // 侧面 低uv
+    0,
+    // 侧面低 uv
+    prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
     var normal = computeVertexNormals([nextPoint[0], nextPoint[1], 1], [prePoint[0], prePoint[1], 0], [prePoint[0], prePoint[1], 1], needFlat);
     normals.push.apply(normals, _toConsumableArray(normal).concat(_toConsumableArray(normal), _toConsumableArray(normal), _toConsumableArray(normal)));
     indexArray.push.apply(indexArray, _toConsumableArray([1, 2, 0, 3, 2, 1].map(function (v) {
       return v + indexOffset;
     })));
   };
-
   for (var i = 0; i < n; i++) {
-    _loop2(i);
+    _loop2();
   }
-
   return {
     positions: positions,
     index: indexArray,
     normals: normals
   };
 }
-
 function computeVertexNormals(p1, p2, p3) {
   var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var cb = vec3.create();
   var ab = vec3.create();
   var normal = vec3.create();
-
   if (needFlat) {
     p1 = lngLatToMeters(p1);
     p2 = lngLatToMeters(p2);
     p3 = lngLatToMeters(p3);
   }
-
   var pA = vec3.fromValues.apply(vec3, _toConsumableArray(p1));
   var pB = vec3.fromValues.apply(vec3, _toConsumableArray(p2));
   var pC = vec3.fromValues.apply(vec3, _toConsumableArray(p3));

package/es/core/triangulation.d.ts

@@ -47,6 +47,18 @@ export declare function LineTriangulation(feature: IEncodeFeature): {
     indexes: number[];
     size: number;
 };
+export declare function FlowLineFillTriangulation(feature: IEncodeFeature): {
+    vertices: any[];
+    normals: number[];
+    indices: number[];
+    size: number;
+};
+export declare function FlowLineStrokeTriangulation(feature: IEncodeFeature): {
+    vertices: any[];
+    normals: number[];
+    indices: number[];
+    size: number;
+};
 export declare function SimpleLineTriangulation(feature: IEncodeFeature): {
     vertices: any[];
     indices: never[];