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

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

@@ -495,6 +495,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;
@@ -523,10 +525,21 @@ var PinLayer = class {
 		const cached = this.elevationCache.get(key);
 		if (cached !== void 0) return cached;
 		const terrain = this.map.terrain;
-		const { tileID, mercatorX, mercatorY } = terrain._getOverscaledTileIDFromLngLatZoom(new LngLat(position[0], position[1]), Math.min(terrain.tileManager.maxzoom, terrain.tileManager.getSource().maxzoom + terrain.tileManager.deltaZoom));
-		const sampler = terrain._getElevationSampler(tileID);
-		if (!sampler) return NaN;
-		const value = sampler(mercatorX % 8192, mercatorY % 8192, 8192) * terrain.exaggeration;
+		const manager = terrain.tileManager ?? terrain.sourceCache;
+		const source = terrain.tileManager ? terrain.tileManager.getSource() : terrain.sourceCache.sourceCache.getSource();
+		const { tileID, mercatorX, mercatorY } = terrain._getOverscaledTileIDFromLngLatZoom(new LngLat(position[0], position[1]), Math.min(manager.maxzoom, source.maxzoom + manager.deltaZoom));
+		const x = mercatorX % 8192;
+		const y = mercatorY % 8192;
+		const getSampler = terrain.getElevationSampler ?? terrain._getElevationSampler;
+		let value;
+		if (getSampler) {
+			const sampler = getSampler.call(terrain, tileID);
+			if (!sampler) return NaN;
+			value = sampler(x, y, 8192) * terrain.exaggeration;
+		} else {
+			if (!manager.getSourceTile(tileID, true)?.dem) return NaN;
+			value = terrain.getElevation(tileID, x, y, 8192);
+		}
 		this.elevationCache.set(key, value);
 		return value;
 	}
@@ -627,6 +640,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?.({
@@ -2600,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,
@@ -2685,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.0",
+  "version": "0.4.2",
   "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",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@orbat-mapper/control-measures": "^0.27.0",
-    "@orbat-mapper/tactical-draw": "^0.9.0"
+    "@orbat-mapper/tactical-draw": "^0.9.2"
   },
   "peerDependencies": {
     "maplibre-gl": ">=5.8.0 <7.0.0"
@@ -48,7 +48,7 @@
     "@maplibre/maplibre-gl-style-spec": "^26.2.1",
     "@types/geojson": "^7946.0.16",
     "jsdom": "^27.4.0",
-    "maplibre-gl": "^6.3.0",
+    "maplibre-gl": "^6.10.0",
     "playwright-core": "^1.62.1",
     "publint": "^0.3.21",
     "tsdown": "^0.22.2",