@antv/l7-layers 2.16.1 → 2.16.2

package/es/plugins/ShaderUniformPlugin.js

@@ -4,13 +4,12 @@ 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, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
-
 import { CameraUniform, CoordinateUniform, TYPES } from '@antv/l7-core';
 import { $window } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
+
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：
  * 1. 从相机服务中获取 View & ProjectionMatrix，当前缩放等级等等
@@ -18,74 +17,61 @@ 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), _dec(_class = (_class2 = /*#__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);
   }
-
   _createClass(ShaderUniformPlugin, [{
     key: "apply",
     value: function apply(layer) {
       var _this = this;
-
       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 sceneCenterMKT = [0, 0];
+      var sceneCenterMercator = [0, 0];
       layer.hooks.beforeRender.tap('ShaderUniformPlugin', function () {
         // @ts-ignore
-        var offset = layer.getLayerConfig().tileOrigin; // 重新计算坐标系参数
-
+        var offset = layer.getLayerConfig().tileOrigin;
+        // 重新计算坐标系参数
         _this.coordinateSystemService.refresh(offset);
-
         if (version === 'GAODE2.x') {
-          _this.setLayerCenter(layer); // @ts-ignore
-
-
-          mvp = _this.mapService.map.customCoords.getMVPMatrix(); // mvp = amapCustomCoords.getMVPMatrix()
+          _this.setLayerCenter(layer);
           // @ts-ignore
-
-          sceneCenterMKT = _this.mapService.getCustomCoordCenter();
+          mvp = _this.mapService.map.customCoords.getMVPMatrix();
+          // mvp = amapCustomCoords.getMVPMatrix()
+          // @ts-ignore
+          sceneCenterMercator = _this.mapService.getCustomCoordCenter();
         }
-
         var _this$rendererService = _this.rendererService.getViewportSize(),
-            width = _this$rendererService.width,
-            height = _this$rendererService.height;
-
+          width = _this$rendererService.width,
+          height = _this$rendererService.height;
         layer.models.forEach(function (model) {
           var _model$addUniforms;
+          model.addUniforms((_model$addUniforms = {}, _defineProperty(_model$addUniforms, CameraUniform.ProjectionMatrix, _this.cameraService.getProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewMatrix, _this.cameraService.getViewMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewProjectionMatrix, _this.cameraService.getViewProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.Zoom, _this.cameraService.getZoom()), _defineProperty(_model$addUniforms, CameraUniform.ZoomScale, _this.cameraService.getZoomScale()), _defineProperty(_model$addUniforms, CameraUniform.FocalDistance, _this.cameraService.getFocalDistance()), _defineProperty(_model$addUniforms, CameraUniform.CameraPosition, _this.cameraService.getCameraPosition()), _defineProperty(_model$addUniforms, CoordinateUniform.CoordinateSystem, _this.coordinateSystemService.getCoordinateSystem()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenter, _this.coordinateSystemService.getViewportCenter()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenterProjection, _this.coordinateSystemService.getViewportCenterProjection()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree, _this.coordinateSystemService.getPixelsPerDegree()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree2, _this.coordinateSystemService.getPixelsPerDegree2()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerMeter, _this.coordinateSystemService.getPixelsPerMeter()), _defineProperty(_model$addUniforms, CoordinateUniform.Mvp, mvp), _defineProperty(_model$addUniforms, "u_sceneCenterMercator", sceneCenterMercator), _defineProperty(_model$addUniforms, "u_ViewportSize", [width, height]), _defineProperty(_model$addUniforms, "u_ModelMatrix", _this.cameraService.getModelMatrix()), _defineProperty(_model$addUniforms, "u_DevicePixelRatio", $window.devicePixelRatio), _defineProperty(_model$addUniforms, "u_PickingBuffer", layer.getLayerConfig().pickingBuffer || 0), _defineProperty(_model$addUniforms, "u_shaderPick", Number(layer.getShaderPickStat())), _model$addUniforms));
+        });
 
-          model.addUniforms((_model$addUniforms = {}, _defineProperty(_model$addUniforms, CameraUniform.ProjectionMatrix, _this.cameraService.getProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewMatrix, _this.cameraService.getViewMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewProjectionMatrix, _this.cameraService.getViewProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.Zoom, _this.cameraService.getZoom()), _defineProperty(_model$addUniforms, CameraUniform.ZoomScale, _this.cameraService.getZoomScale()), _defineProperty(_model$addUniforms, CameraUniform.FocalDistance, _this.cameraService.getFocalDistance()), _defineProperty(_model$addUniforms, CameraUniform.CameraPosition, _this.cameraService.getCameraPosition()), _defineProperty(_model$addUniforms, CoordinateUniform.CoordinateSystem, _this.coordinateSystemService.getCoordinateSystem()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenter, _this.coordinateSystemService.getViewportCenter()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenterProjection, _this.coordinateSystemService.getViewportCenterProjection()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree, _this.coordinateSystemService.getPixelsPerDegree()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree2, _this.coordinateSystemService.getPixelsPerDegree2()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerMeter, _this.coordinateSystemService.getPixelsPerMeter()), _defineProperty(_model$addUniforms, CoordinateUniform.Mvp, mvp), _defineProperty(_model$addUniforms, "u_SceneCenterMKT", sceneCenterMKT), _defineProperty(_model$addUniforms, "u_ViewportSize", [width, height]), _defineProperty(_model$addUniforms, "u_ModelMatrix", _this.cameraService.getModelMatrix()), _defineProperty(_model$addUniforms, "u_DevicePixelRatio", $window.devicePixelRatio), _defineProperty(_model$addUniforms, "u_PickingBuffer", layer.getLayerConfig().pickingBuffer || 0), _defineProperty(_model$addUniforms, "u_shaderPick", Number(layer.getShaderPickStat())), _model$addUniforms));
-        }); // TODO：脏检查，决定是否需要渲染
+        // TODO：脏检查，决定是否需要渲染
       });
     }
+
     /**
      * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
      * @param layer
      */
-
   }, {
     key: "setLayerCenter",
     value: function setLayerCenter(layer) {
       if (layer.coordCenter === undefined) {
         layer.coordCenter = layer.getSource().center;
       }
-
       if (this.mapService.setCoordCenter) {
         this.mapService.setCoordCenter(layer.coordCenter);
       }
     }
   }]);
