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

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { project, unproject } from "@orbat-mapper/control-measures";
-import { BaseMapAdapter, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, bindAbortable, nearestWorldCopyLng, pickHitTolerance, tryControlMeasureIdFromFeature } from "@orbat-mapper/tactical-draw";
+import { BaseMapAdapter, DEFAULT_TEXT_SIZE_MAX_PIXELS, DEFAULT_TEXT_SIZE_MIN_PIXELS, PointerCallbackHub, TOUCH_HIT_TOLERANCE_PX, bindAbortable, nearestWorldCopyLng, pickHitTolerance, tryControlMeasureIdFromFeature } from "@orbat-mapper/tactical-draw";
 //#region src/ml-adapter.ts
 function emptyFC() {
 	return {
@@ -59,39 +59,47 @@ function buildCirclePointFilter(style) {
 		"Point"
 	];
 }
-function buildTextSizeExpression() {
-	const size = [
+/** Web Mercator world circumference in meters (2π × 6378137). */
+const WEB_MERCATOR_CIRCUMFERENCE = 40075016.686;
+/**
+* Per-feature text size (ADR-0028): a ground-anchored label carries
+* `textSizeMeters` and renders at `textSizeMeters / resolution`, clamped to
+* the layer's `textSizeMinPixels`/`textSizeMaxPixels` band; a screen-anchored
+* one carries `textSizePixels` and renders at that constant; neither renders
+* the 14px engine default. Layout properties only take zoom as an
+* `interpolate`/`step` input, so the ground conversion is evaluated at every
+* integer zoom stop (resolution = world circumference / 512·2^zoom pixels,
+* matching `getResolution`); the linear ramp between stops approximates the
+* exponential exactly closely enough at 1-zoom granularity.
+*/
+function buildTextSizeExpression(text) {
+	const minPx = text.textSizeMinPixels ?? DEFAULT_TEXT_SIZE_MIN_PIXELS;
+	const maxPx = text.textSizeMaxPixels ?? DEFAULT_TEXT_SIZE_MAX_PIXELS;
+	const screenOrDefault = [
 		"coalesce",
 		["get", "textSizePixels"],
 		14
 	];
-	const referenceZoom = [
-		"coalesce",
-		["get", "textSizeZoom"],
-		0
-	];
-	const sizeAtZoom = (zoom) => [
-		"min",
-		254,
-		[
+	const sizeAtZoom = (zoom) => {
+		return [
 			"case",
-			["has", "textSizeZoom"],
+			["has", "textSizeMeters"],
 			[
-				"*",
-				size,
+				"min",
+				maxPx,
 				[
-					"^",
-					2,
+					"max",
+					minPx,
 					[
-						"-",
-						zoom,
-						referenceZoom
+						"*",
+						["get", "textSizeMeters"],
+						Math.pow(2, zoom + 9) / WEB_MERCATOR_CIRCUMFERENCE
 					]
 				]
 			],
-			size
-		]
-	];
+			screenOrDefault
+		];
+	};
 	return [
 		"interpolate",
 		["linear"],
@@ -136,6 +144,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",
@@ -143,8 +167,9 @@ function buildSymbolLayer(symbolId, sourceId, text) {
 		layout: {
 			"text-field": text.labelProperty ? ["get", text.labelProperty] : text.text ?? "",
 			"text-font": ["Open Sans Regular"],
-			"text-size": buildTextSizeExpression(),
+			"text-size": buildTextSizeExpression(text),
 			"text-rotate": textRotate,
+			"text-anchor": textAnchor,
 			"text-rotation-alignment": "map",
 			"text-pitch-alignment": "map",
 			"text-allow-overlap": true
@@ -508,9 +533,7 @@ var MapLibreAdapter = class extends BaseMapAdapter {
 		else this.map.doubleClickZoom.disable();
 	}
 	getResolution() {
-		const zoom = this.map.getZoom();
-		const center = this.map.getCenter();
-		return 40075016.686 * Math.cos(center.lat * Math.PI / 180) / Math.pow(2, zoom + 8);
+		return WEB_MERCATOR_CIRCUMFERENCE / Math.pow(2, this.map.getZoom() + 9);
 	}
 	getZoom() {
 		return this.map.getZoom();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw-adapter-maplibre",
-  "version": "0.2.0-alpha.2",
+  "version": "0.2.0-alpha.4",
   "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.7",
-    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.6"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.11",
+    "@orbat-mapper/tactical-draw": "^0.2.0-alpha.14"
   },
   "peerDependencies": {
     "maplibre-gl": ">=4.0.0 <6.0.0"