@antv/l7-layers 2.9.35 → 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;
     }
   }, {

package/es/glsl.d.ts

@@ -0,0 +1,5 @@
+declare module '*.glsl' {
+  const content: string;
+  // @ts-ignore
+  export default content;
+}

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

@@ -32,7 +32,7 @@ export default class TileFactory implements ITileFactory {
     updateStyle(styles: ITileStyles): string;
     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 | unknown[])[] | (import("@antv/l7-core").StyleAttributeField | ((...args: any[]) => [] | 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;
     protected emitEvent(layers: ILayer[], isVector?: boolean): void;
     protected getCombineFeature(features: IParseDataItem[]): any;

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;
     }
   }, {

package/lib/glsl.d.ts

@@ -0,0 +1,5 @@
+declare module '*.glsl' {
+  const content: string;
+  // @ts-ignore
+  export default content;
+}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.35",
+  "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.35",
-    "@antv/l7-maps": "2.9.35",
-    "@antv/l7-source": "2.9.35",
-    "@antv/l7-utils": "2.9.35",
+    "@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": "b61714e6b9e5e2179a1ac86b757a4ec6277f545a",
+  "gitHead": "dafb82e5eb2cf73db95d8dbdcef63d4ad5f99554",
   "publishConfig": {
     "access": "public"
   }