@antv/l7-layers 2.17.2 → 2.17.4

package/es/mask/models/fill.js

@@ -5,31 +5,42 @@ 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 _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 { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
 var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
 var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+
 var MaskModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(MaskModel, _BaseModel);
+
   var _super = _createSuper(MaskModel);
+
   function MaskModel() {
     _classCallCheck(this, MaskModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(MaskModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$color = _ref.color,
-        color = _ref$color === void 0 ? '#000' : _ref$color;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#000' : _ref$color;
+
       return {
         u_opacity: isNumber(opacity) ? opacity : 0.0,
         u_color: rgb2arr(color)
@@ -40,18 +51,23 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -60,37 +76,44 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.layer.buildLayerModel({
-                moduleName: 'mask',
-                vertexShader: mask_vert,
-                fragmentShader: mask_frag,
-                triangulation: polygonTriangulation,
-                depth: {
-                  enable: false
-                },
-                pick: false
-              });
-            case 2:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'mask',
+                  vertexShader: mask_vert,
+                  fragmentShader: mask_frag,
+                  triangulation: polygonTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  pick: false
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+
       if (refresh) {
         this.layerService.clear();
       }
@@ -101,6 +124,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
       return '';
     }
   }]);
+
   return MaskModel;
 }(BaseModel);
+
 export { MaskModel as default };

package/es/plugins/DataMappingPlugin.js

@@ -6,7 +6,9 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
+
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
@@ -17,27 +19,35 @@ import 'reflect-metadata';
 var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService), _dec3 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
+
     _initializerDefineProperty(this, "mapService", _descriptor, this);
+
     _initializerDefineProperty(this, "fontService", _descriptor2, this);
   }
+
   _createClass(DataMappingPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
+
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              layer.log(IDebugLog.MappingStart, ILayerStage.INIT);
-              // 初始化重新生成 map
-              _this.generateMaping(layer, {
-                styleAttributeService: styleAttributeService
-              });
-              layer.log(IDebugLog.MappingEnd, ILayerStage.INIT);
-            case 3:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                layer.log(IDebugLog.MappingStart, ILayerStage.INIT); // 初始化重新生成 map
+
+                _this.generateMaping(layer, {
+                  styleAttributeService: styleAttributeService
+                });
+
+                layer.log(IDebugLog.MappingEnd, ILayerStage.INIT);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       })));
@@ -45,95 +55,106 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
           var mappingResult;
           return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                if (flag) {
-                  _context2.next = 2;
-                  break;
-                }
-                return _context2.abrupt("return", flag);
-              case 2:
-                layer.dataState.dataMappingNeedUpdate = false;
-                layer.log(IDebugLog.MappingStart, ILayerStage.UPDATE);
-                mappingResult = _this.generateMaping(layer, {
-                  styleAttributeService: styleAttributeService
-                });
-                layer.log(IDebugLog.MappingEnd, ILayerStage.UPDATE);
-                return _context2.abrupt("return", mappingResult);
-              case 7:
-              case "end":
-                return _context2.stop();
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  if (flag) {
+                    _context2.next = 2;
+                    break;
+                  }
+
+                  return _context2.abrupt("return", flag);
+
+                case 2:
+                  layer.dataState.dataMappingNeedUpdate = false;
+                  layer.log(IDebugLog.MappingStart, ILayerStage.UPDATE);
+                  mappingResult = _this.generateMaping(layer, {
+                    styleAttributeService: styleAttributeService
+                  });
+                  layer.log(IDebugLog.MappingEnd, ILayerStage.UPDATE);
+                  return _context2.abrupt("return", mappingResult);
+
+                case 7:
+                case "end":
+                  return _context2.stop();
+              }
             }
           }, _callee2);
         }));
+
         return function (_x) {
           return _ref3.apply(this, arguments);
         };
-      }());
+      }()); // remapping before render
 
-      // remapping before render
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var source = layer.getSource();
+
         if (layer.layerModelNeedUpdate || !source || !source.inited) {
           return;
         }
+
         var attributes = styleAttributeService.getLayerStyleAttributes() || [];
         var filter = styleAttributeService.getLayerStyleAttribute('filter');
-        var dataArray = source.data.dataArray;
-        // TODO 数据为空的情况
+        var dataArray = source.data.dataArray; // TODO 数据为空的情况
+
         if (Array.isArray(dataArray) && dataArray.length === 0) {
           return;
         }
+
         var attributesToRemapping = attributes.filter(function (attribute) {
           return attribute.needRemapping;
         } // 如果filter变化
         );
+        var filterData = dataArray; // 数据过滤完 再执行数据映射
 
-        var filterData = dataArray;
-        // 数据过滤完 再执行数据映射
         if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
           filterData = dataArray.filter(function (record) {
             return _this.applyAttributeMapping(filter, record)[0];
           });
         }
+
         if (attributesToRemapping.length) {
           // 过滤数据
           var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData() // TODO 优化
           );
 
           layer.setEncodedData(encodeData);
-        }
-
-        // 处理文本更新，更新文字形状
+        } // 处理文本更新，更新文字形状
         // layer.emit('remapping', null);
