p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shihui (#989) 

* chore: update version 2.7.30 -> 2.7.31

* fix: 修复 高德 1.x 地图时存在的可视化层延迟的现象

* style: lint style
This commit is contained in:
YiQianYao 2022-03-03 11:52:41 +08:00 committed by GitHub
parent 646073bb34
commit d957ae7ca1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -14,7 +14,7 @@
"message": "chore: publish" "message": "chore: publish"
} }
}, },
"version": "2.7.30", "version": "2.7.31",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"publishConfig": { "publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-component", "name": "@antv/l7-component",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,8 +25,8 @@
"author": "lzxue", "author": "lzxue",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-core", "name": "@antv/l7-core",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,7 +24,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"ajv": "^6.10.2", "ajv": "^6.10.2",
"element-resize-event": "^3.0.3", "element-resize-event": "^3.0.3",

2
packages/core/src/services/map/IMapService.ts
View File

@ -193,7 +193,7 @@ export interface IEarthService<RawMap = {}> {
): void; ): void;
} }
export const MapServiceEvent = ['mapload', 'mapchange']; export const MapServiceEvent = ['mapload', 'mapchange', 'mapAfterFrameChange'];
/** /**
* 地图初始化配置项 * 地图初始化配置项

16
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "2.7.30", "version": "2.7.31",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,13 +25,13 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.7.30", "@antv/l7-component": "^2.7.31",
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-layers": "^2.7.30", "@antv/l7-layers": "^2.7.31",
"@antv/l7-maps": "^2.7.30", "@antv/l7-maps": "^2.7.31",
"@antv/l7-scene": "^2.7.30", "@antv/l7-scene": "^2.7.31",
"@antv/l7-source": "^2.7.30", "@antv/l7-source": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

2
packages/l7/src/version.ts
View File

@ -1,2 +1,2 @@
const version = '2.7.30'; const version = '2.7.31';
export { version }; export { version };

8
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-layers", "name": "@antv/l7-layers",
"version": "2.7.30", "version": "2.7.31",
"description": "L7's collection of built-in layers", "description": "L7's collection of built-in layers",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,9 +24,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/geo-coord": "^1.0.8", "@antv/geo-coord": "^1.0.8",
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-source": "^2.7.30", "@antv/l7-source": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.2.0", "@mapbox/martini": "^0.2.0",
"@turf/meta": "^6.0.2", "@turf/meta": "^6.0.2",

8
packages/layers/src/core/BaseLayer.ts
View File

@ -299,6 +299,14 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
TYPES.IPickingService, TYPES.IPickingService,
); );
this.mapService = this.container.get<IMapService>(TYPES.IMapService); this.mapService = this.container.get<IMapService>(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<ICameraService>( this.cameraService = this.container.get<ICameraService>(
TYPES.ICameraService, TYPES.ICameraService,
); );

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-map", "name": "@antv/l7-map",
"version": "2.7.30", "version": "2.7.31",
"description": "l7 map", "description": "l7 map",
"keywords": [], "keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>", "author": "thinkinggis <lzx199065@gmail.com>",
@ -37,7 +37,7 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/point-geometry": "^0.1.0", "@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0", "@mapbox/unitbezier": "^0.0.0",

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-maps", "name": "@antv/l7-maps",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -27,9 +27,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^0.0.3", "@amap/amap-jsapi-loader": "^0.0.3",
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-map": "^2.7.30", "@antv/l7-map": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6", "@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2", "@types/mapbox-gl": "^1.11.2",

10
packages/maps/src/amap/map.ts
View File

@ -371,11 +371,11 @@ export default class AMapService
// @ts-ignore // @ts-ignore
const map = new AMap.Map(this.$mapContainer, mapConstructorOptions); const map = new AMap.Map(this.$mapContainer, mapConstructorOptions);
// 监听地图相机事件 // 监听地图相机事件
// map.on('camerachange', this.handleCameraChanged); map.on('camerachange', this.handleCameraChanged);
// Tip: 为了兼容开启 MultiPassRender 的情况 // Tip: 为了兼容开启 MultiPassRender 的情况
// 修复 MultiPassRender 在高德地图 1.x 的情况下，缩放地图改变 zoom 时存在可视化层和底图不同步的现象 // 修复 MultiPassRender 在高德地图 1.x 的情况下，缩放地图改变 zoom 时存在可视化层和底图不同步的现象
map.on('camerachange', (e) => { map.on('camerachange', () => {
setTimeout(() => this.handleCameraChanged(e)); setTimeout(() => this.handleAfterMapChange());
}); });
// @ts-ignore // @ts-ignore
@ -476,6 +476,10 @@ export default class AMapService
this.cameraChangedCallback = callback; this.cameraChangedCallback = callback;
} }
private handleAfterMapChange() {
this.emit('mapAfterFrameChange');
}
private handleCameraChanged = (e: IAMapEvent): void => { private handleCameraChanged = (e: IAMapEvent): void => {
const { const {
fov, fov,

12
packages/mini/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-mini", "name": "@antv/l7-mini",
"version": "2.7.30", "version": "2.7.31",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,11 +25,11 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-layers": "^2.7.30", "@antv/l7-layers": "^2.7.31",
"@antv/l7-maps": "^2.7.30", "@antv/l7-maps": "^2.7.31",
"@antv/l7-scene": "^2.7.30", "@antv/l7-scene": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-renderer", "name": "@antv/l7-renderer",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,7 +26,7 @@
"gl": "^4.4.0" "gl": "^4.4.0"
}, },
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"l7regl": "^0.0.17", "l7regl": "^0.0.17",

14
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-scene", "name": "@antv/l7-scene",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -23,12 +23,12 @@
"author": "xiaoiver", "author": "xiaoiver",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.7.30", "@antv/l7-component": "^2.7.31",
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-layers": "^2.7.30", "@antv/l7-layers": "^2.7.31",
"@antv/l7-maps": "^2.7.30", "@antv/l7-maps": "^2.7.31",
"@antv/l7-renderer": "^2.7.30", "@antv/l7-renderer": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"mapbox-gl": "^1.2.1", "mapbox-gl": "^1.2.1",

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-source", "name": "@antv/l7-source",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,8 +26,8 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-utils": "^2.7.30", "@antv/l7-utils": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0", "@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4", "@turf/helpers": "^6.1.4",

8
packages/three/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-three", "name": "@antv/l7-three",
"version": "2.7.30", "version": "2.7.31",
"description": "three for L7 ", "description": "three for L7 ",
"keywords": [ "keywords": [
"3D", "3D",
@ -44,9 +44,9 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.30", "@antv/l7-core": "^2.7.31",
"@antv/l7-layers": "^2.7.30", "@antv/l7-layers": "^2.7.31",
"@antv/l7-scene": "^2.7.30", "@antv/l7-scene": "^2.7.31",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-utils", "name": "@antv/l7-utils",
"version": "2.7.30", "version": "2.7.31",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",