@orbat-mapper/tactical-map-sheet 0.4.1 → 0.4.2

package/README.md

@@ -298,6 +298,14 @@ Each layer has a stable `id`, ordered `{ graphic }[]`, and optional shared portr
 color, line/dash/cap/join, and label size/clamp. A graphic is a control-measure `ControlMeasure`, a
 `MapSheetPointSymbol`, or a `MapSheetCustomSymbol`.
 
+Control-measure label sizes and Text sizes authored in metres retain their existing Web Mercator
+construction-unit meaning. The renderer converts the sheet's true-ground scale at each graphic's
+control-point bounding-box midpoint latitude for both label layout and final SVG/PDF text sizing.
+For example, a `labelSize` of 280 at 60° latitude prints at 14 CSS pixels when the sheet represents
+10 true-ground metres per CSS pixel. Ordinary ground labels use the layer's clamp band; ground Text
+graphics instead scale freely and hide above their `maxSizePixels` threshold. Screen sizes remain
+fixed CSS reference pixels. Authored graphics are never rewritten by export.
+
 Point symbols carry `id`, `sidc`, position, rotation in radians, pixel- or metre-based size, optional
 amplifiers/modifiers, and renderer style/options. `MapSheetPointSymbolCapability.render(symbol)`
 must return a `ControlledVectorSymbol`: stable resource ID, controlled-subset SVG, complete width and

package/dist/{create-tactical-map-sheet-Dm9IiFHP.mjs → create-tactical-map-sheet-DOsMPUJp.mjs}

@@ -1,8 +1,8 @@
 import GeographicLibMgrs from "geographiclib-mgrs";
 import PolarStereographic from "geographiclib-mgrs/src/polar-stereographic.mjs";
 import opentype from "opentype.js";
-import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS, DEFAULT_LINE_CAP, DEFAULT_LINE_JOIN, DEFAULT_PORTRAYAL, DEFAULT_STROKE_DASH_CSS_PIXELS, DEFAULT_STROKE_WIDTH_CSS_PIXELS, getFillPatternDefinition, renderControlMeasure, resolveSymbolColor } from "@orbat-mapper/control-measures";
-import { effectivePointSymbolPixelSize, resolvePointSymbolOffset, scalePointSymbolLayout } from "@orbat-mapper/tactical-draw";
+import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, DEFAULT_LABEL_SIZE_CLAMP_CSS_PIXELS, DEFAULT_LINE_CAP, DEFAULT_LINE_JOIN, DEFAULT_PORTRAYAL, DEFAULT_STROKE_DASH_CSS_PIXELS, DEFAULT_STROKE_WIDTH_CSS_PIXELS, getFillPatternDefinition, renderControlMeasure, resolveConstructionMetersPerCssPixel, resolveSymbolColor } from "@orbat-mapper/control-measures";
+import { effectivePointSymbolPixelSize, resolvePointSymbolOffset, resolveTextSizePixels, scalePointSymbolLayout } from "@orbat-mapper/tactical-draw";
 import { SaxesParser } from "saxes";
 //#region src/projection/geographic-lib.ts
 const backend = GeographicLibMgrs.UTMUPS;
@@ -1453,20 +1453,18 @@ function pathFromPositions(positions, closed, properties, portrayal, context) {
 		...fillPatternId ? { fillPatternId } : {}
 	};
 }
