@antv/l7-layers 2.20.20 → 2.21.1

package/es/plugins/ShaderUniformPlugin.js

@@ -1,15 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-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, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
-import { CameraUniform, CoordinateUniform, TYPES } from '@antv/l7-core';
-import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
+import { CameraUniform, CoordinateUniform } from '@antv/l7-core';
 
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：
@@ -18,19 +12,24 @@ import 'reflect-metadata';
  *    @see https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/doml91
  * 3. 当前 Layer 本身的样式属性
  */
-var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraService), _dec3 = inject(TYPES.ICoordinateSystemService), _dec4 = inject(TYPES.IRendererService), _dec5 = inject(TYPES.IMapService), _dec6 = inject(TYPES.ILayerService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var ShaderUniformPlugin = /*#__PURE__*/function () {
   function ShaderUniformPlugin() {
     _classCallCheck(this, ShaderUniformPlugin);
-    _initializerDefineProperty(this, "cameraService", _descriptor, this);
-    _initializerDefineProperty(this, "coordinateSystemService", _descriptor2, this);
-    _initializerDefineProperty(this, "rendererService", _descriptor3, this);
-    _initializerDefineProperty(this, "mapService", _descriptor4, this);
-    _initializerDefineProperty(this, "layerService", _descriptor5, this);
   }
   _createClass(ShaderUniformPlugin, [{
     key: "apply",
-    value: function apply(layer) {
+    value: function apply(layer, _ref) {
       var _this = this;
+      var rendererService = _ref.rendererService,
+        mapService = _ref.mapService,
+        layerService = _ref.layerService,
+        coordinateSystemService = _ref.coordinateSystemService,
+        cameraService = _ref.cameraService;
+      this.rendererService = rendererService;
+      this.mapService = mapService;
+      this.layerService = layerService;
+      this.coordinateSystemService = coordinateSystemService;
+      this.cameraService = cameraService;
       var version = this.mapService.version;
       var mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
       var sceneCenterMercator = [0, 0];
@@ -76,7 +75,7 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
           });
         }
 
-        // For WebGL1. regl 
+        // For WebGL1. regl
         var platformString = _this.rendererService.queryVerdorInfo();
         if (platformString === 'WebGL1') {
           layer.models.forEach(function (model) {
@@ -140,35 +139,10 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
       0, 0, 0]);
       return {
         data: data,
-        uniforms: (_uniforms = {}, _defineProperty(_uniforms, CameraUniform.ProjectionMatrix, u_ProjectionMatrix), _defineProperty(_uniforms, CameraUniform.ViewMatrix, u_ViewMatrix), _defineProperty(_uniforms, CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), _defineProperty(_uniforms, CameraUniform.Zoom, u_Zoom), _defineProperty(_uniforms, CameraUniform.ZoomScale, u_ZoomScale), _defineProperty(_uniforms, CameraUniform.FocalDistance, u_FocalDistance), _defineProperty(_uniforms, CameraUniform.CameraPosition, u_CameraPosition), _defineProperty(_uniforms, CoordinateUniform.CoordinateSystem, u_CoordinateSystem), _defineProperty(_uniforms, CoordinateUniform.ViewportCenter, u_ViewportCenter), _defineProperty(_uniforms, CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), _defineProperty(_uniforms, CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), _defineProperty(_uniforms, CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), _defineProperty(_uniforms, CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), _defineProperty(_uniforms, CoordinateUniform.Mvp, u_Mvp), _defineProperty(_uniforms, "u_sceneCenterMercator", sceneCenterMercator), _defineProperty(_uniforms, "u_ViewportSize", u_ViewportSize), _defineProperty(_uniforms, "u_ModelMatrix", u_ModelMatrix), _defineProperty(_uniforms, "u_DevicePixelRatio", u_DevicePixelRatio), _uniforms)
+        uniforms: (_uniforms = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_uniforms, CameraUniform.ProjectionMatrix, u_ProjectionMatrix), CameraUniform.ViewMatrix, u_ViewMatrix), CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), CameraUniform.Zoom, u_Zoom), CameraUniform.ZoomScale, u_ZoomScale), CameraUniform.FocalDistance, u_FocalDistance), CameraUniform.CameraPosition, u_CameraPosition), CoordinateUniform.CoordinateSystem, u_CoordinateSystem), CoordinateUniform.ViewportCenter, u_ViewportCenter), CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_uniforms, CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), CoordinateUniform.Mvp, u_Mvp), "u_sceneCenterMercator", sceneCenterMercator), "u_ViewportSize", u_ViewportSize), "u_ModelMatrix", u_ModelMatrix), "u_DevicePixelRatio", u_DevicePixelRatio))
       };
     }
   }]);
   return ShaderUniformPlugin;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "coordinateSystemService", [_dec3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "rendererService", [_dec4], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec5], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "layerService", [_dec6], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-})), _class2)) || _class);
