@antv/l7-layers 2.20.20 → 2.21.0

package/es/core/BaseLayer.js

@@ -2,7 +2,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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 _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -10,11 +9,8 @@ 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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
 var _excluded = ["passes"],
   _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "styleOption", "pickingEnabled"];
-var _dec, _class, _descriptor;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -23,10 +19,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, IDebugLog, ILayerStage, TYPES, lazyInject } from '@antv/l7-core';
-import Source from '@antv/l7-source';
+import { BlendType, IDebugLog, ILayerStage, globalConfigService } from '@antv/l7-core';
 import { encodePickingColor, lodashUtil } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
+import { createPlugins } from "../plugins";
 import { BlendTypes } from "../utils/blend";
 import { createMultiPassRenderer, normalizePasses } from "../utils/multiPassRender";
 import LayerPickService from "./LayerPickService";
@@ -41,7 +37,7 @@ var isEqual = lodashUtil.isEqual,
  * 分配 layer id
  */
 var layerIdCounter = 0;
-var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function (_ref) {
+var BaseLayer = /*#__PURE__*/function (_ref) {
   _inherits(BaseLayer, _ref);
   var _super = _createSuper(BaseLayer);
   function BaseLayer() {
@@ -97,7 +93,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     // 用于保存子图层对象
     _defineProperty(_assertThisInitialized(_this), "layerChildren", []);
     _defineProperty(_assertThisInitialized(_this), "masks", []);
-    _initializerDefineProperty(_assertThisInitialized(_this), "configService", _descriptor, _assertThisInitialized(_this));
+    _defineProperty(_assertThisInitialized(_this), "configService", globalConfigService);
     _defineProperty(_assertThisInitialized(_this), "animateOptions", {
       enable: false
     });
@@ -133,9 +129,70 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     _this.name = config.name || _this.id;
     _this.zIndex = config.zIndex || 0;
     _this.rawConfig = config;
+    _this.masks = config.maskLayers || [];
     return _this;
   }
   _createClass(BaseLayer, [{
+    key: "shaderModuleService",
+    get: function get() {
+      return this.container.shaderModuleService;
+    }
+  }, {
+    key: "cameraService",
+    get: function get() {
+      return this.container.cameraService;
+    }
+  }, {
+    key: "coordinateService",
+    get: function get() {
+      return this.container.coordinateSystemService;
+    }
+  }, {
+    key: "iconService",
+    get: function get() {
+      return this.container.iconService;
+    }
+  }, {
+    key: "fontService",
+    get: function get() {
+      return this.container.fontService;
+    }
+  }, {
+    key: "pickingService",
+    get: function get() {
+      return this.container.pickingService;
+    }
+  }, {
+    key: "rendererService",
+    get: function get() {
+      return this.container.rendererService;
+    }
+  }, {
+    key: "layerService",
+    get: function get() {
+      return this.container.layerService;
+    }
+  }, {
+    key: "debugService",
+    get: function get() {
+      return this.container.debugService;
+    }
+  }, {
+    key: "interactionService",
+    get: function get() {
+      return this.container.interactionService;
+    }
+  }, {
+    key: "mapService",
+    get: function get() {
+      return this.container.mapService;
+    }
+  }, {
+    key: "normalPassFactory",
+    get: function get() {
+      return this.container.normalPassFactory;
+    }
+  }, {
     key: "addMask",
     value: function addMask(layer) {
       this.masks.push(layer);
@@ -217,7 +274,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       if (!this.startInit) {
         this.needUpdateConfig = _objectSpread(_objectSpread({}, this.needUpdateConfig), configToUpdate);
       } else {
-        var sceneId = this.container.get(TYPES.SceneID);
+        var sceneId = this.container.id;
         // @ts-ignore
         // styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
         this.configService.setLayerConfig(sceneId, this.id, _objectSpread(_objectSpread(_objectSpread({}, this.configService.getLayerConfig(this.id)), this.needUpdateConfig), configToUpdate));
@@ -233,9 +290,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
      */
   }, {
     key: "setContainer",
-    value: function setContainer(container, sceneContainer) {
+    value: function setContainer(container) {
       this.container = container;
-      this.sceneContainer = sceneContainer;
     }
   }, {
     key: "getContainer",
@@ -258,7 +314,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 设置配置项
-              sceneId = this.container.get(TYPES.SceneID);
+              sceneId = this.container.id;
               this.startInit = true;
               // 初始化图层配置项
               // const { enableMultiPassRenderer = false } = this.rawConfig;
@@ -271,14 +327,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               // 全局容器服务
 
               // 场景容器服务
-              this.iconService = this.container.get(TYPES.IIconService);
-              this.fontService = this.container.get(TYPES.IFontService);
-              this.rendererService = this.container.get(TYPES.IRendererService);
-              this.layerService = this.container.get(TYPES.ILayerService);
-              this.debugService = this.container.get(TYPES.IDebugService);
-              this.interactionService = this.container.get(TYPES.IInteractionService);
-              this.pickingService = this.container.get(TYPES.IPickingService);
-              this.mapService = this.container.get(TYPES.IMapService);
               _this$getLayerConfig = this.getLayerConfig(), enableMultiPassRenderer = _this$getLayerConfig.enableMultiPassRenderer, passes = _this$getLayerConfig.passes;
               if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
                 // Tip: 兼容 multiPassRender 在 amap1 时存在的图层不同步问题 zoom
@@ -286,17 +334,13 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                   _this3.renderLayers();
                 });
               }
-              this.cameraService = this.container.get(TYPES.ICameraService);
-              this.coordinateService = this.container.get(TYPES.ICoordinateSystemService);
-              this.shaderModuleService = this.container.get(TYPES.IShaderModuleService);
-              this.postProcessingPassFactory = this.container.get(TYPES.IFactoryPostProcessingPass);
-              this.normalPassFactory = this.container.get(TYPES.IFactoryNormalPass);
+              this.postProcessingPassFactory = this.container.postProcessingPassFactory;
 
               // 图层容器服务
-              this.styleAttributeService = this.container.get(TYPES.IStyleAttributeService);
+              this.styleAttributeService = this.container.styleAttributeService;
               if (enableMultiPassRenderer) {
                 // 按需初始化 瓦片频繁报错
-                this.multiPassRenderer = this.container.get(TYPES.IMultiPassRenderer);
+                this.multiPassRenderer = this.container.multiPassRenderer;
                 this.multiPassRenderer.setLayer(this);
               }
               // 完成样式服务注册完成前添加的属性
@@ -322,20 +366,17 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               this.pendingStyleAttributes = [];
 
               // 获取插件集
-              this.plugins = this.container.getAll(TYPES.ILayerPlugin);
+              this.plugins = createPlugins();
               // 完成插件注册，传入场景和图层容器内的服务
               _iterator = _createForOfIteratorHelper(this.plugins);
               try {
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   plugin = _step.value;
-                  plugin.apply(this, {
-                    rendererService: this.rendererService,
-                    mapService: this.mapService,
-                    styleAttributeService: this.styleAttributeService,
-                    normalPassFactory: this.normalPassFactory,
-                    postProcessingPassFactory: this.postProcessingPassFactory
-                  });
+                  plugin.apply(this, this.container);
                 }
+                // if (this.getSource().isTile) {
+                //   this.tileLayer = new TileLayer(this);
+                // }
 
                 // 初始化其他服务
               } catch (err) {
@@ -349,9 +390,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               this.textureService = new TextureService(this);
               this.log(IDebugLog.LayerInitStart);
               // 触发 init 生命周期插件
-              _context.next = 31;
+              _context.next = 19;
               return this.hooks.init.promise();
-            case 31:
+            case 19:
               this.log(IDebugLog.LayerInitEnd);
               this.inited = true;
               // add mask layer
@@ -365,7 +406,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 type: 'add'
               });
               this.hooks.afterInit.call();
-            case 36:
+            case 24:
             case "end":
               return _context.stop();
           }
@@ -517,25 +558,17 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "setData",
     value: function setData(data, options) {
       var _this4 = this;
+      this.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
       if (this.inited) {
-        this.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
         this.layerSource.setData(data, options);
-        this.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
       } else {
         this.on('inited', function () {
-          _this4.log(IDebugLog.SourceInitStart, ILayerStage.UPDATE);
-          var currentSource = _this4.getSource();
-          if (!currentSource) {
-            // 执行 setData 的时候 source 还不存在（还未执行 addLayer）
-            _this4.source(new Source(data, options));
-          } else {
-            _this4.layerSource.setData(data, options);
-          }
-          _this4.layerSource.once('update', function () {
-            _this4.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
-          });
+          _this4.layerSource.setData(data, options);
         });
       }
+      this.layerSource.once('update', function () {
+        _this4.log(IDebugLog.SourceInitEnd, ILayerStage.UPDATE);
+      });
       return this;
     }
   }, {
@@ -1018,8 +1051,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       });
       this.removeAllListeners();
       this.isDestroyed = true;