-function resolveTextSizeCssPixels(properties, portrayal, groundMetersPerCssPixel) {
-	if (properties.textSizePixels !== void 0) return properties.textSizePixels;
-	if (properties.textSizeMeters !== void 0) {
-		const requested = properties.textSizeMeters / groundMetersPerCssPixel;
-		if (properties.textMaxSizePixels !== void 0 && requested > properties.textMaxSizePixels) return;
-		const min = Math.min(portrayal.labelSizeClampCssPixels.min, portrayal.labelSizeClampCssPixels.max);
-		const max = Math.max(portrayal.labelSizeClampCssPixels.min, portrayal.labelSizeClampCssPixels.max);
-		return Math.min(max, Math.max(min, requested));
-	}
-	return portrayal.labelHeightCssPixels;
+function resolveTextSizeCssPixels(properties, portrayal, constructionMetersPerCssPixel) {
+	if (properties.textSizePixels === void 0 && properties.textSizeMeters === void 0) return portrayal.labelHeightCssPixels;
+	const { min, max } = portrayal.labelSizeClampCssPixels;
+	return resolveTextSizePixels({
+		...properties,
+		textSizeMinPixels: Math.min(min, max),
+		textSizeMaxPixels: Math.max(min, max)
+	}, constructionMetersPerCssPixel) ?? void 0;
 }
-function textFromFeature(feature, portrayal, context) {
+function textFromFeature(feature, portrayal, context, constructionMetersPerCssPixel) {
 	if (feature.geometry.type !== "Point" || feature.properties.text === void 0) return;
-	const fontSizeCssPixels = resolveTextSizeCssPixels(feature.properties, portrayal, context.groundMetersPerCssPixel);
+	const fontSizeCssPixels = resolveTextSizeCssPixels(feature.properties, portrayal, constructionMetersPerCssPixel);
 	if (fontSizeCssPixels === void 0) return;
 	requirePositiveFinite(fontSizeCssPixels, "Text size");
 	const style = feature.properties.textStyle ?? "regular";
@@ -1498,8 +1496,8 @@ function textFromFeature(feature, portrayal, context) {
 		} : {}
 	};
 }
-function elementsFromGeometry(feature, portrayal, context) {
-	const text = textFromFeature(feature, portrayal, context);
+function elementsFromGeometry(feature, portrayal, context, constructionMetersPerCssPixel) {
+	const text = textFromFeature(feature, portrayal, context, constructionMetersPerCssPixel);
 	if (text) return [text];
 	if (feature.geometry.type === "Point" && feature.properties.text !== void 0) return [];
 	const path = (positions, closed = false) => pathFromPositions(positions, closed, feature.properties, portrayal, context);
@@ -1693,13 +1691,14 @@ function renderGraphic(layerId, authored, portrayal, context) {
 		layerId,
 		graphicId: graphic.id
 	}] };
+	const constructionMetersPerCssPixel = resolveConstructionMetersPerCssPixel(graphic.controlPoints, context.groundMetersPerCssPixel);
 	const elements = rendered.features.flatMap((feature, index) => {
 		try {
 			const geometry = featureOutOfRange[index] ? clipGeometryToBounds(feature.geometry, frameBounds) : feature.geometry;
 			return geometry ? elementsFromGeometry({
 				...feature,
 				geometry
-			}, portrayal, context) : [];
+			}, portrayal, context, constructionMetersPerCssPixel) : [];
 		} catch (error) {
 			throw new Error(`Cannot render Graphic "${graphic.id}": ${String(error)}`, { cause: error });
 		}

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as geographicToMgrs, c as normalizeMgrsReference, d as snapGeographicToMgrs, f as snapProjectedToMgrs, i as resolveMapSheetRasterPlan, l as parseMgrsReference, o as mgrsToGeographic, r as mapSheetRasterPointToGeographic, s as mgrsToProjected, t as createTacticalMapSheet, u as projectedToMgrs } from "./create-tactical-map-sheet-Dm9IiFHP.mjs";
+import { a as geographicToMgrs, c as normalizeMgrsReference, d as snapGeographicToMgrs, f as snapProjectedToMgrs, i as resolveMapSheetRasterPlan, l as parseMgrsReference, o as mgrsToGeographic, r as mapSheetRasterPointToGeographic, s as mgrsToProjected, t as createTacticalMapSheet, u as projectedToMgrs } from "./create-tactical-map-sheet-DOsMPUJp.mjs";
 //#region src/paper.ts
 const A0 = Object.freeze({
 	widthMm: 841,

package/dist/pdf.mjs

@@ -1,4 +1,4 @@
-import { _ as openSansMiddleBaselineOffset, g as openSansCentralBaselineOffset, h as POINTS_PER_MILLIMETRE, m as MILLIMETRES_PER_CSS_PIXEL, n as createTacticalMapSheetDocument, p as formatDecimal } from "./create-tactical-map-sheet-Dm9IiFHP.mjs";
+import { _ as openSansMiddleBaselineOffset, g as openSansCentralBaselineOffset, h as POINTS_PER_MILLIMETRE, m as MILLIMETRES_PER_CSS_PIXEL, n as createTacticalMapSheetDocument, p as formatDecimal } from "./create-tactical-map-sheet-DOsMPUJp.mjs";
 import { jsPDF } from "jspdf";
 //#region src/pdf-transparency.ts
 const FORM_DICTIONARY_MARKER = new TextEncoder().encode("/Subtype /Form\n/BBox");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-map-sheet",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Scale-accurate projected vector tactical map-sheet renderer.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -30,8 +30,8 @@
     "jspdf": "4.2.1",
     "opentype.js": "2.0.0",
     "saxes": "6.0.0",
-    "@orbat-mapper/control-measures": "^0.25.0",
-    "@orbat-mapper/tactical-draw": "^0.8.1"
+    "@orbat-mapper/control-measures": "^0.26.0",
+    "@orbat-mapper/tactical-draw": "^0.8.2"
   },
   "devDependencies": {
     "@napi-rs/canvas": "1.0.7",
@@ -45,7 +45,7 @@
     "typescript": "~5.9.3",
     "vite": "^8.0.16",
     "vitest": "^4.1.8",
-    "@orbat-mapper/point-symbols": "0.2.1"
+    "@orbat-mapper/point-symbols": "0.2.2"
   },
   "inlinedDependencies": {
     "@types/geojson": "7946.0.16"