+}();
 export { ShaderUniformPlugin as default };

package/es/plugins/UpdateModelPlugin.d.ts

@@ -1,5 +1,4 @@
 import type { ILayer, ILayerPlugin } from '@antv/l7-core';
-import 'reflect-metadata';
 /**
  * Model 更新
  */

package/es/plugins/UpdateModelPlugin.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';
 /**
  * Model 更新
  */
-var UpdateModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var UpdateModelPlugin = /*#__PURE__*/function () {
   function UpdateModelPlugin() {
     _classCallCheck(this, UpdateModelPlugin);
   }
@@ -29,5 +26,5 @@ var UpdateModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functio
     }
   }]);
   return UpdateModelPlugin;
-}()) || _class);
+}();
 export { UpdateModelPlugin as default };

package/es/plugins/UpdateStyleAttributePlugin.d.ts

@@ -1,12 +1,9 @@
-import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
-import 'reflect-metadata';
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
 export default class UpdateStyleAttributePlugin implements ILayerPlugin {
-    apply(layer: ILayer, { styleAttributeService, }: {
-        styleAttributeService: IStyleAttributeService;
-    }): void;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
     private updateStyleAttribute;
     private initStyleAttribute;
 }

package/es/plugins/UpdateStyleAttributePlugin.js

@@ -1,13 +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';
-
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+var UpdateStyleAttributePlugin = /*#__PURE__*/function () {
   function UpdateStyleAttributePlugin() {
     _classCallCheck(this, UpdateStyleAttributePlugin);
   }
@@ -72,5 +68,5 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
     }
   }]);
   return UpdateStyleAttributePlugin;
-}()) || _class);
+}();
 export { UpdateStyleAttributePlugin as default };

package/es/plugins/index.d.ts

@@ -0,0 +1,15 @@
+import DataMappingPlugin from './DataMappingPlugin';
+import DataSourcePlugin from './DataSourcePlugin';
+import FeatureScalePlugin from './FeatureScalePlugin';
+import LayerAnimateStylePlugin from './LayerAnimateStylePlugin';
+import LayerMaskPlugin from './LayerMaskPlugin';
+import LayerModelPlugin from './LayerModelPlugin';
+import LayerStylePlugin from './LayerStylePlugin';
+import LightingPlugin from './LightingPlugin';
+import MultiPassRendererPlugin from './MultiPassRendererPlugin';
+import PixelPickingPlugin from './PixelPickingPlugin';
+import RegisterStyleAttributePlugin from './RegisterStyleAttributePlugin';
+import ShaderUniformPlugin from './ShaderUniformPlugin';
+import UpdateModelPlugin from './UpdateModelPlugin';
+import UpdateStyleAttributePlugin from './UpdateStyleAttributePlugin';
+export declare function createPlugins(): (DataMappingPlugin | DataSourcePlugin | FeatureScalePlugin | LayerAnimateStylePlugin | LayerMaskPlugin | LayerModelPlugin | LayerStylePlugin | LightingPlugin | MultiPassRendererPlugin | PixelPickingPlugin | RegisterStyleAttributePlugin | ShaderUniformPlugin | UpdateModelPlugin | UpdateStyleAttributePlugin)[];

package/es/plugins/index.js