-
   return ShaderUniformPlugin;
 }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec2], {
   configurable: true,

package/es/plugins/UpdateModelPlugin.js

@@ -1,19 +1,15 @@
 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 () {
   function UpdateModelPlugin() {
     _classCallCheck(this, UpdateModelPlugin);
   }
-
   _createClass(UpdateModelPlugin, [{
     key: "apply",
     value: function apply(layer) {
@@ -32,7 +28,6 @@ var UpdateModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functio
       });
     }
   }]);
-
   return UpdateModelPlugin;
 }()) || _class);
 export { UpdateModelPlugin as default };

package/es/plugins/UpdateStyleAttributePlugin.js

@@ -1,24 +1,20 @@
 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 () {
   function UpdateStyleAttributePlugin() {
     _classCallCheck(this, UpdateStyleAttributePlugin);
   }
-
   _createClass(UpdateStyleAttributePlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tapPromise('UpdateStyleAttributePlugin', function () {
         _this.initStyleAttribute(layer, {
@@ -29,7 +25,6 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
         if (layer.layerModelNeedUpdate) {
           return;
         }
-
         if (layer.inited) {
           _this.updateStyleAttribute(layer, {
             styleAttributeService: styleAttributeService
@@ -43,7 +38,6 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
       var styleAttributeService = _ref2.styleAttributeService;
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
-
       if (filter && filter.needRegenerateVertices) {
         layer.layerModelNeedUpdate = true;
         attributes.forEach(function (attr) {
@@ -51,12 +45,12 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
         });
         return;
       }
-
       attributes.filter(function (attribute) {
         return attribute.needRegenerateVertices;
       }).forEach(function (attribute) {
         // 精确更新某个/某些 feature(s)，需要传入 featureIdx d
-        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(), // 获取经过 mapping 最新的数据
+        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(),
+        // 获取经过 mapping 最新的数据
         attribute.featureRange.startIndex, attribute.featureRange.endIndex, layer);
         attribute.needRegenerateVertices = false;
       });
@@ -70,13 +64,13 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
         return attribute.needRegenerateVertices;
       }).forEach(function (attribute) {
         // 精确更新某个/某些 feature(s)，需要传入 featureIdx d
-        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(), // 获取经过 mapping 最新的数据
+        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(),
+        // 获取经过 mapping 最新的数据
         attribute.featureRange.startIndex, attribute.featureRange.endIndex);
         attribute.needRegenerateVertices = false;
       });
     }
   }]);
-
   return UpdateStyleAttributePlugin;
 }()) || _class);
 export { UpdateStyleAttributePlugin as default };

package/es/point/index.d.ts

@@ -3,6 +3,7 @@ import { IPointLayerStyleOptions } from '../core/interface';
 import { PointType } from './models/index';
 export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
     type: string;
