@antv/l7-layers 2.25.9 → 2.28.10

package/es/point/shaders/earthFill/earthFill_vert.glsl

@@ -17,6 +17,35 @@ out float v_radius;
 #pragma include "projection"
 #pragma include "picking"
 
+// 根据 anchor 值计算 extrude 偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchor(vec2 extrude, float anchor) {
+  if (anchor < 0.5) {
+    return extrude;
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    // top-right, right, bottom-right -> shift left
+    offset.x = -1.0;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    // bottom-left, left, top-left -> shift right
+    offset.x = 1.0;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    // top, top-right, top-left -> shift down
+    offset.y = -1.0;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    // bottom-right, bottom, bottom-left, bottom-center -> shift up
+    offset.y = 1.0;
+  }
+
+  return extrude + offset;
+}
 
 void main() {
   vec3 extrude = a_Extrude;
@@ -37,10 +66,15 @@ void main() {
   //  float antialiased_blur = -max(u_blur, antialiasblur);
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);
 
-  // TODP: /abs(extrude.x) 是为了兼容地球模式
-  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
+  // apply anchor to extrude direction
+  vec2 anchoredExtrude = applyAnchor(extrude.xy, anchor);
+
+  // TODP: sign() 是为了兼容地球模式，同时避免 anchor 偏移后为 0 时除以零产生 NaN
+  // 注意：v_data 必须使用原始 extrude 而非 anchoredExtrude，因为 SDF 形状计算需要基于原始形状坐标系
+  // anchoredExtrude 只用于位置偏移，不改变形状本身的 SDF 采样
+  v_data = vec4(sign(extrude.x), sign(extrude.y), antialiasblur,shape_type);
 
-  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + vec3(u_offsets,0.0), 1.0);
+  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + anchoredExtrude * newSize * 0.1 + vec3(offsets,0.0), 1.0);
 
   setPickingColor(a_PickingColor);
 }

package/es/point/shaders/fill/fill_vert.glsl

@@ -24,6 +24,36 @@ out float v_radius;
 #pragma include "picking"
 #pragma include "rotation_2d"
 
+// 根据 anchor 值计算 extrude 偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchor(vec2 extrude, float anchor) {
+  if (anchor < 0.5) {
+    return extrude;
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    // top-right, right, bottom-right -> shift left
+    offset.x = -1.0;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    // bottom-left, left, top-left -> shift right
+    offset.x = 1.0;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    // top, top-right, top-left -> shift down
+    offset.y = -1.0;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    // bottom-right, bottom, bottom-left, bottom-center -> shift up
+    offset.y = 1.0;
+  }
+
+  return extrude + offset;
+}
+
 void main() {
   // 透明度计算
    v_stroke = stroke;
@@ -51,13 +81,18 @@ void main() {
   //  float antialiased_blur = -max(u_blur, antialiasblur);
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);
 
-  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);
+  // apply anchor to extrude direction
+  vec2 anchoredExtrude = applyAnchor(extrude.xy, anchor);
+
+  vec2 offset = (anchoredExtrude * (newSize + u_stroke_width) + offsets);
 
   offset = project_pixel(offset);
   offset = rotate_matrix(offset,rotation);
 
-  // TODP: /abs(extrude.x) 是为了兼容地球模式
-  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
+  // TODP: sign() 是为了兼容地球模式，同时避免 anchor 偏移后为 0 时除以零产生 NaN
+  // 注意：v_data 必须使用原始 extrude 而非 anchoredExtrude，因为 SDF 形状计算需要基于原始形状坐标系
+  // anchoredExtrude 只用于位置偏移，不改变形状本身的 SDF 采样
+  v_data = vec4(sign(extrude.x), sign(extrude.y), antialiasblur,shape_type);
 
   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));

package/es/point/shaders/fillImage/fillImage_vert.glsl

@@ -20,6 +20,36 @@ out float v_opacity;
 #pragma include "picking"
 #pragma include "rotation_2d"
 