@@ -0,0 +1,18 @@
+// import ConfigSchemaValidationPlugin from './ConfigSchemaValidationPlugin';
+import DataMappingPlugin from "./DataMappingPlugin";
+import DataSourcePlugin from "./DataSourcePlugin";
+import FeatureScalePlugin from "./FeatureScalePlugin";
+import LayerAnimateStylePlugin from "./LayerAnimateStylePlugin";
+import LayerMaskPlugin from "./LayerMaskPlugin";
+import LayerModelPlugin from "./LayerModelPlugin";
+import LayerStylePlugin from "./LayerStylePlugin";
+import LightingPlugin from "./LightingPlugin";
+import MultiPassRendererPlugin from "./MultiPassRendererPlugin";
+import PixelPickingPlugin from "./PixelPickingPlugin";
+import RegisterStyleAttributePlugin from "./RegisterStyleAttributePlugin";
+import ShaderUniformPlugin from "./ShaderUniformPlugin";
+import UpdateModelPlugin from "./UpdateModelPlugin";
+import UpdateStyleAttributePlugin from "./UpdateStyleAttributePlugin";
+export function createPlugins() {
+  return [new DataSourcePlugin(), new RegisterStyleAttributePlugin(), new FeatureScalePlugin(), new DataMappingPlugin(), new LayerStylePlugin(), new LayerMaskPlugin(), new UpdateStyleAttributePlugin(), new UpdateModelPlugin(), new MultiPassRendererPlugin(), new ShaderUniformPlugin(), new LayerAnimateStylePlugin(), new LightingPlugin(), new PixelPickingPlugin(), new LayerModelPlugin()];
+}

package/es/point/models/fill.d.ts

