@orbat-mapper/tactical-map-sheet 0.3.11 → 0.4.0

package/dist/{create-tactical-map-sheet-Cydh9ghW.d.mts → create-tactical-map-sheet-ByCfDv0u.d.mts}

@@ -1,4 +1,5 @@
 import { ControlMeasure, PatternId, TextAmplifiers } from "@orbat-mapper/control-measures";
+import { PointSymbolOffset, PointSymbolRender } from "@orbat-mapper/tactical-draw";
 
 //#region ../../node_modules/.pnpm/@types+geojson@7946.0.16/node_modules/@types/geojson/index.d.ts
 /**
@@ -277,6 +278,7 @@ interface ControlledVectorSymbol {
   readonly octagonAnchor: VectorSymbolAnchor;
   readonly valid?: boolean;
   readonly validation?: unknown;
+  readonly offset?: PointSymbolRender["offset"];
 }
 interface MapSheetPointSymbol {
   readonly id: string;
@@ -285,12 +287,14 @@ interface MapSheetPointSymbol {
   readonly position: Position;
   readonly rotation: number;
   readonly size: MapSheetSymbolSize;
+  readonly offset?: PointSymbolOffset;
   readonly textAmplifiers?: TextAmplifiers;
   readonly graphicModifiers?: {
     readonly direction?: number;
   };
   readonly style?: {
     readonly opacity?: number;
+    readonly overallOpacity?: number;
     readonly colors?: {
       readonly fill?: string;
       readonly frame?: string;
@@ -360,7 +364,10 @@ interface PointSymbolFallbackWarning extends IdentifiedGraphicWarning {
   readonly code: "point-symbol-fallback";
 }
 type GraphicVisibilityWarning = GraphicClippedWarning | GraphicOutsideFrameWarning | GraphicHiddenWarning;
-type GraphicRenderWarning = GraphicVisibilityWarning | PointSymbolFallbackWarning;
+interface PointSymbolOffsetWarning extends IdentifiedGraphicWarning {
+  readonly code: "point-symbol-offset-unsupported";
+}
+type GraphicRenderWarning = GraphicVisibilityWarning | PointSymbolFallbackWarning | PointSymbolOffsetWarning;
 //#endregion
 //#region src/paper.d.ts
 type PaperOrientation = "portrait" | "landscape";
@@ -520,4 +527,4 @@ interface TacticalMapSheetResult {
 }
 declare function createTacticalMapSheet(request: TacticalMapSheetRequest): TacticalMapSheetResult;
 //#endregion
-export { SceneRectangle as $, PaperSizeName as A, ControlledVectorSymbol as B, ResolvedMapSheetRasterTileMetadata as C, ResolvedRegistrationMark as D, MapSheetRegistrationRequest as E, GraphicOutsideFrameWarning as F, VectorSymbolAnchor as G, MapSheetPointSymbol as H, GraphicRenderWarning as I, MgrsGridOptions as J, MapSheetMarginaliaOptions as K, MapSheetPortrayalDefaults as L, AuthoredMapSheetGraphic as M, GraphicClippedWarning as N, PAPER_SIZES as O, GraphicHiddenWarning as P, MapSheetPatternIdentity as Q, PointSymbolFallbackWarning as R, ResolvedMapSheetRasterLayerMetadata as S, AuthoredRegistrationMark as T, MapSheetPointSymbolCapability as U, MapSheetCustomSymbol as V, MapSheetSymbolSize as W, MgrsPrecision as X, ResolvedMgrsGridMetadata as Y, MgrsSnapInterval as Z, MapSheetRasterLayer as _, ResolvedMapSheetMetadata as a, Position as at, RasterDpiAnisotropyWarning as b, TacticalMapSheetResources as c, UpsProjection as d, GeographicPosition as et, UtmProjection as f, MapSheetRasterBasemap as g, MapSheetRasterAttribution as h, MapSheetPageInput as i, Polygon as it, resolvePaperSize as j, PaperOrientation as k, TacticalMapSheetResult as l, LowRasterDpiWarning as m, CrossZoneFootprintWarning as n, UpsCrs as nt, ScaleDeviationWarning as o, createTacticalMapSheet as p, MapSheetMetadata as q, MapSheetFontIdentity as r, UtmCrs as rt, TacticalMapSheetRequest as s, CrossProjectionFootprintWarning as t, GridCrs as tt, TacticalMapSheetWarning as u, MapSheetRasterTile as v, PrinterCalibrationRequest as w, ResolvedMapSheetRasterBasemapMetadata as x, MapSheetRasterWarning as y, TacticalMapSheetLayer as z };
+export { MapSheetPatternIdentity as $, PaperSizeName as A, TacticalMapSheetLayer as B, ResolvedMapSheetRasterTileMetadata as C, ResolvedRegistrationMark as D, MapSheetRegistrationRequest as E, GraphicOutsideFrameWarning as F, MapSheetSymbolSize as G, MapSheetCustomSymbol as H, GraphicRenderWarning as I, MapSheetMetadata as J, VectorSymbolAnchor as K, MapSheetPortrayalDefaults as L, AuthoredMapSheetGraphic as M, GraphicClippedWarning as N, PAPER_SIZES as O, GraphicHiddenWarning as P, MgrsSnapInterval as Q, PointSymbolFallbackWarning as R, ResolvedMapSheetRasterLayerMetadata as S, AuthoredRegistrationMark as T, MapSheetPointSymbol as U, ControlledVectorSymbol as V, MapSheetPointSymbolCapability as W, ResolvedMgrsGridMetadata as X, MgrsGridOptions as Y, MgrsPrecision as Z, MapSheetRasterLayer as _, ResolvedMapSheetMetadata as a, Polygon as at, RasterDpiAnisotropyWarning as b, TacticalMapSheetResources as c, UpsProjection as d, SceneRectangle as et, UtmProjection as f, MapSheetRasterBasemap as g, MapSheetRasterAttribution as h, MapSheetPageInput as i, UtmCrs as it, resolvePaperSize as j, PaperOrientation as k, TacticalMapSheetResult as l, LowRasterDpiWarning as m, CrossZoneFootprintWarning as n, GridCrs as nt, ScaleDeviationWarning as o, Position as ot, createTacticalMapSheet as p, MapSheetMarginaliaOptions as q, MapSheetFontIdentity as r, UpsCrs as rt, TacticalMapSheetRequest as s, CrossProjectionFootprintWarning as t, GeographicPosition as tt, TacticalMapSheetWarning as u, MapSheetRasterTile as v, PrinterCalibrationRequest as w, ResolvedMapSheetRasterBasemapMetadata as x, MapSheetRasterWarning as y, PointSymbolOffsetWarning as z };

package/dist/{create-tactical-map-sheet-D2G1PW2H.mjs → create-tactical-map-sheet-DCUo2mKe.mjs}

@@ -1,7 +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 } from "@orbat-mapper/control-measures";
+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 { SaxesParser } from "saxes";
 //#region src/projection/geographic-lib.ts
 const backend = GeographicLibMgrs.UTMUPS;
@@ -219,6 +220,11 @@ function openSansIdentities(styles) {
 	const requested = new Set(styles);
 	return OPEN_SANS_IDENTITIES.filter((identity) => requested.has(identity.style));
 }
+/** SVG middle aligns the alphabetic baseline by half the font's x-height. */
+function openSansMiddleBaselineOffset(sizeCssPixels) {
+	const font = getFont("Regular");
+	return font.charToGlyph("x").getBoundingBox().y2 * sizeCssPixels / font.unitsPerEm / 2;
+}
 //#endregion
 //#region src/units.ts
 /** Unit conversions shared by the scene builders and serializers. */
