@antv/l7-layers 2.20.19 → 2.21.0

package/es/index.js

@@ -1,4 +1,3 @@
-import { container, TYPES } from '@antv/l7-core';
 import CanvasLayer from "./canvas";
 import CityBuildingLayer from "./citybuliding/building";
 import BaseLayer from "./core/BaseLayer";
@@ -10,96 +9,10 @@ import LineLayer from "./line/index";
 import PointLayer from "./point";
 import PolygonLayer from "./polygon";
 import RasterLayer from "./raster";
+import TileLayer from "./tile/core/BaseLayer";
 import TileDebugLayer from "./tile/core/TileDebugLayer";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
 import WindLayer from "./wind";
-
-// import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
-import DataMappingPlugin from "./plugins/DataMappingPlugin";
-import DataSourcePlugin from "./plugins/DataSourcePlugin";
-import FeatureScalePlugin from "./plugins/FeatureScalePlugin";
-import LayerAnimateStylePlugin from "./plugins/LayerAnimateStylePlugin";
-import LayerMaskPlugin from "./plugins/LayerMaskPlugin";
-import LayerModelPlugin from "./plugins/LayerModelPlugin";
-import LayerStylePlugin from "./plugins/LayerStylePlugin";
-import LightingPlugin from "./plugins/LightingPlugin";
-import MultiPassRendererPlugin from "./plugins/MultiPassRendererPlugin";
-import PixelPickingPlugin from "./plugins/PixelPickingPlugin";
-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
- */
-// container
-//   .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 };
+export { BaseLayer, BaseModel, CanvasLayer, CityBuildingLayer, EarthLayer, GeometryLayer, HeatmapLayer, ImageLayer, LineLayer, MaskLayer, PointLayer, PolygonLayer, RasterLayer, TileDebugLayer, TileLayer, WindLayer };

package/es/line/models/arc.js

@@ -10,7 +10,7 @@ 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 { lodashUtil, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { LineArcTriangulation } from "../../core/triangulation";
@@ -22,7 +22,6 @@ var lineStyleObj = {
   solid: 0.0,
   dash: 1.0
 };
-var isNumber = lodashUtil.isNumber;
 var ArcModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ArcModel, _BaseModel);
   var _super = _createSuper(ArcModel);