@@ -21,7 +21,7 @@ export default class FillModel extends BaseModel {
      * 根据 animateOption 的值返回对应的 shader 代码
      * @returns
      */
-    getShaders(animateOption: Partial<IAnimateOption>): {
+    getShaders(): {
         frag: string;
         vert: string;
         type: string;

package/es/point/models/fill.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 { PointFillTriangulation } from '@antv/l7-utils';
+import { PointFillTriangulation } from "../../core/triangulation";
 import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/fill/fill_frag.glsl' */
@@ -97,17 +97,14 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$animateOption, animateOption, _this$getShaders, frag, vert, type, model;
+        var _this$getShaders, frag, vert, type, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref3 = this.layer.getLayerConfig(), _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
-                enable: false
-              } : _ref3$animateOption;
-              _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
               this.layer.triangulation = PointFillTriangulation;
               this.initUniformsBuffer();
-              _context2.next = 6;
+              _context2.next = 5;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
@@ -118,10 +115,10 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 6:
+            case 5:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 8:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -138,7 +135,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
      */
   }, {
     key: "getShaders",
-    value: function getShaders(animateOption) {
+    value: function getShaders() {
       return {
         frag: pointFillFrag,
         vert: pointFillVert,

package/es/point/models/fillImage.js

@@ -72,7 +72,8 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
         _ref$unit = _ref.unit,
         unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       /**
        *               rotateFlag
@@ -158,9 +159,9 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture;
+      var _this$texture2;
       this.iconService.off('imageUpdate', this.updateTexture);
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
 
     // overwrite baseModel func

package/es/point/models/image.js

@@ -62,7 +62,8 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       // ThreeJS 图层兼容
       if (this.rendererService.getDirty()) {
-        this.texture.bind();
+        var _this$texture;
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
       }
       var commonInfo = this.getCommonUniformsInfo();
       var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -111,8 +112,8 @@ var ImageModel = /*#__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/polygon/models/extrude.js

@@ -215,7 +215,6 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           update: function update(feature, featureIdx, vertex) {
             var lng = vertex[0];
             var lat = vertex[1];
-            // console.log((lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4])
             // 临时 兼容高德V2
             return [(lng - bounds[0]) / lngLen, (lat - bounds[1]) / latLen, vertex[4]];
           }

package/es/polygon/models/fill.js

@@ -9,9 +9,8 @@ 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 { polygonFillTriangulation } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { polygonTriangulationWithCenter } from "../../core/triangulation";
+import { polygonTriangulationWithCenter, polygonTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/fill/fill_frag.glsl' */
 var polygon_frag = "in vec4 v_color;\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/fill/fill_linear_frag.glsl' */
@@ -161,7 +160,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           frag: polygon_frag,
           vert: polygon_vert,
           type: 'polygonFill',
-          triangulation: polygonFillTriangulation
+          triangulation: polygonTriangulation
         };
       }
     }

package/es/polygon/models/index.js

@@ -23,5 +23,4 @@ var PolygonModels = {
   extrusion: Extrusion
   // point_fill: PointModels.fill,
 };
-
 export default PolygonModels;

package/es/polygon/models/ocean.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 { polygonTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/ocean/ocean_frag.glsl' */
@@ -18,7 +18,6 @@ var ocean_frag = "\nlayout(std140) uniform commonUniforms {\n  vec4 u_watercolor
 /* babel-plugin-inline-import '../shaders/ocean/ocean_vert.glsl' */
 var ocean_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_uv;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_watercolor;\n  vec4 u_watercolor2;\n  float u_time;\n};\n\n\nout vec2 v_uv;\nout float v_opacity;\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n  v_opacity = opacity;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
-var isNumber = lodashUtil.isNumber;
 var OceanModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(OceanModel, _BaseModel);
   var _super = _createSuper(OceanModel);

package/es/polygon/models/water.js

@@ -10,7 +10,6 @@ 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 } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { polygonTriangulation } from "../../core/triangulation";
@@ -18,7 +17,6 @@ import { polygonTriangulation } from "../../core/triangulation";
 var water_frag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\n\nout vec4 outputColor;\n\n\nin vec4 v_Color;\nin vec2 v_uv;\n\nfloat rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }\n\nfloat water(vec3 p) {\n  float t = u_time * u_speed;\n  p.z += t * 2.; p.x += t * 2.;\n  vec3 c1 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 3.; p.x += t * 0.52;\n  vec3 c2 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  p.z += t * 4.; p.x += t * 0.8;\n  vec3 c3 = texture(SAMPLER_2D(u_texture), p.xz / 30.).xyz;\n  c1 += c2 - c3;\n  float z = (c1.x + c1.y + c1.z) / 3.;\n  return p.y + z / 4.;\n}\n\nfloat map(vec3 p) {\n  float d = 100.0;\n  d = water(p);\n  return d;\n}\n\nfloat intersect(vec3 ro, vec3 rd) {\n  float d = 0.0;\n  for (int i = 0; i <= 100; i++) {\n    float h = map(ro + rd * d);\n    if (h < 0.1) return  d;\n    d += h;\n  }\n  return 0.0;\n}\n\nvec3 norm(vec3 p) {\n  float eps = .1;\n  return normalize(vec3(\n    map(p + vec3(eps, 0, 0)) - map(p + vec3(-eps, 0, 0)),\n    map(p + vec3(0, eps, 0)) - map(p + vec3(0, -eps, 0)),\n    map(p + vec3(0, 0, eps)) - map(p + vec3(0, 0, -eps))\n  ));\n} \n\nfloat calSpc() {\n  vec3 l1 = normalize(vec3(1, 1, 1));\n  vec3 ro = vec3(-3, 20, -8);\n  vec3 rc = vec3(0, 0, 0);\n  vec3 ww = normalize(rc - ro);\n  vec3 uu = normalize(cross(vec3(0,1,0), ww));\n  vec3 vv = normalize(cross(rc - ro, uu));\n  vec3 rd = normalize(uu * v_uv.x + vv * v_uv.y + ww);\n  float d = intersect(ro, rd);\n  vec3 p = ro + rd * d;\n  vec3 n = norm(p);\n  float spc = pow(max(0.0, dot(reflect(l1, n), rd)), 30.0);\n  return spc;\n}\n\nvoid main() {\n\n  outputColor = v_Color;\n  float spc = calSpc();\n  outputColor += spc * 0.4;\n}\n";
 /* babel-plugin-inline-import '../shaders/water/polygon_water_vert.glsl' */
 var water_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 14) in vec2 a_uv;\nlayout(std140) uniform commonUniforms {\n  float u_speed;\n  float u_time;\n};\nout vec4 v_Color;\nout vec2 v_uv;\n\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_uv;\n  v_Color = a_Color;\n  v_Color.a *= opacity;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n}\n\n";
