@antv/l7-layers 2.9.34 → 2.9.36-alpha.1

package/es/core/BaseLayer.js

@@ -793,6 +793,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         visible: true
       });
       this.reRender();
+      this.emit('show');
       return this;
     }
   }, {
@@ -802,6 +803,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         visible: false
       });
       this.reRender();
+      this.emit('hide');
       return this;
     }
   }, {
@@ -1390,14 +1392,20 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "dispatchModelLoad",
     value: function dispatchModelLoad(models) {
+      var _this11 = this;
+
       this.models.forEach(function (model) {
         return model.destroy();
       });
       this.models = [];
       this.models = models;
       this.emit('modelLoaded', null);
-      this.modelLoaded = true;
-      this.layerService.throttleRenderLayers();
+      this.modelLoaded = true; // Tip: setTimeout 用于延迟绘制，可以让拖动图层时连续的 setData 更加平滑 - L7Draw
+
+      setTimeout(function () {
+        // Tip: 使用 renderLayers 而不是 throttleRenderLayers，让图层之间的 setData 更新绘制不存在延迟
+        _this11.layerService.renderLayers();
+      }, 32);
     }
   }, {
     key: "reRender",

package/es/core/interface.d.ts

@@ -120,6 +120,7 @@ export interface IRasterTileLayerStyleOptions extends IBaseLayerStyleOptions {
 export interface IMaskLayerStyleOptions extends IBaseLayerStyleOptions {
     opacity: number;
     color: string;
+    sourceLayer?: string;
 }
 export interface IWindLayerStyleOptions extends IBaseLayerStyleOptions {
     uMin?: number;

package/es/mask/index.js

@@ -19,6 +19,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseLayer from "../core/BaseLayer";
 import MaskModels from "./models";
+import { isVectorTile } from "../tile/utils";
 import { TYPES } from '@antv/l7-core';
 
 var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
@@ -143,6 +144,12 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
+        return 'vectorMask';
+      }
+
       return 'fill';
     }
   }]);

package/es/mask/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type MaskModelType = 'fill';
+export declare type MaskModelType = 'fill' | 'vectorMask';
 declare const MaskModels: {
     [key in MaskModelType]: any;
 };

package/es/mask/models/index.js

@@ -1,5 +1,7 @@
+import MaskTileModel from "../../tile/models/tileModel";
 import FillModel from "./fill";
 var MaskModels = {
-  fill: FillModel
+  fill: FillModel,
+  vectorMask: MaskTileModel
 };
 export default MaskModels;

package/es/plugins/DataMappingPlugin.js

@@ -254,7 +254,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
-        var layerCenter = layer.coordCenter;
+        var layerCenter = layer.coordCenter || layer.getSource().center;
 
         if (typeof mappedData[0].coordinates[0] === 'number') {
           // 单个的点数据

package/es/plugins/ShaderUniformPlugin.d.ts

@@ -13,5 +13,9 @@ export default class ShaderUniformPlugin implements ILayerPlugin {
     private readonly rendererService;
     private readonly mapService;
     apply(layer: ILayer): void;
-    private getLayerCenter;
+    /**
+     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
+     * @param layer
+     */
+    private setLayerCenter;
 }

package/es/plugins/ShaderUniformPlugin.js

@@ -48,7 +48,9 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         _this.coordinateSystemService.refresh(offset);
 
         if (version === 'GAODE2.x') {
-          // @ts-ignore
+          _this.setLayerCenter(layer); // @ts-ignore
+
+
           mvp = _this.mapService.map.customCoords.getMVPMatrix(); // mvp = amapCustomCoords.getMVPMatrix()
           // @ts-ignore
 
@@ -66,11 +68,16 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         }); // TODO：脏检查，决定是否需要渲染
       });
     }
+    /**
+     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
+     * @param layer
+     */
+
   }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
+    key: "setLayerCenter",
+    value: function setLayerCenter(layer) {
+      if (layer.coordCenter === undefined) layer.coordCenter = layer.getSource().center;
+      this.mapService.setCoordCenter && this.mapService.setCoordCenter(layer.coordCenter);
     }
   }]);
 

