From 6124cfa9d9bf46189e2fbd0cee459a35ec37efef Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+2912401452@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:34:28 +0800 Subject: [PATCH] Shihui dev (#804) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add getModelMatrix into viewport * feat: 新增地球模式 （初步构建） * feat: 完善地球交互 * style: lint style * feat: 调整地球图层缩放的方向 * style: lint style * feat: 增加地球模式的 pointLayer/fill 图层 * style: lint style * feat: 增加地球、太阳的简单运动系统，优化部分代码结构 * fix: 修复时间点击出错 * style: lint style * fix: 修复地图 panBy 方法参数错误 * style: lint style * feat: pointLayer/cylinder 圆柱兼容地球模式 * style: lint style * feat: 修复 pointLayer/fill 在拾取是破面严重的情况 * style: lint style * feat: 增加 arc 弧度调节 * feat: 增加 lineLayer/arc3d 兼容地球模式 * style: lint style * feat: 增加地球图层 - 大气层 * style: lint style * feat: 增加设置可视化层背景色的能力 * style: lint style * feat: 增加地球外发光效果 * style: lint style * feat: 允许用户不使用 layer 的 source 方法 - 地球模式下光晕图层不需要传数据 * style: lint style * feat: 调整光晕的 shader 计算 * chore: update version 2.5.32 -> 2.5.33 * feat: 调整地球大气层的渲染层级 * style: lint style * feat: 调整案例 * style: lint style * chore: update version 2.5.34 -> 2.5.35 * feat: 增加地球图层的默认参数、调整部分代码 * style: lint style * chore: update version 2.5.34 -> 2.5.35 * fix: 修复 amap2 新增样式导致的 marker 失效 * feat: 修复 amap2 的 amap-maps 新增 z-index=0; 引发的marker 显示层级失效 * feat: amap2 的 amap-maps 新增 z-index=0; 样式，让 marker 中 zIndex 失效 * style: lint style --- lerna.json | 2 +- packages/component/package.json | 6 +++--- packages/core/package.json | 4 ++-- packages/l7/package.json | 14 +++++++------- packages/l7/src/version.ts | 2 +- packages/layers/package.json | 8 ++++---- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/maps/src/amap2/map.ts | 20 +++++++++++--------- 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, 52 insertions(+), 50 deletions(-) diff --git a/lerna.json b/lerna.json index 98835cc551..5c722756d3 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.5.34", + "version": "2.5.35", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index 397035d6e0..9e90425603 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.5.34", + "version": "2.5.35", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.5.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-core": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@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 b203e56561..fdaeeb3392 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.5.34", + "version": "2.5.35", "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.34", + "@antv/l7-utils": "^2.5.35", "@babel/runtime": "^7.7.7", "@mapbox/tiny-sdf": "^1.1.1", "ajv": "^6.10.2", diff --git a/packages/l7/package.json b/packages/l7/package.json index bcad369258..3cc7148ff4 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.5.34", + "version": "2.5.35", "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.34", - "@antv/l7-core": "^2.5.34", - "@antv/l7-layers": "^2.5.34", - "@antv/l7-maps": "^2.5.34", - "@antv/l7-scene": "^2.5.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-component": "^2.5.35", + "@antv/l7-core": "^2.5.35", + "@antv/l7-layers": "^2.5.35", + "@antv/l7-maps": "^2.5.35", + "@antv/l7-scene": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index f6179f4f48..b80c690969 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.5.34'; +const version = '2.5.35'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index e83b7a730b..8424fa40ad 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.5.34", + "version": "2.5.35", "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.34", - "@antv/l7-source": "^2.5.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-core": "^2.5.35", + "@antv/l7-source": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@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 2c903d10b8..c7f0001c9a 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.5.34", + "version": "2.5.35", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.5.34", + "@antv/l7-utils": "^2.5.35", "@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 af23748258..37a80558fa 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.5.34", + "version": "2.5.35", "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.34", - "@antv/l7-map": "^2.5.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-core": "^2.5.35", + "@antv/l7-map": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/maps/src/amap2/map.ts b/packages/maps/src/amap2/map.ts index 80d4283e9b..f3822b418b 100644 --- a/packages/maps/src/amap2/map.ts +++ b/packages/maps/src/amap2/map.ts @@ -151,15 +151,17 @@ export default class AMapService } const mapContainer = this.map.getContainer(); if (mapContainer !== null) { - // const amap = mapContainer.getElementsByClassName( - // 'amap-maps', - // )[0] as HTMLElement; - // this.markerContainer = DOM.create('div', 'l7-marker-container2', amap); - this.markerContainer = DOM.create( - 'div', - 'l7-marker-container2', - mapContainer, - ); + const amap = mapContainer.getElementsByClassName( + 'amap-maps', + )[0] as HTMLElement; + // TODO: amap2 的 amap-maps 新增 z-index=0; 样式，让 marker 中 zIndex 失效 + amap.style.zIndex = '2'; + this.markerContainer = DOM.create('div', 'l7-marker-container2', amap); + // this.markerContainer = DOM.create( + // 'div', + // 'l7-marker-container2', + // mapContainer, + // ); // this.markerContainer = mapContainer; } } diff --git a/packages/renderer/package.json b/packages/renderer/package.json index b7b7e4218b..fe5ca4251b 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.5.34", + "version": "2.5.35", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.5.34", + "@antv/l7-core": "^2.5.35", "@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 a0277c877e..9f724ec769 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.5.34", + "version": "2.5.35", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.5.34", - "@antv/l7-core": "^2.5.34", - "@antv/l7-layers": "^2.5.34", - "@antv/l7-maps": "^2.5.34", - "@antv/l7-renderer": "^2.5.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-component": "^2.5.35", + "@antv/l7-core": "^2.5.35", + "@antv/l7-layers": "^2.5.35", + "@antv/l7-maps": "^2.5.35", + "@antv/l7-renderer": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@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 640d41c8d0..1705705446 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.5.34", + "version": "2.5.35", "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.34", - "@antv/l7-utils": "^2.5.34", + "@antv/l7-core": "^2.5.35", + "@antv/l7-utils": "^2.5.35", "@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 e7a456e437..21cc9bd8fb 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.5.34", + "version": "2.5.35", "description": "three for L7 ", "keywords": [ "3D", @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-core": "^2.5.34", - "@antv/l7-layers": "^2.5.34", - "@antv/l7-scene": "^2.5.34", + "@antv/l7-core": "^2.5.35", + "@antv/l7-layers": "^2.5.35", + "@antv/l7-scene": "^2.5.35", "@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 29567121bb..3d72ab5bbd 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.5.34", + "version": "2.5.35", "description": "", "main": "lib/index.js", "module": "es/index.js",