-var isNumber = lodashUtil.isNumber;
 var WaterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(WaterModel, _BaseModel);
   var _super = _createSuper(WaterModel);

package/es/tile/core/BaseLayer.js

@@ -3,7 +3,6 @@ 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import { TileLayerService } from "../service/TileLayerService";
 import { TilePickService } from "../service/TilePickService";
@@ -55,10 +54,10 @@ var BaseTileLayer = /*#__PURE__*/function () {
     _defineProperty(this, "viewchange", debounce(this.mapchange, 24));
     this.parent = parent;
     var container = this.parent.getContainer();
-    this.rendererService = container.get(TYPES.IRendererService);
-    this.layerService = container.get(TYPES.ILayerService);
-    this.mapService = container.get(TYPES.IMapService);
-    this.pickingService = container.get(TYPES.IPickingService);
+    this.rendererService = container.rendererService;
+    this.layerService = container.layerService;
+    this.mapService = container.mapService;
+    this.pickingService = container.pickingService;
 
     // 初始化瓦片管理服务
     this.tileLayerService = new TileLayerService({

package/es/tile/interaction/getRasterData.js

@@ -20,7 +20,6 @@ export function readRasterValue(tile, mapService, x, y) {
   // x
   (y - tileMaxXY.y) / tilePixelHeight // y
   ];
-
   var tileWidth = (tile === null || tile === void 0 || (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
   var tileHeight = (tile === null || tile === void 0 || (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
   var indexX = Math.floor(pos[0] * tileWidth);
@@ -37,8 +36,6 @@ export function readPixel(x, y, rendererService) {
   var _getViewportSize = getViewportSize(),
     width = _getViewportSize.width,
     height = _getViewportSize.height;
-  width *= DOM.DPR;
-  height *= DOM.DPR;
   if (xInDevicePixel > width - 1 * DOM.DPR || xInDevicePixel < 0 || yInDevicePixel > height - 1 * DOM.DPR || yInDevicePixel < 0) {
     return false;
   }

package/es/tile/service/TileLayerService.d.ts

@@ -1,6 +1,5 @@
 import type { ILayer, ILayerService, ILngLat, IRendererService, ITile } from '@antv/l7-core';
 import type { SourceTile } from '@antv/l7-utils';
-import 'reflect-metadata';
 interface ITileLayerServiceOptions {
     rendererService: IRendererService;
     layerService: ILayerService;

package/es/tile/service/TileLayerService.js

@@ -4,7 +4,6 @@ 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import 'reflect-metadata';
 export var TileLayerService = /*#__PURE__*/function () {
   function TileLayerService(_ref) {
     var rendererService = _ref.rendererService,

package/es/tile/service/TilePickService.d.ts

@@ -22,5 +22,5 @@ export declare class TilePickService implements ITilePickService {
     private pickId2Color;
     /** 从瓦片中根据数据 */
     getFeatureById(pickedFeatureIdx: number): any[];
-    pickRasterLayer(layer: ILayer, target: IInteractionTarget, parent?: ILayer): boolean;
+    pickRasterLayer(): boolean;
 }

package/es/tile/service/TilePickService.js

@@ -5,7 +5,6 @@ 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
 import { decodePickingColor, encodePickingColor } from '@antv/l7-utils';
 import { TileSourceService } from "./TileSourceService";
 var SELECT = 'select';
@@ -42,7 +41,7 @@ export var TilePickService = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               container = this.parent.getContainer();
-              pickingService = container.get(TYPES.IPickingService);
+              pickingService = container.pickingService;
               if (!(layer.type === 'RasterLayer')) {
                 _context.next = 8;
                 break;
@@ -170,7 +169,7 @@ export var TilePickService = /*#__PURE__*/function () {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "pickRasterLayer",
-    value: function pickRasterLayer(layer, target, parent) {
+    value: function pickRasterLayer() {
       return false;
     }
   }]);

package/es/tile/tile/Tile.js

@@ -118,8 +118,8 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
               }).shape('fill').color('#0f0').style({
                 opacity: 0.5
               });
-              container = createLayerContainer(this.parent.sceneContainer);
-              mask.setContainer(container, this.parent.sceneContainer);
+              container = createLayerContainer(this.parent.container);
+              mask.setContainer(container);
               _context.next = 5;
               return mask.init();
             case 5:
@@ -148,8 +148,8 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              container = createLayerContainer(this.parent.sceneContainer);
-              mask.setContainer(container, this.parent.sceneContainer);
+              container = createLayerContainer(this.parent.container);
+              mask.setContainer(container);
               _context2.next = 4;
               return mask.init();
             case 4:
@@ -176,8 +176,8 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
             case 0:
               // set flag
               layer.isTileLayer = true;
-              container = createLayerContainer(this.parent.sceneContainer);
-              layer.setContainer(container, this.parent.sceneContainer);
+              container = createLayerContainer(this.parent.container);
+              layer.setContainer(container);
               this.layers.push(layer);
               _context3.next = 6;
               return layer.init();
@@ -214,6 +214,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
     value: function getMainLayer() {
       return this.layers[0];
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "getFeatures",
     value: function getFeatures(sourceLayer) {
@@ -225,6 +226,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
      * @param id
      * @returns
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "getFeatureById",
     value: function getFeatureById(id) {

package/es/utils/blend.js

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _BlendTypes;
 import { BlendType, gl } from '@antv/l7-core';
-export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendType.additive, {
+export var BlendTypes = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, BlendType.additive, {
   enable: true,
   func: {
     srcRGB: gl.ONE,
@@ -9,9 +8,9 @@ export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendTyp
     srcAlpha: 1,
     dstAlpha: 1
   }
-}), _defineProperty(_BlendTypes, BlendType.none, {
+}), BlendType.none, {
   enable: false
-}), _defineProperty(_BlendTypes, BlendType.normal, {
+}), BlendType.normal, {
   enable: true,
   func: {
     srcRGB: gl.SRC_ALPHA,
@@ -19,7 +18,7 @@ export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendTyp
     srcAlpha: 1,
     dstAlpha: 1
   }
-}), _defineProperty(_BlendTypes, BlendType.subtractive, {
+}), BlendType.subtractive, {
   enable: true,
   func: {
     srcRGB: gl.ONE,
@@ -31,7 +30,7 @@ export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendTyp
     rgb: gl.FUNC_SUBTRACT,
     alpha: gl.FUNC_SUBTRACT
   }
-}), _defineProperty(_BlendTypes, BlendType.max, {
+}), BlendType.max, {
   enable: true,
   func: {
     srcRGB: gl.ONE,
@@ -40,7 +39,7 @@ export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendTyp
   equation: {
     rgb: gl.MAX_EXT
   }
-}), _defineProperty(_BlendTypes, BlendType.min, {
+}), BlendType.min, {
   enable: true,
   func: {
     srcRGB: gl.ONE,
@@ -49,4 +48,4 @@ export var BlendTypes = (_BlendTypes = {}, _defineProperty(_BlendTypes, BlendTyp
   equation: {
     rgb: gl.MIN_EXT
   }
-}), _BlendTypes);
+});

package/es/utils/polylineNormal.js

@@ -175,7 +175,6 @@ export default function (points, closed, indexOffset) {
     miters[_i], totalDistance // dash
     );
   }
-
   return {
     normals: out,
     attrIndex: attrIndex,

package/es/utils/rampcolor_legend.js

@@ -4,8 +4,7 @@ export function rampColor2legend(rampColors, name) {
     type: rampColors.type,
     field: 'value',
     items: rampColors.positions.map(function (value, index) {
-      var _ref;
-      return _ref = {}, _defineProperty(_ref, name, index >= rampColors.colors.length ? null : rampColors.colors[index]), _defineProperty(_ref, "value", value), _ref;
+      return _defineProperty(_defineProperty({}, name, index >= rampColors.colors.length ? null : rampColors.colors[index]), "value", value);
     })
   };
 }

package/es/wind/index.js

@@ -54,7 +54,6 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       if (this.layerModel) {
         this.layerModel.render(options); // 独立的渲染流程
       }
-
       return this;
     }
   }, {