@antv/l7-layers 2.25.9 → 2.28.10

package/es/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/es/core/BaseModel.js

@@ -8,10 +8,37 @@ import { getStencil, getStencilMask } from "../utils/stencil";
 import { COMMON_ATTRIBUTE_LOCATION, getCommonStyleAttributeOptions } from "./CommonStyleAttribute";
 import { DefaultUniformStyleType, DefaultUniformStyleValue } from "./constant";
 import { MultipleOfFourNumber } from "./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
 export default class BaseModel {
   /**
    * Attribute Layout Location in Shader
@@ -142,19 +169,16 @@ export default class BaseModel {
       return false;
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   buildModels() {
     return _asyncToGenerator(function* () {
       throw new Error('Method not implemented.');
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   initModels() {
     return _asyncToGenerator(function* () {
       throw new Error('Method not implemented.');
     })();
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   clearModels(refresh = true) {
     return;
   }
@@ -162,7 +186,6 @@ export default 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.');
   }
@@ -207,6 +230,9 @@ export default class BaseModel {
         if (key === 'stroke') {
           value = rgb2arr(value);
         }
+        if (key === 'anchor') {
+          value = anchorToNumber(value);
+        }
         options['u_' + key] = value;
       }
     });

package/es/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;

package/es/core/CommonStyleAttribute.js

@@ -15,8 +15,9 @@ export const COMMON_ATTRIBUTE_LOCATION = {
   OPACITY: 5,
   OFFSETS: 6,
   ROTATION: 7,
+  ANCHOR: 8,
   // last index
-  MAX: 8
+  MAX: 9
 };
 export function getCommonStyleAttributeOptions(name) {
   switch (name) {
@@ -108,6 +109,27 @@ export function getCommonStyleAttributeOptions(name) {
           }
         }
       };
+    case 'anchor':
+      return {
+        name: 'anchor',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Anchor',
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.ANCHOR,
+          buffer: {
+            usage: gl.STATIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 1,
+          update: feature => {
+            const {
+              anchor = 0
+            } = feature;
+            return [anchor];
+          }
+        }
+      };
     default:
       return undefined;
   }

package/es/core/constant.js

@@ -5,7 +5,8 @@ export const DefaultUniformStyleValue = {
   rotation: 0,
   extrusionBase: 0,
   strokeOpacity: 1,
-  thetaOffset: 0.314
+  thetaOffset: 0.314,
+  anchor: 0
 };
 export const DefaultUniformStyleType = {
   opacity: 'float',
@@ -15,5 +16,6 @@ export const DefaultUniformStyleType = {
   rotation: 'float',
   extrusionBase: 'float',
   strokeOpacity: 'float',
-  thetaOffset: 'float'
+  thetaOffset: 'float',
+  anchor: 'float'
 };

package/es/core/interface.d.ts

@@ -71,6 +71,7 @@ export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
     stroke: string;
     blur?: number;
     billboard?: boolean;
+    anchor?: anchorType;
     textOffset?: [number, number];
     textAnchor?: anchorType;
     spacing?: number;

package/es/earth/models/atmosphere.d.ts

@@ -10,9 +10,10 @@ export default class EarthAtomSphereModel 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;
         NORMAL: number;
         UV: number;
     };

package/es/earth/models/base.d.ts

@@ -10,9 +10,10 @@ export default class BaseEarthModel 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;
         NORMAL: number;
         UV: number;
     };

package/es/earth/models/bloomsphere.d.ts

@@ -10,9 +10,10 @@ export default class EarthBloomSphereModel 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;
         NORMAL: number;
         UV: number;
     };

package/es/geometry/models/billboard.d.ts

@@ -10,9 +10,10 @@ export default class BillBoardModel 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;
         EXTRUDE: number;
         UV: number;
     };

package/es/geometry/models/plane.d.ts

@@ -10,9 +10,10 @@ export default class PlaneModel 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/heatmap/models/grid.d.ts

@@ -10,9 +10,10 @@ export default class GridModel 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;
         POS: number;
     };
     getUninforms(): IModelUniform;

package/es/heatmap/models/grid3d.d.ts

@@ -10,9 +10,10 @@ export default class Grid3DModel 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;
         POS: number;
         NORMAL: number;

package/es/heatmap/models/heatmap.d.ts

@@ -10,9 +10,10 @@ export default class HeatMapModel 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;
         UV: number;
         DIR: number;

package/es/heatmap/models/hexagon.d.ts

@@ -10,9 +10,10 @@ export default class HexagonModel 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;
         POS: number;
     };
     getUninforms(): IModelUniform;

package/es/image/models/image.d.ts

@@ -11,9 +11,10 @@ export default class ImageModel 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 getCommonUniformsInfo(): {

package/es/line/models/arc.d.ts

@@ -10,9 +10,10 @@ export default class ArcModel 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;
         INSTANCE: number;
         INSTANCE_64LOW: number;

package/es/line/models/arc_3d.d.ts

@@ -10,9 +10,10 @@ export default class Arc3DModel 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;
         INSTANCE: number;
         INSTANCE_64LOW: number;

package/es/line/models/flow.d.ts

@@ -10,9 +10,10 @@ export default class FlowLineModel 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;
         INSTANCE: number;
         INSTANCE_64LOW: number;

package/es/line/models/great_circle.d.ts

@@ -10,9 +10,10 @@ export default class GreatCircleModel 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;
         INSTANCE: number;
         INSTANCE_64LOW: number;

package/es/line/models/line.d.ts

@@ -10,9 +10,10 @@ export default class LineModel 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;
         DISTANCE_INDEX: number;
         NORMAL: number;

package/es/line/models/simple_line.d.ts

@@ -10,9 +10,10 @@ export default class SimpleLineModel 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;
     };
     protected getCommonUniformsInfo(): {

package/es/line/models/wall.d.ts

@@ -10,9 +10,10 @@ export default class LineWallModel 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/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(): (DataMappingPlugin | DataSourcePlugin | FeatureScalePlugin | LayerAnimateStylePlugin | LayerMaskPlugin | LayerModelPlugin | LayerStylePlugin | LightingPlugin | MultiPassRendererPlugin | PixelPickingPlugin | RegisterStyleAttributePlugin | ShaderUniformPlugin | UpdateModelPlugin | UpdateStyleAttributePlugin)[];
+export declare function createPlugins(): (DataSourcePlugin | RegisterStyleAttributePlugin | FeatureScalePlugin | DataMappingPlugin | LayerStylePlugin | LayerMaskPlugin | UpdateStyleAttributePlugin | UpdateModelPlugin | MultiPassRendererPlugin | ShaderUniformPlugin | LayerAnimateStylePlugin | LightingPlugin | PixelPickingPlugin | LayerModelPlugin)[];

package/es/point/index.js

@@ -6,8 +6,8 @@ export default class PointLayer extends BaseLayer {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "type", 'PointLayer');
-    _defineProperty(this, "enableShaderEncodeStyles", ['stroke', 'offsets', 'opacity', 'rotation']);
-    //4+2+1+1
+    _defineProperty(this, "enableShaderEncodeStyles", ['stroke', 'offsets', 'opacity', 'rotation', 'anchor']);
+    //4+2+1+1+1
     _defineProperty(this, "enableDataEncodeStyles", ['textOffset', 'textAnchor']);
     _defineProperty(this, "defaultSourceConfig", {
       data: [],

package/es/point/models/billboard_point.d.ts

@@ -16,9 +16,10 @@ export default class SimplePointModel 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;
     };
     getDefaultStyle(): Partial<IPointLayerStyleOptions>;

package/es/point/models/earthExtrude.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;
         POS: number;
         NORMAL: number;

package/es/point/models/earthFill.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;
         SIZE: number;
         SHAPE: number;
         EXTRUDE: number;

package/es/point/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;
         EXTRUDE: number;
         NORMAL: number;

package/es/point/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;
         SIZE: number;
         SHAPE: number;
         EXTRUDE: number;

package/es/point/models/fillImage.d.ts

@@ -10,9 +10,10 @@ export default class FillImageModel 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;
         EXTRUDE: number;
         UV: number;

package/es/point/models/image.d.ts

@@ -10,9 +10,10 @@ export default class ImageModel 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;
         UV: number;
     };

package/es/point/models/normal.d.ts

@@ -16,9 +16,10 @@ export default class NormalModel 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;
     };
     getDefaultStyle(): Partial<IPointLayerStyleOptions>;

package/es/point/models/radar.d.ts

@@ -10,9 +10,10 @@ export default class RadarModel 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;
         EXTRUDE: number;
     };

package/es/point/models/text.d.ts

@@ -16,9 +16,10 @@ export default class TextModel 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;
         TEXT_OFFSETS: number;
         UV: number;

package/es/point/shaders/billboard/billboard_point_vert.glsl

@@ -18,16 +18,48 @@ out float v_innerRadius;
 #pragma include "projection"
 #pragma include "picking"
 #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);
   v_blur = 1.0 - max(2.0 / a_Size, 0.05);
   v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);
 
-  vec2 offset = project_pixel(u_offsets);
+  vec2 offset = project_pixel(offsets);
 
   vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
   gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));
 
   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);
 }