@aibee/crc-bmap 0.14.34 → 0.14.36

package/lib/src/config.d.ts

@@ -66,6 +66,10 @@ export interface Config {
     };
     poi: {
         boxScale: number;
+        /** 是否把 POI 文字合并成少量 InstancedMesh 绘制（默认开启） */
+        batchText: boolean;
+        /** 是否把相同贴图的 POI 图标合并成 InstancedMesh 绘制（默认开启） */
+        batchIcon: boolean;
     };
     loaderPlaceConfig: {
         textFontSize: number;
@@ -75,7 +79,17 @@ export interface Config {
         color: string;
         opacity: number;
     };
+    /** POI 文字默认字体族（CSS font-family），POI 未单独指定 text_font_family 时生效 */
+    poiTextFontFamily: string;
     renderAnimation: 'setTimeout' | 'requestAnimationFrame';
+    /**
+     * 渲染器参数。iOS 默认关闭 antialias、限制 DPR，避免高 DPR + MSAA 的帧缓冲峰值。
+     * antialias 不传时由 Renderer 按设备自动选择。
+     */
+    renderer: {
+        antialias?: boolean;
+        maxPixelRatio: number;
+    };
 }
 export declare const defaultConfig: Config;
 export type DeepPartial<T> = {

package/lib/src/context/renderer.d.ts

@@ -14,8 +14,10 @@ export declare class Renderer extends WebGLRenderer {
     enable: boolean;
     timer: Timer;
     constructor(context: Context, options?: WebGLRendererParameters & {
-        backgroundColor: string | number;
+        backgroundColor?: string | number;
     });
+    onContextLost: (event: Event) => void;
+    onContextRestored: () => void;
     setCameraAndScene(scene: ContextScene, camera: ContextCamera): void;
     autoRender(): void;
     pauseRender(): void;

package/lib/src/elements/poi2.d.ts

@@ -1,6 +1,8 @@
 import { Context } from "../context/context";
 import { Box2, DataTexture, Mesh, Object3D, Object3DEventMap, ShaderMaterial, Sprite, Vector3 } from "three";
 import type { TextLayoutResult } from "../utils/text-layout";
+import type { PoiTextBatch } from "../layer/poi-text-batch";
+import type { PoiIconBatch } from "../layer/poi-icon-batch";
 export interface PoiOptions2 {
     text: string;
     icon: string;
@@ -17,6 +19,8 @@ export interface PoiOptions2 {
     text_font_size: number;
     /** 文字字重：400（常规）/'bold'、700（加粗）。不同字重使用独立的 SDF 图集 */
     text_font_weight: string | number;
+    /** 文字字体族（CSS font-family）。不同字体使用独立的 SDF 图集 */
+    text_font_family: string;
     /** 文字描边宽度，单位 CSS 像素（0 表示不描边） */
     text_outline_width: number;
     icon_rotate: number;
@@ -62,6 +66,14 @@ export declare class Poi2 extends Object3D<PoiEventMap2> {
     private _shouldShow;
     /** 文字布局结果（按 textTextureKey 缓存） */
     textLayoutMap: Record<string, TextLayoutResult>;
+    /** 所属 PoiLayer2 的文字合批器；为空时保持旧的逐 POI Mesh 渲染 */
+    textBatch: PoiTextBatch | null;
+    /** 合批模式下是否已经注册过文字 */
+    batchTextReady: boolean;
+    /** 所属 PoiLayer2 的图标合批器 */
+    iconBatch: PoiIconBatch | null;
+    /** 合批模式下是否已经注册过图标 */
+    batchIconReady: boolean;
     textTextureRectMap: Record<string, {
         width: number;
         height: number;
@@ -69,11 +81,15 @@ export declare class Poi2 extends Object3D<PoiEventMap2> {
         aspect: number;
     }>;
     constructor(context: Context, options: PoiOptionsParam2);
-    /** 当前文字使用的 SDF 字体规格：字重不同即对应不同图集 */
+    /** 当前文字使用的 SDF 字体规格：字重/字体族不同即对应不同图集 */
     get sdfFontSpec(): import("../factory").SdfFontSpec;
     get textTexture(): DataTexture | null;
     /** 当前文字渲染对象 */
     get textObject(): Mesh | undefined;
+    /** 合批使用的垂直 pivot（与旧 Sprite.center.y 语义一致） */
+    get textPivotY(): number;
+    /** 导航起点/终点辅助 POI 会逐帧移动，不适合放进静态合批 */
+    get isMovingBatchPoi(): boolean;
     /** 当前文字材质列表（字形分布在多张图集页时，每页对应一个材质） */
     get textMaterials(): ShaderMaterial[];
     /** 合并各图集页的几何；只有一页时直接复用，避免无谓开销 */
@@ -150,6 +166,8 @@ export declare class Poi2 extends Object3D<PoiEventMap2> {
     setVisible(visible: boolean): void;
     parentSetVisible(visible: boolean): void;
     clearTextTextureCache(): void;
+    private resetBatchText;
+    private resetBatchIcon;
     dispose(): void;
 }
 export {};

package/lib/src/factory/sdf-text.d.ts

@@ -86,6 +86,8 @@ export declare class SdfTextFactory {
     static getAtlasSize(): number;
     /** 获取（必要时创建）某个字体规格对应的共享图集 */
     static getAtlas(partial?: Partial<SdfFontSpec>): SdfAtlas;
+    /** 按字体 key 取已存在的图集（合批用，不主动创建） */
+    static getAtlasByKey(key: string): SdfAtlas | undefined;
     /** 图集第一页纹理（单页场景的常用入口） */
     static getTexture(partial?: Partial<SdfFontSpec>): DataTexture;
     /** 该字体规格的全部图集页纹理（多页时按字形所属页取用） */
@@ -97,6 +99,8 @@ export declare class SdfTextFactory {
      */
     static ensureText(text: string, partial?: Partial<SdfFontSpec>): Promise<SdfAtlas>;
     private static createAtlas;
+    /** 按需创建/获取指定页（当前只按顺序追加） */
+    private static ensurePage;
     /** 新建一张图集页（独立的缓冲与纹理） */
     private static createPage;
     private static generateMissing;
@@ -104,7 +108,7 @@ export declare class SdfTextFactory {
     private static insertGlyph;
     /** 判断某页还能否放下指定尺寸的字形（shelf packing 规则） */
     private static pageCanFit;
-    /** 选择可容纳该字形的图集页；所有页都放不下时新建一页 */
+    /** 选择可容纳该字形的图集页；预算用尽后允许少量溢出页，优先保证文字完整 */
     private static pickPage;
     private static generate;
     private static getWorker;

package/lib/src/layer/poi-icon-batch.d.ts

@@ -0,0 +1,34 @@
+import { Object3D, Texture } from "three";
+import { Context } from "../context/context";
+export declare class PoiIconBatch extends Object3D {
+    private context;
+    private items;
+    private buckets;
+    private materials;
+    private rebuildRaf;
+    private rebuildScheduled;
+    constructor(context: Context);
+    addPoi(poi: any, texture: Texture, options: {
+        size: [number, number];
+        offsetY: number;
+        rotation: number;
+        opacity: number;
+        depthTest: boolean;
+        alphaTest: number;
+    }): void;
+    removePoi(poi: any): void;
+    setVisible(poi: any, visible: boolean): void;
+    setOpacity(poi: any, opacity: number): void;
+    setRotation(poi: any, rotation: number): void;
+    setSize(poi: any, size: [number, number]): void;
+    setOffsetY(poi: any, offsetY: number): void;
+    setDepthTest(poi: any, depthTest: boolean): void;
+    dispose(): void;
+    private onZoomChange;
+    private writeOpacity;
+    private writeTransform;
+    private scheduleRebuild;
+    private clearBuckets;
+    private rebuild;
+    private getMaterial;
+}

package/lib/src/layer/poi-layer2.d.ts

@@ -2,9 +2,13 @@ import { Poi2, PoiOptionsParam2 } from "../elements";
 import { Layer } from "./layer";
 import { Context } from "../context/context";
 import { Timer } from "../utils";
+import { PoiTextBatch } from "./poi-text-batch";
+import { PoiIconBatch } from "./poi-icon-batch";
 export declare class PoiLayer2 extends Layer {
     pois: Poi2[];
     timer: Timer;
+    textBatch: PoiTextBatch | null;
+    iconBatch: PoiIconBatch | null;
     constructor(context: Context);
     clear(): this;
     createPoi(options: PoiOptionsParam2): Poi2;

package/lib/src/layer/poi-text-batch.d.ts

@@ -0,0 +1,31 @@
+import { Object3D } from "three";
+import { Context } from "../context/context";
+import type { TextLayoutResult } from "../utils/text-layout";
+/**
+ * 文字合批只接管 POI 文字；图标/背景仍走各自的对象，
+ * 这样不改动碰撞、拾取和 icon 的既有逻辑。
+ */
+export declare class PoiTextBatch extends Object3D {
+    private context;
+    private items;
+    private buckets;
+    private materials;
+    private rebuildRaf;
+    private rebuildScheduled;
+    constructor(context: Context);
+    addPoi(poi: any, layout: TextLayoutResult): void;
+    removePoi(poi: any): void;
+    refresh(poi: any, layout: TextLayoutResult): void;
+    setVisible(poi: any, visible: boolean): void;
+    setOpacity(poi: any, opacity: number): void;
+    setDepthTest(poi: any, depthTest: boolean): void;
+    setOutlineWidth(poi: any, outlineWidth: number): void;
+    dispose(): void;
+    private get pixelRatio();
+    private onZoomChange;
+    private writeOpacity;
+    private scheduleRebuild;
+    private clearBuckets;
+    private rebuild;
+    private getMaterial;
+}

package/lib/src/loader/AibeeLoader/index.d.ts

@@ -62,23 +62,37 @@ export declare class AibeeLoader extends EventDispatcher<AibeeLoaderEventMap> {
     bmap: BMap;
     floors: AibeeFloorInfo[];
     initDbPromise: Promise<void>;
+    /** 全场预热的完成信号；需要确保缓存已就绪时可 await 它 */
+    preloadPromise: Promise<void>;
     db: IDBDatabase | null;
     taskQueue: TaskQueue;
     loadWorker: Worker;
     options: AibeeLoaderOptions;
     locale: Locale;
     placeConfig: PlaceConfig;
+    /** 只缓存在途的楼层请求；请求完成并写入 IndexedDB 后会被清理，不常驻整层数据 */
     getFloorDataPromise: Map<string, Promise<AibeeFloorData>>;
     constructor(bmap: BMap, options?: Partial<AibeeLoaderOptions>);
     initDb(): Promise<void>;
     load(data: number | string | AibeeFloorInfo[], placeConfig?: Partial<PlaceConfig>): Promise<void>;
+    waitForPreload(): Promise<void>;
     setCacheData(storeName: string, key: string | number, data: any): Promise<unknown>;
     getCacheData<T>(storeName: string, key: string | number): Promise<T>;
+    /**
+     * 刚写入 IndexedDB 的数据，在 Safari/WKWebView 下可能因为事务提交时序短暂读不到。
+     * 这里做一次轻量重试；正常命中时没有额外开销。
+     */
+    private getCacheDataWithRetry;
     getFloorData(floor: string): Promise<Floor | null>;
     getFloorDataByFloorInfo(floorInfo: AibeeFloorInfo): Promise<Floor>;
     setLocale(locale: Locale): void;
+    /**
+     * 读取顺序：IndexedDB → 正在进行的 Promise → 网络请求。
+     * 这个方法只负责前两步，不会触发网络。
+     */
+    private readFloorFromCache;
     getFloorJsonDataByFloorInfo(floorInfo: AibeeFloorInfo): Promise<AibeeFloorData>;
-    getFloorJsonData(floor: string): Promise<AibeeFloorData | null>;
+    getFloorJsonData(floor: string, retry?: boolean): Promise<AibeeFloorData | null>;
     getRoadNetworkData(): Promise<RoadData2[]>;
     getFacilitiesData(): Promise<{
         infrastructures: any[];

package/lib/src/utils/os.d.ts

@@ -2,3 +2,5 @@ export declare const isMac: boolean;
 export declare const UA: string;
 export declare const isIphone: boolean;
 export declare const isAndroid: boolean;
+/** iPadOS 13+ 的 UA 伪装成 Mac，需要结合 touch points 判断 */
+export declare const isIOS: boolean;