@teeechina/teee-map 0.0.33 → 0.0.34

package/dist/teee-map.mjs

@@ -41971,7 +41971,7 @@ function zn(e, t) {
 	});
 }
 function Bn() {
-	this.stashFeatures.clear(), this.map && (this.map.remove(), console.log("地图实例已移除"));
+	this.invalidateStashReady(), this.stashFeatures.clear(), this.map && (this.map.remove(), console.log("地图实例已移除"));
 }
 function Vn(e, t, n) {
 	let r = 2 ** n, i = Math.floor((e + 180) / 360 * r), a = t * Math.PI / 180;
@@ -42683,7 +42683,7 @@ function $n(e) {
 //#endregion
 //#region src/teee-map/utils/geojsonLayerTool.ts
 function er() {
-	this.mapConfigs && (this.mapConfigs.layers ?? []).forEach((e) => {
+	this.mapConfigs && this.stashFeatures.size !== 0 && (this.mapConfigs.layers ?? []).forEach((e) => {
 		let t = `geojson_${e}`;
 		this.map.getSource(t) && this.stashFeatures.forEach((n) => {
 			n.sourceLayer !== t || !n.properties || this.initGeoJsonFeatureState({ properties: n.properties }, e);
@@ -42691,7 +42691,7 @@ function er() {
 	});
 }
 function tr() {
-	if (this.mixingMapConfigs.size !== 0) for (let [e, t] of this.mixingMapConfigs) {
+	if (this.mixingMapConfigs.size !== 0 && this.stashFeatures.size !== 0) for (let [e, t] of this.mixingMapConfigs) {
 		let n = t.type;
 		(t.layers ?? []).forEach((t) => {
 			let r = `geojson_${n}_${e}_${t}`;
@@ -52302,6 +52302,9 @@ var ic = class e {
 	stashFeatures = /* @__PURE__ */ new Map();
 	layerFeaturesCache = /* @__PURE__ */ new Map();
 	_activeBlinkCleanup = null;
+	_stashReady = Promise.resolve();
+	_stashReadyResolve = null;
+	_stashReadyReject = null;
 	constructor(e) {
 		let t = {
 			version: 8,
@@ -52319,7 +52322,36 @@ var ic = class e {
 			this.cursorTool = new Bs.cursor(this.map), this.drawTool = new Bs.draw(this), this.injectTeeeGeoJson = Bs.injectTeeeGeoJson, this.snaps = new Bs.snaps(this), this.drawRoute = new Bs.drawRoute(this);
 		});
 	}
+	resetStashReady() {
+		this._stashReadyResolve?.(), this._stashReady = new Promise((e, t) => {
+			this._stashReadyResolve = e, this._stashReadyReject = t;
+		}), this._stashReady.catch(() => {});
+	}
+	markStashReady() {
+		this._stashReadyResolve?.(), this._stashReadyResolve = null, this._stashReadyReject = null;
+	}
+	invalidateStashReady(e) {
+		this._stashReadyReject?.(Error(e ?? "TeeeMap 已销毁：要素缓存不会再就绪")), this._stashReadyResolve = null, this._stashReadyReject = null;
+	}
+	whenStashed(e = 3e4) {
+		return e <= 0 ? this._stashReady : new Promise((t, n) => {
+			let r = setTimeout(() => {
+				n(/* @__PURE__ */ Error(`whenStashed 超时(${e}ms)：要素缓存未在预期时间内就绪`));
+			}, e);
+			this._stashReady.then(() => {
+				clearTimeout(r), t();
+			}, (e) => {
+				clearTimeout(r), n(e);
+			});
+		});
+	}
+	onStashReady(e, t) {
+		this.whenStashed().then(e).catch((e) => {
+			t ? t(e) : console.error("onStashReady: 等待要素缓存就绪失败", e);
+		});
+	}
 	initMap(e, t = !1) {
+		this.resetStashReady();
 		let n = async () => {
 			try {
 				if (console.log(`开始构建业务地图: ${e.id}`), Array.isArray(e.source)) if (t) {
@@ -52358,7 +52390,9 @@ var ic = class e {
 			}
 		}, r = () => {
 			this.map.once("idle", () => {
-				t ? this.stashMixMapAllFeature() : this.stashAllFeature();
+				(t ? this.stashMixMapAllFeature() : this.stashAllFeature()).catch((t) => {
+					console.error(`要素缓存失败: ${e.id}`, t);
+				}).finally(() => this.markStashReady());
 			});
 		};
 		this.map.loaded() ? n().then(r) : this.map.on("load", () => {
@@ -52366,6 +52400,7 @@ var ic = class e {
 		});
 	}
 	async initMixMap(e) {
+		this.resetStashReady();
 		let t = async () => {
 			let t = await rt();
 			console.log(`图标列表 (${t.length}):`, t), t.forEach((e) => {
@@ -52399,11 +52434,17 @@ var ic = class e {
 				let e = c.geometry;
 				this.mapDir = e.coordinates[0][0] - e.coordinates[1][0] > 0 ? "left" : "right";
 			}
-			this.stashMixMapAllFeature(), Bs.geojson(this);
+			await this.stashMixMapAllFeature(), Bs.geojson(this);
+		}, n = async () => {
+			try {
+				await t();
+			} catch (e) {
+				console.error("混合地图构建失败", e);
+			} finally {
+				this.markStashReady();
+			}
 		};
-		this.map.loaded() ? t() : this.map.on("load", () => {
-			t();
-		});
+		this.map.loaded() ? n() : this.map.once("load", () => void n());
 	}
 	createCTCMap(e, t, n) {
 		let r = Vs.ctc(e, t, n);
@@ -52731,7 +52772,7 @@ var ic = class e {
 		return this.mapConfigs;
 	}
 	destroy() {
-		this._activeBlinkCleanup?.(), this._activeBlinkCleanup = null, this.stashFeatures.clear(), this.layerFeaturesCache.clear(), this.mixingMapConfigs.clear(), this.map.remove();
+		this._activeBlinkCleanup?.(), this._activeBlinkCleanup = null, this.invalidateStashReady(), this.stashFeatures.clear(), this.layerFeaturesCache.clear(), this.mixingMapConfigs.clear(), this.map.remove();
 	}
 	async stashMixMapAllFeature() {
 		if (this.mixingMapConfigs.size !== 0) for (let [e, t] of this.mixingMapConfigs) {