@orbat-mapper/tactical-draw-adapter-maplibre 0.2.0-alpha.1 → 0.2.0-alpha.3

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 {
@@ -136,6 +136,22 @@ function buildSymbolLayer(symbolId, sourceId, text) {
 		],
 		"#000"
 	];
+	const textAnchor = text.labelProperty ? [
+		"case",
+		[
+			"==",
+			["get", "textAnchor"],
+			"start"
+		],
+		"left",
+		[
+			"==",
+			["get", "textAnchor"],
+			"end"
+		],
+		"right",
+		"center"
+	] : "center";
 	return {
 		id: symbolId,
 		type: "symbol",
@@ -145,6 +161,7 @@ function buildSymbolLayer(symbolId, sourceId, text) {
 			"text-font": ["Open Sans Regular"],
 			"text-size": buildTextSizeExpression(),
 			"text-rotate": textRotate,
+			"text-anchor": textAnchor,
 			"text-rotation-alignment": "map",
 			"text-pitch-alignment": "map",
 			"text-allow-overlap": true
@@ -212,6 +229,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 +322,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 {
@@ -329,6 +349,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 	}
 	createEditPointerDriver() {
 		const map = this.map;
+		const toContinuousLng = (lng) => this.toContinuousLng(lng);
 		const hub = new PointerCallbackHub();
 		let dragPanWasEnabled = false;
 		let disposed = false;
@@ -403,12 +424,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;
@@ -472,7 +493,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() {
@@ -534,7 +555,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.1",
+  "version": "0.2.0-alpha.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/control-measures": "^0.2.0-alpha.6",
-    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.5"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.9",
+    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.12"
   },
   "peerDependencies": {
     "maplibre-gl": ">=4.0.0 <6.0.0"