@orbat-mapper/tactical-draw-adapter-maplibre 0.2.0-alpha.21 → 0.2.0-alpha.23

package/dist/index.d.mts

@@ -17,7 +17,20 @@ interface MapLibreGroupBundle {
   readonly sourceId: string;
   readonly layerIds: Map<PaintChannel, string>;
   features: readonly Feature[];
-  featureSignature: string;
+  /** Features most recently submitted to the native source, after MapLibre-specific promotion. */
+  sourceFeatures: readonly Feature[];
+  /** Whether the native source has received its first complete dataset. */
+  sourceInitialized: boolean;
+  /** Unset while the stored value describes older features than `features` holds. */
+  featureSignature: string | undefined;
+  /**
+   * Last `FeatureGroup.revision` seen for this bundle, when the producer
+   * supplied one. Two consecutive groups with the same `revision` are known
+   * to carry byte-identical `features`, so it stands in for `featureSignature`
+   * without paying to re-stringify the whole group. A missing revision on
+   * either side falls back to the signature comparison — see `applyFeatureGroups`.
+   */
+  revision?: number;
   requiredIconIds: ReadonlySet<string>;
 }
 type MapLibreEventToken = (e: any) => void;

package/dist/index.mjs

@@ -28,6 +28,49 @@ function sameOrder(a, b) {
 	return true;
 }
 /**
+* Replace the contents of shared-id features while adding/removing ids that
+* entered or left a stable group bundle. Remove stale keys explicitly instead
+* of combining `removeAllProperties` with `addOrUpdateProperties`: MapLibre's
+* tile-index diff treats the former as exclusive and otherwise drops the
+* replacement properties, including the promoted feature id.
+*/
+function buildGeoJSONSourceDiff(previousFeatures, nextFeatures) {
+	const previousById = new Map(previousFeatures.map((feature) => [feature.id, feature]));
+	const nextById = new Map(nextFeatures.map((feature) => [feature.id, feature]));
+	const remove = previousFeatures.filter((feature) => !nextById.has(feature.id)).map((feature) => feature.id);
+	const add = [];
+	const update = [];
+	for (const feature of nextFeatures) {
+		const previous = previousById.get(feature.id);
+		if (!previous) {
+			add.push(feature);
+			continue;
+		}
+		if (feature.geometry === null) {
+			remove.push(feature.id);
+			add.push(feature);
+			continue;
+		}
+		const previousProperties = previous.properties ?? {};
+		const nextProperties = feature.properties ?? {};
+		const removeProperties = Object.keys(previousProperties).filter((key) => !Object.hasOwn(nextProperties, key));
+		update.push({
+			id: feature.id,
+			newGeometry: feature.geometry,
+			...removeProperties.length > 0 ? { removeProperties } : {},
+			addOrUpdateProperties: Object.entries(nextProperties).map(([key, value]) => ({
+				key,
+				value
+			}))
+		});
+	}
+	return {
+		...remove.length > 0 ? { remove } : {},
+		...add.length > 0 ? { add } : {},
+		...update.length > 0 ? { update } : {}
+	};
+}
+/**
 * Find the largest subset of bundles whose relative order already matches the
 * desired stack. Reorders then move only the remaining bundles.
 */
@@ -800,12 +843,19 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 				bundle = this.createGroupBundle(layerId, handle);
 				handle.groupBundles.set(group.id, bundle);
 			}
-			const featureSignature = JSON.stringify(group.features);
-			const contentChanged = isNewBundle || bundle.featureSignature !== featureSignature;
+			let contentChanged;
+			if (!isNewBundle && bundle.revision !== void 0 && group.revision !== void 0) {
+				contentChanged = bundle.revision !== group.revision;
+				if (contentChanged) bundle.featureSignature = void 0;
+			} else {
+				const featureSignature = JSON.stringify(group.features);
+				contentChanged = isNewBundle || bundle.featureSignature !== featureSignature;
+				bundle.featureSignature = featureSignature;
+			}
 			const requiredIconIds = this.requiredIconIds(group);
 			const resourcesChanged = bundle.requiredIconIds.size !== requiredIconIds.size || [...bundle.requiredIconIds].some((id) => !requiredIconIds.has(id));
 			bundle.features = group.features;
-			bundle.featureSignature = featureSignature;
+			bundle.revision = group.revision;
 			bundle.requiredIconIds = requiredIconIds;
 			if (this.reconcileGroupChannels(handle, bundle, groupPaintChannels(group.features, handle.style))) bundlesNeedingOrder.add(group.id);
 			if (contentChanged || resourcesChanged) this.updateGroupBundleSource(bundle);
@@ -824,6 +874,8 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 			sourceId,
 			layerIds: /* @__PURE__ */ new Map(),
 			features: [],
+			sourceFeatures: [],
+			sourceInitialized: false,
 			featureSignature: "[]",
 			requiredIconIds: /* @__PURE__ */ new Set()
 		};
@@ -917,10 +969,12 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 		const source = this.map.getSource(bundle.sourceId);
 		if (!source) return;
 		const features = [...bundle.requiredIconIds].every((id) => this.map.hasImage(id)) ? bundle.features.map((feature) => this.promoteFeature(feature)) : [];
-		const result = source.setData({
+		const result = bundle.sourceInitialized && typeof source.updateData === "function" ? source.updateData(buildGeoJSONSourceDiff(bundle.sourceFeatures, features), true) : source.setData({
 			type: "FeatureCollection",
 			features
 		}, true);
+		bundle.sourceFeatures = features;
+		bundle.sourceInitialized = true;
 		if (isPromiseLike(result)) Promise.resolve(result).catch(() => {});
 	}
 	orderGroupBundles(handle, previousGroupIds, desiredGroupIds, forcedGroupIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.2.0-alpha.21",
+  "version": "0.2.0-alpha.23",
   "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.26",
-    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.36"
+    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.38",
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.26"
   },
   "peerDependencies": {
     "maplibre-gl": ">=5.8.0 <6.0.0"