Merge pull request #121 from dfpc-coe/contentResource

Mission Change - Content Resource

Author: ingalls

lib/parser.ts

@@ -55,7 +55,9 @@ export class CoTParser {
         if (opts.flow === undefined) opts.flow = true;
 
         checkXML(cot.raw);
-        if (checkXML.errors) throw new Err(400, null, `${checkXML.errors[0].message} (${checkXML.errors[0].instancePath})`);
+        if (checkXML.errors) {
+            throw new Err(400, null, `${checkXML.errors[0].message} (${checkXML.errors[0].instancePath})`);
+        }
 
         if (opts.flow) {
             if (!cot.raw.event.detail) cot.raw.event.detail = {};

lib/parser/to_geojson.ts

@@ -4,6 +4,7 @@ import type {
     Feature,
     Polygon,
     FeaturePropertyMission,
+    FeaturePropertyMissionChange,
     FeaturePropertyMissionLayer,
 } from '../types/feature.js';
 import type {
@@ -219,20 +220,40 @@ export async function to_geojson(cot: CoT): Promise<Static<typeof Feature>> {
 
             mission.missionChanges = []
             for (const change of changes) {
-                mission.missionChanges.push({
-                    contentUid: change.MissionChange.contentUid._text,
+                const mc: Static<typeof FeaturePropertyMissionChange> = {
+                    contentUid: change.MissionChange.contentUid ? change.MissionChange.contentUid._text : undefined,
                     creatorUid: change.MissionChange.creatorUid._text,
                     isFederatedChange: change.MissionChange.isFederatedChange._text,
                     missionName: change.MissionChange.missionName._text,
                     timestamp: change.MissionChange.timestamp._text,
                     type: change.MissionChange.type._text,
-                    details: {
+                };
+
+                if (change.MissionChange.contentResource) {
+                    const cr = change.MissionChange.contentResource;
+                    mc.contentResource = {
+                        expiration: cr.expiration._text,
+                        filename: cr.filename._text,
+                        hash: cr.hash._text,
+                        name: cr.name._text,
+                        size: parseInt(cr.size._text),
+                        submissionTime: cr.submissionTime._text,
+                        submitter: cr.submitter._text,
+                        tool: cr.tool._text,
+                        uid: cr.uid._text,
+                    };
+                }
+
+                if (change.MissionChange.details) {
+                    mc.details = {
                         ...change.MissionChange.details._attributes,
                         ...change.MissionChange.details.location
                             ? change.MissionChange.details.location._attributes
                             : {}
-                    }
-                })
+                    };
+                }
+
+                mission.missionChanges.push(mc)
             }
         }
 

lib/types/feature.ts

@@ -39,19 +39,30 @@ export const FeaturePropertyMissionLayer = Type.Object({
 })
 
 export const FeaturePropertyMissionChange = Type.Object({
-    contentUid: Type.String(),
+    contentUid: Type.Optional(Type.String()),
     creatorUid: Type.String(),
     isFederatedChange: Type.Boolean(),
     missionName: Type.String(),
     timestamp: Type.String(),
     type: Type.String(),
-    details: Type.Object({
+    contentResource: Type.Optional(Type.Object({
+        expiration: Type.String(),
+        filename: Type.String(),
+        hash: Type.String(),
+        name: Type.String(),
+        size: Type.Integer(),
+        submissionTime: Type.String(),
+        submitter: Type.String(),
+        tool: Type.String(),
+        uid: Type.String(),
+    })),
+    details: Type.Optional(Type.Object({
         type: Type.String(),
         callsign: Type.String(),
         color: Type.String(),
         lat: Type.String(),
         lon: Type.String()
-    })
+    }))
 })
 
 export const FeaturePropertyMission = Type.Object({

lib/types/types.ts

@@ -208,6 +208,11 @@ export const GenericTextBoolean = Type.Object({
     _text: Type.Boolean()
 })
 
+export const GenericTextInteger = Type.Object({
+    _text: Type.Integer()
+})
+
+
 export const TrackAttributes = Type.Object({
     speed: Type.Optional(Type.String()),
     course: Type.Optional(Type.String()),
@@ -322,13 +327,27 @@ export const MissionChangeDetails = Type.Object({
     }))
 })
 
+export const MissionChangeContentResource = Type.Object({
+    expiration: GenericText,
+    filename: GenericText,
+    hash: GenericText,
+    name: GenericText,
+    size: GenericTextInteger,
+    submissionTime: GenericText,
+    submitter: GenericText,
+    tool: GenericText,
+    uid: GenericText
+});
+
 export const MissionChange = Type.Object({
     contentUid: Type.Optional(GenericText),
     creatorUid: GenericOptionalText,
     isFederatedChange: GenericTextBoolean,
     missionName: GenericText,
+    missionGuid: Type.Optional(GenericText),
     timestamp: GenericText,
     type: GenericText,
+    contentResource: Type.Optional(MissionChangeContentResource),
     details: Type.Optional(MissionChangeDetails)
 })