Merge branch 'next' into refactor/split-tripartite-map

antvis · Jun 11, 2024 · 36266c2 · 36266c2
2 parents 7f19909 + 902556e
commit 36266c2
Show file tree

Hide file tree

Showing 37 changed files with 615 additions and 41 deletions.
diff --git a/.changeset/proud-flies-change.md b/.changeset/proud-flies-change.md
diff --git a/extensions/extension-maps/src/bmap/map.ts b/extensions/extension-maps/src/bmap/map.ts
@@ -27,6 +27,7 @@ const BMAP_API_KEY = 'zLhopYPPERGtpGOgimcdKcCimGRyyIsh';
 const BMAP_VERSION = '1.0';
 const ZOOM_OFFSET = 1.75;
 
+// TODO: 基于抽象类 BaseMap 实现，补全缺失方法，解决类型问题
 export default class BMapService extends BaseMapService<BMapGL.Map> {
   public type: string = 'BMap';
 

diff --git a/extensions/extension-maps/src/tdtmap/map.ts b/extensions/extension-maps/src/tdtmap/map.ts
@@ -16,6 +16,7 @@ const MapEvent: Record<string, string[] | string> = {
 };
 const TDT_API_KEY = 'b15e548080c79819617367d3f6095c69';
 
+// TODO: 基于抽象类 BaseMap 实现，补全缺失方法，解决类型问题
 export default class TdtMapService extends BaseMapService<any> {
   public type: string = 'TdtMap';
 

diff --git a/packages/component/CHANGELOG.md b/packages/component/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+## 2.22.0
+
+### Patch Changes
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: 无地图与 MapLibre 模式移动 Marker 出错
+
+- Updated dependencies [[`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8)]:
+  - @antv/l7-layers@2.22.0
+  - @antv/l7-core@2.22.0
+  - @antv/l7-utils@2.22.0
+
+## 2.21.11-beta.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @antv/l7-layers@2.21.11-beta.7
+  - @antv/l7-core@2.21.11-beta.7
+  - @antv/l7-utils@2.21.11-beta.7
+
 ## 2.21.11-beta.6
 
 ### Patch Changes

diff --git a/packages/component/package.json b/packages/component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.21.11-beta.6",
+  "version": "2.22.0",
   "description": "Component for L7",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Change Log
 
+## 2.22.0
+
+### Patch Changes
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: 在 WebGL2 拾取事件冒泡延迟问题
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: Mapbox/Maplibre 20 层级以上数据偏移问题
+  fix: 修复点图层部分 shape 中心点计算有误
+  fix: 修复立体面图层光照计算有误
+- Updated dependencies []:
+  - @antv/l7-utils@2.22.0
+
+## 2.21.11-beta.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @antv/l7-utils@2.21.11-beta.7
+
 ## 2.21.11-beta.6
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-core",
-  "version": "2.21.11-beta.6",
+  "version": "2.22.0",
   "description": "",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

diff --git a/packages/l7/CHANGELOG.md b/packages/l7/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Change Log
 
+## 2.22.0
+
+### Patch Changes
+
+- Updated dependencies [[`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8)]:
+  - @antv/l7-layers@2.22.0
+  - @antv/l7-component@2.22.0
+  - @antv/l7-maps@2.22.0
+  - @antv/l7-core@2.22.0
+  - @antv/l7-scene@2.22.0
+  - @antv/l7-source@2.22.0
+  - @antv/l7-utils@2.22.0
+
+## 2.21.11-beta.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @antv/l7-scene@2.21.11-beta.7
+  - @antv/l7-component@2.21.11-beta.7
+  - @antv/l7-layers@2.21.11-beta.7
+  - @antv/l7-core@2.21.11-beta.7
+  - @antv/l7-maps@2.21.11-beta.7
+  - @antv/l7-source@2.21.11-beta.7
+  - @antv/l7-utils@2.21.11-beta.7
+
 ## 2.21.11-beta.6
 
 ### Patch Changes

diff --git a/packages/l7/package.json b/packages/l7/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7",
-  "version": "2.21.11-beta.6",
+  "version": "2.22.0",
   "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
   "repository": "git@github.com:antvis/L7.git",
   "license": "MIT",

diff --git a/packages/layers/CHANGELOG.md b/packages/layers/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Change Log
 
+## 2.22.0
+
+### Patch Changes
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: mapbox 线图层的贴图变形
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: 解决 GeometryLayer 在不同底图上的渲染不一致情况
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: 修复热力蜂窝图层渲染空白
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: Mapbox/Maplibre 20 层级以上数据偏移问题
+  fix: 修复点图层部分 shape 中心点计算有误
+  fix: 修复立体面图层光照计算有误
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - fix: mapbox 下部分面数据图层绘制异常
+
+- Updated dependencies [[`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8), [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8)]:
+  - @antv/l7-maps@2.22.0
+  - @antv/l7-core@2.22.0
+  - @antv/l7-source@2.22.0
+  - @antv/l7-utils@2.22.0
+
+## 2.21.11-beta.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @antv/l7-core@2.21.11-beta.7
+  - @antv/l7-maps@2.21.11-beta.7
+  - @antv/l7-source@2.21.11-beta.7
+  - @antv/l7-utils@2.21.11-beta.7
+
 ## 2.21.11-beta.6
 
 ### Patch Changes

diff --git a/packages/layers/package.json b/packages/layers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.21.11-beta.6",
+  "version": "2.22.0",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

diff --git a/packages/layers/src/line/shaders/arc3d/line_arc_3d_frag.glsl b/packages/layers/src/line/shaders/arc3d/line_arc_3d_frag.glsl
@@ -23,12 +23,11 @@ layout(std140) uniform commonUniorm {
   float u_linearColor: 0.0;
 };
 
-// varying vec2 v_normal;
-in vec4 v_dash_array;
 in vec4 v_color;
-in vec4 v_line_data;
+in vec4 v_dash_array;
 in float v_segmentIndex;
 in vec2 v_iconMapUV;
+in vec4 v_line_data;
 
 out vec4 outputColor;
 
@@ -57,7 +56,7 @@ void main() {
       alpha = clamp(alpha, 0.0, 1.0);
       outputColor.a *= alpha;
 
-      // u_animate 
+      // u_animate
       // x enable
       // y duration
       // z interval

diff --git a/packages/layers/src/line/shaders/greatCircle/line_arc_great_circle_frag.glsl b/packages/layers/src/line/shaders/greatCircle/line_arc_great_circle_frag.glsl
@@ -19,11 +19,11 @@ layout(std140) uniform commonUniorm {
   float u_linearColor: 0;
 };
 
-in vec4 v_line_data;
-in vec2 v_iconMapUV;
 in vec4 v_dash_array;
-in float v_distance_ratio;
 in vec4 v_color;
+in vec2 v_iconMapUV;
+in vec4 v_line_data;
+in float v_distance_ratio;
 
 out vec4 outputColor;
 #pragma include "picking"
@@ -34,7 +34,7 @@ void main() {
 
   float animateSpeed = 0.0;
   float d_segmentIndex = v_line_data.g;
-  
+
   // 设置弧线的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
     outputColor = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
@@ -65,7 +65,7 @@ void main() {
   }
 
   // 设置弧线的贴图
-  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { 
+  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) {
     float arcRadio = smoothstep( 0.0, 1.0, (d_segmentIndex / (segmentNumber - 1.0)));
     // float arcRadio = d_segmentIndex / (segmentNumber - 1.0);
     float count = v_line_data.b; // 贴图在弧线上重复的数量
@@ -79,7 +79,7 @@ void main() {
 
     vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
     vec4 pattern = texture(SAMPLER_2D(u_texture), uv);
-    
+
     // 设置贴图和底色的叠加模式
     if(u_textureBlend == 0.0) { // normal
       pattern.a = 0.0;
@@ -96,4 +96,4 @@ void main() {
   }
 
   // gl_FragColor = filterColor(gl_FragColor);
-}
+}
diff --git a/packages/layers/src/line/shaders/wall/wall_frag.glsl b/packages/layers/src/line/shaders/wall/wall_frag.glsl
@@ -17,13 +17,15 @@ layout(std140) uniform commonUniorm {
   float u_iconStepCount;
   float u_time;
 };
+
+
 in vec2 v_iconMapUV;
-in float v_blur;
-in float v_radio;
 in vec4 v_color;
+in float v_blur;
 in vec4 v_dataset;
 
 out vec4 outputColor;
+
 #pragma include "picking"
 
 void main() {
@@ -79,7 +81,7 @@ void main() {
         outputColor = filterColor(pattern);
     }
   }
-  
+
 
   // blur - AA
   if(v < v_blur) {

diff --git a/packages/layers/src/line/shaders/wall/wall_vert.glsl b/packages/layers/src/line/shaders/wall/wall_vert.glsl
@@ -21,17 +21,16 @@ layout(std140) uniform commonUniorm {
   float u_time;
 };
 
-#pragma include "projection"
-#pragma include "light"
-#pragma include "picking"
-
 // texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
 out vec2 v_iconMapUV;
 out vec4 v_color;
 out float v_blur;
-out float v_radio;
 out vec4 v_dataset;
 
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
 void main() {
   float a_Distance = a_Distance_Total_Miter.x;
   float a_Miter = a_Distance_Total_Miter.y;

diff --git a/packages/map/CHANGELOG.md b/packages/map/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @antv/l7-map
 
+## 2.22.0
+
+### Patch Changes
+
+- [#2529](https://github.com/antvis/L7/pull/2529) [`ce90571`](https://github.com/antvis/L7/commit/ce90571ba77686790b2476936b9466657e187ae8) Thanks [@lvisei](https://github.com/lvisei)! - refactor: 升级新版一方地图交互事件机制，解决抖动问题
+
+- Updated dependencies []:
+  - @antv/l7-utils@2.22.0
+
+## 2.21.11-beta.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @antv/l7-utils@2.21.11-beta.7
+
 ## 2.21.11-beta.6
 
 ### Patch Changes

diff --git a/packages/map/legacy/README.md b/packages/map/legacy/README.md
@@ -0,0 +1,3 @@
+## Map
+
+Map fork from [mapbox-gl-js@1.x](https://github.com/mapbox/mapbox-gl-js/tree/release-v1.13.3), keep event loop, responds user interaction and updates the internal state of the map (current viewport, camera angle, etc.)