@orbat-mapper/tactical-draw-adapter-maplibre 0.2.0-alpha.11 → 0.2.0-alpha.12

package/dist/index.d.mts

@@ -25,12 +25,17 @@ declare class MapLibreAdapter extends BaseMapAdapter<MapLibreLayerHandle, MapLib
   private map;
   private readonly viewChangeMode;
   private readonly pendingIconImages;
+  private readonly pendingLayerUpdates;
+  private readonly deferredLayerRemovals;
   readonly scalesGroundPointSymbolsNatively = true;
   constructor(map: maplibregl.Map, options?: MapLibreAdapterOptions);
   private toContinuousLng;
   protected createLayer(layerId: LayerId, style?: StyleOptions): MapLibreLayerHandle;
   protected destroyLayer(handle: MapLibreLayerHandle): void;
   protected applyFeatureOps(layerId: LayerId, ops: FeatureOps): void;
+  private updateSourceData;
+  private flushDeferredLayerRemoval;
+  deferLayerRemovalUntilLayerUpdate(layerId: LayerId, updatedLayerId: LayerId): void;
   protected applyIconResources(resources: readonly IconResource[]): void;
   protected removeIconResource(id: string): void;
   protected attachNativeEvent(type: "click" | "pointermove" | "dblclick", onEvent: (lonLat: Position, pixel: PixelCoordinate, originalEvent: unknown) => void): NativeEventEntry<MapLibreEventToken>;

package/dist/index.mjs

@@ -1,6 +1,9 @@
 import { project, unproject } from "@orbat-mapper/control-measures";
 import { BaseMapAdapter, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, bindAbortable, nearestWorldCopyLng, pickHitTolerance, tryControlMeasureIdFromFeature } from "@orbat-mapper/tactical-draw";
 //#region src/ml-adapter.ts
+function isPromiseLike(value) {
+	return (typeof value === "object" || typeof value === "function") && value !== null && typeof value.then === "function";
+}
 function emptyFC() {
 	return {
 		type: "FeatureCollection",
@@ -340,6 +343,8 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 	map;
 	viewChangeMode;
 	pendingIconImages = /* @__PURE__ */ new Set();
+	pendingLayerUpdates = /* @__PURE__ */ new Map();
+	deferredLayerRemovals = /* @__PURE__ */ new Map();
 	scalesGroundPointSymbolsNatively = true;
 	constructor(map, options = {}) {
 		super();
@@ -419,25 +424,73 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 		};
 	}
 	destroyLayer(handle) {
+		for (const [layerId, layerHandle] of this.layers) {
+			if (layerHandle !== handle) continue;
+			this.pendingLayerUpdates.get(layerId)?.cancel();
+			this.pendingLayerUpdates.delete(layerId);
+			this.deferredLayerRemovals.delete(layerId);
+			break;
+		}
 		for (const mlId of handle.mlLayerIds) if (this.map.getLayer(mlId)) this.map.removeLayer(mlId);
 		if (this.map.getSource(handle.sourceId)) this.map.removeSource(handle.sourceId);
 	}
 	applyFeatureOps(layerId, ops) {
+		const deferred = this.deferredLayerRemovals.get(layerId);
+		const isPureRemoval = ops.adds.length === 0 && ops.updates.length === 0 && (ops.removes?.length ?? 0) > 0;
+		if (deferred && isPureRemoval) {
+			deferred.after.then(() => this.flushDeferredLayerRemoval(layerId, deferred), () => this.flushDeferredLayerRemoval(layerId, deferred));
+			return;
+		}
+		if (deferred) this.deferredLayerRemovals.delete(layerId);
+		this.updateSourceData(layerId, ops.full);
+	}
+	updateSourceData(layerId, features) {
 		const handle = this.layers.get(layerId);
 		if (!handle) return;
 		const source = this.map.getSource(handle.sourceId);
 		if (!source) return;
-		const features = ops.full.map((f) => f.id !== void 0 ? {
+		const promotedFeatures = features.map((f) => f.id !== void 0 ? {
 			...f,
 			properties: {
 				...f.properties ?? {},
 				_fid: f.id
 			}
 		} : f);
-		source.setData({
-			type: "FeatureCollection",
-			features
+		let resolveSourceData;
+		const sourceDataCompletion = new Promise((resolve) => {
+			resolveSourceData = resolve;
 		});
+		const onSourceData = (event) => {
+			if (event.sourceDataType !== "content") return;
+			source.off("data", onSourceData);
+			resolveSourceData();
+		};
+		source.on("data", onSourceData);
+		const result = source.setData({
+			type: "FeatureCollection",
+			features: promotedFeatures
+		}, true);
+		const supportsCompletionPromise = isPromiseLike(result);
+		if (supportsCompletionPromise) source.off("data", onSourceData);
+		const completion = supportsCompletionPromise ? Promise.resolve(result) : sourceDataCompletion;
+		const pending = {
+			completion,
+			cancel() {
+				source.off("data", onSourceData);
+			}
+		};
+		this.pendingLayerUpdates.set(layerId, pending);
+		completion.catch(() => {});
+	}
+	flushDeferredLayerRemoval(layerId, deferred) {
+		if (this.deferredLayerRemovals.get(layerId) !== deferred) return;
+		this.deferredLayerRemovals.delete(layerId);
+		this.updateSourceData(layerId, this.getLayerFeatures(layerId));
+	}
+	deferLayerRemovalUntilLayerUpdate(layerId, updatedLayerId) {
+		const pending = this.pendingLayerUpdates.get(updatedLayerId);
+		if (!pending || !this.layers.has(layerId)) return;
+		this.deferredLayerRemovals.set(layerId, { after: pending.completion });
 	}
 	applyIconResources(resources) {
 		if (typeof Image === "undefined") return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.2.0-alpha.11",
+  "version": "0.2.0-alpha.12",
   "description": "MapLibre GL JS engine adapter for @orbat-mapper/tactical-draw. Draw and edit tactical control measures (MIL-STD-2525 / APP-6) on a MapLibre map.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -37,8 +37,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.2.0-alpha.16",
-    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.26"
+    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.27",
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.16"
   },
   "peerDependencies": {
     "maplibre-gl": ">=4.0.0 <6.0.0"