@antv/l7-layers 2.16.0 → 2.16.1

package/lib/core/BaseModel.js

@@ -1,43 +1,61 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
+
 var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _d3Color = require("d3-color");
+
 var _lodash = require("lodash");
+
 var _blend = require("../utils/blend");
+
 var _stencil = require("../utils/stencil");
+
 var _dec, _class, _descriptor;
+
 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; }
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // style texture data mapping
-
   // 用于数据传递的数据纹理
   // 默认有多少列（宽度）
   // 计算得到的当前数据纹理有多少行（高度）
-
   // 单个 cell 的长度
   // 需要进行数据映射的属性集合
-
   // style texture data mapping
-
   function BaseModel(layer) {
     (0, _classCallCheck2.default)(this, BaseModel);
     (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
@@ -50,15 +68,15 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     this.iconService = layer.getContainer().get(_l7Core.TYPES.IIconService);
     this.fontService = layer.getContainer().get(_l7Core.TYPES.IFontService);
     this.cameraService = layer.getContainer().get(_l7Core.TYPES.ICameraService);
-    this.layerService = layer.getContainer().get(_l7Core.TYPES.ILayerService);
+    this.layerService = layer.getContainer().get(_l7Core.TYPES.ILayerService); // 注册 Attribute
+
+    this.registerBuiltinAttributes(); // 开启动画
 
-    // 注册 Attribute
-    this.registerBuiltinAttributes();
-    // 开启动画
     this.startModelAnimate();
     var createTexture2D = this.rendererService.createTexture2D;
     this.createTexture2D = createTexture2D;
     this.DATA_TEXTURE_WIDTH = 1024; // 数据纹理固定宽度
+
     this.rowCount = 1;
     this.cellLength = 0;
     this.cellProperties = [];
@@ -78,8 +96,8 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       hasStroke: 0,
       hasOffsets: 0
     };
-    this.dataTextureTest = this.layerService.getOESTextureFloat();
-    // 只有在不支持数据纹理的情况下进行赋值
+    this.dataTextureTest = this.layerService.getOESTextureFloat(); // 只有在不支持数据纹理的情况下进行赋值
+
     if (!this.dataTextureTest) {
       this.dataTexture = this.createTexture2D({
         // data: new Uint8ClampedArray(4),
@@ -92,18 +110,20 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         height: 1
       });
     }
-  }
-
-  // style datatexture mapping
+  } // style datatexture mapping
 
   /**
    * 清除上一次的计算结果 - 全量清除
    */
