@orbat-mapper/point-symbols 0.1.21 → 0.2.0

package/dist/index.mjs

@@ -10,6 +10,7 @@ function stableValue(value) {
 function pointSymbolDrawingKey(symbol, capabilityOptions, resolvedOptions) {
 	const drawingStyle = { ...symbol.style ?? {} };
 	delete drawingStyle.opacity;
+	delete drawingStyle.overallOpacity;
 	return JSON.stringify(stableValue({
 		sidc: symbol.sidc.trim(),
 		textAmplifiers: normalizeTextAmplifiers(symbol.textAmplifiers),
@@ -73,12 +74,19 @@ function resolveMilsymbolOptions(symbol, capabilityOptions, resolvedOptions) {
 	options.size = CANONICAL_OCTAGON_SIZE;
 	return options;
 }
+function constructBodySymbol(sidc, options) {
+	return new ms.Symbol(sidc, {
+		...options,
+		hqStaffLength: Object(0)
+	});
+}
 function renderPointSymbolWithRevision(symbol, revision, capabilityOptions, resolvedOptions) {
-	const rendered = new ms.Symbol(symbol.sidc.trim(), resolveMilsymbolOptions(symbol, capabilityOptions, resolvedOptions));
+	const options = resolveMilsymbolOptions(symbol, capabilityOptions, resolvedOptions);
+	const rendered = new ms.Symbol(symbol.sidc.trim(), options);
 	const { width, height } = rendered.getSize();
 	const valid = rendered.isValid() === true;
 	const validation = rendered.isValid(true);
-	return {
+	const result = {
 		resourceId: `milsymbol-${revision}-${hashKey(pointSymbolDrawingKey(symbol, capabilityOptions, resolvedOptions))}`,
 		svg: rendered.asSVG(),
 		octagonSize: CANONICAL_OCTAGON_SIZE,
@@ -89,6 +97,48 @@ function renderPointSymbolWithRevision(symbol, revision, capabilityOptions, reso
 		valid,
 		...valid ? {} : { validation }
 	};
+	const metadata = rendered.getMetadata();
+	const bbox = metadata.baseGeometry.bbox;
+	const framed = bbox.x2 > bbox.x1 && bbox.y2 > bbox.y1;
+	if (valid) {
+		const bodySymbol = metadata.headquarters ? constructBodySymbol(symbol.sidc.trim(), options) : rendered;
+		const bodyRegistration = framed ? bodySymbol.getOctagonAnchor() : bodySymbol.getAnchor();
+		const body = {
+			...result,
+			resourceId: `${result.resourceId}-body`,
+			svg: bodySymbol.asSVG(),
+			...bodySymbol.getSize(),
+			anchor: bodyRegistration,
+			octagonAnchor: bodySymbol.getOctagonAnchor()
+		};
+		const local = (x, y) => ({
+			x: body.octagonAnchor.x + x - 100,
+			y: body.octagonAnchor.y + y - 100
+		});
+		const resolveAttachment = () => {
+			if (!framed) return bodyRegistration;
+			if (!metadata.headquarters) return local(100, bbox.y2);
+			const squareFrame = metadata.affiliation === "Friend" || metadata.affiliation === "Neutral";
+			return local(bbox.x1, squareFrame ? bbox.y2 : 100);
+		};
+		const attachment = resolveAttachment();
+		const colors = rendered.getColors();
+		result.offset = {
+			body,
+			ordinaryRegistration: framed ? result.octagonAnchor : result.anchor,
+			attachment,
+			indicator: {
+				direction: {
+					x: 0,
+					y: 1
+				},
+				length: 100
+			},
+			strokeColor: symbol.style?.monoColor ?? symbol.style?.colors?.frame ?? colors.iconColor[metadata.affiliation] ?? "#000000",
+			strokeWidth: Number(options.strokeWidth ?? 4)
+		};
+	}
+	return result;
 }
 function renderPointSymbol(symbol) {
 	return renderPointSymbolWithRevision(symbol, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/point-symbols",
-  "version": "0.1.21",
+  "version": "0.2.0",
   "description": "Milsymbol-backed MIL-STD-2525 and APP-6 point symbols for tactical-draw.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -24,8 +24,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.22.0",
-    "@orbat-mapper/tactical-draw": "^0.6.2"
+    "@orbat-mapper/control-measures": "^0.24.0",
+    "@orbat-mapper/tactical-draw": "^0.8.0"
   },
   "peerDependencies": {
     "milsymbol": ">=3.0.4 <4.0.0"