Merge pull request #113 from dfpc-coe/rotate

Rotate

Author: ingalls

lib/parser/from_geojson.ts

@@ -115,7 +115,11 @@ export async function from_geojson(
         cot.event.detail.takv = { _attributes: { ...feature.properties.takv } };
     }
 
-    if (feature.properties.minzoom !== undefined || feature.properties.maxzoom !== undefined) {
+    if (
+        feature.properties.minzoom !== undefined
+        || feature.properties.maxzoom !== undefined
+        || feature.properties.rotate !== undefined
+    ) {
         if (!cot.event.detail.display || !cot.event.detail.display._attributes) {
             cot.event.detail.display = { _attributes: {} };
         }
@@ -127,6 +131,10 @@ export async function from_geojson(
         if (feature.properties.maxzoom !== undefined) {
             cot.event.detail.display._attributes.maxzoom = feature.properties.maxzoom;
         }
+
+        if (feature.properties.rotate !== undefined) {
+            cot.event.detail.display._attributes.rotate = feature.properties.rotate;
+        }
     }
 
     if (feature.properties.creator) {

lib/parser/to_geojson.ts

@@ -93,6 +93,10 @@ export async function to_geojson(cot: CoT): Promise<Static<typeof Feature>> {
         feat.properties.minzoom = raw.event.detail.display._attributes.minzoom;
     }
 
+    if (raw.event.detail.display?._attributes?.rotate !== undefined) {
+        feat.properties.rotate = raw.event.detail.display._attributes.rotate;
+    }
+
     if (raw.event.detail.display?._attributes?.maxzoom !== undefined) {
         feat.properties.maxzoom = raw.event.detail.display._attributes.maxzoom;
     }

lib/types/feature.ts

@@ -70,6 +70,7 @@ export const Properties = Type.Object({
     center: Position,
     minzoom: Type.Optional(Type.Number()),
     maxzoom: Type.Optional(Type.Number()),
+    rotate: Type.Optional(Type.Boolean()),
     range: Type.Optional(Type.Number()),
     bearing: Type.Optional(Type.Number()),
     creator: Type.Optional(CreatorAttributes),

lib/types/types.ts

@@ -605,8 +605,15 @@ export const Inclination = Type.Object({
 
 export const Display = Type.Object({
     _attributes: Type.Object({
-        minzoom: Type.Optional(Type.Number()),
-        maxzoom: Type.Optional(Type.Number()),
+        minzoom: Type.Optional(Type.Number({
+            description: 'The minimum zoom level at which to display the feature'
+        })),
+        maxzoom: Type.Optional(Type.Number({
+            description: 'The maximum zoom level at which to display the feature'
+        })),
+        rotate: Type.Optional(Type.Boolean({
+            description: 'Whether to rotate the icon based on heading'
+        })),
     })
 });
 

package-lock.json

@@ -36,13 +36,14 @@
         "@turf/point-on-feature": "^7.0.0",
         "@turf/sector": "^7.1.0",
         "@turf/truncate": "^7.0.0",
-        "@types/archiver": "^6.0.2",
+        "@types/archiver": "^7.0.0",
         "@types/geojson": "^7946.0.14",
         "ajv": "^8.12.0",
         "archiver": "^7.0.1",
         "color": "^5.0.0",
         "geomagnetism": "^0.2.0",
         "json-diff-ts": "^4.0.1",
+        "mil-std-2525": "^0.2.8",
         "milsymbol": "^3.0.2",
         "node-stream-zip": "^1.15.0",
         "protobufjs": "^7.3.0",

package.json

@@ -0,0 +1,20 @@
+{
+    "id": "123",
+    "type": "Feature",
+    "path": "/",
+    "properties": {
+        "type": "a-f-G",
+        "how": "m-g",
+        "callsign": "BasicTest",
+        "center": [ 1.1, 2.2, 0 ],
+        "time": "2023-08-04T15:17:43.649Z",
+        "start": "2023-08-04T15:17:43.649Z",
+        "rotate": true,
+        "stale": "2023-08-04T15:17:43.649Z",
+        "metadata": {}
+    },
+    "geometry": {
+        "type": "Point",
+        "coordinates": [1.1, 2.2, 0]
+    }
+}