@antv/l7-layers 2.16.1 → 2.16.2

package/es/heatmap/triangulation.js

@@ -6,10 +6,8 @@ export function heatMap3DTriangulation(width, height) {
   var gridY1 = height + 1;
   var widthHalf = width / 2;
   var heightHalf = height / 2;
-
   for (var iy = 0; iy < gridY1; iy++) {
     var y = iy - heightHalf;
-
     for (var ix = 0; ix < gridX1; ix++) {
       var x = ix - widthHalf;
       vertices.push(x / widthHalf, -y / heightHalf, 0);
@@ -17,7 +15,6 @@ export function heatMap3DTriangulation(width, height) {
       uvs.push(1 - iy / height);
     }
   }
-
   for (var _iy = 0; _iy < height; _iy++) {
     for (var _ix = 0; _ix < width; _ix++) {
       var a = _ix + gridX1 * _iy;
@@ -28,7 +25,6 @@ export function heatMap3DTriangulation(width, height) {
       indices.push(b, c, d);
     }
   }
-
   return {
     vertices: vertices,
     indices: indices,

package/es/image/index.js

@@ -7,61 +7,44 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import BaseLayer from "../core/BaseLayer";
 import ImageModels from "./models/index";
-
 var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(ImageLayer, _BaseLayer);
-
   var _super = _createSuper(ImageLayer);
-
   function ImageLayer() {
     var _this;
-
     _classCallCheck(this, ImageLayer);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
-
     _defineProperty(_assertThisInitialized(_this), "type", 'ImageLayer');
-
     return _this;
   }
-
   _createClass(ImageLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var modelType;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new ImageModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              modelType = this.getModelType();
+              this.layerModel = new ImageModels[modelType](this);
+              _context.next = 4;
+              return this.initLayerModels();
+            case 4:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -79,8 +62,6 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
       return 'image';
     }
   }]);
-
   return ImageLayer;
 }(BaseLayer);
-
 export { ImageLayer as default };

package/es/image/models/image.js

@@ -5,39 +5,28 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import { AttributeType, gl } from '@antv/l7-core';
 import { isMini } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
-
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
 var ImageFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n  if(gl_FragColor.a < 0.01)\n    discard;\n}\n";
-
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
 var ImageVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
-
 var ImageModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ImageModel, _BaseModel);
-
   var _super = _createSuper(ImageModel);
-
   function ImageModel() {
     _classCallCheck(this, ImageModel);
-
     return _super.apply(this, arguments);
   }
