@orbat-mapper/tactical-draw-adapter-maplibre 0.4.1 → 0.4.3

package/dist/index.d.mts

@@ -65,6 +65,8 @@ declare class PinLayer implements CustomLayerInterface {
   private version;
   private resourceRevision;
   private needsDepth;
+  /** Whether a pin hit outranks an overlapping ordinary graphic during selection. */
+  prioritizesSelection: boolean;
   private elevationCache;
   private pendingElevation;
   private removed;

package/dist/index.mjs

@@ -439,6 +439,7 @@ function shader(gl, type, source) {
 	}
 	return s;
 }
+const elevationOrSeaLevel = (value) => Number.isFinite(value) ? value : 0;
 /**
 * Appends one instance's worth of vertex-shader input to `data` and extends `ranges`
 * accordingly. Hoisted out of rebuild()'s per-pin loop (ADR n/a) so pushing 10k+ pins
@@ -471,7 +472,7 @@ function arrowSegmentPoint(center, position, elevationAt, from, to, t) {
 	return [
 		mc.x - center.x,
 		mc.y - center.y,
-		elevationAt(ll) + 1,
+		elevationOrSeaLevel(elevationAt(ll)) + 1,
 		0
 	];
 }
@@ -495,6 +496,8 @@ var PinLayer = class {
 	version = 0;
 	resourceRevision = -1;
 	needsDepth = false;
+	/** Whether a pin hit outranks an overlapping ordinary graphic during selection. */
+	prioritizesSelection = false;
 	elevationCache = /* @__PURE__ */ new Map();
 	pendingElevation = /* @__PURE__ */ new Set();
 	removed = false;
@@ -638,6 +641,7 @@ var PinLayer = class {
 			}
 		}
 		this.pins = pins;
+		this.prioritizesSelection = pins[0]?.presentation.prioritizePins ?? false;
 		if (this.elevationCache.size > pins.length * 60 + 1e3) this.elevationCache.clear();
 		if (!this.program) {
 			this.onStatus?.({
@@ -674,13 +678,12 @@ var PinLayer = class {
 		const pin = this.pins[i], p = pin.presentation;
 		const anchor = pinMercator(pin.position);
 		anchor.x += Math.round(center.x - anchor.x);
-		const elevation = this.elevation(pin.position);
+		const sampledElevation = this.elevation(pin.position);
+		const hasElevation = Number.isFinite(sampledElevation);
+		const elevation = elevationOrSeaLevel(sampledElevation);
 		this.elevations[i] = elevation;
-		if (!Number.isFinite(elevation)) {
-			this.pendingElevation.add(pin.id);
-			return;
-		}
-		this.pendingElevation.delete(pin.id);
+		if (hasElevation) this.pendingElevation.delete(pin.id);
+		else this.pendingElevation.add(pin.id);
 		const a = [
 			anchor.x - center.x,
 			anchor.y - center.y,
@@ -697,7 +700,7 @@ var PinLayer = class {
 		const opacity = pin.opacity;
 		const highlightOnly = pin.highlightOnly;
 		const instanceId = i + 1;
-		const occlusionFlag = p.occlusion === "terrain" ? 1 : 0;
+		const occlusionFlag = hasElevation && p.occlusion === "terrain" ? 1 : 0;
 		const worldMode = p.mode === "world" ? 1 : 0;
 		const haloColor = rgba(p.halo.color, p.halo.opacity * opacity);
 		const stemColor = rgba(p.stem.color, p.stem.opacity * opacity);
@@ -821,7 +824,7 @@ var PinLayer = class {
 				this.buildPin(i, center, data, []);
 				const slice = this.slices[i];
 				const page = this.atlas.entries.get(this.pins[i].resource.id)?.page;
-				if (data.length !== slice.length || page !== slice.page) {
+				if (data.length !== slice.length || page !== slice.page || previousPending.has(this.pins[i].id) !== this.pendingElevation.has(this.pins[i].id)) {
 					this.pendingElevation = previousPending;
 					this.dirty = true;
 					break;
@@ -1023,7 +1026,7 @@ var PinLayer = class {
 			const c = pinMercator(ll);
 			c.x += Math.round(this.origin[0] - c.x);
 			const world = 512 * 2 ** this.map.getZoom();
-			const [px, py] = this.projectToPixel((c.x - this.origin[0]) * world, (c.y - this.origin[1]) * world, this.elevation(ll) + (p.mode === "world" ? p.heightMeters : 0));
+			const [px, py] = this.projectToPixel((c.x - this.origin[0]) * world, (c.y - this.origin[1]) * world, elevationOrSeaLevel(this.elevation(ll)) + (p.mode === "world" ? p.heightMeters : 0));
 			return [px, py - (p.mode === "screen" ? p.liftPixels : 0)];
 		};
 		return invertPinProjection(project, pin.position, attachment, this.map.getProjection()?.type === "globe" ? 90 : void 0);
@@ -2611,7 +2614,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 				bearing: this.getBearing()
 			});
 			const pinHit = this.pinHit(layerId, [x, y], tol);
-			if (pinHit && (!candidate || pinHit.order >= (this.getFeatureGroupOrder(layerId, candidate.feature.id) ?? -1))) {
+			if (pinHit && (pinHit.prioritize || !candidate || pinHit.order >= (this.getFeatureGroupOrder(layerId, candidate.feature.id) ?? -1))) {
 				handler({
 					id: pinHit.id,
 					feature: pinHit.feature,
@@ -2696,7 +2699,8 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 			if (feature) return {
 				id,
 				feature,
-				order: this.getFeatureGroupOrder(layerId, feature.id) ?? 0
+				order: this.getFeatureGroupOrder(layerId, feature.id) ?? 0,
+				prioritize: pinLayer.prioritizesSelection
 			};
 		}
 		return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "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/tactical-draw": "^0.9.0",
-    "@orbat-mapper/control-measures": "^0.27.0"
+    "@orbat-mapper/control-measures": "^0.27.0",
+    "@orbat-mapper/tactical-draw": "^0.9.2"
   },
   "peerDependencies": {
     "maplibre-gl": ">=5.8.0 <7.0.0"