Merge pull request #112 from dfpc-coe/min-max-zoom

Per Feature Min/Max Zoom

Author: ingalls

lib/parser/from_geojson.ts

@@ -115,16 +115,30 @@ export async function from_geojson(
         cot.event.detail.takv = { _attributes: { ...feature.properties.takv } };
     }
 
+    if (feature.properties.minzoom !== undefined || feature.properties.maxzoom !== undefined) {
+        if (!cot.event.detail.display || !cot.event.detail.display._attributes) {
+            cot.event.detail.display = { _attributes: {} };
+        }
+
+        if (feature.properties.minzoom !== undefined) {
+            cot.event.detail.display._attributes.minzoom = feature.properties.minzoom;
+        }
+
+        if (feature.properties.maxzoom !== undefined) {
+            cot.event.detail.display._attributes.maxzoom = feature.properties.maxzoom;
+        }
+    }
+
     if (feature.properties.creator) {
         cot.event.detail.creator = { _attributes: { ...feature.properties.creator } };
     }
 
     if (feature.properties.range !== undefined) {
-        cot.event.detail.range = { _attributes: { value:  feature.properties.range  } }
+        cot.event.detail.range = { _attributes: { value: feature.properties.range  } }
     }
 
     if (feature.properties.bearing !== undefined) {
-        cot.event.detail.bearing = { _attributes: { value:  feature.properties.bearing  } }
+        cot.event.detail.bearing = { _attributes: { value: feature.properties.bearing  } }
     }
 
     if (feature.properties.geofence) {

lib/parser/to_geojson.ts

@@ -89,6 +89,14 @@ export async function to_geojson(cot: CoT): Promise<Static<typeof Feature>> {
         feat.properties.bearing = raw.event.detail.bearing._attributes.value;
     }
 
+    if (raw.event.detail.display?._attributes?.minzoom !== undefined) {
+        feat.properties.minzoom = raw.event.detail.display._attributes.minzoom;
+    }
+
+    if (raw.event.detail.display?._attributes?.maxzoom !== undefined) {
+        feat.properties.maxzoom = raw.event.detail.display._attributes.maxzoom;
+    }
+
     if (raw.event.detail.labels_on && raw.event.detail.labels_on._attributes && raw.event.detail.labels_on._attributes.value !== undefined) {
         feat.properties.labels = raw.event.detail.labels_on._attributes.value;
     }

lib/types/feature.ts

@@ -68,6 +68,8 @@ export const Properties = Type.Object({
     start: Type.String(),
     stale: Type.String(),
     center: Position,
+    minzoom: Type.Optional(Type.Number()),
+    maxzoom: Type.Optional(Type.Number()),
     range: Type.Optional(Type.Number()),
     bearing: Type.Optional(Type.Number()),
     creator: Type.Optional(CreatorAttributes),

lib/types/types.ts

@@ -603,6 +603,13 @@ export const Inclination = Type.Object({
     _attributes: InclinationAttributes,
 });
 
+export const Display = Type.Object({
+    _attributes: Type.Object({
+        minzoom: Type.Optional(Type.Number()),
+        maxzoom: Type.Optional(Type.Number()),
+    })
+});
+
 export const NorthRefAttributes = Type.Object({
     value: Type.Number()
 });
@@ -678,6 +685,10 @@ export const Detail = Type.Object({
     link: Type.Optional(Type.Union([Link, Type.Array(Link)])),
     link_attr: Type.Optional(LinkAttr),
 
+    // Custom Attributes related to CloudTAK Display
+    display: Type.Optional(Display),
+    // ---------------------------------------------
+
     usericon: Type.Optional(UserIcon),
     track: Type.Optional(Track),
     sensor: Type.Optional(Sensor),

package-lock.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",
+        "maxzoom": 5,
+        "stale": "2023-08-04T15:17:43.649Z",
+        "metadata": {}
+    },
+    "geometry": {
+        "type": "Point",
+        "coordinates": [1.1, 2.2, 0]
+    }
+}

test/fixtures/maxzoom.geojson

@@ -0,0 +1,21 @@
+{
+    "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",
+        "maxzoom": 14,
+        "minzoom": 5,
+        "stale": "2023-08-04T15:17:43.649Z",
+        "metadata": {}
+    },
+    "geometry": {
+        "type": "Point",
+        "coordinates": [1.1, 2.2, 0]
+    }
+}

test/fixtures/minmaxzoom.geojson

@@ -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",
+        "minzoom": 5,
+        "stale": "2023-08-04T15:17:43.649Z",
+        "metadata": {}
+    },
+    "geometry": {
+        "type": "Point",
+        "coordinates": [1.1, 2.2, 0]
+    }
+}