+
+
   (0, _createClass2.default)(BaseModel, [{
     key: "clearLastCalRes",
     value: function clearLastCalRes() {
       this.cellProperties = []; // 清空上一次计算的需要进行数据映射的属性集合
+
       this.cellLength = 0; // 清空上一次计算的 cell 的长度
+
       this.stylePropertiesExist = {
         // 全量清空上一次是否需要对 style 属性进行数据映射的判断
         hasThetaOffset: 0,
@@ -118,91 +138,82 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "getCellTypeLayout",
     value: function getCellTypeLayout() {
       if (this.dataTextureTest) {
-        return [
-        // 0
-        this.rowCount,
-        // 数据纹理有几行
-        this.DATA_TEXTURE_WIDTH,
-        // 数据纹理有几列
-        0.0, 0.0,
-        // 1
-        this.stylePropertiesExist.hasOpacity,
-        // cell 中是否存在 opacity
-        this.stylePropertiesExist.hasStrokeOpacity,
-        // cell 中是否存在 strokeOpacity
-        this.stylePropertiesExist.hasStrokeWidth,
-        // cell 中是否存在 strokeWidth
-        this.stylePropertiesExist.hasStroke,
-        // cell 中是否存在 stroke
+        return [// 0
+        this.rowCount, // 数据纹理有几行
+        this.DATA_TEXTURE_WIDTH, // 数据纹理有几列
+        0.0, 0.0, // 1
+        this.stylePropertiesExist.hasOpacity, // cell 中是否存在 opacity
+        this.stylePropertiesExist.hasStrokeOpacity, // cell 中是否存在 strokeOpacity
+        this.stylePropertiesExist.hasStrokeWidth, // cell 中是否存在 strokeWidth
+        this.stylePropertiesExist.hasStroke, // cell 中是否存在 stroke
         // 2
-        this.stylePropertiesExist.hasOffsets,
-        // cell 中是否存在 offsets
-        this.stylePropertiesExist.hasThetaOffset,
-        // cell 中是否存在 thetaOffset
-        0.0, 0.0,
-        // 3
+        this.stylePropertiesExist.hasOffsets, // cell 中是否存在 offsets
+        this.stylePropertiesExist.hasThetaOffset, // cell 中是否存在 thetaOffset
+        0.0, 0.0, // 3
         0.0, 0.0, 0.0, 1.0];
       } else {
-        return [1.0,
-        // 数据纹理有几行
-        1.0,
-        // 数据纹理有几列
-        0.0, 0.0, 0.0,
-        // cell 中是否存在 opacity
-        0.0,
-        // cell 中是否存在 strokeOpacity
-        0.0,
-        // cell 中是否存在 strokeWidth
-        0.0,
-        // cell 中是否存在 stroke
-        0.0,
-        // cell 中是否存在 offsets
+        return [1.0, // 数据纹理有几行
+        1.0, // 数据纹理有几列
+        0.0, 0.0, 0.0, // cell 中是否存在 opacity
+        0.0, // cell 中是否存在 strokeOpacity
+        0.0, // cell 中是否存在 strokeWidth
+        0.0, // cell 中是否存在 stroke
+        0.0, // cell 中是否存在 offsets
         0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0];
       }
     }
-
     /**
      * 判断数据纹理是否需要重新计算 - 根据传入的值进行判断
      * @param options
      * @returns
      */
+
   }, {
     key: "dataTextureNeedUpdate",
     value: function dataTextureNeedUpdate(options) {
       var isUpdate = false;
+
       if (!(0, _lodash.isEqual)(options.thetaOffset, this.cacheStyleProperties.thetaOffset)) {
         isUpdate = true;
         this.cacheStyleProperties.thetaOffset = options.thetaOffset;
       }
+
       if (!(0, _lodash.isEqual)(options.opacity, this.cacheStyleProperties.opacity)) {
         isUpdate = true;
         this.cacheStyleProperties.opacity = options.opacity;
       }
+
       if (!(0, _lodash.isEqual)(options.strokeOpacity, this.cacheStyleProperties.strokeOpacity)) {
         isUpdate = true;
         this.cacheStyleProperties.strokeOpacity = options.strokeOpacity;
       }
+
       if (!(0, _lodash.isEqual)(options.strokeWidth, this.cacheStyleProperties.strokeWidth)) {
         isUpdate = true;
         this.cacheStyleProperties.strokeWidth = options.strokeWidth;
       }
+
       if (!(0, _lodash.isEqual)(options.stroke, this.cacheStyleProperties.stroke)) {
         isUpdate = true;
         this.cacheStyleProperties.stroke = options.stroke;
       }
+
       if (!(0, _lodash.isEqual)(options.offsets, this.cacheStyleProperties.offsets)) {
         isUpdate = true;
         this.cacheStyleProperties.offsets = options.offsets;
       }
+
       if (this.dataTexture === undefined) {
         isUpdate = true;
       }
+
       return isUpdate;
     }
     /**
      * 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
      * @param options
      */
+
   }, {
     key: "judgeStyleAttributes",
     value: function judgeStyleAttributes(options) {
@@ -217,6 +228,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.stylePropertiesExist.hasOpacity = 1;
         this.cellLength += 1;
       }
+
       if (options.strokeOpacity !== undefined && !(0, _lodash.isNumber)(options.strokeOpacity)) {
         // 数据映射
         this.cellProperties.push({
@@ -226,6 +238,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.stylePropertiesExist.hasStrokeOpacity = 1;
         this.cellLength += 1;
       }
+
       if (options.strokeWidth !== undefined && !(0, _lodash.isNumber)(options.strokeWidth)) {
         // 数据映射
         this.cellProperties.push({
@@ -235,6 +248,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.stylePropertiesExist.hasStrokeWidth = 1;
         this.cellLength += 1;
       }
+
       if (options.stroke !== undefined && !this.isStaticColor(options.stroke)) {
         // 数据映射
         this.cellProperties.push({
@@ -244,6 +258,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.stylePropertiesExist.hasStroke = 1;
         this.cellLength += 4;
       }
+
       if (options.offsets !== undefined && !this.isOffsetStatic(options.offsets)) {
         // 数据映射
         this.cellProperties.push({
@@ -253,6 +268,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.stylePropertiesExist.hasOffsets = 1;
         this.cellLength += 2;
       }
+
       if (options.thetaOffset !== undefined && !(0, _lodash.isNumber)(options.thetaOffset)) {
         // 数据映射
         this.cellProperties.push({
@@ -263,12 +279,12 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.cellLength += 1;
       }
     }
-
     /**
      * 判断变量 stroke 是否是常量值
      * @param stroke
      * @returns
      */
+
   }, {
     key: "isStaticColor",
     value: function isStaticColor(stroke) {
@@ -279,6 +295,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           return false;
         }
       }
+
       return false;
     }
     /**
@@ -286,6 +303,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
      * @param stroke
      * @returns
      */
+
   }, {
     key: "getStrokeColor",
     value: function getStrokeColor(stroke) {
@@ -300,12 +318,12 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         return [0, 0, 0, 0];
       }
     }
-
     /**
      * 判断 offsets 是否是常量
      * @param offsets
      * @returns
      */
+
   }, {
     key: "isOffsetStatic",
     value: function isOffsetStatic(offsets) {
@@ -315,12 +333,12 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         return false;
       }
     }
-
     /**
      * 补空位
      * @param d
      * @param count
      */
+
   }, {
     key: "patchMod",
     value: function patchMod(d, count) {
@@ -328,24 +346,26 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         d.push(-1);
       }
     }
-
     /**
      * 根据映射的数据字段往推入数据
      * @param d
      * @param cellData
      * @param cellPropertiesLayouts
      */
+
   }, {
     key: "patchData",
     value: function patchData(d, cellData, cellPropertiesLayouts) {
       var _iterator = _createForOfIteratorHelper(cellPropertiesLayouts),
-        _step;
+          _step;
+
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var layout = _step.value;
           var attr = layout.attr,
-            count = layout.count;
+              count = layout.count;
           var value = cellData[attr];
+
           if (value !== undefined) {
             // 数据中存在该属性
             if (attr === 'stroke') {
@@ -370,7 +390,6 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         _iterator.f();
       }
     }
-
     /**
      * 计算推入数据纹理的数据
      * @param cellLength
@@ -378,6 +397,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
      * @param cellPropertiesLayouts
      * @returns
      */
+
   }, {
     key: "calDataFrame",
     value: function calDataFrame(cellLength, encodeData, cellPropertiesLayouts) {
@@ -386,44 +406,48 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       var totalLength = rowCount * this.DATA_TEXTURE_WIDTH;
       var d = [];
+
       for (var i = 0; i < encodeDatalength; i++) {
         // 根据 encodeData 数据推入数据
         var cellData = encodeData[i];
         this.patchData(d, cellData, cellPropertiesLayouts);
       }
+
       for (var _i = d.length; _i < totalLength; _i++) {
         // 每行不足的部分用 -1 补足（数据纹理时 width * height 的矩形数据集合）
         d.push(-1);
-      }
-      // console.log('data', d)
+      } // console.log('data', d)
+
+
       return {
         data: d,
         width: this.DATA_TEXTURE_WIDTH,
         height: rowCount
       };
-    }
+    } // style datatexture mapping
 
-    // style datatexture mapping
   }, {
     key: "getBlend",
     value: function getBlend() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
-        _this$layer$getLayerC2 = _this$layer$getLayerC.blend,
-        blend = _this$layer$getLayerC2 === void 0 ? 'normal' : _this$layer$getLayerC2;
+          _this$layer$getLayerC2 = _this$layer$getLayerC.blend,
+          blend = _this$layer$getLayerC2 === void 0 ? 'normal' : _this$layer$getLayerC2;
+
       return _blend.BlendTypes[_l7Core.BlendType[blend]];
     }
   }, {
     key: "getStencil",
     value: function getStencil(option) {
       var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
-        _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
-        mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
-        _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
-        maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
-        enableMask = _this$layer$getLayerC3.enableMask,
-        _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
-        maskOperation = _this$layer$getLayerC6 === void 0 ? _l7Core.MaskOperation.AND : _this$layer$getLayerC6;
-      // TODO 临时处理，后期移除MaskLayer
+          _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
+          mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
+          _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
+          maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
+          enableMask = _this$layer$getLayerC3.enableMask,
+          _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
+          maskOperation = _this$layer$getLayerC6 === void 0 ? _l7Core.MaskOperation.AND : _this$layer$getLayerC6; // TODO 临时处理，后期移除MaskLayer
+
+
       if (this.layer.type === 'MaskLayer') {
         return (0, _stencil.getStencilMask)({
           isStencil: true,
@@ -437,12 +461,11 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         })); // 用于遮罩的stencil 参数
       }
 
-      var maskflag = mask ||
-      //  mask 兼容历史写法
-      enableMask && this.layer.masks.length !== 0 ||
-      // 外部图层的mask
+      var maskflag = mask || //  mask 兼容历史写法
+      enableMask && this.layer.masks.length !== 0 || // 外部图层的mask
       this.layer.tileMask !== undefined; // 瓦片图层
       // !!(mask || enableMask || this.layer.tileMask);
+
       return (0, _stencil.getStencil)(maskflag, maskInside);
     }
   }, {
@@ -465,58 +488,76 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function () {
       var _needUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", false);
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", false);
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
+
       function needUpdate() {
         return _needUpdate.apply(this, arguments);
       }
+
       return needUpdate;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              throw new Error('Method not implemented.');
-            case 1:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                throw new Error('Method not implemented.');
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              throw new Error('Method not implemented.');
-            case 1:
-            case "end":
-              return _context3.stop();
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                throw new Error('Method not implemented.');
+
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
           }
         }, _callee3);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -527,8 +568,8 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "getAttribute",
     value: function getAttribute() {
       throw new Error('Method not implemented.');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "render",
     value: function render(renderOptions) {
@@ -548,7 +589,8 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "startModelAnimate",
     value: function startModelAnimate() {
       var _ref = this.layer.getLayerConfig(),
-        animateOption = _ref.animateOption;
+          animateOption = _ref.animateOption;
+
       if (animateOption.enable) {
         this.layer.setAnimateStartTime();
       }