diff --git a/lerna.json b/lerna.json index 0f4d43ade4..b384d41d87 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.5.21", + "version": "2.5.22", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index c4d2360257..896954daf6 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.5.21", + "version": "2.5.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-core": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@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 7b290cc2b1..904658cd95 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.5.21", + "version": "2.5.22", "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.5.21", + "@antv/l7-utils": "^2.5.22", "@babel/runtime": "^7.7.7", "@mapbox/tiny-sdf": "^1.1.1", "ajv": "^6.10.2", diff --git a/packages/core/src/services/layer/LayerService.ts b/packages/core/src/services/layer/LayerService.ts index b5ee8a15c9..c9fa78d28a 100644 --- a/packages/core/src/services/layer/LayerService.ts +++ b/packages/core/src/services/layer/LayerService.ts @@ -23,6 +23,8 @@ export default class LayerService implements ILayerService { private lastRenderType: string; + private lastPickRenderTime: number; + @inject(TYPES.IRendererService) private readonly renderService: IRendererService; @@ -129,6 +131,12 @@ export default class LayerService implements ILayerService { // 渲染检测 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) { switch (renderType) { @@ -140,7 +148,12 @@ export default class LayerService implements ILayerService { this.lastRenderType === 'animate' ) { this.lastRenderType = 'picking'; - return false; + // 如果上一次触发的事件在 48 ms 以上,则这一次不放弃触发 + if (betweenPickRenderTime > 48) { + return true; + } else { + return false; + } } else { this.lastRenderType = 'picking'; return true; diff --git a/packages/core/src/services/renderer/passes/PixelPickingPass.ts b/packages/core/src/services/renderer/passes/PixelPickingPass.ts index 6623ada734..51e73c29ee 100644 --- a/packages/core/src/services/renderer/passes/PixelPickingPass.ts +++ b/packages/core/src/services/renderer/passes/PixelPickingPass.ts @@ -243,12 +243,14 @@ export default class PixelPickingPass< * }); */ private highlightPickedFeature(pickedColors: Uint8Array | undefined) { + // @ts-ignore const [r, g, b] = pickedColors; this.layer.hooks.beforeHighlight.call([r, g, b]); this.layerService.renderLayers(); } private selectFeature(pickedColors: Uint8Array | undefined) { + // @ts-ignore const [r, g, b] = pickedColors; this.layer.hooks.beforeSelect.call([r, g, b]); this.layerService.renderLayers(); diff --git a/packages/l7/package.json b/packages/l7/package.json index fa0a044b3c..704d0328f1 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.5.21", + "version": "2.5.22", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,12 +25,12 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "^2.5.21", - "@antv/l7-core": "^2.5.21", - "@antv/l7-layers": "^2.5.21", - "@antv/l7-maps": "^2.5.21", - "@antv/l7-scene": "^2.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-component": "^2.5.22", + "@antv/l7-core": "^2.5.22", + "@antv/l7-layers": "^2.5.22", + "@antv/l7-maps": "^2.5.22", + "@antv/l7-scene": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index 984e79959f..b115a1ad62 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.5.20'; +const version = '2.5.22'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 82153fa8af..6e58c97214 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.5.21", + "version": "2.5.22", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -24,9 +24,9 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "^2.5.21", - "@antv/l7-source": "^2.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-core": "^2.5.22", + "@antv/l7-source": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/meta": "^6.0.2", diff --git a/packages/map/package.json b/packages/map/package.json index 47a0387102..7d3457878b 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.5.21", + "version": "2.5.22", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.5.21", + "@antv/l7-utils": "^2.5.22", "@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 d85f3bcde8..cd12786e31 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.5.21", + "version": "2.5.22", "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.5.21", - "@antv/l7-map": "^2.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-core": "^2.5.22", + "@antv/l7-map": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 5b99cb6155..9fd014defd 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.5.21", + "version": "2.5.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.5.21", + "@antv/l7-core": "^2.5.22", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.14", diff --git a/packages/scene/package.json b/packages/scene/package.json index 830c4adc9c..9a031e2aa9 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.5.21", + "version": "2.5.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.5.21", - "@antv/l7-core": "^2.5.21", - "@antv/l7-layers": "^2.5.21", - "@antv/l7-maps": "^2.5.21", - "@antv/l7-renderer": "^2.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-component": "^2.5.22", + "@antv/l7-core": "^2.5.22", + "@antv/l7-layers": "^2.5.22", + "@antv/l7-maps": "^2.5.22", + "@antv/l7-renderer": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@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 fdfd4ab992..d3ddc67418 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.5.21", + "version": "2.5.22", "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.5.21", - "@antv/l7-utils": "^2.5.21", + "@antv/l7-core": "^2.5.22", + "@antv/l7-utils": "^2.5.22", "@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 0a02183800..59fca29c77 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.5.21", + "version": "2.5.22", "description": "three for L7 ", "keywords": [ "3D", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7": "^2.5.21", + "@antv/l7": "^2.5.22", "@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 1de2cb7235..122ea83eb7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.5.21", + "version": "2.5.22", "description": "", "main": "lib/index.js", "module": "es/index.js", diff --git a/stories/MapPerformance/components/Map.tsx b/stories/MapPerformance/components/Map.tsx index 7399e64bf3..ad7ea9f9fd 100644 --- a/stories/MapPerformance/components/Map.tsx +++ b/stories/MapPerformance/components/Map.tsx @@ -163,9 +163,9 @@ export default class PointTest extends React.Component { .style({ opacity: 1.0, }) - .select(true) - // .animate(true) - .active(true); + .select(true); + // .animate(true) + // .active(true); scene.on('loaded', () => { scene.addLayer(layer);