+    enableEncodeStyles: string[];
     defaultSourceConfig: {
         data: never[];
         options: {

package/es/point/index.js

@@ -6,40 +6,26 @@ 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";
-
 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); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import BaseLayer from "../core/BaseLayer";
 import PointModels from "./models/index";
-
 var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(PointLayer, _BaseLayer);
-
   var _super = _createSuper(PointLayer);
-
   function PointLayer() {
     var _this;
-
     _classCallCheck(this, PointLayer);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
-
     _defineProperty(_assertThisInitialized(_this), "type", 'PointLayer');
-
+    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [],
       options: {
@@ -50,41 +36,32 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         }
       }
     });
-
     return _this;
   }
-
   _createClass(PointLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var modelType;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-
-                if (this.layerModel) {
-                  this.layerModel.clearModels();
-                }
-
-                this.layerModel = new PointModels[modelType](this);
-                _context.next = 5;
-                return this.initLayerModels();
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              modelType = this.getModelType();
+              if (this.layerModel) {
+                this.layerModel.clearModels();
+              }
+              this.layerModel = new PointModels[modelType](this);
+              _context.next = 5;
+              return this.initLayerModels();
+            case 5:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -92,60 +69,47 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function () {
       var _rebuildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.buildModels();
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.buildModels();
+            case 2:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function rebuildModels() {
         return _rebuildModels.apply(this, arguments);
       }
-
       return rebuildModels;
     }()
     /**
      * 在未传入数据的时候判断点图层的 shape 类型
      * @returns
      */
-
   }, {
     key: "getModelTypeWillEmptyData",
     value: function getModelTypeWillEmptyData() {
       if (this.shapeOption) {
         var _this$shapeOption = this.shapeOption,
-            field = _this$shapeOption.field,
-            values = _this$shapeOption.values;
-
+          field = _this$shapeOption.field,
+          values = _this$shapeOption.values;
         var _this$getLayerConfig = this.getLayerConfig(),
-            shape2d = _this$getLayerConfig.shape2d;
-
+          shape2d = _this$getLayerConfig.shape2d;
         var iconMap = this.iconService.getIconMap();
-
         if (field && (shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(field)) !== -1) {
           return 'fill';
         }
-
         if (values === 'text') {
           return 'text';
         }
-
         if (values && values instanceof Array) {
           var _iterator = _createForOfIteratorHelper(values),
-              _step;
-
+            _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var v = _step.value;
-
               if (typeof v === 'string' && iconMap.hasOwnProperty(v)) {
                 return 'image';
               }
@@ -157,7 +121,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
           }
         }
       }
-
       return 'normal';
     }
   }, {
@@ -191,37 +154,29 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       //  2D、 3d、 shape、image、text、normal、
       var layerData = this.getEncodedData();
-
       var _this$getLayerConfig2 = this.getLayerConfig(),
-          shape2d = _this$getLayerConfig2.shape2d,
-          shape3d = _this$getLayerConfig2.shape3d;
-
+        shape2d = _this$getLayerConfig2.shape2d,
+        shape3d = _this$getLayerConfig2.shape3d;
       var iconMap = this.iconService.getIconMap();
       var item = layerData.find(function (fe) {
         return fe.hasOwnProperty('shape');
       });
-
       if (!item) {
         return this.getModelTypeWillEmptyData();
       } else {
         var shape = item.shape;
-
         if (shape === 'dot') {
           return 'normal';
         }
-
         if (shape === 'simple') {
           return 'simplePoint';
         }
-
         if (shape === 'radar') {
           return 'radar';
         }
-
         if (this.layerType === 'fillImage') {
           return 'fillImage';
         }
-
         if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
           if (this.mapService.version === 'GLOBEL') {
             return 'earthFill';
@@ -229,7 +184,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
             return 'fill';
           }
         }
-
         if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
           if (this.mapService.version === 'GLOBEL') {
             return 'earthExtrude';
@@ -237,17 +191,13 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
             return 'extrude';
           }
         }
-
         if (iconMap.hasOwnProperty(shape)) {
           return 'image';
         }
-
         return 'text';
       }
     }
   }]);
-
   return PointLayer;
 }(BaseLayer);
-
 export { PointLayer as default };

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

@@ -7,8 +7,6 @@ export default class ExtrudeModel extends BaseModel {
         u_pickLight: number;
         u_heightfixed: number;
         u_r: number;
-        u_dataTexture: import("@antv/l7-core").ITexture2D;
-        u_cellTypeLayout: number[];
         u_opacity: number;
         u_linearColor: number;
         u_sourceColor: number[];
@@ -19,6 +17,5 @@ export default class ExtrudeModel extends BaseModel {
     };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
-    clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }