@tak-ps/node-cot 12.37.0 → 13.0.0

package/lib/types/types.ts

@@ -46,6 +46,9 @@ export const LinkAttributes = Type.Object({
     // Polygon/LineString
     point: Type.Optional(Type.String()),
 
+    // Used in Routes
+    callsign: Type.Optional(Type.String()),
+
     // URL Style Links
     url: Type.Optional(Type.String()),
     mime: Type.Optional(Type.String()),
@@ -114,16 +117,37 @@ export const ServerVersionAttributes = Type.Object({
 
 export const ColorAttributes = Type.Object({
     _attributes: Type.Optional(Type.Object({
-        argb: Type.Optional(Type.String())
+        argb: Type.Optional(Type.Integer()),
+
+        // Have seen this used in range and bearing
+        value: Type.Optional(Type.Integer())
     }))
 })
 
-export const GenericAttributes = Type.Object({
+export const GenericStringAttributes = Type.Object({
     _attributes: Type.Optional(Type.Object({
         value: Type.Optional(Type.String())
     }))
 })
 
+export const GenericBooleanAttributes = Type.Object({
+    _attributes: Type.Optional(Type.Object({
+        value: Type.Optional(Type.Boolean())
+    }))
+})
+
+export const GenericIntegerAttributes = Type.Object({
+    _attributes: Type.Optional(Type.Object({
+        value: Type.Optional(Type.Integer())
+    }))
+})
+
+export const GenericNumberAttributes = Type.Object({
+    _attributes: Type.Optional(Type.Object({
+        value: Type.Optional(Type.Integer())
+    }))
+})
+
 export const GenericOptionalText = Type.Object({
     _text: Type.Optional(Type.String())
 })
@@ -457,7 +481,7 @@ export const Range = Type.Object({
 });
 
 export const RangeUnitsAttributes = Type.Object({
-    value: Type.String()
+    value: Type.Integer()
 });
 
 export const RangeUnits = Type.Object({
@@ -473,7 +497,7 @@ export const Bearing = Type.Object({
 });
 
 export const BearingUnitsAttributes = Type.Object({
-    value: Type.String()
+    value: Type.Integer()
 });
 
 export const BearingUnits = Type.Object({
@@ -481,7 +505,7 @@ export const BearingUnits = Type.Object({
 });
 
 export const InclinationAttributes = Type.Object({
-    value: Type.String()
+    value: Type.Number()
 });
 
 export const Inclination = Type.Object({
@@ -489,7 +513,7 @@ export const Inclination = Type.Object({
 });
 
 export const NorthRefAttributes = Type.Object({
-    value: Type.String()
+    value: Type.Number()
 });
 
 export const NorthRef = Type.Object({
@@ -540,12 +564,12 @@ export const Detail = Type.Object({
     remarks: Type.Optional(Remarks),
     precisionlocation: Type.Optional(PrecisionLocation),
     color: Type.Optional(ColorAttributes),
-    strokeColor: Type.Optional(GenericAttributes),
-    archive: Type.Optional(Type.Union([GenericAttributes, Type.Array(GenericAttributes)])),
-    strokeWeight: Type.Optional(GenericAttributes),
-    strokeStyle: Type.Optional(GenericAttributes),
-    labels_on: Type.Optional(GenericAttributes),
-    fillColor: Type.Optional(GenericAttributes),
+    strokeColor: Type.Optional(GenericIntegerAttributes),
+    archive: Type.Optional(Type.Union([GenericStringAttributes, Type.Array(GenericStringAttributes)])),
+    strokeWeight: Type.Optional(GenericNumberAttributes),
+    strokeStyle: Type.Optional(GenericStringAttributes),
+    labels_on: Type.Optional(GenericBooleanAttributes),
+    fillColor: Type.Optional(GenericIntegerAttributes),
     mission: Type.Optional(Mission),
     shape: Type.Optional(Shape),
 
@@ -575,11 +599,12 @@ export const Detail = Type.Object({
 
 export const Point = Type.Object({
     _attributes: Type.Object({
-        lat: Type.Union([Type.String(), Type.Number()]),
-        lon: Type.Union([Type.String(), Type.Number()]),
-        hae: Type.Union([Type.String(), Type.Number()]),
-        ce: Type.Union([Type.String(), Type.Number()]),
-        le: Type.Union([Type.String(), Type.Number()]),
+        lat: Type.Number(),
+        lon: Type.Number(),
+        hae: Type.Number(),
+        // Are Occasionally seen as "NaN"
+        ce: Type.Union([Type.Number(), Type.String()]),
+        le: Type.Union([Type.Number(), Type.String()])
     })
 })
 

package/lib/utils/util.ts

@@ -89,11 +89,11 @@ export default class Util {
     static cot_point(): Static<typeof Point> {
         return {
             '_attributes': {
-                'lat': '0.000000',
-                'lon': '0.000000',
-                'hae': '0.0',
-                'ce': '9999999.0',
-                'le': '9999999.0'
+                'lat': 0.000000,
+                'lon': 0.000000,
+                'hae': 0.0,
+                'ce': 9999999.0,
+                'le': 9999999.0
             }
         };
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "12.37.0",
+    "version": "13.0.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
     "author": "Nick Ingalls <nick@ingalls.ca>",
     "types": "index.ts",
@@ -10,7 +10,7 @@
         "./2525": "./dist/lib/utils/2525.js"
     },
     "scripts": {
-        "test": "c8 --reporter=lcov ts-node-test test/",
+        "test": "c8 --reporter=lcov --reporter html tsx --test test/*.ts",
         "lint": "eslint *.ts lib/ test/",
         "doc": "typedoc index.ts",
         "build": "tsc --build && cp package.json dist/ && cp ./lib/types/*.xml ./dist/lib/types/ &&  mkdir -p ./dist/lib/proto/ && cp lib/proto/* ./dist/lib/proto/",
@@ -42,13 +42,12 @@
         "xml-js": "^1.6.11"
     },
     "devDependencies": {
-        "@types/node": "^22.0.0",
+        "@types/node": "^24.0.0",
         "@types/tape": "^5.6.0",
         "c8": "^10.1.3",
         "eslint": "^9.0.0",
         "tape": "^5.6.1",
-        "ts-node": "^10.9.1",
-        "ts-node-test": "^0.4.0",
+        "tsx": "^4.20.3",
         "typedoc": "^0.28.0",
         "typescript": "^5.7.0",
         "typescript-eslint": "^8.0.0"

package/tsconfig.json

@@ -1,7 +1,4 @@
 {
-    "ts-node": {
-        "esm": true
-    },
     "compilerOptions": {
         "strict": true,
         "strictNullChecks": true,