diff --git a/lerna.json b/lerna.json index 0e69af157f..7be7efee7d 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.7.30", + "version": "2.7.31", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index 5f74ab3743..53c64e8fe5 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 8665f6441b..3716f266b0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -24,7 +24,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "ajv": "^6.10.2", "element-resize-event": "^3.0.3", diff --git a/packages/core/src/services/map/IMapService.ts b/packages/core/src/services/map/IMapService.ts index 2f5362327b..fc1804d632 100644 --- a/packages/core/src/services/map/IMapService.ts +++ b/packages/core/src/services/map/IMapService.ts @@ -193,7 +193,7 @@ export interface IEarthService { ): void; } -export const MapServiceEvent = ['mapload', 'mapchange']; +export const MapServiceEvent = ['mapload', 'mapchange', 'mapAfterFrameChange']; /** * 地图初始化配置项 diff --git a/packages/l7/package.json b/packages/l7/package.json index e80ca47226..8091b3ca67 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.7.30", + "version": "2.7.31", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,13 +25,13 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "^2.7.30", - "@antv/l7-core": "^2.7.30", - "@antv/l7-layers": "^2.7.30", - "@antv/l7-maps": "^2.7.30", - "@antv/l7-scene": "^2.7.30", - "@antv/l7-source": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-component": "^2.7.31", + "@antv/l7-core": "^2.7.31", + "@antv/l7-layers": "^2.7.31", + "@antv/l7-maps": "^2.7.31", + "@antv/l7-scene": "^2.7.31", + "@antv/l7-source": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 32b3b465de..105c72028e 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.7.30'; +const version = '2.7.31'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 01df398db4..4d3cdc10b2 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.7.30", + "version": "2.7.31", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -24,9 +24,9 @@ "license": "ISC", "dependencies": { "@antv/geo-coord": "^1.0.8", - "@antv/l7-core": "^2.7.30", - "@antv/l7-source": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-source": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/meta": "^6.0.2", diff --git a/packages/layers/src/core/BaseLayer.ts b/packages/layers/src/core/BaseLayer.ts index 64b5294d22..db2054dcaf 100644 --- a/packages/layers/src/core/BaseLayer.ts +++ b/packages/layers/src/core/BaseLayer.ts @@ -299,6 +299,14 @@ export default class BaseLayer extends EventEmitter TYPES.IPickingService, ); this.mapService = this.container.get(TYPES.IMapService); + const { enableMultiPassRenderer, passes } = this.getLayerConfig(); + if (enableMultiPassRenderer && passes?.length && passes.length > 0) { + // Tip: 兼容 multiPassRender 在 amap1 时存在的图层不同步问题 zoom + this.mapService.on('mapAfterFrameChange', () => { + this.renderLayers(); + }); + } + this.cameraService = this.container.get( TYPES.ICameraService, ); diff --git a/packages/map/package.json b/packages/map/package.json index 13e504967f..9e06c30c0d 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.7.30", + "version": "2.7.31", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.7.30", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/maps/package.json b/packages/maps/package.json index 3431dc2970..1729426a38 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^0.0.3", - "@antv/l7-core": "^2.7.30", - "@antv/l7-map": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-map": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/maps/src/amap/map.ts b/packages/maps/src/amap/map.ts index 6f4594f4e8..bb9ee0f25e 100644 --- a/packages/maps/src/amap/map.ts +++ b/packages/maps/src/amap/map.ts @@ -371,11 +371,11 @@ export default class AMapService // @ts-ignore const map = new AMap.Map(this.$mapContainer, mapConstructorOptions); // 监听地图相机事件 - // map.on('camerachange', this.handleCameraChanged); + map.on('camerachange', this.handleCameraChanged); // Tip: 为了兼容开启 MultiPassRender 的情况 // 修复 MultiPassRender 在高德地图 1.x 的情况下，缩放地图改变 zoom 时存在可视化层和底图不同步的现象 - map.on('camerachange', (e) => { - setTimeout(() => this.handleCameraChanged(e)); + map.on('camerachange', () => { + setTimeout(() => this.handleAfterMapChange()); }); // @ts-ignore @@ -476,6 +476,10 @@ export default class AMapService this.cameraChangedCallback = callback; } + private handleAfterMapChange() { + this.emit('mapAfterFrameChange'); + } + private handleCameraChanged = (e: IAMapEvent): void => { const { fov, diff --git a/packages/mini/package.json b/packages/mini/package.json index e07da1f6c7..d9e93bee8d 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-mini", - "version": "2.7.30", + "version": "2.7.31", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,11 +25,11 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-core": "^2.7.30", - "@antv/l7-layers": "^2.7.30", - "@antv/l7-maps": "^2.7.30", - "@antv/l7-scene": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-layers": "^2.7.31", + "@antv/l7-maps": "^2.7.31", + "@antv/l7-scene": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 1eeed0e236..d29920b7bf 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.7.30", + "@antv/l7-core": "^2.7.31", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.17", diff --git a/packages/scene/package.json b/packages/scene/package.json index 1e14804d5c..e1147b0d5a 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.7.30", - "@antv/l7-core": "^2.7.30", - "@antv/l7-layers": "^2.7.30", - "@antv/l7-maps": "^2.7.30", - "@antv/l7-renderer": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-component": "^2.7.31", + "@antv/l7-core": "^2.7.31", + "@antv/l7-layers": "^2.7.31", + "@antv/l7-maps": "^2.7.31", + "@antv/l7-renderer": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "mapbox-gl": "^1.2.1", diff --git a/packages/source/package.json b/packages/source/package.json index 4eef9bd91a..41a77d73d0 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "^2.7.30", - "@antv/l7-utils": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-utils": "^2.7.31", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.4.0", "@turf/helpers": "^6.1.4", diff --git a/packages/three/package.json b/packages/three/package.json index 2d1651338f..c01c6e1906 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.7.30", + "version": "2.7.31", "description": "three for L7 ", "keywords": [ "3D", @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-core": "^2.7.30", - "@antv/l7-layers": "^2.7.30", - "@antv/l7-scene": "^2.7.30", + "@antv/l7-core": "^2.7.31", + "@antv/l7-layers": "^2.7.31", + "@antv/l7-scene": "^2.7.31", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index 5dc6f31fb4..c8414f2b1f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.7.30", + "version": "2.7.31", "description": "", "main": "lib/index.js", "module": "es/index.js",