-      // 解绑图层容器中的服务
-      // this.container.unbind(TYPES.IStyleAttributeService);
     }
   }, {
     key: "clear",
@@ -1115,11 +1146,11 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "getLegend",
     value: function getLegend(name) {
-      var _attribute$scale, _scales$0$option, _attribute$scale2;
+      var _attribute$scale, _scales$, _attribute$scale2;
       var attribute = this.styleAttributeService.getLayerStyleAttribute(name);
       var scales = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       return {
-        type: (_scales$0$option = scales[0].option) === null || _scales$0$option === void 0 ? void 0 : _scales$0$option.type,
+        type: (_scales$ = scales[0]) === null || _scales$ === void 0 || (_scales$ = _scales$.option) === null || _scales$ === void 0 ? void 0 : _scales$.type,
         field: attribute === null || attribute === void 0 || (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
         items: this.getLegendItems(name)
       };
@@ -1194,7 +1225,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
               _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
               createModel = this.rendererService.createModel;
               return _context3.abrupt("return", new Promise(function (resolve) {
-                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption),
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption, _this10),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
                   count = _this10$styleAttribut.count;
@@ -1524,10 +1555,5 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     }
   }]);
   return BaseLayer;
-}(EventEmitter), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class));
+}(EventEmitter);
 export { BaseLayer as default };

