@orbat-mapper/tactical-map-sheet 0.5.0 → 0.6.0

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

@@ -1,4 +1,4 @@
-import { ControlMeasure, PatternId, TextAmplifiers } from "@orbat-mapper/control-measures";
+import { ControlMeasure, HighlightAppearance, 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
@@ -337,6 +337,11 @@ interface MapSheetPortrayalDefaults {
     readonly min: number;
     readonly max: number;
   };
+  /**
+   * How graphics with `style.highlight` print (ADR-0062). Pass the same value
+   * as the on-screen `TacticalDraw` so the sheet matches the map.
+   */
+  readonly highlightAppearance?: HighlightAppearance;
 }
 type MapSheetAuthoredGraphic = ControlMeasure | MapSheetPointSymbol | MapSheetCustomSymbol;
 interface AuthoredMapSheetGraphic {

package/dist/{create-tactical-map-sheet-BJLUJ9b5.mjs → create-tactical-map-sheet-jY-O7aUB.mjs}

@@ -2,7 +2,7 @@ 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, resolveConstructionMetersPerCssPixel, resolveSymbolColor } from "@orbat-mapper/control-measures";
-import { effectivePointSymbolPixelSize, resolveHighlightCasing, resolvePointSymbolOffset, resolveTextAppearance, scalePointSymbolLayout } from "@orbat-mapper/tactical-draw";
+import { effectivePointSymbolPixelSize, highlightBandsInPaintOrder, resolvePointSymbolOffset, resolveTextAppearance, scalePointSymbolLayout } from "@orbat-mapper/tactical-draw";
 import { SaxesParser } from "saxes";
 //#region src/projection/geographic-lib.ts
 const backend = GeographicLibMgrs.UTMUPS;
@@ -684,6 +684,7 @@ function serializeElement(element) {
 		].join(" ")}"`,
 		` stroke="${escapeXml(element.strokeColor)}"`,
 		` stroke-width="${formatDecimal(element.strokeWidthMm)}"`,
+		element.strokeOpacity !== void 0 ? ` stroke-opacity="${formatDecimal(element.strokeOpacity)}"` : "",
 		` stroke-linecap="${element.lineCap}" stroke-linejoin="${element.lineJoin}"`,
 		element.strokeDashMm.length > 0 ? ` stroke-dasharray="${element.strokeDashMm.map(formatDecimal).join(" ")}"` : "",
 		element.fillColor || element.fillPatternId ? ` paint-order="fill stroke"` : "",
@@ -1424,7 +1425,8 @@ function resolvePortrayal(input) {
 		lineCap: input?.lineCap ?? DEFAULT_LINE_CAP,
 		lineJoin: input?.lineJoin ?? DEFAULT_LINE_JOIN,
 		labelHeightCssPixels,
-		labelSizeClampCssPixels
+		labelSizeClampCssPixels,
+		highlightAppearance: input?.highlightAppearance
 	};
 }
 function toScenePoint(position, context) {
@@ -1500,20 +1502,20 @@ function textFromFeature(feature, portrayal, context, constructionMetersPerCssPi
 	};
 }
 /**
-* The Highlight casing beneath each path a highlighted line or area part drew:
-* the same geometry as one solid stroke in the resolved `highlightColor`,
-* `highlightCasingWidth` wide and never filled, so an area is cased along its
-* outline only and a transparent stroke is still cased.
+* One Highlight band stroked along each path a highlighted line or area part
+* drew: the same geometry as one solid stroke in the resolved
+* `highlightColor`, never filled, so an area is cased along its outline only
+* and a transparent stroke is still cased. Glow bands carry their opacity, so
+* SVG and PDF print them alike.
 */
-function highlightCasings(feature, parts, portrayal) {
-	const casing = resolveHighlightCasing(feature, portrayal.strokeWidthCssPixels);
-	if (!casing) return [];
+function highlightBandPaths(band, parts) {
 	return parts.flatMap((part) => part.kind === "path" ? [{
 		kind: "path",
 		points: part.points,
 		...part.closed ? { closed: true } : {},
-		strokeColor: casing.color,
-		strokeWidthMm: casing.width * MILLIMETRES_PER_CSS_PIXEL,
+		strokeColor: band.color,
+		strokeWidthMm: band.width * MILLIMETRES_PER_CSS_PIXEL,
+		...band.opacity < 1 ? { strokeOpacity: band.opacity } : {},
 		strokeDashMm: [],
 		lineCap: "round",
 		lineJoin: "round"
@@ -1695,6 +1697,7 @@ function renderGraphic(layerId, authored, portrayal, context) {
 		rendered = renderControlMeasure(graphic, {
 			validationMode: "throw",
 			graphicsStyle,
+			highlightAppearance: portrayal.highlightAppearance,
 			context: {
 				groundMetersPerCssPixel: context.groundMetersPerCssPixel,
 				labelSizeClampCssPixels: portrayal.labelSizeClampCssPixels,
@@ -1726,7 +1729,7 @@ function renderGraphic(layerId, authored, portrayal, context) {
 			throw new Error(`Cannot render Graphic "${graphic.id}": ${String(error)}`, { cause: error });
 		}
 	});
-	const elements = [...featureElements.flatMap((parts, index) => highlightCasings(rendered.features[index], parts, portrayal)), ...featureElements.flat()];
+	const elements = [...highlightBandsInPaintOrder(rendered.features, portrayal.strokeWidthCssPixels).flatMap(({ feature, band }) => highlightBandPaths(band, featureElements[rendered.features.indexOf(feature)])), ...featureElements.flat()];
 	if (elements.length === 0 && rendered.features.every((feature) => feature.properties.text !== void 0)) return { warnings: [{
 		code: "graphic-hidden",
 		layerId,

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-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";
+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-CEQT11I-.mjs";
 
 //#region src/mgrs.d.ts
 interface ProjectedGridCoordinate {

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

package/dist/pdf.d.mts

@@ -1,4 +1,4 @@
-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";
+import { a as ResolvedMapSheetMetadata, at as Polygon, c as TacticalMapSheetResources, l as TacticalMapSheetResult, s as TacticalMapSheetRequest, u as TacticalMapSheetWarning } from "./create-tactical-map-sheet-CEQT11I-.mjs";
 
 //#region src/pdf.d.ts
 interface TacticalMapSheetPdfResult {

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-BJLUJ9b5.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-jY-O7aUB.mjs";
 import { jsPDF } from "jspdf";
 //#region src/pdf-transparency.ts
 const FORM_DICTIONARY_MARKER = new TextEncoder().encode("/Subtype /Form\n/BBox");
@@ -571,6 +571,7 @@ function renderElement(pdf, element, formIds) {
 		fill: element.fillColor,
 		stroke: element.strokeColor,
 		strokeWidth: element.strokeWidthMm,
+		strokeOpacity: element.strokeOpacity ?? DEFAULT_VECTOR_PAINT.strokeOpacity,
 		lineCap: element.lineCap,
 		lineJoin: element.lineJoin,
 		dash: element.strokeDashMm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-map-sheet",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "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.37.0",
-    "@orbat-mapper/tactical-draw": "^0.21.0"
+    "@orbat-mapper/control-measures": "^0.38.0",
+    "@orbat-mapper/tactical-draw": "^0.22.0"
   },
   "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.19"
+    "@orbat-mapper/point-symbols": "0.2.20"
   },
   "inlinedDependencies": {
     "@types/geojson": "7946.0.16"