package/es/tile/tileFactory/base.d.ts

@@ -30,7 +30,7 @@ export default class TileFactory implements ITileFactory {
     };
     createLayer(tileLayerOption: ILayerTileConfig): any;
     updateStyle(styles: ITileStyles): string;
-    getDefautStyleAttributeField(layer: ILayer, type: string): string | string[] | 1;
+    getDefaultStyleAttributeField(layer: ILayer, type: string): string | string[] | 1;
     setStyleAttributeField(layer: ILayer, type: ScaleAttributeType, value: IScaleValue | undefined | string | string[]): ILayer | undefined;
     protected parseScaleValue(value: IScaleValue | string, type: string): (string | number | any[])[] | (import("@antv/l7-core").StyleAttributeField | ((...args: any[]) => [] | undefined))[];
     protected getTile(lng: number, lat: number): Tile;

package/es/tile/tileFactory/base.js

@@ -5,7 +5,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import Source from '@antv/l7-source';
 import { osmLonLat2TileXY } from '@antv/l7-utils';
-import MaskLayer from "../../mask";
 import { getLayerShape, readRasterValue, registerLayers } from "../utils";
 import VectorLayer from "./vectorLayer";
 import * as turf from '@turf/helpers';
@@ -170,7 +169,9 @@ var TileFactory = /*#__PURE__*/function () {
       var layers = [layer];
 
       if (mask && layer.isVector) {
-        var masklayer = new MaskLayer().source({
+        var masklayer = new VectorLayer({
+          layerType: "MaskLayer"
+        }).source({
           type: 'FeatureCollection',
           features: [tile.bboxPolygon]
         }, {
@@ -187,15 +188,16 @@ var TileFactory = /*#__PURE__*/function () {
       registerLayers(this.parentLayer, layers);
       this.layers = [layer];
       return layer;
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "updateStyle",
     value: function updateStyle(styles) {
       return '';
     }
   }, {
-    key: "getDefautStyleAttributeField",
-    value: function getDefautStyleAttributeField(layer, type) {
+    key: "getDefaultStyleAttributeField",
+    value: function getDefaultStyleAttributeField(layer, type) {
       switch (type) {
         case 'size':
           return 1;
@@ -224,7 +226,7 @@ var TileFactory = /*#__PURE__*/function () {
         return;
       }
 
-      var defaultValue = this.getDefautStyleAttributeField(layer, type);
+      var defaultValue = this.getDefaultStyleAttributeField(layer, type);
 
       if (!value) {
         layer[type](defaultValue);

package/es/tile/tileFactory/index.d.ts

@@ -1,5 +1,5 @@
 import { IParserCfg } from '@antv/l7-core';
 import VectorLineTile from './line';
-export declare type TileType = 'PolygonLayer' | 'PointLayer' | 'LineLayer' | 'RasterLayer' | 'TileDebugLayer';
+export declare type TileType = 'PolygonLayer' | 'PointLayer' | 'LineLayer' | 'RasterLayer' | 'MaskLayer' | 'TileDebugLayer';
 export declare function getTileFactory(tileType: TileType, parser: IParserCfg): typeof VectorLineTile;
 export * from '../interface';

package/es/tile/tileFactory/index.js

@@ -2,6 +2,7 @@ import { rasterDataTypes } from '@antv/l7-source';
 import VectorLineTile from "./line";
 import VectorPointLayer from "./point";
 import VectorPolygonTile from "./polygon";
+import VectorMask from "./mask";
 import RasterTileFactory from "./raster";
 import RasterDataFactory from "./rasterData";
 import TestTile from "./test";
@@ -16,6 +17,9 @@ export function getTileFactory(tileType, parser) {
     case 'PointLayer':
       return VectorPointLayer;
 
+    case 'MaskLayer':
+      return VectorMask;
+
     case 'TileDebugLayer':
       return TestTile;
 

package/es/tile/tileFactory/line.d.ts

@@ -2,7 +2,7 @@ import { ILayer, ISubLayerInitOptions } from '@antv/l7-core';
 import { Tile } from '@antv/l7-utils';
 import { ITileFactoryOptions } from '../interface';
 import TileFactory from './base';
-export default class VectorPolygonTile extends TileFactory {
+export default class VectorLineTile extends TileFactory {
     parentLayer: ILayer;
     constructor(option: ITileFactoryOptions);
     createTile(tile: Tile, initOptions: ISubLayerInitOptions): {

package/es/tile/tileFactory/line.js

@@ -10,22 +10,22 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import TileFactory from "./base";
 
-var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  _inherits(VectorPolygonTile, _TileFactory);
+var VectorLineTile = /*#__PURE__*/function (_TileFactory) {
+  _inherits(VectorLineTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorLineTile);
 
-  function VectorPolygonTile(option) {
+  function VectorLineTile(option) {
     var _this;
 
-    _classCallCheck(this, VectorPolygonTile);
+    _classCallCheck(this, VectorLineTile);
 
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  _createClass(VectorPolygonTile, [{
+  _createClass(VectorLineTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -56,7 +56,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
     }
   }]);
 
-  return VectorPolygonTile;
+  return VectorLineTile;
 }(TileFactory);
 
-export { VectorPolygonTile as default };
+export { VectorLineTile as default };

package/es/tile/tileFactory/mask.d.ts

@@ -0,0 +1,12 @@
+import { ILayer, ISubLayerInitOptions } from '@antv/l7-core';
+import { Tile } from '@antv/l7-utils';
+import { ITileFactoryOptions } from '../interface';
+import TileFactory from './base';
+export default class VectorMaskTile extends TileFactory {
+    parentLayer: ILayer;
+    constructor(option: ITileFactoryOptions);
+    createTile(tile: Tile, initOptions: ISubLayerInitOptions): {
+        layers: any[];
+        layerIDList: any[];
+    };
+}

package/es/tile/tileFactory/mask.js

@@ -0,0 +1,63 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+
+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 TileFactory from "./base";
+
+var VectorMaskTile = /*#__PURE__*/function (_TileFactory) {
+  _inherits(VectorMaskTile, _TileFactory);
+
+  var _super = _createSuper(VectorMaskTile);
+
+  function VectorMaskTile(option) {
+    var _this;
+
+    _classCallCheck(this, VectorMaskTile);
+
+    _this = _super.call(this, option);
+    _this.parentLayer = option.parent;
+    return _this;
+  }
+
+  _createClass(VectorMaskTile, [{
+    key: "createTile",
+    value: function createTile(tile, initOptions) {
+      var _this$getFeatureData = this.getFeatureData(tile, initOptions),
+          features = _this$getFeatureData.features,
+          vectorTileLayer = _this$getFeatureData.vectorTileLayer,
+          source = _this$getFeatureData.source;
+
+      if (features.length === 0) {
+        return {
+          layers: [],
+          layerIDList: []
+        };
+      }
+
+      var layer = this.createLayer({
+        tile: tile,
+        initOptions: initOptions,
+        vectorTileLayer: vectorTileLayer,
+        source: source,
+        needListen: false
+      });
+      layer.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
+      return {
+        layers: [layer],
+        layerIDList: [layer.id]
+      };
+    }
+  }]);
+
+  return VectorMaskTile;
+}(TileFactory);
+
+export { VectorMaskTile as default };

package/es/tile/tileFactory/point.d.ts

@@ -2,7 +2,7 @@ import { ILayer, ISubLayerInitOptions } from '@antv/l7-core';
 import { Tile } from '@antv/l7-utils';
 import { ITileFactoryOptions } from '../interface';
 import TileFactory from './base';
-export default class VectorPolygonTile extends TileFactory {
+export default class VectorPointTile extends TileFactory {
     parentLayer: ILayer;
     constructor(option: ITileFactoryOptions);
     createTile(tile: Tile, initOptions: ISubLayerInitOptions): {

package/es/tile/tileFactory/point.js

@@ -10,22 +10,22 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import TileFactory from "./base";
 
-var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  _inherits(VectorPolygonTile, _TileFactory);
+var VectorPointTile = /*#__PURE__*/function (_TileFactory) {
+  _inherits(VectorPointTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorPointTile);
 
-  function VectorPolygonTile(option) {
+  function VectorPointTile(option) {
     var _this;
 
-    _classCallCheck(this, VectorPolygonTile);
+    _classCallCheck(this, VectorPointTile);
 
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  _createClass(VectorPolygonTile, [{
+  _createClass(VectorPointTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -57,7 +57,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
     }
   }]);
 
-  return VectorPolygonTile;
+  return VectorPointTile;
 }(TileFactory);
 
-export { VectorPolygonTile as default };
+export { VectorPointTile as default };

package/es/tile/tileFactory/vectorLayer.d.ts

@@ -1,11 +1,13 @@
 import BaseLayer from '../../core/BaseLayer';
-import { ILineLayerStyleOptions, IPointLayerStyleOptions, IPolygonLayerStyleOptions } from '../../core/interface';
+import { ILineLayerStyleOptions, IPointLayerStyleOptions, IPolygonLayerStyleOptions, IMaskLayerStyleOptions } from '../../core/interface';
 import lineFillModel from '../../line/models/tile';
 import lineSimpleModel from '../../line/models/simpleTileLine';
 import pointTextModel from '../../point/models/tileText';
 import pointFillModel from '../../point/models/tile';
 import polygonFillModel from '../../polygon/models/tile';
-export default class VectorLayer extends BaseLayer<Partial<IPolygonLayerStyleOptions & ILineLayerStyleOptions & IPointLayerStyleOptions & {
+import maskModel from '../../mask/models/fill';
+declare type ILayerStyleOptions = IPolygonLayerStyleOptions & ILineLayerStyleOptions & IPointLayerStyleOptions & IMaskLayerStyleOptions;
+export default class VectorLayer extends BaseLayer<Partial<ILayerStyleOptions & {
     needListen: boolean;
 }>> {
     needListen: boolean;
@@ -19,7 +21,7 @@ export default class VectorLayer extends BaseLayer<Partial<IPolygonLayerStyleOpt
     setPickID(): number | null;
     buildModels(): void;
     rebuildModels(): void;
-    protected getModelType(): typeof lineFillModel | typeof lineSimpleModel | typeof pointTextModel | typeof pointFillModel | typeof polygonFillModel;
+    protected getModelType(): typeof lineFillModel | typeof lineSimpleModel | typeof pointTextModel | typeof pointFillModel | typeof polygonFillModel | typeof maskModel;
     protected getLineModel(): typeof lineFillModel | typeof lineSimpleModel;
     protected getPointModel(): typeof pointTextModel | typeof pointFillModel;
     protected getConfigSchema(): {
@@ -33,3 +35,4 @@ export default class VectorLayer extends BaseLayer<Partial<IPolygonLayerStyleOpt
     };
     protected getDefaultConfig(): {};
 }
+export {};

package/es/tile/tileFactory/vectorLayer.js

@@ -24,6 +24,7 @@ import lineSimpleModel from "../../line/models/simpleTileLine";
 import pointTextModel from "../../point/models/tileText";
 import pointFillModel from "../../point/models/tile";
 import polygonFillModel from "../../polygon/models/tile";
+import maskModel from "../../mask/models/fill";
 
 var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(VectorLayer, _BaseLayer);
@@ -186,6 +187,9 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'PointLayer':
           return this.getPointModel();
 
+        case 'MaskLayer':
+          return maskModel;
+
         default:
           return pointFillModel;
       }

package/es/utils/layerData.js

@@ -1,6 +1,7 @@
 import { Version } from '@antv/l7-maps';
 import Source from '@antv/l7-source';
 import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
+import { cloneDeep } from 'lodash';
 
 function getArrowPoints(p1, p2) {
   var dir = [p2[0] - p1[0], p2[1] - p1[1]];
@@ -9,11 +10,11 @@ function getArrowPoints(p1, p2) {
   return arrowPoint;
 }
 
-function adjustData2Amap2Coordinates(mappedData, mapService) {
-  var _this = this;
-
+function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
   // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
   if (mappedData.length > 0 && mapService.version === Version['GAODE2.x']) {
+    var layerCenter = layer.coordCenter;
+
     if (typeof mappedData[0].coordinates[0] === 'number') {
       // 单个的点数据
       // @ts-ignore
@@ -25,8 +26,9 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
 
         d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoord(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoord(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
@@ -39,8 +41,9 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
 
         d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoords(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoords(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
       });
     }
   }
@@ -158,7 +161,7 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     return encodeRecord;
   }); // 调整数据兼容 Amap2.0
 
-  adjustData2Amap2Coordinates(mappedData, mapService); // 调整数据兼容 SimpleCoordinates
+  adjustData2Amap2Coordinates(mappedData, mapService, layer); // 调整数据兼容 SimpleCoordinates
 
   adjustData2SimpleCoordinates(mappedData, mapService);
   return mappedData;

package/lib/core/BaseLayer.js

@@ -790,6 +790,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         visible: true
       });
       this.reRender();
+      this.emit('show');
       return this;
     }
   }, {
@@ -799,6 +800,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         visible: false
       });
       this.reRender();
+      this.emit('hide');
       return this;
     }
   }, {
@@ -1386,14 +1388,20 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "dispatchModelLoad",
     value: function dispatchModelLoad(models) {
+      var _this11 = this;
+
       this.models.forEach(function (model) {
         return model.destroy();
       });
       this.models = [];
       this.models = models;
       this.emit('modelLoaded', null);
-      this.modelLoaded = true;
-      this.layerService.throttleRenderLayers();
+      this.modelLoaded = true; // Tip: setTimeout 用于延迟绘制，可以让拖动图层时连续的 setData 更加平滑 - L7Draw
+
+      setTimeout(function () {
+        // Tip: 使用 renderLayers 而不是 throttleRenderLayers，让图层之间的 setData 更新绘制不存在延迟
+        _this11.layerService.renderLayers();
+      }, 32);
     }
   }, {
     key: "reRender",

package/lib/mask/index.js

@@ -27,6 +27,8 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
 var _models = _interopRequireDefault(require("./models"));
 
+var _utils = require("../tile/utils");
+
 var _l7Core = require("@antv/l7-core");
 
 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; } } }; }
@@ -159,6 +161,12 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
+      var parserType = this.layerSource.getParserType();
+
+      if ((0, _utils.isVectorTile)(parserType)) {
+        return 'vectorMask';
+      }
+
       return 'fill';
     }
   }]);

package/lib/mask/models/index.js

@@ -7,10 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
+
 var _fill = _interopRequireDefault(require("./fill"));
 
 var MaskModels = {
-  fill: _fill.default
+  fill: _fill.default,
+  vectorMask: _tileModel.default
 };
 var _default = MaskModels;
 exports.default = _default;

package/lib/plugins/DataMappingPlugin.js

@@ -269,7 +269,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version['GAODE2.x']) {
-        var layerCenter = layer.coordCenter;
+        var layerCenter = layer.coordCenter || layer.getSource().center;
 
         if (typeof mappedData[0].coordinates[0] === 'number') {
           // 单个的点数据

package/lib/plugins/ShaderUniformPlugin.js

@@ -62,7 +62,9 @@ _dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPE
         _this.coordinateSystemService.refresh(offset);
 
         if (version === 'GAODE2.x') {
-          // @ts-ignore
+          _this.setLayerCenter(layer); // @ts-ignore
+
+
           mvp = _this.mapService.map.customCoords.getMVPMatrix(); // mvp = amapCustomCoords.getMVPMatrix()
           // @ts-ignore
 
@@ -80,11 +82,16 @@ _dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPE
         }); // TODO：脏检查，决定是否需要渲染
       });
     }
+    /**
+     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
+     * @param layer
+     */
+
   }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
+    key: "setLayerCenter",
+    value: function setLayerCenter(layer) {
+      if (layer.coordCenter === undefined) layer.coordCenter = layer.getSource().center;
+      this.mapService.setCoordCenter && this.mapService.setCoordCenter(layer.coordCenter);
     }
   }]);
   return ShaderUniformPlugin;

package/lib/tile/tileFactory/base.js

@@ -23,8 +23,6 @@ var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
 
 var _l7Utils = require("@antv/l7-utils");
 
-var _mask = _interopRequireDefault(require("../../mask"));
-
 var _utils = require("../utils");
 
 var _vectorLayer = _interopRequireDefault(require("./vectorLayer"));
@@ -196,7 +194,9 @@ var TileFactory = /*#__PURE__*/function () {
       var layers = [layer];
 
       if (mask && layer.isVector) {
-        var masklayer = new _mask.default().source({
+        var masklayer = new _vectorLayer.default({
+          layerType: "MaskLayer"
+        }).source({
           type: 'FeatureCollection',
           features: [tile.bboxPolygon]
         }, {
@@ -213,15 +213,16 @@ var TileFactory = /*#__PURE__*/function () {
       (0, _utils.registerLayers)(this.parentLayer, layers);
       this.layers = [layer];
       return layer;
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "updateStyle",
     value: function updateStyle(styles) {
       return '';
     }
   }, {
-    key: "getDefautStyleAttributeField",
-    value: function getDefautStyleAttributeField(layer, type) {
+    key: "getDefaultStyleAttributeField",
+    value: function getDefaultStyleAttributeField(layer, type) {
       switch (type) {
         case 'size':
           return 1;
@@ -250,7 +251,7 @@ var TileFactory = /*#__PURE__*/function () {
         return;
       }
 
-      var defaultValue = this.getDefautStyleAttributeField(layer, type);
+      var defaultValue = this.getDefaultStyleAttributeField(layer, type);
 
       if (!value) {
         layer[type](defaultValue);

package/lib/tile/tileFactory/index.js

@@ -18,6 +18,8 @@ var _point = _interopRequireDefault(require("./point"));
 
 var _polygon = _interopRequireDefault(require("./polygon"));
 
+var _mask = _interopRequireDefault(require("./mask"));
+
 var _raster = _interopRequireDefault(require("./raster"));
 
 var _rasterData = _interopRequireDefault(require("./rasterData"));
@@ -49,6 +51,9 @@ function getTileFactory(tileType, parser) {
     case 'PointLayer':
       return _point.default;
 
+    case 'MaskLayer':
+      return _mask.default;
+
     case 'TileDebugLayer':
       return _test.default;
 

package/lib/tile/tileFactory/line.js

@@ -23,21 +23,21 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  (0, _inherits2.default)(VectorPolygonTile, _TileFactory);
+var VectorLineTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorLineTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorLineTile);
 
-  function VectorPolygonTile(option) {
+  function VectorLineTile(option) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, VectorPolygonTile);
+    (0, _classCallCheck2.default)(this, VectorLineTile);
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  (0, _createClass2.default)(VectorPolygonTile, [{
+  (0, _createClass2.default)(VectorLineTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -67,7 +67,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
       };
     }
   }]);
-  return VectorPolygonTile;
+  return VectorLineTile;
 }(_base.default);
 
-exports.default = VectorPolygonTile;
+exports.default = VectorLineTile;

package/lib/tile/tileFactory/mask.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _base = _interopRequireDefault(require("./base"));
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
+
+var VectorMaskTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorMaskTile, _TileFactory);
+
+  var _super = _createSuper(VectorMaskTile);
+
+  function VectorMaskTile(option) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, VectorMaskTile);
+    _this = _super.call(this, option);
+    _this.parentLayer = option.parent;
+    return _this;
+  }
+
+  (0, _createClass2.default)(VectorMaskTile, [{
+    key: "createTile",
+    value: function createTile(tile, initOptions) {
+      var _this$getFeatureData = this.getFeatureData(tile, initOptions),
+          features = _this$getFeatureData.features,
+          vectorTileLayer = _this$getFeatureData.vectorTileLayer,
+          source = _this$getFeatureData.source;
+
+      if (features.length === 0) {
+        return {
+          layers: [],
+          layerIDList: []
+        };
+      }
+
+      var layer = this.createLayer({
+        tile: tile,
+        initOptions: initOptions,
+        vectorTileLayer: vectorTileLayer,
+        source: source,
+        needListen: false
+      });
+      layer.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
+      return {
+        layers: [layer],
+        layerIDList: [layer.id]
+      };
+    }
+  }]);
+  return VectorMaskTile;
+}(_base.default);
+
+exports.default = VectorMaskTile;

package/lib/tile/tileFactory/point.js

@@ -23,21 +23,21 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  (0, _inherits2.default)(VectorPolygonTile, _TileFactory);
+var VectorPointTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorPointTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorPointTile);
 
-  function VectorPolygonTile(option) {
+  function VectorPointTile(option) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, VectorPolygonTile);
+    (0, _classCallCheck2.default)(this, VectorPointTile);
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  (0, _createClass2.default)(VectorPolygonTile, [{
+  (0, _createClass2.default)(VectorPointTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -68,7 +68,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
       };
     }
   }]);
-  return VectorPolygonTile;
+  return VectorPointTile;
 }(_base.default);
 
-exports.default = VectorPolygonTile;
+exports.default = VectorPointTile;

package/lib/tile/tileFactory/vectorLayer.js

@@ -37,6 +37,8 @@ var _tile2 = _interopRequireDefault(require("../../point/models/tile"));
 
 var _tile3 = _interopRequireDefault(require("../../polygon/models/tile"));
 
+var _fill = _interopRequireDefault(require("../../mask/models/fill"));
+
 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); }
@@ -202,6 +204,9 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'PointLayer':
           return this.getPointModel();
 
+        case 'MaskLayer':
+          return _fill.default;
+
         default:
           return _tile2.default;
       }

package/lib/utils/layerData.js

@@ -13,6 +13,8 @@ var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
 
 var _l7Utils = require("@antv/l7-utils");
 
+var _lodash = require("lodash");
+
 function getArrowPoints(p1, p2) {
   var dir = [p2[0] - p1[0], p2[1] - p1[1]];
   var normalizeDir = (0, _l7Utils.normalize)(dir);
@@ -20,11 +22,11 @@ function getArrowPoints(p1, p2) {
   return arrowPoint;
 }
 
-function adjustData2Amap2Coordinates(mappedData, mapService) {
-  var _this = this;
-
+function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
   // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
   if (mappedData.length > 0 && mapService.version === _l7Maps.Version['GAODE2.x']) {
+    var layerCenter = layer.coordCenter;
+
     if (typeof mappedData[0].coordinates[0] === 'number') {
       // 单个的点数据
       // @ts-ignore
@@ -34,10 +36,11 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
       }).map(function (d) {
         d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
 
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoord(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoord(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
@@ -48,10 +51,11 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
       }).map(function (d) {
         d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
 
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoords(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoords(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
       });
     }
   }
@@ -169,7 +173,7 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     return encodeRecord;
   }); // 调整数据兼容 Amap2.0
 
-  adjustData2Amap2Coordinates(mappedData, mapService); // 调整数据兼容 SimpleCoordinates
+  adjustData2Amap2Coordinates(mappedData, mapService, layer); // 调整数据兼容 SimpleCoordinates
 
   adjustData2SimpleCoordinates(mappedData, mapService);
   return mappedData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.34",
+  "version": "2.9.36-alpha.1",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.2",
-    "@antv/l7-core": "2.9.34",
-    "@antv/l7-maps": "2.9.34",
-    "@antv/l7-source": "2.9.34",
-    "@antv/l7-utils": "2.9.34",
+    "@antv/l7-core": "2.9.36-alpha.1",
+    "@antv/l7-maps": "2.9.36-alpha.1",
+    "@antv/l7-source": "2.9.36-alpha.1",
+    "@antv/l7-utils": "2.9.36-alpha.1",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "5e0fdaf978907383aedd4ba77a8508e7b3b87671",
+  "gitHead": "dafb82e5eb2cf73db95d8dbdcef63d4ad5f99554",
   "publishConfig": {
     "access": "public"
   }