package/es/core/BaseModel.js

@@ -1,15 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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, _class, _descriptor;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { BlendType, lazyInject, MaskOperation, StencilType, TYPES } from '@antv/l7-core';
+import { BlendType, MaskOperation, StencilType } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
 import { BlendTypes } from "../utils/blend";
 import { getStencil as _getStencil, getStencilMask } from "../utils/stencil";
@@ -26,14 +22,9 @@ var shaderLocationMap = {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
-  // @lazyInject(TYPES.IIconService)
-  // protected readonly iconService: IIconService;
-
-  // @lazyInject(TYPES.IFontService)
-  // protected readonly fontService: IFontService;
-
-  // @lazyInject(TYPES.IShaderModuleService)
+var BaseModel = /*#__PURE__*/function () {
+  // 用于数据传递的数据纹理
+  // 默认有多少列（宽度）
 
   // 支持数据映射的buffer
   // 不支持数据映射的buffer
@@ -46,17 +37,17 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     _defineProperty(this, "textures", []);
     _defineProperty(this, "preStyleAttribute", {});
     _defineProperty(this, "encodeStyleAttribute", {});
-    _initializerDefineProperty(this, "configService", _descriptor, this);
     this.layer = layer;
-    this.rendererService = layer.getContainer().get(TYPES.IRendererService);
-    this.pickingService = layer.getContainer().get(TYPES.IPickingService);
-    this.shaderModuleService = layer.getContainer().get(TYPES.IShaderModuleService);
-    this.styleAttributeService = layer.getContainer().get(TYPES.IStyleAttributeService);
-    this.mapService = layer.getContainer().get(TYPES.IMapService);
-    this.iconService = layer.getContainer().get(TYPES.IIconService);
-    this.fontService = layer.getContainer().get(TYPES.IFontService);
-    this.cameraService = layer.getContainer().get(TYPES.ICameraService);
-    this.layerService = layer.getContainer().get(TYPES.ILayerService);
+    this.configService = layer.getContainer().globalConfigService;
+    this.rendererService = layer.getContainer().rendererService;
+    this.pickingService = layer.getContainer().pickingService;
+    this.shaderModuleService = layer.getContainer().shaderModuleService;
+    this.styleAttributeService = layer.getContainer().styleAttributeService;
+    this.mapService = layer.getContainer().mapService;
+    this.iconService = layer.getContainer().iconService;
+    this.fontService = layer.getContainer().fontService;
+    this.cameraService = layer.getContainer().cameraService;
+    this.layerService = layer.getContainer().layerService;
     // 初始化支持数据映射的 Style 属性
 
     this.registerStyleAttribute();
@@ -388,10 +379,5 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     }
   }]);
   return BaseModel;
