@antv/l7-layers 2.25.1 → 2.25.3

package/es/line/models/arc_3d.js

@@ -31,8 +31,8 @@ export default class Arc3DModel extends BaseModel {
       }
       this.texture = createTexture2D({
         data: this.iconService.getCanvas(),
-        mag: gl.NEAREST,
-        min: gl.NEAREST,
+        mag: gl.LINEAR,
+        min: gl.LINEAR,
         premultiplyAlpha: false,
         width: 1024,
         height: this.iconService.canvasHeight || 128

package/es/plugins/index.d.ts

@@ -12,4 +12,4 @@ import RegisterStyleAttributePlugin from './RegisterStyleAttributePlugin';
 import ShaderUniformPlugin from './ShaderUniformPlugin';
 import UpdateModelPlugin from './UpdateModelPlugin';
 import UpdateStyleAttributePlugin from './UpdateStyleAttributePlugin';
-export declare function createPlugins(): (DataSourcePlugin | RegisterStyleAttributePlugin | FeatureScalePlugin | DataMappingPlugin | LayerStylePlugin | LayerMaskPlugin | UpdateStyleAttributePlugin | UpdateModelPlugin | MultiPassRendererPlugin | ShaderUniformPlugin | LayerAnimateStylePlugin | LightingPlugin | PixelPickingPlugin | LayerModelPlugin)[];
+export declare function createPlugins(): (DataMappingPlugin | DataSourcePlugin | FeatureScalePlugin | LayerAnimateStylePlugin | LayerMaskPlugin | LayerModelPlugin | LayerStylePlugin | LightingPlugin | MultiPassRendererPlugin | PixelPickingPlugin | RegisterStyleAttributePlugin | ShaderUniformPlugin | UpdateModelPlugin | UpdateStyleAttributePlugin)[];

package/es/point/shaders/text/text_frag.glsl

@@ -34,7 +34,9 @@ void main() {
 
   highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
 
-  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));
+  // 根据 stroke 的 alpha 值调整混合权重，避免透明 stroke 影响文本颜色
+  float stroke_mix_factor = smoothstep(0., 0.5, 1.- dist) * v_stroke_color.a;
+  outputColor = mix(v_color, v_stroke_color, stroke_mix_factor);
 
   outputColor.a *= alpha;
    // 作为 mask 模板时需要丢弃透明的像素

package/es/tile/tile/Tile.d.ts

@@ -47,7 +47,7 @@ export default abstract class Tile extends EventEmitter implements ITile {
         enablePropagation?: boolean | undefined;
         fitBoundsOptions?: unknown;
         name?: string | undefined;
-        blend?: "normal" | "none" | "additive" | "subtractive" | "min" | "max" | undefined;
+        blend?: "min" | "max" | "normal" | "additive" | "subtractive" | "none" | undefined;
         depth?: boolean | undefined;
         pickedFeatureID?: number | undefined;
         enableMultiPassRenderer?: boolean | undefined;

package/es/tile/tile/index.d.ts

@@ -7,6 +7,6 @@ import RasterTerrainRGBTile from './RasterTerrainRGBTile';
 import RasterTile from './RasterTile';
 import VectorTile from './VectorTile';
 export type TileType = 'VectorTile' | 'DebugTile' | 'PolygonLayer' | 'PointLayer' | 'LineLayer' | 'RasterLayer' | 'image' | 'MaskLayer' | 'TileDebugLayer';
-export declare function getTileFactory(layer: ILayer): typeof VectorTile | typeof DebugTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTile | typeof RasterTerrainRGBTile | typeof ImageTile;
+export declare function getTileFactory(layer: ILayer): typeof DebugTile | typeof ImageTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTerrainRGBTile | typeof RasterTile | typeof VectorTile;
 export * from '../interface';
 export * from './Tile';

package/es/tile/tile/util.d.ts

@@ -1,5 +1,5 @@
 import LineLayer from '../../line';
 import PointLayer from '../../point/index';
 import PolygonLayer from '../../polygon';
-export declare function getTileLayer(type: string): typeof PointLayer | typeof PolygonLayer | typeof LineLayer;
+export declare function getTileLayer(type: string): typeof LineLayer | typeof PointLayer | typeof PolygonLayer;
 export declare function isNeedMask(type: string): boolean;

package/es/utils/extrude_polyline.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { aProjectFlat } from '@antv/l7-utils';
 import { vec2 } from 'gl-matrix';
 const tmp = vec2.create();
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const capEnd = vec2.create();
 const lineA = vec2.create();
 const lineB = vec2.create();
@@ -304,9 +303,11 @@ export default class ExtrudePolyline {
   distanceRadio) {
     normals.push(normal[0], normal[1], 0);
     normals.push(normal[0], normal[1], 0);
-    positions.push(point[0], point[1], point[2] | 0, distanceRadio, -thickness, point[2] | 0);
+    // 修复：正确处理 z 坐标，当 point[2] 不存在时使用 0，但保留传入的高度值
+    const z = point[2] !== undefined ? point[2] : 0;
+    positions.push(point[0], point[1], z, distanceRadio, -thickness, z);
     this.complex.indexes.push(this.currentIndex);
-    positions.push(point[0], point[1], point[2] | 0, distanceRadio, thickness, point[2] | 0);
+    positions.push(point[0], point[1], z, distanceRadio, thickness, z);
     this.complex.indexes.push(this.currentIndex);
     this.currentIndex++;
   }

package/lib/line/models/arc_3d.js

@@ -38,8 +38,8 @@ class Arc3DModel extends _BaseModel.default {
       }
       this.texture = createTexture2D({
         data: this.iconService.getCanvas(),
-        mag: _l7Core.gl.NEAREST,
-        min: _l7Core.gl.NEAREST,
+        mag: _l7Core.gl.LINEAR,
+        min: _l7Core.gl.LINEAR,
         premultiplyAlpha: false,
         width: 1024,
         height: this.iconService.canvasHeight || 128

package/lib/plugins/index.d.ts

@@ -12,4 +12,4 @@ import RegisterStyleAttributePlugin from './RegisterStyleAttributePlugin';
 import ShaderUniformPlugin from './ShaderUniformPlugin';
 import UpdateModelPlugin from './UpdateModelPlugin';
 import UpdateStyleAttributePlugin from './UpdateStyleAttributePlugin';
-export declare function createPlugins(): (DataSourcePlugin | RegisterStyleAttributePlugin | FeatureScalePlugin | DataMappingPlugin | LayerStylePlugin | LayerMaskPlugin | UpdateStyleAttributePlugin | UpdateModelPlugin | MultiPassRendererPlugin | ShaderUniformPlugin | LayerAnimateStylePlugin | LightingPlugin | PixelPickingPlugin | LayerModelPlugin)[];
+export declare function createPlugins(): (DataMappingPlugin | DataSourcePlugin | FeatureScalePlugin | LayerAnimateStylePlugin | LayerMaskPlugin | LayerModelPlugin | LayerStylePlugin | LightingPlugin | MultiPassRendererPlugin | PixelPickingPlugin | RegisterStyleAttributePlugin | ShaderUniformPlugin | UpdateModelPlugin | UpdateStyleAttributePlugin)[];

package/lib/point/shaders/text/text_frag.glsl

@@ -34,7 +34,9 @@ void main() {
 
   highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
 
-  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));
+  // 根据 stroke 的 alpha 值调整混合权重，避免透明 stroke 影响文本颜色
+  float stroke_mix_factor = smoothstep(0., 0.5, 1.- dist) * v_stroke_color.a;
+  outputColor = mix(v_color, v_stroke_color, stroke_mix_factor);
 
   outputColor.a *= alpha;
    // 作为 mask 模板时需要丢弃透明的像素

package/lib/tile/tile/Tile.d.ts

@@ -47,7 +47,7 @@ export default abstract class Tile extends EventEmitter implements ITile {
         enablePropagation?: boolean | undefined;
         fitBoundsOptions?: unknown;
         name?: string | undefined;
-        blend?: "normal" | "none" | "additive" | "subtractive" | "min" | "max" | undefined;
+        blend?: "min" | "max" | "normal" | "additive" | "subtractive" | "none" | undefined;
         depth?: boolean | undefined;
         pickedFeatureID?: number | undefined;
         enableMultiPassRenderer?: boolean | undefined;

package/lib/tile/tile/index.d.ts

@@ -7,6 +7,6 @@ import RasterTerrainRGBTile from './RasterTerrainRGBTile';
 import RasterTile from './RasterTile';
 import VectorTile from './VectorTile';
 export type TileType = 'VectorTile' | 'DebugTile' | 'PolygonLayer' | 'PointLayer' | 'LineLayer' | 'RasterLayer' | 'image' | 'MaskLayer' | 'TileDebugLayer';
-export declare function getTileFactory(layer: ILayer): typeof VectorTile | typeof DebugTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTile | typeof RasterTerrainRGBTile | typeof ImageTile;
+export declare function getTileFactory(layer: ILayer): typeof DebugTile | typeof ImageTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTerrainRGBTile | typeof RasterTile | typeof VectorTile;
 export * from '../interface';
 export * from './Tile';

package/lib/tile/tile/util.d.ts

@@ -1,5 +1,5 @@
 import LineLayer from '../../line';
 import PointLayer from '../../point/index';
 import PolygonLayer from '../../polygon';
-export declare function getTileLayer(type: string): typeof PointLayer | typeof PolygonLayer | typeof LineLayer;
+export declare function getTileLayer(type: string): typeof LineLayer | typeof PointLayer | typeof PolygonLayer;
 export declare function isNeedMask(type: string): boolean;

package/lib/utils/extrude_polyline.js

@@ -13,7 +13,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Utils = require("@antv/l7-utils");
 var _glMatrix = require("gl-matrix");
 const tmp = _glMatrix.vec2.create();
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const capEnd = _glMatrix.vec2.create();
 const lineA = _glMatrix.vec2.create();
 const lineB = _glMatrix.vec2.create();
@@ -315,9 +314,11 @@ class ExtrudePolyline {
   distanceRadio) {
     normals.push(normal[0], normal[1], 0);
     normals.push(normal[0], normal[1], 0);
-    positions.push(point[0], point[1], point[2] | 0, distanceRadio, -thickness, point[2] | 0);
+    // 修复：正确处理 z 坐标，当 point[2] 不存在时使用 0，但保留传入的高度值
+    const z = point[2] !== undefined ? point[2] : 0;
+    positions.push(point[0], point[1], z, distanceRadio, -thickness, z);
     this.complex.indexes.push(this.currentIndex);
-    positions.push(point[0], point[1], point[2] | 0, distanceRadio, thickness, point[2] | 0);
+    positions.push(point[0], point[1], z, distanceRadio, thickness, z);
     this.complex.indexes.push(this.currentIndex);
     this.currentIndex++;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.25.1",
+  "version": "2.25.3",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -26,10 +26,10 @@
     "earcut": "^2.2.1",
     "eventemitter3": "^4.0.0",
     "gl-matrix": "^3.1.0",
-    "@antv/l7-core": "2.25.1",
-    "@antv/l7-maps": "2.25.1",
-    "@antv/l7-source": "2.25.1",
-    "@antv/l7-utils": "2.25.1"
+    "@antv/l7-core": "2.25.3",
+    "@antv/l7-maps": "2.25.3",
+    "@antv/l7-source": "2.25.3",
+    "@antv/l7-utils": "2.25.3"
   },
   "devDependencies": {
     "@types/earcut": "^2.1.0",