@@ -1077,17 +1083,11 @@ function validateVectorMetadata(vector) {
 }
 function resolveSizePixels(size, groundMetersPerCssPixel) {
 	requirePositiveFinite(size.value, "Symbol size");
-	let pixels = size.unit === "meters" ? size.value / groundMetersPerCssPixel : size.value;
-	if (size.unit === "pixels") return pixels;
-	if (size.minPixels !== void 0) {
-		requirePositiveFinite(size.minPixels, "Symbol minimum size");
-		pixels = Math.max(pixels, size.minPixels);
-	}
-	if (size.maxPixels !== void 0) {
-		requirePositiveFinite(size.maxPixels, "Symbol maximum size");
-		pixels = Math.min(pixels, size.maxPixels);
+	if (size.unit === "meters") {
+		if (size.minPixels !== void 0) requirePositiveFinite(size.minPixels, "Symbol minimum size");
+		if (size.maxPixels !== void 0) requirePositiveFinite(size.maxPixels, "Symbol maximum size");
 	}
-	return pixels;
+	return effectivePointSymbolPixelSize({ size }, groundMetersPerCssPixel);
 }
 function renderVectorSymbol(symbol, vector, context) {
 	validateVectorMetadata(vector);
@@ -1095,7 +1095,7 @@ function renderVectorSymbol(symbol, vector, context) {
 	requireFinite(symbol.rotation, "Symbol rotation");
 	const projected = geographicLibGridProjection.forward(context.crs, symbol.position);
 	const position = projectedToScenePoint(projected, context);
-	const opacity = symbol.kind === "point-symbol" ? symbol.style?.opacity ?? 1 : symbol.opacity ?? 1;
+	const opacity = symbol.kind === "point-symbol" ? (symbol.style?.opacity ?? 1) * (symbol.style?.overallOpacity ?? 1) : symbol.opacity ?? 1;
 	if (!Number.isFinite(opacity) || opacity < 0 || opacity > 1) throw new RangeError("Symbol opacity must be between 0 and 1");
 	const octagonSizeMm = resolveSizePixels(symbol.size, context.groundMetersPerCssPixel) * MILLIMETRES_PER_CSS_PIXEL;
 	return {
@@ -1114,6 +1114,56 @@ function renderVectorSymbol(symbol, vector, context) {
 		usesFont: imported.usesFont
 	};
 }
+/** Resolve the same layout as the map, using CSS pixels as a physical sheet unit. */
+function renderPointSymbolElements(symbol, vector, context) {
+	const factor = MILLIMETRES_PER_CSS_PIXEL;
+	const projected = geographicLibGridProjection.forward(context.crs, symbol.position);
+	const layout = resolvePointSymbolOffset(symbol, {
+		...vector,
+		valid: vector.valid ?? true
+	}, {
+		getPixelFromCoordinate(position) {
+			const point = projectedToScenePoint(geographicLibGridProjection.forward(context.crs, position), context);
+			return [point.xMm / factor, point.yMm / factor];
+		},
+		getBearing: () => projected.convergenceDegrees * Math.PI / 180,
+		getResolution: () => context.groundMetersPerCssPixel
+	});
+	const sheetLayout = layout && scalePointSymbolLayout(layout, factor);
+	const base = renderVectorSymbol(symbol, sheetLayout?.render ?? vector, context);
+	const body = sheetLayout ? {
+		...base,
+		position: {
+			xMm: sheetLayout.imageAnchor[0],
+			yMm: sheetLayout.imageAnchor[1]
+		},
+		scaleMmPerUnit: sheetLayout.scale,
+		rotationDegrees: sheetLayout.rotation * 180 / Math.PI,
+		opacity: sheetLayout.bodyOpacity
+	} : base;
+	const elements = [];
+	if (sheetLayout && sheetLayout.path.length > 1) {
+		const style = resolveSymbolColor(sheetLayout.connectorStyle, false);
+		elements.push({
+			kind: "path",
+			points: sheetLayout.path.map(([x, y]) => ({
+				xMm: x,
+				yMm: y
+			})),
+			strokeColor: style.strokeColor,
+			strokeWidthMm: sheetLayout.connectorStyle.strokeWidth,
+			strokeDashMm: sheetLayout.connectorStyle.strokeDash,
+			lineCap: "round",
+			lineJoin: "round",
+			attributes: { "data-connector": symbol.id }
+		});
+	}
+	elements.push(body);
+	return {
+		elements,
+		status: layout?.status ?? "unsupported-presentation"
+	};
+}
 //#endregion
 //#region src/render-layers.ts
 function geographicBounds(positions, longitudeReference) {
@@ -1589,19 +1639,27 @@ function renderGraphic(layerId, authored, portrayal, context) {
 		}] };
 		if (graphic.kind === "point-symbol" && !context.pointSymbols) throw new Error(`Cannot render Graphic "${graphic.id}": a point-symbol capability is required`);
 		const vector = graphic.kind === "point-symbol" ? context.pointSymbols.render(graphic) : graphic.vector;
-		const element = renderVectorSymbol(graphic, vector, context);
+		const result = graphic.kind === "point-symbol" ? renderPointSymbolElements(graphic, vector, context) : {
+			elements: [renderVectorSymbol(graphic, vector, context)],
+			status: "ok"
+		};
 		const warnings = [];
+		if (result.status !== "ok") warnings.push({
+			code: "point-symbol-offset-unsupported",
+			layerId,
+			graphicId: graphic.id
+		});
 		if (graphic.kind === "point-symbol" && vector.valid === false) warnings.push({
 			code: "point-symbol-fallback",
 			layerId,
 			graphicId: graphic.id
 		});
-		const visibility = visibilityWarning(layerId, graphic.id, [element], context.frame);
+		const visibility = visibilityWarning(layerId, graphic.id, result.elements, context.frame);
 		if (visibility) warnings.push(visibility);
 		return {
 			graphic: {
 				id: graphic.id,
-				elements: [element]
+				elements: result.elements
 			},
 			warnings
 		};
@@ -2560,4 +2618,4 @@ function createTacticalMapSheet(request) {
 	return createTacticalMapSheetDocument(request).result;
 }
 //#endregion
-export { geographicToMgrs as a, normalizeMgrsReference as c, snapGeographicToMgrs as d, snapProjectedToMgrs as f, openSansCentralBaselineOffset as g, POINTS_PER_MILLIMETRE as h, resolveMapSheetRasterPlan as i, parseMgrsReference as l, MILLIMETRES_PER_CSS_PIXEL as m, createTacticalMapSheetDocument as n, mgrsToGeographic as o, formatDecimal as p, mapSheetRasterPointToGeographic as r, mgrsToProjected as s, createTacticalMapSheet as t, projectedToMgrs as u };
+export { openSansMiddleBaselineOffset as _, geographicToMgrs as a, normalizeMgrsReference as c, snapGeographicToMgrs as d, snapProjectedToMgrs as f, openSansCentralBaselineOffset as g, POINTS_PER_MILLIMETRE as h, resolveMapSheetRasterPlan as i, parseMgrsReference as l, MILLIMETRES_PER_CSS_PIXEL as m, createTacticalMapSheetDocument as n, mgrsToGeographic as o, formatDecimal as p, mapSheetRasterPointToGeographic as r, mgrsToProjected as s, createTacticalMapSheet as t, projectedToMgrs as u };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { $ as SceneRectangle, A as PaperSizeName, B as ControlledVectorSymbol, C as ResolvedMapSheetRasterTileMetadata, D as ResolvedRegistrationMark, E as MapSheetRegistrationRequest, F as GraphicOutsideFrameWarning, G as VectorSymbolAnchor, H as MapSheetPointSymbol, I as GraphicRenderWarning, J as MgrsGridOptions, K as MapSheetMarginaliaOptions, L as MapSheetPortrayalDefaults, M as AuthoredMapSheetGraphic, N as GraphicClippedWarning, O as PAPER_SIZES, P as GraphicHiddenWarning, Q as MapSheetPatternIdentity, R as PointSymbolFallbackWarning, S as ResolvedMapSheetRasterLayerMetadata, T as AuthoredRegistrationMark, U as MapSheetPointSymbolCapability, V as MapSheetCustomSymbol, W as MapSheetSymbolSize, X as MgrsPrecision, Y as ResolvedMgrsGridMetadata, Z as MgrsSnapInterval, _ as MapSheetRasterLayer, a as ResolvedMapSheetMetadata, at as Position, b as RasterDpiAnisotropyWarning, c as TacticalMapSheetResources, d as UpsProjection, et as GeographicPosition, f as UtmProjection, g as MapSheetRasterBasemap, h as MapSheetRasterAttribution, i as MapSheetPageInput, j as resolvePaperSize, k as PaperOrientation, l as TacticalMapSheetResult, m as LowRasterDpiWarning, n as CrossZoneFootprintWarning, nt as UpsCrs, o as ScaleDeviationWarning, p as createTacticalMapSheet, q as MapSheetMetadata, r as MapSheetFontIdentity, rt as UtmCrs, s as TacticalMapSheetRequest, t as CrossProjectionFootprintWarning, tt as GridCrs, u as TacticalMapSheetWarning, v as MapSheetRasterTile, w as PrinterCalibrationRequest, x as ResolvedMapSheetRasterBasemapMetadata, y as MapSheetRasterWarning, z as TacticalMapSheetLayer } from "./create-tactical-map-sheet-Cydh9ghW.mjs";
+import { $ as MapSheetPatternIdentity, A as PaperSizeName, B as TacticalMapSheetLayer, C as ResolvedMapSheetRasterTileMetadata, D as ResolvedRegistrationMark, E as MapSheetRegistrationRequest, F as GraphicOutsideFrameWarning, G as MapSheetSymbolSize, H as MapSheetCustomSymbol, I as GraphicRenderWarning, J as MapSheetMetadata, K as VectorSymbolAnchor, L as MapSheetPortrayalDefaults, M as AuthoredMapSheetGraphic, N as GraphicClippedWarning, O as PAPER_SIZES, P as GraphicHiddenWarning, Q as MgrsSnapInterval, R as PointSymbolFallbackWarning, S as ResolvedMapSheetRasterLayerMetadata, T as AuthoredRegistrationMark, U as MapSheetPointSymbol, V as ControlledVectorSymbol, W as MapSheetPointSymbolCapability, X as ResolvedMgrsGridMetadata, Y as MgrsGridOptions, Z as MgrsPrecision, _ as MapSheetRasterLayer, a as ResolvedMapSheetMetadata, b as RasterDpiAnisotropyWarning, c as TacticalMapSheetResources, d as UpsProjection, et as SceneRectangle, f as UtmProjection, g as MapSheetRasterBasemap, h as MapSheetRasterAttribution, i as MapSheetPageInput, it as UtmCrs, j as resolvePaperSize, k as PaperOrientation, l as TacticalMapSheetResult, m as LowRasterDpiWarning, n as CrossZoneFootprintWarning, nt as GridCrs, o as ScaleDeviationWarning, ot as Position, p as createTacticalMapSheet, q as MapSheetMarginaliaOptions, r as MapSheetFontIdentity, rt as UpsCrs, s as TacticalMapSheetRequest, t as CrossProjectionFootprintWarning, tt as GeographicPosition, u as TacticalMapSheetWarning, v as MapSheetRasterTile, w as PrinterCalibrationRequest, x as ResolvedMapSheetRasterBasemapMetadata, y as MapSheetRasterWarning, z as PointSymbolOffsetWarning } from "./create-tactical-map-sheet-ByCfDv0u.mjs";
 
 //#region src/mgrs.d.ts
 interface ProjectedGridCoordinate {
@@ -42,4 +42,4 @@ type RasterPlanRequest = Pick<TacticalMapSheetRequest, "page" | "mapFrame" | "ce
 declare function resolveMapSheetRasterPlan(request: RasterPlanRequest): MapSheetRasterPlan;
 declare function mapSheetRasterPointToGeographic(plan: MapSheetRasterPlan, normalizedX: number, normalizedY: number): Position;
 //#endregion
-export { type AuthoredMapSheetGraphic, type AuthoredRegistrationMark, type ControlledVectorSymbol, type CrossProjectionFootprintWarning, type CrossZoneFootprintWarning, type GraphicClippedWarning, type GraphicHiddenWarning, type GraphicOutsideFrameWarning, type GraphicRenderWarning, type GridCrs, type LowRasterDpiWarning, type MapSheetCustomSymbol, type MapSheetFontIdentity, type MapSheetMarginaliaOptions, type MapSheetMetadata, type MapSheetPageInput, type MapSheetPatternIdentity, type MapSheetPointSymbol, type MapSheetPointSymbolCapability, type MapSheetPortrayalDefaults, type MapSheetProjectedBounds, type MapSheetRasterAttribution, type MapSheetRasterBasemap, type MapSheetRasterLayer, type MapSheetRasterPlan, type MapSheetRasterTile, type MapSheetRasterWarning, type MapSheetRegistrationRequest, type MapSheetSymbolSize, type MgrsGridOptions, type MgrsPrecision, type MgrsSnapInterval, PAPER_SIZES, type PaperOrientation, type PaperSizeName, type PointSymbolFallbackWarning, type PrinterCalibrationRequest, type ProjectedGridCoordinate, type RasterDpiAnisotropyWarning, type ResolvedMapSheetMetadata, type ResolvedMapSheetRasterBasemapMetadata, type ResolvedMapSheetRasterLayerMetadata, type ResolvedMapSheetRasterTileMetadata, type ResolvedMgrsGridMetadata, type ResolvedMgrsReference, type ResolvedRegistrationMark, type ScaleDeviationWarning, type TacticalMapSheetLayer, type TacticalMapSheetRequest, type TacticalMapSheetResources, type TacticalMapSheetResult, type TacticalMapSheetWarning, type UpsCrs, type UpsProjection, type UtmCrs, type UtmProjection, type VectorSymbolAnchor, createTacticalMapSheet, geographicToMgrs, mapSheetRasterPointToGeographic, mgrsToGeographic, mgrsToProjected, normalizeMgrsReference, parseMgrsReference, projectedToMgrs, resolveMapSheetRasterPlan, resolvePaperSize, snapGeographicToMgrs, snapProjectedToMgrs };
+export { type AuthoredMapSheetGraphic, type AuthoredRegistrationMark, type ControlledVectorSymbol, type CrossProjectionFootprintWarning, type CrossZoneFootprintWarning, type GraphicClippedWarning, type GraphicHiddenWarning, type GraphicOutsideFrameWarning, type GraphicRenderWarning, type GridCrs, type LowRasterDpiWarning, type MapSheetCustomSymbol, type MapSheetFontIdentity, type MapSheetMarginaliaOptions, type MapSheetMetadata, type MapSheetPageInput, type MapSheetPatternIdentity, type MapSheetPointSymbol, type MapSheetPointSymbolCapability, type MapSheetPortrayalDefaults, type MapSheetProjectedBounds, type MapSheetRasterAttribution, type MapSheetRasterBasemap, type MapSheetRasterLayer, type MapSheetRasterPlan, type MapSheetRasterTile, type MapSheetRasterWarning, type MapSheetRegistrationRequest, type MapSheetSymbolSize, type MgrsGridOptions, type MgrsPrecision, type MgrsSnapInterval, PAPER_SIZES, type PaperOrientation, type PaperSizeName, type PointSymbolFallbackWarning, type PointSymbolOffsetWarning, type PrinterCalibrationRequest, type ProjectedGridCoordinate, type RasterDpiAnisotropyWarning, type ResolvedMapSheetMetadata, type ResolvedMapSheetRasterBasemapMetadata, type ResolvedMapSheetRasterLayerMetadata, type ResolvedMapSheetRasterTileMetadata, type ResolvedMgrsGridMetadata, type ResolvedMgrsReference, type ResolvedRegistrationMark, type ScaleDeviationWarning, type TacticalMapSheetLayer, type TacticalMapSheetRequest, type TacticalMapSheetResources, type TacticalMapSheetResult, type TacticalMapSheetWarning, type UpsCrs, type UpsProjection, type UtmCrs, type UtmProjection, type VectorSymbolAnchor, createTacticalMapSheet, geographicToMgrs, mapSheetRasterPointToGeographic, mgrsToGeographic, mgrsToProjected, normalizeMgrsReference, parseMgrsReference, projectedToMgrs, resolveMapSheetRasterPlan, resolvePaperSize, snapGeographicToMgrs, snapProjectedToMgrs };

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-D2G1PW2H.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-DCUo2mKe.mjs";
 //#region src/paper.ts
 const A0 = Object.freeze({
 	widthMm: 841,

package/dist/pdf.d.mts

@@ -1,4 +1,4 @@
-import { a as ResolvedMapSheetMetadata, c as TacticalMapSheetResources, it as Polygon, l as TacticalMapSheetResult, s as TacticalMapSheetRequest, u as TacticalMapSheetWarning } from "./create-tactical-map-sheet-Cydh9ghW.mjs";
+import { a as ResolvedMapSheetMetadata, at as Polygon, c as TacticalMapSheetResources, l as TacticalMapSheetResult, s as TacticalMapSheetRequest, u as TacticalMapSheetWarning } from "./create-tactical-map-sheet-ByCfDv0u.mjs";
 
 //#region src/pdf.d.ts
 interface TacticalMapSheetPdfResult {

package/dist/pdf.mjs

@@ -1,4 +1,4 @@
-import { 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-D2G1PW2H.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-DCUo2mKe.mjs";
 import { jsPDF } from "jspdf";
 //#region src/pdf-transparency.ts
 const FORM_DICTIONARY_MARKER = new TextEncoder().encode("/Subtype /Form\n/BBox");
@@ -62,7 +62,8 @@ const DEFAULT_VECTOR_PAINT = {
 	fillOpacity: 1,
 	strokeOpacity: 1,
 	fontSize: 16,
-	textAnchor: "start"
+	textAnchor: "start",
+	dominantBaseline: "auto"
 };
 const FIXED_CREATION_DATE = "D:20000101000000+00'00'";
 const FIXED_FILE_ID = "00000000000000000000000000000001";
@@ -127,6 +128,7 @@ function inheritedPaint(parent, node) {
 		fillOpacity: numberAttribute(attributes, "fill-opacity", parent.fillOpacity),
 		strokeOpacity: numberAttribute(attributes, "stroke-opacity", parent.strokeOpacity),
 		fontSize: numberAttribute(attributes, "font-size", parent.fontSize),
+		dominantBaseline: stringAttribute(attributes, "dominant-baseline") ?? parent.dominantBaseline,
 		textAnchor: stringAttribute(attributes, "text-anchor") ?? parent.textAnchor
 	};
 }
@@ -402,7 +404,8 @@ function renderVectorNode(pdf, node, parentPaint, context, ignoreNodeOpacity = f
 	}
 	if (node.kind === "text") {
 		const x = numberAttribute(node.attributes, "x");
-		const y = numberAttribute(node.attributes, "y");
+		const baselineOffset = paint.dominantBaseline === "middle" ? openSansMiddleBaselineOffset(paint.fontSize) : paint.dominantBaseline === "central" ? openSansCentralBaselineOffset("Regular", paint.fontSize) : 0;
+		const y = numberAttribute(node.attributes, "y") + baselineOffset;
 		pdf.setFont("Open Sans", "normal", 400);
 		pdf.setFontSize(paint.fontSize * POINTS_PER_MILLIMETRE);
 		const renderedWidth = pdf.getTextWidth(node.text);
@@ -422,7 +425,8 @@ function renderVectorNode(pdf, node, parentPaint, context, ignoreNodeOpacity = f
 	else if (node.kind === "ellipse") pdf.ellipse(numberAttribute(node.attributes, "cx"), numberAttribute(node.attributes, "cy"), numberAttribute(node.attributes, "rx"), numberAttribute(node.attributes, "ry"), null);
 	else if (node.kind === "rect") {
 		const x = numberAttribute(node.attributes, "x");
-		const y = numberAttribute(node.attributes, "y");
+		const baselineOffset = paint.dominantBaseline === "middle" ? openSansMiddleBaselineOffset(paint.fontSize) : paint.dominantBaseline === "central" ? openSansCentralBaselineOffset("Regular", paint.fontSize) : 0;
+		const y = numberAttribute(node.attributes, "y") + baselineOffset;
 		const width = numberAttribute(node.attributes, "width");
 		const height = numberAttribute(node.attributes, "height");
 		const rawRadiusX = numberAttribute(node.attributes, "rx", numberAttribute(node.attributes, "ry"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-map-sheet",
-  "version": "0.3.11",
+  "version": "0.4.0",
   "description": "Scale-accurate projected vector tactical map-sheet renderer.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -30,7 +30,8 @@
     "jspdf": "4.2.1",
     "opentype.js": "2.0.0",
     "saxes": "6.0.0",
-    "@orbat-mapper/control-measures": "^0.22.0"
+    "@orbat-mapper/control-measures": "^0.24.0",
+    "@orbat-mapper/tactical-draw": "^0.8.0"
   },
   "devDependencies": {
     "@napi-rs/canvas": "1.0.7",
@@ -44,7 +45,7 @@
     "typescript": "~5.9.3",
     "vite": "^8.0.16",
     "vitest": "^4.1.8",
-    "@orbat-mapper/point-symbols": "0.1.21"
+    "@orbat-mapper/point-symbols": "0.2.0"
   },
   "inlinedDependencies": {
     "@types/geojson": "7946.0.16"