Get User Drawn tests passing

Author: ingalls

lib/parser/to_geojson.ts

@@ -376,27 +376,35 @@ export async function to_geojson(cot: CoT): Promise<Static<typeof Feature>> {
             && raw.event.detail.shape.link?.Style
         ) {
             if (raw.event.detail.shape.link.Style.LineStyle?.color) {
-                const rawColor = raw.event.detail.shape.link.Style.LineStyle.color._text.startsWith('#')
-                    ? raw.event.detail.shape.link.Style.LineStyle.color._text
-                    : '#' + raw.event.detail.shape.link.Style.LineStyle.color._text;
+                let rawColor = raw.event.detail.shape.link.Style.LineStyle.color._text;
+                if (rawColor.startsWith('#')) rawColor = rawColor.substring(1);
 
-                const strokeColor = new Color(rawColor);
+                const a = parseInt(rawColor.substring(0, 2), 16);
+                const b = parseInt(rawColor.substring(2, 4), 16);
+                const g = parseInt(rawColor.substring(4, 6), 16);
+                const r = parseInt(rawColor.substring(6, 8), 16);
+
+                const strokeColor = new Color([a, r, g, b]);
                 feat.properties.stroke = strokeColor.as_hex();
 
-                feat.properties['stroke-opacity'] = strokeColor.as_opacity();
+                feat.properties['stroke-opacity'] = strokeColor.as_opacity() / 255;
             }
 
             if (raw.event.detail.shape.link.Style.LineStyle?.width) {
                 feat.properties['stroke-width'] = Number(raw.event.detail.shape.link.Style.LineStyle.width._text);
             }
 
             if (raw.event.detail.shape.link.Style.PolyStyle?.color) {
-                const rawColor = raw.event.detail.shape.link.Style.PolyStyle.color._text.startsWith('#')
-                    ? raw.event.detail.shape.link.Style.PolyStyle.color._text
-                    : '#' + raw.event.detail.shape.link.Style.PolyStyle.color._text;
+                let rawColor = raw.event.detail.shape.link.Style.PolyStyle.color._text;
+                if (rawColor.startsWith('#')) rawColor = rawColor.substring(1);
+
+                const a = parseInt(rawColor.substring(0, 2), 16);
+                const b = parseInt(rawColor.substring(2, 4), 16);
+                const g = parseInt(rawColor.substring(4, 6), 16);
+                const r = parseInt(rawColor.substring(6, 8), 16);
 
-                const fillColor = new Color(rawColor);
-                feat.properties['fill-opacity'] = fillColor.as_opacity();
+                const fillColor = new Color([a, r, g, b]);
+                feat.properties['fill-opacity'] = fillColor.as_opacity() / 255;
                 feat.properties['fill'] = fillColor.as_hex();
             }
         }

test/cot-user-draw.test.ts

@@ -85,12 +85,12 @@ test('Parse u-d-c-c (Circle - Transparent)', async (t) => {
             precisionlocation: { 
                 altsrc: 'DTED2' 
             }, 
-            stroke: '#FFFF77', 
-            'stroke-opacity': 0, 
+            stroke: '#0077FF', 
+            'stroke-opacity': 1, 
             'stroke-width': 3, 
             'stroke-style': 'solid', 
             'fill-opacity': 0, 
-            fill: '#00FF77', 
+            fill: '#0077FF', 
             shape: { 
                 ellipse: { 
                     major: 2535.9708862816324, 
@@ -263,12 +263,12 @@ test('Parse u-d-c-c (Circle - Filled)', async (t) => {
             precisionlocation: { 
                 altsrc: 'DTED2' 
             }, 
-            stroke: '#FFFF77', 
-            'stroke-opacity': 0, 
+            stroke: '#0077FF', 
+            'stroke-opacity': 1, 
             'stroke-width': 3, 
             'stroke-style': 'solid', 
-            'fill-opacity': 0, 
-            fill: '#FFFF77', 
+            'fill-opacity': 1, 
+            fill: '#0077FF', 
             shape: { 
                 ellipse: { 
                     major: 2908.096601511143,