From 87fc927880bca69f18137625344c73053faddc6f Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+2912401452@users.noreply.github.com> Date: Tue, 21 Dec 2021 16:36:22 +0800 Subject: [PATCH 1/3] Shihuidev (#889) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 增加着色器的拾取计算控制、完善 arcmini * feat: 完善 enableShaderPick/disableShaderPick 功能 * style: lint style * feat: 补充调用高德地图公交线路查询 demo * style: lint style * feat: 优化弧线的纹理动画 * style: lint style * feat: 去除greatCircle 的纹理动画优化 * feat: 扩展点图层圆柱效果 * feat: 增加几何体的径向渐变配置 * style: lint style * fix: 修复bug 图层触发的事件跟图层设置的zIndex无关，只跟插入图层先后顺序有关 * style: lint style * feat: 补全挤出几何体拾取颜色的光照配置 * style: lint style * fix: 修复圆柱 cull 问题 mapbox amap 不同 * feat: 图层销毁时的内存泄漏 * style: lint style * feat: 平面弧线新增弧线偏移量的数据映射能力 * style: lint style * fix: 修复重复销毁bug * style: lint style * feat: 修复 texture 重复销毁问题 * style: lint style * fix: 修复图层叠加模式下的拾取失效问题 * style: lint style * fix: 修复纹理贴图在 zoom 大于 12 时存在的问题 * fix: 修复水波点颜色偏暗 * feat: 优化点图层的渲染效果，叠加渲染效果 * style: lint style * fix: 修复 layer contextmenu 事件丢失 * fix: 修复 map 类型 resize 失效 * style: lint style * feat: 增加瓦片地图的请求节流 * style: lint style * feat: 优化热力图在 radius 数值比较大时热力点边缘发生裁剪的现象 * style: lint style * fix: 修复resize 后 picking shiqu 拾取失败的问题 * feat: 优化 marker/popup 在容器边缘的表现 * feat: 增加 setEnableRender 方法 * style: lint style * feat: 增加城市图层扫光特效 * style: lint style * feat: 补全拾取色混合配置 * style: lint style * feat: 增加高德地图的面积大小点 * style: lint style * feat: 点优化边缘锯齿 * fix: 修复pointLayer stroke 变暗问题 * fix: 修复混合导致的拾取错误 --- packages/renderer/src/regl/ReglModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/renderer/src/regl/ReglModel.ts b/packages/renderer/src/regl/ReglModel.ts index 377306e240..4c5dff4f54 100644 --- a/packages/renderer/src/regl/ReglModel.ts +++ b/packages/renderer/src/regl/ReglModel.ts @@ -97,7 +97,7 @@ export default class ReglModel implements IModel { const pickDrawParams = cloneDeep(drawParams); // @ts-ignore - pickDrawParams.blend.enable = true; + pickDrawParams.blend.enable = false; // @ts-ignore pickDrawParams.blend.func = { dstAlpha: 'one', From 9078e41740f2cbabd780410c80c0dfb45dd877da Mon Sep 17 00:00:00 2001 From: 2912401452 <2912401452@qq.com> Date: Tue, 21 Dec 2021 16:38:36 +0800 Subject: [PATCH 2/3] chore: update version 2.6.21 -> 2.6.22 --- lerna.json | 2 +- packages/component/package.json | 6 +++--- packages/core/package.json | 4 ++-- packages/l7/package.json | 16 ++++++++-------- packages/l7/src/version.ts | 2 +- packages/layers/package.json | 8 ++++---- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/mini/package.json | 12 ++++++------ packages/renderer/package.json | 4 ++-- packages/scene/package.json | 14 +++++++------- packages/source/package.json | 6 +++--- packages/three/package.json | 8 ++++---- packages/utils/package.json | 2 +- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index d73d9ffdd6..381b174107 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.6.21", + "version": "2.6.22", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index bc34bec6b0..633e35b2f5 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.6.21", + "version": "2.6.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-utils": "^2.6.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 f11946d233..b54604dac1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.6.21", + "version": "2.6.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.6.21", + "@antv/l7-utils": "^2.6.22", "@babel/runtime": "^7.7.7", "ajv": "^6.10.2", "element-resize-event": "^3.0.3", diff --git a/packages/l7/package.json b/packages/l7/package.json index 0277a16a2e..a387012338 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.6.21", + "version": "2.6.22", "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.6.21", - "@antv/l7-core": "^2.6.21", - "@antv/l7-layers": "^2.6.21", - "@antv/l7-maps": "^2.6.21", - "@antv/l7-scene": "^2.6.21", - "@antv/l7-source": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-component": "^2.6.22", + "@antv/l7-core": "^2.6.22", + "@antv/l7-layers": "^2.6.22", + "@antv/l7-maps": "^2.6.22", + "@antv/l7-scene": "^2.6.22", + "@antv/l7-source": "^2.6.22", + "@antv/l7-utils": "^2.6.22", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index f9db62dec0..b5a39b8443 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.6.21'; +const version = '2.6.22'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index a5d4a7d968..45f2e84340 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.6.21", + "version": "2.6.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/geo-coord": "^1.0.8", - "@antv/l7-core": "^2.6.21", - "@antv/l7-source": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-source": "^2.6.22", + "@antv/l7-utils": "^2.6.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 c635892af6..cc55500f59 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.6.21", + "version": "2.6.22", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.6.21", + "@antv/l7-utils": "^2.6.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 7f52c0803c..31df40855c 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.6.21", + "version": "2.6.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.6.21", - "@antv/l7-map": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-map": "^2.6.22", + "@antv/l7-utils": "^2.6.22", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/mini/package.json b/packages/mini/package.json index 5b34a623a7..50a6ab72dd 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-mini", - "version": "2.6.21", + "version": "2.6.22", "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.6.21", - "@antv/l7-layers": "^2.6.21", - "@antv/l7-maps": "^2.6.21", - "@antv/l7-scene": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-layers": "^2.6.22", + "@antv/l7-maps": "^2.6.22", + "@antv/l7-scene": "^2.6.22", + "@antv/l7-utils": "^2.6.22", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 50cc722ffb..d7fdb7c55a 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.6.21", + "version": "2.6.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.6.21", + "@antv/l7-core": "^2.6.22", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.16", diff --git a/packages/scene/package.json b/packages/scene/package.json index 0a48d47e6b..207d09d605 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.6.21", + "version": "2.6.22", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.6.21", - "@antv/l7-core": "^2.6.21", - "@antv/l7-layers": "^2.6.21", - "@antv/l7-maps": "^2.6.21", - "@antv/l7-renderer": "^2.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-component": "^2.6.22", + "@antv/l7-core": "^2.6.22", + "@antv/l7-layers": "^2.6.22", + "@antv/l7-maps": "^2.6.22", + "@antv/l7-renderer": "^2.6.22", + "@antv/l7-utils": "^2.6.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 a7983e87bb..ac3401f4c2 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.6.21", + "version": "2.6.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.6.21", - "@antv/l7-utils": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-utils": "^2.6.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 d20d9889ab..17a8b09923 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.6.21", + "version": "2.6.22", "description": "three for L7 ", "keywords": [ "3D", @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-core": "^2.6.21", - "@antv/l7-layers": "^2.6.21", - "@antv/l7-scene": "^2.6.21", + "@antv/l7-core": "^2.6.22", + "@antv/l7-layers": "^2.6.22", + "@antv/l7-scene": "^2.6.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 274ade097e..0b6b505b5b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.6.21", + "version": "2.6.22", "description": "", "main": "lib/index.js", "module": "es/index.js", From 72a0e4443ed364242e5842c51856a2a3dbfc14e6 Mon Sep 17 00:00:00 2001 From: 2912401452 <2912401452@qq.com> Date: Tue, 21 Dec 2021 16:39:26 +0800 Subject: [PATCH 3/3] style: lint style --- docs/api/district/drilldown.zh.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/api/district/drilldown.zh.md b/docs/api/district/drilldown.zh.md index 6526180d89..07d537378f 100644 --- a/docs/api/district/drilldown.zh.md +++ b/docs/api/district/drilldown.zh.md @@ -94,7 +94,6 @@ DrillDownLayer 提供默认提供通过 Layer 的交互事件，实现上钻下 ] ``` - ### label 文本配置项 `labelOption` @@ -219,7 +218,7 @@ DrillDownLayer 提供默认提供通过 Layer 的交互事件，实现上钻下 ```javascirpt drillLayer.drillDown(['110100']) -```` +``` ### drillUp