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

Merge pull request #774 from antvis/shihui_dev 

Shihui dev
This commit is contained in:
YiQianYao 2021-09-18 17:01:54 +08:00 committed by GitHub
parent bc36b0a520 a397d0034a
commit aac7c708a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 43 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.5.21", "version": "2.5.22",
"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.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-utils": "^2.5.22",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/tiny-sdf": "^1.1.1", "@mapbox/tiny-sdf": "^1.1.1",
"ajv": "^6.10.2", "ajv": "^6.10.2",

13
packages/core/src/services/layer/LayerService.ts
View File

@ -23,6 +23,8 @@ export default class LayerService implements ILayerService {
private lastRenderType: string; private lastRenderType: string;
private lastPickRenderTime: number;
@inject(TYPES.IRendererService) @inject(TYPES.IRendererService)
private readonly renderService: IRendererService; private readonly renderService: IRendererService;
@ -129,6 +131,12 @@ export default class LayerService implements ILayerService {
// 渲染检测 // 渲染检测
private renderTest(renderType: string | undefined): boolean { private renderTest(renderType: string | undefined): boolean {
const now = new Date().getTime();
const betweenPickRenderTime = now - this.lastPickRenderTime;
if (renderType === 'picking') {
this.lastPickRenderTime = new Date().getTime();
}
// 继续渲染事件 // 继续渲染事件
if (renderType) { if (renderType) {
switch (renderType) { switch (renderType) {
@ -140,7 +148,12 @@ export default class LayerService implements ILayerService {
this.lastRenderType === 'animate' this.lastRenderType === 'animate'
) { ) {
this.lastRenderType = 'picking'; this.lastRenderType = 'picking';
// 如果上一次触发的事件在 48 ms 以上，则这一次不放弃触发
if (betweenPickRenderTime > 48) {
return true;
} else {
return false; return false;
}
} else { } else {
this.lastRenderType = 'picking'; this.lastRenderType = 'picking';
return true; return true;

2
packages/core/src/services/renderer/passes/PixelPickingPass.ts
View File

@ -243,12 +243,14 @@ export default class PixelPickingPass<
* }); * });
*/ */
private highlightPickedFeature(pickedColors: Uint8Array | undefined) { private highlightPickedFeature(pickedColors: Uint8Array | undefined) {
// @ts-ignore
const [r, g, b] = pickedColors; const [r, g, b] = pickedColors;
this.layer.hooks.beforeHighlight.call([r, g, b]); this.layer.hooks.beforeHighlight.call([r, g, b]);
this.layerService.renderLayers(); this.layerService.renderLayers();
} }
private selectFeature(pickedColors: Uint8Array | undefined) { private selectFeature(pickedColors: Uint8Array | undefined) {
// @ts-ignore
const [r, g, b] = pickedColors; const [r, g, b] = pickedColors;
this.layer.hooks.beforeSelect.call([r, g, b]); this.layer.hooks.beforeSelect.call([r, g, b]);
this.layerService.renderLayers(); this.layerService.renderLayers();

14
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "2.5.21", "version": "2.5.22",
"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,12 +25,12 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.5.21", "@antv/l7-component": "^2.5.22",
"@antv/l7-core": "^2.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-layers": "^2.5.21", "@antv/l7-layers": "^2.5.22",
"@antv/l7-maps": "^2.5.21", "@antv/l7-maps": "^2.5.22",
"@antv/l7-scene": "^2.5.21", "@antv/l7-scene": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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.5.20'; const version = '2.5.22';
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.5.21", "version": "2.5.22",
"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/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-source": "^2.5.21", "@antv/l7-source": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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",

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-map", "name": "@antv/l7-map",
"version": "2.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-utils": "^2.5.22",
"@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.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-map": "^2.5.21", "@antv/l7-map": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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",

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-renderer", "name": "@antv/l7-renderer",
"version": "2.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-core": "^2.5.22",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"l7regl": "^0.0.14", "l7regl": "^0.0.14",

14
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-scene", "name": "@antv/l7-scene",
"version": "2.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-component": "^2.5.22",
"@antv/l7-core": "^2.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-layers": "^2.5.21", "@antv/l7-layers": "^2.5.22",
"@antv/l7-maps": "^2.5.21", "@antv/l7-maps": "^2.5.22",
"@antv/l7-renderer": "^2.5.21", "@antv/l7-renderer": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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.5.21", "version": "2.5.22",
"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.5.21", "@antv/l7-core": "^2.5.22",
"@antv/l7-utils": "^2.5.21", "@antv/l7-utils": "^2.5.22",
"@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",

4
packages/three/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-three", "name": "@antv/l7-three",
"version": "2.5.21", "version": "2.5.22",
"description": "three for L7 ", "description": "three for L7 ",
"keywords": [ "keywords": [
"3D", "3D",
@ -44,7 +44,7 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7": "^2.5.21", "@antv/l7": "^2.5.22",
"@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.5.21", "version": "2.5.22",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",

4
stories/MapPerformance/components/Map.tsx
View File

@ -163,9 +163,9 @@ export default class PointTest extends React.Component {
.style({ .style({
opacity: 1.0, opacity: 1.0,
}) })
.select(true) .select(true);
// .animate(true) // .animate(true)
.active(true); // .active(true);
scene.on('loaded', () => { scene.on('loaded', () => {
scene.addLayer(layer); scene.addLayer(layer);