@@ -94,7 +93,8 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonOptions = {
         u_animate: this.animateOption2Array(animateOption),
@@ -151,8 +151,8 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/arc_3d.js

@@ -92,7 +92,8 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonOptions = {
         u_animate: this.animateOption2Array(animateOption),
@@ -150,8 +151,8 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/line/models/great_circle.js

@@ -77,7 +77,8 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
         dashArray.push(0, 0);
       }
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
 
       // 转化渐变色
@@ -146,8 +147,8 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {
@@ -245,7 +246,6 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
           update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
             var texture = feature.texture;
-            // console.log('icon feature', feature)
             var _ref4 = iconMap[texture] || {
                 x: 0,
                 y: 0

package/es/line/models/line.js

@@ -21,10 +21,6 @@ import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var line_frag = "// #extension GL_OES_standard_derivatives : enable\n#define Animate 0.0\n#define LineTexture 1.0\n\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_dash_array;\n  vec4 u_blur;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed: 0.0;\n  float u_vertexScale: 1.0;\n  float u_raisingHeight: 0.0;\n  float u_strokeWidth: 0.0;\n  float u_textureBlend;\n  float u_line_texture;\n  float u_linearDir: 1.0;\n  float u_linearColor: 0;\n  float u_time;\n};\n\nin vec4 v_color;\nin vec4 v_stroke;\n// dash\nin vec4 v_dash_array;\nin float v_d_distance_ratio;\nin vec2 v_iconMapUV;\nin vec4 v_texture_data;\n\nout vec4 outputColor;\n#pragma include \"picking\"\n\n// [animate, duration, interval, trailLength],\nvoid main() {\n  if(u_dash_array!=vec4(0.0)){\n    float dashLength = mod(v_d_distance_ratio, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);\n    if(!(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength <  v_dash_array.x + v_dash_array.y + v_dash_array.z))) {\n      // \u865A\u7EBF\u90E8\u5206\n      discard;\n    };\n  }\n  float animateSpeed = 0.0; // \u8FD0\u52A8\u901F\u5EA6\n  float d_distance_ratio = v_texture_data.r; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  if(u_linearDir < 1.0) {\n    d_distance_ratio = v_texture_data.a;\n  }\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    outputColor = mix(u_sourceColor, u_targetColor, d_distance_ratio);\n    outputColor.a *= v_color.a;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     outputColor = v_color;\n  }\n  // anti-alias\n  // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));\n  if(u_animate.x == Animate) {\n      animateSpeed = u_time / u_animate.y;\n       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);\n      alpha = (alpha + u_animate.w -1.0) / u_animate.w;\n      alpha = smoothstep(0., 1., alpha);\n      outputColor.a *= alpha;\n  }\n\n  if(u_line_texture == LineTexture) { // while load texture\n    float aDistance = v_texture_data.g;      // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n    float d_texPixelLen = v_texture_data.b;  // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);\n    float v = v_texture_data.a;  // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n    // v = max(smoothstep(0.95, 1.0, v), v);\n    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;\n     vec4 pattern = texture(SAMPLER_2D(u_texture), uv);\n\n    if(u_textureBlend == 0.0) { // normal\n      pattern.a = 0.0;\n      outputColor += pattern;\n    } else { // replace\n        pattern.a *= v_color.a;\n        if(outputColor.a <= 0.0) {\n          pattern.a = 0.0;\n        }\n        outputColor = pattern;\n    }\n  } \n\n  float v = v_texture_data.a;\n  float strokeWidth = min(0.5, u_strokeWidth);\n  // \u7ED8\u5236 border\n  if(strokeWidth > 0.01) {\n    float borderOuterWidth = strokeWidth / 2.0;\n\n\n    if(v >= 1.0 - strokeWidth || v <= strokeWidth) {\n      if(v > strokeWidth) { // \u5916\u4FA7\n        float linear = smoothstep(0.0, 1.0, (v - (1.0 - strokeWidth))/strokeWidth);\n        //  float linear = step(0.0, (v - (1.0 - borderWidth))/borderWidth);\n        outputColor.rgb = mix(outputColor.rgb, v_stroke.rgb, linear);\n      } else if(v <= strokeWidth) {\n        float linear = smoothstep(0.0, 1.0, v/strokeWidth);\n        outputColor.rgb = mix(v_stroke.rgb, outputColor.rgb, linear);\n      }\n    }\n\n    if(v < borderOuterWidth) {\n      outputColor.a = mix(0.0, outputColor.a, v/borderOuterWidth);\n    } else if(v > 1.0 - borderOuterWidth) {\n      outputColor.a = mix(outputColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);\n    }\n  }\n\n  // blur\n  float blurV = v_texture_data.a;\n  if(blurV < 0.5) {\n    outputColor.a *= mix(u_blur.r, u_blur.g, blurV/0.5);\n  } else {\n    outputColor.a *= mix(u_blur.g, u_blur.b, (blurV - 0.5)/0.5);\n  }\n  \n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/line/line_vert.glsl' */
 var line_vert = "\n#define Animate 0.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec2 a_Size;\nlayout(location = 10) in vec3 a_DistanceAndIndexAndMiter;\nlayout(location = 13) in vec4 a_Normal_Total_Distance;\nlayout(location = 14) in vec2 a_iconMapUV;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_dash_array;\n  vec4 u_blur;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed: 0.0;\n  float u_vertexScale: 1.0;\n  float u_raisingHeight: 0.0;\n  float u_strokeWidth: 0.0;\n  float u_textureBlend;\n  float u_line_texture;\n  float u_linearDir: 1.0;\n  float u_linearColor: 0;\n  float u_time;\n};\n\n\nout vec4 v_color;\nout vec4 v_stroke;\n//dash\nout vec4 v_dash_array;\nout float v_d_distance_ratio;\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nout vec2 v_iconMapUV;\nout vec4 v_texture_data;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec2 a_DistanceAndIndex = a_DistanceAndIndexAndMiter.xy;\n  float a_Miter = a_DistanceAndIndexAndMiter.z;\n  vec3 a_Normal = a_Normal_Total_Distance.xyz;\n  float a_Total_Distance = a_Normal_Total_Distance.w;\n  //dash\u8F93\u51FA\n  v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_Total_Distance;\n  v_d_distance_ratio = a_DistanceAndIndex.x / a_Total_Distance;\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  float d_texPixelLen;    // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n  v_iconMapUV = a_iconMapUV;\n  d_texPixelLen = project_float_pixel(u_icon_step);\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n    d_texPixelLen *= 10.0;\n  }\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n  v_stroke = stroke;\n\n  vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);\n  \n  vec2 offset = project_pixel(size.xy);\n\n  float lineDistance = a_DistanceAndIndex.x;\n  float currentLinePointRatio = lineDistance / a_Total_Distance;\n \n\n  float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // \u7EBF\u6A2A\u5411\u504F\u79FB\u7684\u8DDD\u79BB\uFF08\u5411\u4E24\u4FA7\u504F\u79FB\u7684\u548C\uFF09\n  float linePixelSize = project_pixel(a_Size.x) * 2.0;  // \u5B9A\u70B9\u4F4D\u7F6E\u504F\u79FB\uFF0C\u6309\u5730\u56FE\u7B49\u7EA7\u7F29\u653E\u540E\u7684\u8DDD\u79BB \u5355\u4FA7 * 2\n  float texV = lineOffsetWidth/linePixelSize; // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n  \n  v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);\n  // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5 vertex height\n  float lineHeight = a_Size.y; // size \u7B2C\u4E8C\u4E2A\u53C2\u6570\u4EE3\u8868\u7684\u9AD8\u5EA6 [linewidth, lineheight]\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    lineHeight *= 0.2; // \u4FDD\u6301\u548C amap/mapbox \u4E00\u81F4\u7684\u6548\u679C\n    h *= 0.2;\n    if(u_heightfixed < 1.0) {\n      lineHeight = project_pixel(a_Size.y);\n    }\n    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));\n  } else {\n    // mapbox -  amap\n    \n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // mapbox\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      h *= mapboxZoomScale;\n      h += u_raisingHeight * mapboxZoomScale;\n      if(u_heightfixed > 0.0) {\n        lineHeight *= mapboxZoomScale;\n      }\n      \n    } else {\n      // amap\n      h += u_raisingHeight;\n      // lineHeight \u9876\u70B9\u504F\u79FB\u9AD8\u5EA6\n      if(u_heightfixed < 1.0) {\n        lineHeight *= pow(2.0, 20.0 - u_Zoom);\n      }\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
-var lineStyleObj = {
-  solid: 0.0,
-  dash: 1.0
-};
 var LineModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(LineModel, _BaseModel);
   var _super = _createSuper(LineModel);
@@ -100,7 +96,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         u_dash_array.push(0, 0);
       }
       if (this.rendererService.getDirty() && this.texture) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var _ref2 = this.layer.getLayerConfig(),
         animateOption = _ref2.animateOption;
@@ -175,8 +172,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {
@@ -188,7 +185,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
-              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; // console.log(frag)
+              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
               this.layer.triangulation = LineTriangulation;
               _context2.next = 5;
               return this.layer.buildLayerModel({

package/es/line/models/simple_line.js

@@ -8,7 +8,7 @@ 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 { lodashUtil, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { SimpleLineTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
@@ -16,7 +16,6 @@ var simple_line_frag = "\nlayout(std140) uniform commonUniorm {\n  vec4 u_source
 /* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
 var simple_line_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec4 a_SizeDistanceAndTotalDistance;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec4 u_dash_array;\n  float u_vertexScale: 1.0;\n  float u_linearColor: 0;\n};\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nout vec4 v_color;\nout float v_distanceScale;\nout vec4 v_dash_array;\n\nvoid main() {\n  //dash\u8F93\u51FA\n  v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_SizeDistanceAndTotalDistance.a;\n\n  v_color = a_Color; \n  v_distanceScale = a_SizeDistanceAndTotalDistance.b / a_SizeDistanceAndTotalDistance.a;\n  v_color.a = v_color.a * opacity;\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_SizeDistanceAndTotalDistance.y) + h * 0.2, 1.0));\n  } else {\n    float lineHeight = a_SizeDistanceAndTotalDistance.y;\n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n    }\n\n    // amap1.x\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      lineHeight *= pow(2.0, 20.0 - u_Zoom);\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n    gl_PointSize = 10.0;\n  }\n}\n";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
-var isNumber = lodashUtil.isNumber;
 var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(SimpleLineModel, _BaseModel);
   var _super = _createSuper(SimpleLineModel);

package/es/line/models/wall.js

@@ -68,7 +68,8 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
       var _ref2 = this.layer.getLayerConfig(),
         animateOption = _ref2.animateOption;
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
 
       // 转化渐变色
@@ -130,8 +131,8 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      var _this$texture2;
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/plugins/DataMappingPlugin.d.ts

@@ -1,11 +1,8 @@
-import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 export default class DataMappingPlugin implements ILayerPlugin {
-    private readonly mapService;
-    private readonly fontService;
-    apply(layer: ILayer, { styleAttributeService, }: {
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    private mapService;
+    private fontService;
+    apply(layer: ILayer, { styleAttributeService, mapService, fontService }: L7Container): void;
     private generateMaping;
     private mapping;
     private adjustData2Amap2Coordinates;

package/es/plugins/DataMappingPlugin.js

@@ -1,29 +1,24 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import { lodashUtil, normalize, rgb2arr } from '@antv/l7-utils';
-import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 var cloneDeep = lodashUtil.cloneDeep;
-var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService), _dec3 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var DataMappingPlugin = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
-    _initializerDefineProperty(this, "mapService", _descriptor, this);
-    _initializerDefineProperty(this, "fontService", _descriptor2, this);
   }
   _createClass(DataMappingPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-      var styleAttributeService = _ref.styleAttributeService;
+      var styleAttributeService = _ref.styleAttributeService,
+        mapService = _ref.mapService,
+        fontService = _ref.fontService;
+      this.mapService = mapService;
+      this.fontService = fontService;
       layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -276,15 +271,5 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }]);
   return DataMappingPlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "fontService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}();
 export { DataMappingPlugin as default };

package/es/plugins/DataSourcePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin, IMapService } from '@antv/l7-core';
-import 'reflect-metadata';
 export default class DataSourcePlugin implements ILayerPlugin {
     protected mapService: IMapService;
     apply(layer: ILayer): void;

package/es/plugins/DataSourcePlugin.js

@@ -1,13 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import Source from '@antv/l7-source';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var DataSourcePlugin = /*#__PURE__*/function () {
   function DataSourcePlugin() {
     _classCallCheck(this, DataSourcePlugin);
   }
@@ -15,7 +12,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     key: "apply",
     value: function apply(layer) {
       var _this = this;
-      this.mapService = layer.getContainer().get(TYPES.IMapService);
+      this.mapService = layer.getContainer().mapService;
       layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var source, _ref2, data, options;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -102,5 +99,5 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return DataSourcePlugin;
-}()) || _class);
+}();
 export { DataSourcePlugin as default };

package/es/plugins/FeatureScalePlugin.d.ts

@@ -1,13 +1,10 @@
-import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
 export default class FeatureScalePlugin implements ILayerPlugin {
     private scaleOptions;
-    apply(layer: ILayer, { styleAttributeService, }: {
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
     private isNumber;
     private caculateScalesForAttributes;
     /**

package/es/plugins/FeatureScalePlugin.js

@@ -3,15 +3,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _scaleMap, _dec, _class;
+var _scaleMap;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage, ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
 import * as d3 from 'd3-scale';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import identity from "../utils/identityScale";
 var isNil = lodashUtil.isNil,
   isString = lodashUtil.isString,
@@ -21,7 +19,7 @@ var scaleMap = (_scaleMap = {}, _defineProperty(_scaleMap, ScaleTypes.LINEAR, d3
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
-var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var FeatureScalePlugin = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     _classCallCheck(this, FeatureScalePlugin);
     _defineProperty(this, "scaleOptions", {});
@@ -280,7 +278,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       // quantile domain 需要根据ID 进行去重
       var values = [];
       if (type === ScaleTypes.QUANTILE) {
-        // 根据 obejct 属性 _id 进行去重 
+        // 根据 obejct 属性 _id 进行去重
         var idMap = new Map();
         data === null || data === void 0 || data.forEach(function (obj) {
           idMap.set(obj._id, obj[field]);
@@ -336,5 +334,5 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
     }
   }]);
   return FeatureScalePlugin;
-}()) || _class);
+}();
 export { FeatureScalePlugin as default };

package/es/plugins/LayerAnimateStylePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 export default class LayerAnimateStylePlugin implements ILayerPlugin {
     apply(layer: ILayer): void;
 }

package/es/plugins/LayerAnimateStylePlugin.js

@@ -1,10 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     _classCallCheck(this, LayerAnimateStylePlugin);
   }
@@ -23,5 +20,5 @@ var LayerAnimateStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
     }
   }]);
   return LayerAnimateStylePlugin;
-}()) || _class);
+}();
 export { LayerAnimateStylePlugin as default };

package/es/plugins/LayerMaskPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */

package/es/plugins/LayerMaskPlugin.js

@@ -1,13 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     _classCallCheck(this, LayerStylePlugin);
   }
@@ -20,8 +16,6 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           enableMask = _layer$getLayerConfig.enableMask;
         // mask 初始化
         if (!layer.tileLayer && maskLayers && maskLayers.length > 0) {
-          var _layer$masks;
-          (_layer$masks = layer.masks).push.apply(_layer$masks, _toConsumableArray(maskLayers));
           layer.updateLayerConfig({
             mask: true && enableMask
           });
@@ -30,5 +24,5 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();
 export { LayerStylePlugin as default };

package/es/plugins/LayerModelPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * Layer Model 初始化，更新，销毁
  */

package/es/plugins/LayerModelPlugin.js

@@ -1,16 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage } from '@antv/l7-core';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
-import TileLayer from "../tile/core/BaseLayer";
+// import TileLayer from '../tile/core/BaseLayer';
 /**
  * Layer Model 初始化，更新，销毁
  */
-var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerModelPlugin = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     _classCallCheck(this, LayerModelPlugin);
   }
@@ -90,19 +87,18 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!layer.getSource().isTile) {
-                _context4.next = 4;
+                _context4.next = 3;
                 break;
               }
               layer.prepareBuildModel();
-              layer.tileLayer = new TileLayer(layer);
               return _context4.abrupt("return");
-            case 4:
+            case 3:
               layer.log(IDebugLog.BuildModelStart, ILayerStage.INIT);
-              _context4.next = 7;
+              _context4.next = 6;
               return _this.initLayerModel(layer);
-            case 7:
+            case 6:
               layer.log(IDebugLog.BuildModelEnd, ILayerStage.INIT);
-            case 8:
+            case 7:
             case "end":
               return _context4.stop();
           }
@@ -120,19 +116,18 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 return _context5.abrupt("return", false);
               case 2:
                 if (!layer.getSource().isTile) {
-                  _context5.next = 5;
+                  _context5.next = 4;
                   break;
                 }
-                layer.tileLayer = new TileLayer(layer);
                 return _context5.abrupt("return", false);
-              case 5:
+              case 4:
                 layer.log(IDebugLog.BuildModelStart, ILayerStage.UPDATE);
-                _context5.next = 8;
+                _context5.next = 7;
                 return _this.prepareLayerModel(layer);
-              case 8:
+              case 7:
                 layer.log(IDebugLog.BuildModelEnd, ILayerStage.UPDATE);
                 return _context5.abrupt("return", true);
-              case 10:
+              case 9:
               case "end":
                 return _context5.stop();
             }
@@ -145,5 +140,5 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerModelPlugin;
-}()) || _class);
+}();
 export { LayerModelPlugin as default };

package/es/plugins/LayerStylePlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */

package/es/plugins/LayerStylePlugin.js

@@ -1,12 +1,9 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-var _dec, _class;
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     _classCallCheck(this, LayerStylePlugin);
   }
@@ -26,5 +23,5 @@ var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
+}();
 export { LayerStylePlugin as default };