-
   _createClass(ImageModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          opacity = _ref.opacity;
-
+        opacity = _ref.opacity;
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture
@@ -48,97 +37,81 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this = this;
-
         var source, createTexture2D, canvas, img, imageData, model;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-
-                if (!isMini) {
-                  _context.next = 11;
-                  break;
-                }
-
-                // @ts-ignore
-                canvas = this.layerService.sceneService.getSceneConfig().canvas;
-                img = canvas.createImage();
-                img.crossOrigin = 'anonymous';
-                img.src = source.data.originData;
-
-                img.onload = function () {
-                  _this.texture = createTexture2D({
-                    data: img,
-                    width: img.width,
-                    height: img.height
-                  });
-
-                  _this.layerService.reRender();
-                };
-
-                _context.next = 15;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              source = this.layer.getSource();
+              createTexture2D = this.rendererService.createTexture2D;
+              this.texture = createTexture2D({
+                height: 0,
+                width: 0
+              });
+              if (!isMini) {
+                _context.next = 11;
                 break;
-
-              case 11:
-                _context.next = 13;
-                return source.data.images;
-
-              case 13:
-                imageData = _context.sent;
-                this.texture = createTexture2D({
-                  data: imageData[0],
-                  width: imageData[0].width,
-                  height: imageData[0].height,
-                  mag: gl.LINEAR,
-                  min: gl.LINEAR
+              }
+              // @ts-ignore
+              canvas = this.layerService.sceneService.getSceneConfig().canvas;
+              img = canvas.createImage();
+              img.crossOrigin = 'anonymous';
+              img.src = source.data.originData;
+              img.onload = function () {
+                _this.texture = createTexture2D({
+                  data: img,
+                  width: img.width,
+                  height: img.height
                 });
-
-              case 15:
-                _context.next = 17;
-                return this.layer.buildLayerModel({
-                  moduleName: 'rasterImage',
-                  vertexShader: ImageVert,
-                  fragmentShader: ImageFrag,
-                  triangulation: RasterImageTriangulation,
-                  primitive: gl.TRIANGLES,
-                  blend: {
-                    // Tip: 优化显示效果
-                    enable: true
-                  },
-                  depth: {
-                    enable: false
-                  }
-                });
-
-              case 17:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 19:
-              case "end":
-                return _context.stop();
-            }
+                _this.layerService.reRender();
+              };
+              _context.next = 15;
+              break;
+            case 11:
+              _context.next = 13;
+              return source.data.images;
+            case 13:
+              imageData = _context.sent;
+              this.texture = createTexture2D({
+                data: imageData[0],
+                width: imageData[0].width,
+                height: imageData[0].height,
+                mag: gl.LINEAR,
+                min: gl.LINEAR
+              });
+            case 15:
+              _context.next = 17;
+              return this.layer.buildLayerModel({
+                moduleName: 'rasterImage',
+                vertexShader: ImageVert,
+                fragmentShader: ImageFrag,
+                triangulation: RasterImageTriangulation,
+                primitive: gl.TRIANGLES,
+                blend: {
+                  // Tip: 优化显示效果
+                  enable: true
+                },
+                depth: {
+                  enable: false
+                }
+              });
+            case 17:
+              model = _context.sent;
+              return _context.abrupt("return", [model]);
+            case 19:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
     }
   }, {
@@ -146,23 +119,18 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", this.initModels());
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this.initModels());
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -186,8 +154,6 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
-
   return ImageModel;
 }(BaseModel);
-
 export { ImageModel as default };

package/es/index.js

@@ -4,7 +4,6 @@ import CityBuildingLayer from "./citybuliding/building";
 import BaseLayer from "./core/BaseLayer";
 import BaseModel from "./core/BaseModel";
 import GeometryLayer from "./Geometry"; // 逐步替换为 Geometry
-
 import HeatmapLayer from "./heatmap";
 import ImageLayer from "./image";
 import LineLayer from "./line/index";
@@ -14,8 +13,9 @@ import RasterLayer from "./raster";
 import TileDebugLayer from "./tile/tileFactory/layers/TileDebugLayer";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
-import WindLayer from "./wind"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
+import WindLayer from "./wind";
 
+// import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
 import DataMappingPlugin from "./plugins/DataMappingPlugin";
 import DataSourcePlugin from "./plugins/DataSourcePlugin";
 import FeatureScalePlugin from "./plugins/FeatureScalePlugin";
@@ -30,6 +30,7 @@ import RegisterStyleAttributePlugin from "./plugins/RegisterStyleAttributePlugin
 import ShaderUniformPlugin from "./plugins/ShaderUniformPlugin";
 import UpdateModelPlugin from "./plugins/UpdateModelPlugin";
 import UpdateStyleAttributePlugin from "./plugins/UpdateStyleAttributePlugin";
+
 /**
  * 校验传入参数配置项的正确性
  * @see /dev-docs/ConfigSchemaValidation.md
@@ -38,76 +39,67 @@ import UpdateStyleAttributePlugin from "./plugins/UpdateStyleAttributePlugin";
 //   .bind<ILayerPlugin>(TYPES.ILayerPlugin)
 //   .to(ConfigSchemaValidationPlugin)
 //   .inRequestScope();
-
 /**
  * 获取 Source
  */
-
 container.bind(TYPES.ILayerPlugin).to(DataSourcePlugin).inRequestScope();
 /**
  * 根据 StyleAttribute 创建 VertexAttribute
  */
-
 container.bind(TYPES.ILayerPlugin).to(RegisterStyleAttributePlugin).inRequestScope();
 /**
  * 根据 Source 创建 Scale
  */
-
 container.bind(TYPES.ILayerPlugin).to(FeatureScalePlugin).inRequestScope();
 /**
  * 使用 Scale 进行数据映射
  */
