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

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
 	];
 }
@@ -677,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,
@@ -700,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);
@@ -824,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;
@@ -1026,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.4.2",
+  "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",