@orbat-mapper/tactical-draw-adapter-maplibre 0.2.0-alpha.0 → 0.2.0-alpha.2

package/README.md

@@ -1,13 +1,11 @@
 # @orbat-mapper/tactical-draw-adapter-maplibre
 
-The [MapLibre GL JS](https://maplibre.org/maplibre-gl-js/docs/) engine adapter for
-the `@orbat-mapper/tactical-draw` toolkit. It implements the `MapAdapter` contract
-from `@orbat-mapper/tactical-draw` on top of MapLibre, so the engine-agnostic
-draw/edit controllers — sessions, draw rules, gestures, handle rendering — run
-unchanged against a MapLibre map.
+[MapLibre GL JS](https://maplibre.org/maplibre-gl-js/docs/) bindings for
+`@orbat-mapper/tactical-draw`. `MapLibreAdapter` implements the `MapAdapter`
+contract, so the draw/edit sessions, draw rules, gestures, and handle
+rendering from `tactical-draw` run unchanged on a MapLibre map.
 
-`maplibre-gl` is declared as a **peer dependency**, so you bring your own single
-copy and never install an engine you don't use.
+`maplibre-gl` is a peer dependency — your app supplies the version.
 
 ## Installation
 
@@ -34,8 +32,11 @@ const adapter = new MapLibreAdapter(map);
 const draw = new TacticalDraw(adapter);
 ```
 
-Hand the adapter to `TacticalDraw` and drive draw/edit exactly as with any other
-engine adapter in the family.
+## Quick Links
+
+- [`@orbat-mapper/tactical-draw`](https://www.npmjs.com/package/@orbat-mapper/tactical-draw) — the draw/edit core this adapter plugs into
+- [`@orbat-mapper/control-measures`](https://www.npmjs.com/package/@orbat-mapper/control-measures) — generates the control measures as GeoJSON
+- [GitHub repository](https://github.com/orbat-mapper/tactical-graphics)
 
 ## License
 

package/dist/index.d.mts

@@ -16,6 +16,7 @@ interface MapLibreViewToken {
 declare class MapLibreAdapter extends BaseMapAdapter<MapLibreLayerHandle, MapLibreEventToken, MapLibreViewToken> {
   private map;
   constructor(map: maplibregl.Map);
+  private toContinuousLng;
   protected createLayer(layerId: LayerId, style?: StyleOptions): MapLibreLayerHandle;
   protected destroyLayer(handle: MapLibreLayerHandle): void;
   protected applyFeatureOps(layerId: LayerId, ops: FeatureOps): void;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { project, unproject } from "@orbat-mapper/control-measures";
-import { BaseMapAdapter, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, bindAbortable, pickHitTolerance, tryControlMeasureIdFromFeature } from "@orbat-mapper/tactical-draw";
+import { BaseMapAdapter, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, bindAbortable, nearestWorldCopyLng, pickHitTolerance, tryControlMeasureIdFromFeature } from "@orbat-mapper/tactical-draw";
 //#region src/ml-adapter.ts
 function emptyFC() {
 	return {
@@ -212,6 +212,9 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 		super();
 		this.map = map;
 	}
+	toContinuousLng(lng) {
+		return nearestWorldCopyLng(lng, this.map.getCenter().lng);
+	}
 	createLayer(layerId, style) {
 		const sourceId = `${layerId}-src`;
 		this.map.addSource(sourceId, {
@@ -302,7 +305,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 	attachNativeEvent(type, onEvent) {
 		const mlEvent = type === "pointermove" ? "mousemove" : type === "dblclick" ? "dblclick" : "click";
 		const fn = (e) => {
-			onEvent([e.lngLat.lng, e.lngLat.lat], [e.point.x, e.point.y], e);
+			onEvent([this.toContinuousLng(e.lngLat.lng), e.lngLat.lat], [e.point.x, e.point.y], e);
 		};
 		this.map.on(mlEvent, fn);
 		return {
@@ -315,16 +318,21 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 	}
 	attachViewChange(handler) {
 		const fn = () => handler();
+		this.map.on("zoom", fn);
+		this.map.on("rotate", fn);
+		this.map.on("pitch", fn);
 		this.map.on("moveend", fn);
-		this.map.on("zoomend", fn);
 		return { fn };
 	}
 	detachViewChange(token) {
+		this.map.off("zoom", token.fn);
+		this.map.off("rotate", token.fn);
+		this.map.off("pitch", token.fn);
 		this.map.off("moveend", token.fn);
-		this.map.off("zoomend", token.fn);
 	}
 	createEditPointerDriver() {
 		const map = this.map;
+		const toContinuousLng = (lng) => this.toContinuousLng(lng);
 		const hub = new PointerCallbackHub();
 		let dragPanWasEnabled = false;
 		let disposed = false;
@@ -399,12 +407,12 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 				}
 			},
 			toPixel(lonLat) {
-				const p = map.project(lonLat);
+				const p = map.project([toContinuousLng(lonLat[0]), lonLat[1]]);
 				return [p.x, p.y];
 			},
 			fromPixel(pixel) {
 				const ll = map.unproject(pixel);
-				return [ll.lng, ll.lat];
+				return [toContinuousLng(ll.lng), ll.lat];
 			},
 			dispose() {
 				if (disposed) return;
@@ -468,7 +476,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 		return project(position[0], position[1]);
 	}
 	getPixelFromCoordinate(position) {
-		const point = this.map.project(position);
+		const point = this.map.project([this.toContinuousLng(position[0]), position[1]]);
 		return [point.x, point.y];
 	}
 	getViewportSize() {
@@ -530,7 +538,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 				id: cmId,
 				feature: geojson,
 				pixel: [x, y],
-				coordinate: [e.lngLat.lng, e.lngLat.lat],
+				coordinate: [this.toContinuousLng(e.lngLat.lng), e.lngLat.lat],
 				originalEvent
 			});
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.2.0-alpha.0",
+  "version": "0.2.0-alpha.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",
@@ -37,8 +37,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.2.0-alpha.0",
-    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.0"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.7",
+    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.6"
   },
   "peerDependencies": {
     "maplibre-gl": ">=4.0.0 <6.0.0"