-}(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class));
+}();
 export { BaseModel as default };

package/es/core/LayerPickService.js

@@ -4,7 +4,6 @@ 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
 import { lngLatInExtent } from '@antv/l7-utils';
 var BaseLayerPickService = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
@@ -15,7 +14,7 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     key: "pickRender",
     value: function pickRender(target) {
       var container = this.layer.getContainer();
-      var layerService = container.get(TYPES.ILayerService);
+      var layerService = container.layerService;
       var layer = this.layer;
       // 瓦片图层的拾取绘制
       if (layer.tileLayer) {
@@ -38,7 +37,7 @@ var BaseLayerPickService = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               container = this.layer.getContainer();
-              pickingService = container.get(TYPES.IPickingService);
+              pickingService = container.pickingService;
               if (!(layer.type === 'RasterLayer')) {
                 _context.next = 4;
                 break;
@@ -62,8 +61,8 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     key: "pickRasterLayer",
     value: function pickRasterLayer(layer, target, parent) {
       var container = this.layer.getContainer();
-      var pickingService = container.get(TYPES.IPickingService);
-      var mapService = container.get(TYPES.IMapService);
+      var pickingService = container.pickingService;
+      var mapService = container.mapService;
       var extent = this.layer.getSource().extent;
       var isPick = lngLatInExtent(target.lngLat, extent);
       var layerTarget = {

package/es/core/TextureService.js

@@ -1,13 +1,12 @@
 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);
+    this.rendererService = container.rendererService;
   }
   _createClass(TextureService, [{
     key: "getColorTexture",

package/es/core/interface.d.ts

@@ -1,5 +1,6 @@
 import type { IAnimateOption, IMapService, ITexture2D, StyleAttributeField, StyleAttributeOption } from '@antv/l7-core';
 import type { IColorRamp } from '@antv/l7-utils';
+import type { CanvasModelType } from '../canvas/models';
 import type { anchorType } from '../utils/symbol-layout';
 export declare enum lineStyleType {
     'solid' = 0,
@@ -199,10 +200,36 @@ export interface IDrawingOnCanvas {
     mapService: IMapService;
     size: [number, number];
 }
-export interface ICanvasLayerStyleOptions {
-    zIndex: number;
-    update: CanvasUpdateType | string;
-    drawingOnCanvas: (option: IDrawingOnCanvas) => void;
+export interface ICanvasLayerRenderParams {
+    canvas: HTMLCanvasElement;
+    ctx: RenderingContext;
+    container: {
+        width: number;
+        height: number;
+        bounds: [[number, number], [number, number]];
+    };
+    size: [number, number];
+    utils: {
+        lngLatToContainer: IMapService['lngLatToContainer'];
+    };
+    mapService: IMapService;
+}
+export interface ICanvasLayerOptions {
+    zIndex?: number;
+    contextType?: CanvasModelType;
+    getContext?: (canvas: HTMLCanvasElement) => RenderingContext;
+    trigger?: 'end' | 'change';
+    /**
+     * @deprecated
+     * @alias trigger
+     */
+    update?: CanvasUpdateType | string;
+    draw?: (renderParams: ICanvasLayerRenderParams) => void;
+    /**
+     * @deprecated
+     * @alias draw
+     */
+    drawingOnCanvas?: (renderParams: ICanvasLayerRenderParams) => void;
 }
 export interface IHeatMapLayerStyleOptions extends IBaseLayerStyleOptions {
     intensity: number;

package/es/core/shape/arrow.js

@@ -110,14 +110,10 @@ export function lineArrowPath(coord) {
   var targetType = _typeof(symbol['target']) === 'object' ? symbol['target'].type : symbol['target'];
   var _ref = _typeof(symbol['source']) === 'object' ? symbol['source'] : {},
     _ref$width = _ref.width,
-    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width,
-    _ref$height = _ref.height,
-    sourceHeight = _ref$height === void 0 ? 2 : _ref$height;
+    sourceWidth = _ref$width === void 0 ? sourceType ? maxArrowWidthMap[sourceType] : 0 : _ref$width;
   var _ref2 = _typeof(symbol['target']) === 'object' ? symbol['target'] : {},
     _ref2$width = _ref2.width,
-    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width,
-    _ref2$height = _ref2.height,
-    targetHeight = _ref2$height === void 0 ? 2 : _ref2$height;
+    targetWidth = _ref2$width === void 0 ? targetType ? maxArrowWidthMap[targetType] : 0 : _ref2$width;
   return {
     vertices: [0, PathHeight, 1 * sourceWidth].concat(_toConsumableArray(coord), [1, PathHeight, -1 * targetWidth], _toConsumableArray(coord), [1, -PathHeight, -1 * targetWidth], _toConsumableArray(coord), [0, -PathHeight, 1 * sourceWidth], _toConsumableArray(coord), [0, PathHeight, 1 * sourceWidth], _toConsumableArray(coord), [1, PathHeight, -1 * targetWidth], _toConsumableArray(coord), [1, -PathHeight, -1 * targetWidth], _toConsumableArray(coord), [0, -PathHeight, 1 * sourceWidth], _toConsumableArray(coord)),
     outLineIndices: [0, 1, 2, 0, 2, 3].map(function (t) {

package/es/heatmap/models/heatmap.d.ts

@@ -1,5 +1,4 @@
 import type { IFramebuffer, IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
-import 'reflect-metadata';
 import BaseModel from '../../core/BaseModel';
 export default class HeatMapModel extends BaseModel {
     protected texture: ITexture2D;

package/es/heatmap/models/heatmap.js

@@ -8,15 +8,12 @@ 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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _dec, _class;
 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, TextureUsage, gl } from '@antv/l7-core';
 import { generateColorRamp, getCullFace, lodashUtil } from '@antv/l7-utils';
 import { mat4 } from 'gl-matrix';
-import { injectable } from 'inversify';
-import 'reflect-metadata';
 import BaseModel from "../../core/BaseModel";
 import { HeatmapTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_3d_frag.glsl' */
@@ -34,7 +31,7 @@ var heatmap_framebuffer_frag = "layout(std140) uniform commonUniforms {\n  float
 var heatmap_framebuffer_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_Dir;\n\n\nlayout(std140) uniform commonUniforms {\n  float u_radius;\n  float u_intensity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n};\n\nout vec2 v_extrude;\nout float v_weight;\n\n#define GAUSS_COEF  0.3989422804014327\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main(){\n    vec3 picking_color_placeholder = u_PickingColor;\n\n    v_weight = a_Size;\n    float ZERO = 1.0 / 255.0 / 16.0;\n    float extrude_x = a_Dir.x * 2.0 -1.0;\n    float extrude_y = a_Dir.y * 2.0 -1.0;\n    vec2 extrude_dir = normalize(vec2(extrude_x,extrude_y));\n    float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;\n    v_extrude = extrude_dir * S;\n\n    vec2 offset = project_pixel(v_extrude * u_radius);\n    vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n    // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n        gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));\n    } else {\n        gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n    }\n}\n";
 import { heatMap3DTriangulation } from "../triangulation";
 var isEqual = lodashUtil.isEqual;
-var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_BaseModel) {
+var HeatMapModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(HeatMapModel, _BaseModel);
   var _super = _createSuper(HeatMapModel);
   function HeatMapModel() {
@@ -491,5 +488,5 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
     }
   }]);
   return HeatMapModel;
-}(BaseModel)) || _class);
+}(BaseModel);
 export { HeatMapModel as default };

package/es/index.d.ts

@@ -9,9 +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';
 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, };