+// 根据 anchor 值计算 extrude 偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchor(vec2 extrude, float anchor) {
+  if (anchor < 0.5) {
+    return extrude;
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    // top-right, right, bottom-right -> shift left
+    offset.x = -1.0;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    // bottom-left, left, top-left -> shift right
+    offset.x = 1.0;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    // top, top-right, top-left -> shift down
+    offset.y = -1.0;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    // bottom-right, bottom, bottom-left, bottom-center -> shift up
+    offset.y = 1.0;
+  }
+
+  return extrude + offset;
+}
+
 void main() {
   vec3 extrude = a_Extrude;
   v_uv = (a_Extrude.xy + 1.0) / 2.0;
@@ -32,8 +62,11 @@ void main() {
     newSize = newSize * u_PixelsPerMeter.z;
   }
 
+  // apply anchor to extrude direction
+  vec2 anchoredExtrude = applyAnchor(extrude.xy, anchor);
+
   // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
-  vec2 offset = extrude.xy * newSize + offsets;
+  vec2 offset = anchoredExtrude.xy * newSize + offsets;
 
   offset = rotate_matrix(offset, rotation);
 

package/es/point/shaders/image/image_vert.glsl

@@ -17,6 +17,32 @@ out float v_opacity;
 #pragma include "projection"
 #pragma include "picking"
 
+// 根据 anchor 值计算点精灵的像素偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchorPoint(float anchor, float pointSize) {
+  if (anchor < 0.5) {
+    return vec2(0.0);
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    offset.x = -pointSize * 0.5;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    offset.x = pointSize * 0.5;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    offset.y = -pointSize * 0.5;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    offset.y = pointSize * 0.5;
+  }
+
+  return offset;
+}
+
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
   v_color = a_Color;
@@ -43,5 +69,10 @@ void main() {
   gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
+
+  // apply anchor offset in screen space
+  vec2 anchorOffset = applyAnchorPoint(anchor, gl_PointSize);
+  gl_Position.xy += anchorOffset / u_ViewportSize * 2.0 * gl_Position.w;
+
   setPickingColor(a_PickingColor);
 }

package/es/point/shaders/normal/normal_vert.glsl

@@ -12,6 +12,32 @@ out vec4 v_color;
 #pragma include "projection"
 #pragma include "project"
 
+// 根据 anchor 值计算点精灵的像素偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchorPoint(float anchor, float pointSize) {
+  if (anchor < 0.5) {
+    return vec2(0.0);
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    offset.x = -pointSize * 0.5;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    offset.x = pointSize * 0.5;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    offset.y = -pointSize * 0.5;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    offset.y = pointSize * 0.5;
+  }
+
+  return offset;
+}
+
 void main() {
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
@@ -19,4 +45,8 @@ void main() {
   gl_Position = project_common_position_to_clipspace(project_pos);
 
   gl_PointSize = a_Size * u_size_scale * 2.0 * u_DevicePixelRatio;
+
+  // apply anchor offset in screen space
+  vec2 anchorOffset = applyAnchorPoint(anchor, gl_PointSize);
+  gl_Position.xy += anchorOffset / u_ViewportSize * 2.0 * gl_Position.w;
 }

package/es/point/shaders/radar/radar_vert.glsl

@@ -19,6 +19,34 @@ out vec2 v_extrude;
 #pragma include "projection"
 #pragma include "picking"
 
+// 根据 anchor 值计算 extrude 偏移
+// anchor: 0=center, 1=top, 2=top-right, 3=right, 4=bottom-right, 5=bottom, 6=bottom-left, 7=left, 8=top-left, 9=bottom-center
+vec2 applyAnchor(vec2 extrude, float anchor) {
+  if (anchor < 0.5) {
+    return extrude;
+  }
+
+  vec2 offset = vec2(0.0);
+
+  // horizontal alignment: 左边缘对准坐标 -> 向右移; 右边缘对准坐标 -> 向左移
+  if (anchor == 2.0 || anchor == 3.0 || anchor == 4.0) {
+    offset.x = -1.0;
+  } else if (anchor == 6.0 || anchor == 7.0 || anchor == 8.0) {
+    offset.x = 1.0;
+  }
+
+  // vertical alignment: 上边缘对准坐标 -> 向下移(图形在坐标下方); 下边缘对准坐标 -> 向上移(图形在坐标上方)
+  if (anchor == 1.0 || anchor == 2.0 || anchor == 8.0) {
+    // top, top-right, top-left -> shift down
+    offset.y = -1.0;
+  } else if (anchor == 4.0 || anchor == 5.0 || anchor == 6.0 || anchor == 9.0) {
+    // bottom-right, bottom, bottom-left, bottom-center -> shift up
+    offset.y = 1.0;
+  }
+
+  return extrude + offset;
+}
+
 void main() {
   float newSize = setPickingSize(a_Size);
 
@@ -27,7 +55,10 @@ void main() {
     cos(time), sin(time),
     -sin(time), cos(time)
   );
-  v_extrude = rotateMatrix * a_Extrude.xy;
+
+  // apply anchor to extrude direction before rotation
+  vec2 anchoredExtrude = applyAnchor(a_Extrude.xy, anchor);
+  v_extrude = rotateMatrix * anchoredExtrude;
 
   v_color = a_Color;
   v_color.a *= opacity;
@@ -40,11 +71,11 @@ void main() {
   }
   v_radius = newSize;
 
-  vec2 offset = (a_Extrude.xy * (newSize));
+  vec2 offset = (anchoredExtrude * (newSize));
 
   offset = project_pixel(offset);
 
-  v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);
+  v_data = vec4(anchoredExtrude.x, anchoredExtrude.y, antialiasblur, -1.0);
 
   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);
   gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));