+
       });
     }
   }, {
     key: "generateMaping",
     value: function generateMaping(layer, _ref4) {
       var _this2 = this;
+
       var styleAttributeService = _ref4.styleAttributeService;
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
-      var filterData = dataArray;
-      // 数据过滤完 再执行数据映射
+      var filterData = dataArray; // 数据过滤完 再执行数据映射
+
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
           return _this2.applyAttributeMapping(filter, record)[0];
         });
-      }
-      // Tip: layer 对数据做处理
+      } // Tip: layer 对数据做处理
       // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
       // 在各个 layer 中继承
 
+
       filterData = layer.processData(filterData); // 目前只有简单线需要处理
+
       var encodeData = this.mapping(layer, attributes, filterData, undefined);
       layer.setEncodedData(encodeData);
+
       if (dataArray.length === 0 && layer.encodeDataLength === 0) {
         return false;
-      }
-      // 对外暴露事件
+      } // 对外暴露事件
+
+
       layer.emit('dataUpdate', null);
       return true;
     }
@@ -141,11 +162,13 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "mapping",
     value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
+
       var _ref5 = layer.getLayerConfig(),
-        _ref5$arrow = _ref5.arrow,
-        arrow = _ref5$arrow === void 0 ? {
-          enable: false
-        } : _ref5$arrow;
+          _ref5$arrow = _ref5.arrow,
+          arrow = _ref5$arrow === void 0 ? {
+        enable: false
+      } : _ref5$arrow;
+
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
       }).filter(function (attribute) {
@@ -153,47 +176,52 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
+
         var encodeRecord = _objectSpread({
           id: record._id,
           coordinates: record.coordinates
         }, preRecord);
+
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record);
-          // TODO: 支持每个属性配置 postprocess}
+          var values = _this3.applyAttributeMapping(attribute, record); // TODO: 支持每个属性配置 postprocess}
+
+
           if (attribute.name === 'color' || attribute.name === 'stroke') {
             values = values.map(function (c) {
               return rgb2arr(c);
             });
-          }
-          // @ts-ignore
-          encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values;
+          } // @ts-ignore
+
+
+          encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
 
-          // 增加对 layer/text/iconfont unicode 映射的解析
           if (attribute.name === 'shape') {
             encodeRecord.shape = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
           }
         });
+
         if (arrow.enable && encodeRecord.shape === 'line') {
           // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
-          // @ts-ignore
+          var coords = encodeRecord.coordinates; // @ts-ignore
+
           if (layer.arrowInsertCount < layer.encodeDataLength) {
             // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
             var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
-            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
-            // @ts-ignore
+
+            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint); // @ts-ignore
+
             layer.arrowInsertCount++;
           }
         }
+
         return encodeRecord;
       });
       attributes.forEach(function (attribute) {
         attribute.needRemapping = false;
-      });
-      // 调整数据兼容 Amap2.0
-      this.adjustData2Amap2Coordinates(mappedData, layer);
+      }); // 调整数据兼容 Amap2.0
+
+      this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates
 
-      // 调整数据兼容 SimpleCoordinates
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
@@ -201,21 +229,22 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "adjustData2Amap2Coordinates",
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
       var _this4 = this;
+
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
-        var layerCenter = layer.coordCenter || layer.getSource().center;
-        // 单个的点数据
+        var layerCenter = layer.coordCenter || layer.getSource().center; // 单个的点数据
         // @ts-ignore
-        mappedData
-        // TODO: 避免经纬度被重复计算导致坐标位置偏移
+
+        mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
         .filter(function (d) {
           return !d.originCoordinates;
         }).map(function (d) {
-          d.version = Version['GAODE2.x'];
-          // @ts-ignore
+          d.version = Version['GAODE2.x']; // @ts-ignore
+
           d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
           // @ts-ignore
           // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
+
           d.coordinates = _this4.mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
         });
       }
@@ -224,6 +253,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
       var _this5 = this;
+
       if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
@@ -237,9 +267,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {
       var _this6 = this;
+
       if (typeof coordinates[0] === 'number') {
         return this.mapService.simpleMapCoord.unproject(coordinates);
       }
+
       if (coordinates[0] && coordinates[0][0] instanceof Array) {
         // @ts-ignore
         var coords = [];
@@ -248,20 +280,20 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           var c1 = [];
           coord.map(function (co) {
             c1.push(_this6.mapService.simpleMapCoord.unproject(co));
-          });
-          // @ts-ignore
+          }); // @ts-ignore
+
           coords.push(c1);
-        });
-        // @ts-ignore
+        }); // @ts-ignore
+
         return coords;
       } else {
         // @ts-ignore
-        var _coords = [];
-        // @ts-ignore
+        var _coords = []; // @ts-ignore
+
         coordinates.map(function (coord) {
           _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
-        });
-        // @ts-ignore
+        }); // @ts-ignore
+
         return _coords;
       }
     }
@@ -269,22 +301,25 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "applyAttributeMapping",
     value: function applyAttributeMapping(attribute, record) {
       var _attribute$scale;
+
       if (!attribute.scale) {
         return [];
       }
+
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
       scalers.forEach(function (_ref6) {
         var _attribute$scale2;
+
         var field = _ref6.field;
+
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
           params.push(record[field]);
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-      return mappingResult;
-      // return attribute.mapping ? attribute.mapping(params) : [];
+      return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }, {
     key: "getArrowPoints",
@@ -295,6 +330,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       return arrowPoint;
     }
   }]);
+
   return DataMappingPlugin;
 }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec2], {
   configurable: true,