-
 container.bind(TYPES.ILayerPlugin).to(DataMappingPlugin).inRequestScope();
+
 /**
  * 更新地图样式配置项 如active, show, hide
  */
-
 container.bind(TYPES.ILayerPlugin).to(LayerStylePlugin).inRequestScope();
+
 /**
  * 初始化地图 Mask
  */
-
 container.bind(TYPES.ILayerPlugin).to(LayerMaskPlugin).inRequestScope();
+
 /**
  * 负责属性更新
  */
-
 container.bind(TYPES.ILayerPlugin).to(UpdateStyleAttributePlugin).inRequestScope();
+
 /**
  * 负责Model更新
  */
-
 container.bind(TYPES.ILayerPlugin).to(UpdateModelPlugin).inRequestScope();
+
 /**
  * Multi Pass 自定义渲染管线
  */
-
 container.bind(TYPES.ILayerPlugin).to(MultiPassRendererPlugin).inRequestScope();
 /**
  * 传入相机坐标系参数
  */
-
 container.bind(TYPES.ILayerPlugin).to(ShaderUniformPlugin).inRequestScope();
+
 /**
  * 传入动画参数
  */
-
 container.bind(TYPES.ILayerPlugin).to(LayerAnimateStylePlugin).inRequestScope();
 /**
  * 传入光照相关参数
  */
-
 container.bind(TYPES.ILayerPlugin).to(LightingPlugin).inRequestScope();
 /**
  * 负责拾取过程中 Encode 以及 Highlight 阶段及结束后恢复
  */
-
 container.bind(TYPES.ILayerPlugin).to(PixelPickingPlugin).inRequestScope();
 /**
  * 初始化Model
  */
-
 container.bind(TYPES.ILayerPlugin).to(LayerModelPlugin).inRequestScope();
 export * from "./core/interface";
 export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };

package/es/line/index.d.ts

@@ -4,6 +4,7 @@ import { ILineLayerStyleOptions } from '../core/interface';
 import { LineModelType } from './models';
 export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     type: string;
+    enableEncodeStyles: string[];
     arrowInsertCount: number;
     defaultSourceConfig: {
         data: {

package/es/line/index.js

@@ -8,34 +8,23 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import BaseLayer from "../core/BaseLayer";
 import LineModels from "./models";
-
 var LineLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(LineLayer, _BaseLayer);
-
   var _super = _createSuper(LineLayer);
-
   function LineLayer() {
     var _this;
-
     _classCallCheck(this, LineLayer);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
-
     _defineProperty(_assertThisInitialized(_this), "type", 'LineLayer');
-
+    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
     _defineProperty(_assertThisInitialized(_this), "arrowInsertCount", 0);
-
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [{
         lng1: 100,
@@ -53,36 +42,29 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         }
       }
     });
-
     return _this;
   }
-
   _createClass(LineLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var shape;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                shape = this.getModelType();
-                this.layerModel = new LineModels[shape](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              shape = this.getModelType();
+              this.layerModel = new LineModels[shape](this);
+              _context.next = 4;
+              return this.initLayerModels();
+            case 4:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -104,8 +86,8 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
           blend: 'additive'
         },
         tileLine: {},
-        halfLine: {},
-        earthArc3d: {}
+        earthArc3d: {},
+        flowline: {}
       };
       return defaultConfig[type];
     }
@@ -113,11 +95,9 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "getModelType",
     value: function getModelType() {
       var _shapeAttribute$scale;
-
       if (this.layerType) {
         return this.layerType;
       }
-
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
       var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       return shape || 'line';
@@ -129,12 +109,10 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
       if (this.getModelType() !== 'simple') {
         return filterData;
       }
-
       var dataArray = [];
       filterData.map(function (data) {
         if (Array.isArray(data.coordinates) && Array.isArray(data.coordinates[0]) && Array.isArray(data.coordinates[0][0])) {
           var object = _objectSpread({}, data);
-
           data.coordinates.map(function (d) {
             dataArray.push(_objectSpread(_objectSpread({}, object), {}, {
               coordinates: d
@@ -147,8 +125,6 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
       return dataArray;
     }
   }]);
-
   return LineLayer;
 }(BaseLayer);
-
 export { LineLayer as default };