package/es/polygon/models/extrude.d.ts

@@ -10,9 +10,10 @@ export default class ExtrudeModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         SIZE: number;
         NORMAL: number;
         UV: number;

package/es/polygon/models/extrusion.d.ts

@@ -10,9 +10,10 @@ export default class ExtrusionModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         SIZE: number;
         NORMAL: number;
         EXTRUSION_BASE: number;

package/es/polygon/models/fill.d.ts

@@ -10,9 +10,10 @@ export default class FillModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         LINEAR: number;
     };
     getUninforms(): {

package/es/polygon/models/ocean.d.ts

@@ -10,9 +10,10 @@ export default class OceanModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     private texture1;

package/es/polygon/models/water.d.ts

@@ -10,9 +10,10 @@ export default class WaterModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     private texture;

package/es/raster/models/raster.d.ts

@@ -10,9 +10,10 @@ export default class RasterModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     protected texture: ITexture2D;

package/es/raster/models/rasterRgb.d.ts

@@ -10,9 +10,10 @@ export default class RasterModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     protected texture: ITexture2D;

package/es/raster/models/rasterTerrainRgb.d.ts

@@ -10,9 +10,10 @@ export default class RasterTerrainRGB extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     protected texture: ITexture2D;

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?: "min" | "max" | "normal" | "additive" | "subtractive" | "none" | undefined;
+        blend?: "normal" | "additive" | "subtractive" | "min" | "max" | "none" | undefined;
         depth?: boolean | undefined;
         pickedFeatureID?: number | undefined;
         enableMultiPassRenderer?: boolean | undefined;
@@ -85,7 +85,7 @@ export default abstract class Tile extends EventEmitter implements ITile {
         pickBufferScale?: number | undefined;
         stencil?: boolean | undefined;
         debug?: boolean | undefined;
-        renderer?: "regl" | "device" | undefined;
+        renderer?: "device" | "regl" | undefined;
         antialias?: boolean | undefined;
         preserveDrawingBuffer?: boolean | undefined;
         enableWebGPU?: 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 DebugTile | typeof ImageTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTerrainRGBTile | typeof RasterTile | typeof VectorTile;
+export declare function getTileFactory(layer: ILayer): typeof VectorTile | typeof DebugTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTile | typeof RasterTerrainRGBTile | typeof ImageTile;
 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 LineLayer | typeof PointLayer | typeof PolygonLayer;
+export declare function getTileLayer(type: string): typeof PointLayer | typeof PolygonLayer | typeof LineLayer;
 export declare function isNeedMask(type: string): boolean;

package/es/utils/symbol-layout.d.ts

@@ -2,7 +2,7 @@ interface IPoint {
     x: number;
     y: number;
 }
-export type anchorType = 'right' | 'top-right' | 'left' | 'bottom-right' | 'left' | 'top-left' | 'bottom-left' | 'bottom' | 'bottom-right' | 'bottom-left' | 'top' | 'top-right' | 'top-left' | 'center';
+export type anchorType = 'center' | 'top' | 'top-right' | 'right' | 'bottom-right' | 'bottom' | 'bottom-left' | 'left' | 'top-left' | 'bottom-center';
 export interface IGlyphQuad {
     tr: IPoint;
     tl: IPoint;

package/es/utils/symbol-layout.js

@@ -21,14 +21,15 @@ function getAnchorAlignment(anchor) {
       horizontalAlign = 0.5;
   }
   switch (anchor) {
-    case 'bottom':
-    case 'bottom-right':
-    case 'bottom-left':
-      verticalAlign = 1;
-      break;
     case 'top':
     case 'top-right':
     case 'top-left':
+      verticalAlign = 1;
+      break;
+    case 'bottom':
+    case 'bottom-right':
+    case 'bottom-left':
+    case 'bottom-center':
       verticalAlign = 0;
       break;
     default:
@@ -59,9 +60,18 @@ function justifyLine(positionedGlyphs, glyphMap, start, end, justify) {
 // justify right=1 left=0 center=0.5
 // horizontalAlign right=1 left=0 center=0.5
 // verticalAlign right=1 left=0 center=0.5
-function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lineCount) {
+function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lineCount, yOffset) {
   const shiftX = (justify - horizontalAlign) * maxLineLength;
-  const shiftY = (-verticalAlign * lineCount + 0.5) * lineHeight;
+  let shiftY = (-verticalAlign * lineCount + 0.5) * lineHeight;
+
+  // 补偿 yOffset 使 top/bottom 锚点正确对齐
+  // top: 文字往下移 |yOffset| 像素（远离坐标点）
+  // bottom: 文字往上移 |yOffset| 像素（远离坐标点）
+  if (verticalAlign === 1) {
+    shiftY += yOffset;
+  } else if (verticalAlign === 0) {
+    shiftY -= yOffset;
+  }
   for (const glyphs of positionedGlyphs) {
     glyphs.x += shiftX;
     glyphs.y += shiftY;
@@ -107,7 +117,7 @@ function shapeLines(shaping, glyphMap, lines, lineHeight, textAnchor, textJustif
     horizontalAlign,
     verticalAlign
   } = getAnchorAlignment(textAnchor);
-  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lines.length);
+  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lines.length, yOffset);
 
   // 计算包围盒
   const height = y - yOffset;
@@ -160,7 +170,7 @@ function shapeIconFont(shaping, glyphMap, iconfonts, lineHeight, textAnchor, tex
     horizontalAlign,
     verticalAlign
   } = getAnchorAlignment(textAnchor);
-  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, iconfonts.length);
+  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, iconfonts.length, yOffset);
 
   // 计算包围盒
   const height = y - yOffset;

package/es/wind/models/wind.d.ts

@@ -10,9 +10,10 @@ export default class WindModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         UV: number;
     };
     protected texture: ITexture2D;

package/lib/citybuilding/models/build.d.ts

@@ -10,9 +10,10 @@ export default class CityBuildModel extends BaseModel {
         readonly OPACITY: 5;
         readonly OFFSETS: 6;
         readonly ROTATION: 7;
-        readonly MAX: 8;
+        readonly ANCHOR: 8;
+        readonly MAX: 9;
     } & Record<string, number> & {
-        MAX: 8;
+        MAX: 9;
         SIZE: number;
         NORMAL: number;
         UV: number;

package/lib/core/BaseModel.js

@@ -15,10 +15,37 @@ var _stencil = require("../utils/stencil");
 var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _constant = require("./constant");
 var _utils = require("./utils");
+function anchorToNumber(anchor) {
+  if (typeof anchor === 'number') {
+    return anchor;
+  }
+  switch (anchor) {
+    case 'center':
+      return 0;
+    case 'top':
+      return 1;
+    case 'top-right':
+      return 2;
+    case 'right':
+      return 3;
+    case 'bottom-right':
+      return 4;
+    case 'bottom':
+      return 5;
+    case 'bottom-left':
+      return 6;
+    case 'left':
+      return 7;
+    case 'top-left':
+      return 8;
+    case 'bottom-center':
+      return 9;
+    default:
+      return 0;
+  }
+}
 // 属性索引宏定义前缀，使用命名空间避免 define 名称重复情况
 const DEFINE_ATTRIBUTE_LOCATION_PREFIX = 'ATTRIBUTE_LOCATION_';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 class BaseModel {
   /**
    * Attribute Layout Location in Shader
@@ -149,19 +176,16 @@ class BaseModel {
       return false;
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   buildModels() {
     return (0, _asyncToGenerator2.default)(function* () {
       throw new Error('Method not implemented.');
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   initModels() {
     return (0, _asyncToGenerator2.default)(function* () {
       throw new Error('Method not implemented.');
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   clearModels(refresh = true) {
     return;
   }
@@ -169,7 +193,6 @@ class BaseModel {
     throw new Error('Method not implemented.');
   }
   prerender() {}
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   render(renderOptions) {
     throw new Error('Method not implemented.');
   }
@@ -214,6 +237,9 @@ class BaseModel {
         if (key === 'stroke') {
           value = (0, _l7Utils.rgb2arr)(value);
         }
+        if (key === 'anchor') {
+          value = anchorToNumber(value);
+        }
         options['u_' + key] = value;
       }
     });

package/lib/core/CommonStyleAttribute.d.ts

@@ -11,6 +11,7 @@ export declare const COMMON_ATTRIBUTE_LOCATION: {
     readonly OPACITY: 5;
     readonly OFFSETS: 6;
     readonly ROTATION: 7;
-    readonly MAX: 8;
+    readonly ANCHOR: 8;
+    readonly MAX: 9;
 };
 export declare function getCommonStyleAttributeOptions(name: string): Partial<IStyleAttribute> | undefined;