final linting and adding selection

Author: BryonLewis

client/src/MapStore.ts

@@ -185,7 +185,8 @@ export default class MapStore {
 
   public static vectorFeatureTableGraphVisible = ref(false);
 
-  public static vectorFeatureTableData: Ref<{ layerId: number, vectorFeatureId: number, defaultGraphs?: string[] } | null> = ref(null);
+  public static vectorFeatureTableData:
+  Ref<{ layerId: number, vectorFeatureId: number, defaultGraphs?: string[] } | null> = ref(null);
 
   public static setVectorFeatureTableData = (layerId: number, vectorFeatureId: number, defaultGraphs?: string[]) => {
     if (MapStore.mapLayerFeatureGraphsVisible.value) {
@@ -414,7 +415,8 @@ export default class MapStore {
         globalMax = Math.max(globalMax, max);
       }
     });
-    if ((MapStore.mapLayerFeatureGraphsVisible.value && MapStore.mapLayerFeatureGraphs.value.length) || MapStore.vectorFeatureTableGraphVisible.value) {
+    if ((MapStore.mapLayerFeatureGraphsVisible.value
+      && MapStore.mapLayerFeatureGraphs.value.length) || MapStore.vectorFeatureTableGraphVisible.value) {
       globalMin = Math.min(globalMin, MapStore.graphChartsMinMax.value.min);
       globalMax = Math.max(globalMax, MapStore.graphChartsMinMax.value.max);
       stepSize = Math.min(stepSize, MapStore.graphChartsMinMax.value.stepSize);

client/src/api/UVDATApi.ts

@@ -10,12 +10,12 @@ import {
   Dataset,
   DerivedRegion,
   DisplayConfiguration,
+  FMVLayer,
+  FMVLayerData,
   FeatureGraphData,
   FeatureGraphs,
   FeatureGraphsRequest,
   FileItem,
-  FMVLayer,
-  FMVLayerData,
   LayerCollection,
   LayerCollectionLayer,
   LayerRepresentation,

client/src/components/DataSelection/UploadFile.vue

@@ -13,7 +13,9 @@ export default defineComponent({
     const uploadProgress = ref<number>(0);
     const uploadFile = ref<File | null>(null);
     const uploadError = ref<unknown>();
-    const acceptTypes = ref('.geojson, .json, .tif, .tiff, .zip, .gpkg, .nc');
+    const acceptTypes = ref(
+      '.geojson, .json, .tif, .tiff, .zip, .gpkg, .nc, .mpg, .mp4, .avi, .mov, .mkv, .webm, .jpg, .jpeg, .png, .gif',
+    );
 
     const fileInput = ref<HTMLInputElement | null>(null);
 

client/src/components/Map.vue

@@ -14,6 +14,7 @@ import { setInternalMap } from '../map/mapLayers';
 import TVA_GEOJSON_RAW from '../assets/tva.geojson?raw';
 import vectorMapStyles from '../assets/basic-map-styles.json';
 import oauthClient from '../plugins/Oauth';
+import { updateFMVFlightPathSelected } from '../map/mapFMVLayer';
 
 const TVA_GEOJSON = JSON.parse(TVA_GEOJSON_RAW) as GeoJSON.GeoJSON;
 const OSM_VECTOR_ID = 'osm-vector';
@@ -231,6 +232,7 @@ export default defineComponent({
       () => {
         if (map.value) {
           updateSelected(map.value);
+          updateFMVFlightPathSelected(map.value);
         }
       },
       { deep: true },

client/src/map/fmvStore.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /* eslint-disable no-underscore-dangle */
 import { Ref, reactive, toRefs } from 'vue';
 import { VideoSource } from 'maplibre-gl';

client/src/map/mapColors.ts

@@ -228,4 +228,4 @@ const calculateColors = (map: maplibregl.Map, layer: VectorMapLayer) => {
   }
 };
 
-export { calculateColors, colorGenerator };
+export { calculateColors, colorGenerator, chainSelected };

client/src/map/mapFMVLayer.ts

@@ -11,6 +11,7 @@ import MapStore from '../MapStore';
 import { getLayerDefaultFilter } from './mapFilters';
 import { subLayerMapping } from './mapHeatmap';
 import { FMVStore, getFMVStore } from './fmvStore';
+import { chainSelected } from './mapColors';
 
 const addedLayers: Ref<FMVLayer[]> = ref([]);
 const defaultAnnotationColor = 'black';
@@ -93,9 +94,14 @@ const getCircleRadius = () => {
 };
 
 // As selectedIds change we modify how they are drawn
-const updateSelected = (map: maplibregl.Map) => {
+// TODO:  UPDATE SELECTED ID COLORS
+const updateFMVFlightPathSelected = (map: maplibregl.Map) => {
   MapStore.selectedFMVMapLayers.value.forEach((layer) => {
-    console.log('need to implement selection coloring toggling');
+    const layerName = `FMVLayer_${layer.id}_circle`;
+    const colorFilter = chainSelected([], '#00FFFF', 'gray');
+    if (internalMap.value) {
+      internalMap.value.setPaintProperty(layerName, 'circle-color', colorFilter);
+    }
   });
 };
 
@@ -365,7 +371,7 @@ type Bounds = [LatLon, LatLon, LatLon, LatLon];
 
 function boundsToBBoxWithMultiplier(
   bounds: [[number, number], [number, number], [number, number], [number, number]],
-  sizeMultiplier: number = 1
+  sizeMultiplier: number = 1,
 ): [number, number, number, number] {
   // Extract all lats and lons
   const lons = bounds.map(([lon, _]) => lon);
@@ -379,14 +385,14 @@ function boundsToBBoxWithMultiplier(
   const centerLon = (minLon + maxLon) / 2;
   const centerLat = (minLat + maxLat) / 2;
 
-  const halfWidth = (maxLon - minLon) / 2 * sizeMultiplier;
-  const halfHeight = (maxLat - minLat) / 2 * sizeMultiplier;
+  const halfWidth = ((maxLon - minLon) / 2) * sizeMultiplier;
+  const halfHeight = ((maxLat - minLat) / 2) * sizeMultiplier;
 
   return [
     centerLon - halfWidth, // minLon
     centerLat - halfHeight, // minLat
     centerLon + halfWidth, // maxLon
-    centerLat + halfHeight // maxLat
+    centerLat + halfHeight, // maxLat
   ];
 }
 
@@ -463,7 +469,7 @@ export {
   toggleVisibility,
   toggleLayerTypeVisibility,
   setLayerProperty,
-  updateSelected,
+  updateFMVFlightPathSelected,
   updateFMVLayer,
   updateFrameFilter,
   centerAndZoom,

client/src/map/mouseEvents.ts

@@ -256,6 +256,24 @@ const setPopupEvents = (localMap: Map) => {
         click: clickFunc,
       });
     }
+    for (let i = 0; i < MapStore.selectedFMVMapLayers.value.length; i += 1) {
+      const layer = MapStore.selectedFMVMapLayers.value[i];
+      const { id } = layer;
+      const clickFunc = singleClick;
+      const FMVAnnotationType = ['circle'];
+      // Other layers select and hover is used based on config
+      FMVAnnotationType.forEach((annotationType) => {
+        localMap.on('click', `FMVLayer_${id}_${annotationType}`, clickFunc);
+      });
+      localMap.off('click', clickOutside);
+      localMap.on('click', clickOutside);
+      loadedFunctions.push({
+        id,
+        mouseenter,
+        mouseleave,
+        click: clickFunc,
+      });
+    }
   }
 };
 

scripts/fmv/kwiver-klv.py

@@ -78,12 +78,16 @@ def main(video, output_dir):
 
     click.secho(f'JSON output written to {output_json}', fg='green')
 
-    create_geojson_and_bbox(frames, geojson_out, bbox_out, bbox_geojson_out)
+    geojson_data = create_geojson_and_bbox(frames)
+    with open(geojson_out, 'w') as f:
+        json.dump(geojson_data, f, indent=2)
+    click.secho(f'GeoJSON data created with {len(geojson_data["features"])} features.', fg='green')
     click.secho(f'GeoJSON written to {geojson_out}', fg='cyan')
-    click.secho(f'Bounding box mapping written to {bbox_out}', fg='cyan')
 
 
-def create_geojson_and_bbox(frames, geojson_out, bbox_out, bbox_geojson_out):
+def create_geojson_and_bbox(
+    frames,
+):
     geod = pyproj.Geod(ellps='WGS84')
     features = []
     polygons = []
@@ -120,14 +124,15 @@ def create_geojson_and_bbox(frames, geojson_out, bbox_out, bbox_geojson_out):
 
             # Point feature at sensor location
             point = Point(sensor_lon, sensor_lat)
+            properties = {"fmvType": "flight_path"}
+            properties["frameId"] = int(frame_id)
+            for key, value in frame.items():
+                properties[key] = value
+
             feature = {
                 "type": "Feature",
                 "geometry": mapping(point),
-                "properties": {
-                    "Frame ID": frame_id,
-                    "Platform Ground Speed": frame.get("Platform Ground Speed (m/s)"),
-                    "Platform Vertical Speed": frame.get("Platform Vertical Speed (m/s)")
-                }
+                "properties": properties,
             }
             features.append(feature)
 
@@ -138,58 +143,29 @@ def create_geojson_and_bbox(frames, geojson_out, bbox_out, bbox_geojson_out):
     # Add unioned polygon
     if polygons:
         merged = unary_union(polygons)
-        features.append({
-            "type": "Feature",
-            "geometry": mapping(merged),
-            "properties": {
-                "type": "Unioned Bounding Box"
+        features.append(
+            {
+                "type": "Feature",
+                "geometry": mapping(merged),
+                "properties": {"fmvType": "ground_union"},
             }
-        })
-
-    # Save GeoJSON
-    geojson = {
-        "type": "FeatureCollection",
-        "features": features
-    }
-
-    with open(geojson_out, 'w') as f:
-        json.dump(geojson, f, indent=2)
-
-    # Save bbox mapping
-    with open(bbox_out, 'w') as f:
-        json.dump(frame_to_bbox, f, indent=2)
-
-    def get_gradient_color(idx, total):
-        r = int(255 * (idx / (total - 1)))
-        b = int(255 * (1 - idx / (total - 1)))
-        return f"#{r:02x}00{b:02x}"
+        )
 
     # Individual frame bbox polygons with styling
-    bbox_features = []
     for idx, (frame_id, poly) in enumerate(frame_polygons):
-        color = get_gradient_color(idx, total)
         feature = {
             "type": "Feature",
             "geometry": mapping(poly),
             "properties": {
-                "frame_id": frame_id,
-                "type": "Unioned Bounding Box",
-                "stroke": color,
-                "stroke-width": 2,
-                "stroke-opacity": 1,
-                "fill": "#ff0000",
-                "fill-opacity": 0.5
-            }
+                "frameId": int(frame_id),
+                "fmvType": "ground_frame",
+            },
         }
-        bbox_features.append(feature)
+        features.append(feature)
 
-    bbox_geojson = {
-        "type": "FeatureCollection",
-        "features": bbox_features
-    }
+    geojson = {"type": "FeatureCollection", "features": features}
 
-    with open(bbox_geojson_out, 'w') as f:
-        json.dump(bbox_geojson, f, indent=2)
+    return geojson
 
 if __name__ == '__main__':
     main()

uvdat/core/admin.py

@@ -7,6 +7,8 @@
     DerivedRegion,
     DisplayConfiguration,
     FileItem,
+    FMVLayer,
+    FMVVectorFeature,
     LayerCollection,
     LayerRepresentation,
     NetCDFData,
@@ -23,8 +25,6 @@
     VectorFeatureRowData,
     VectorFeatureTableData,
     VectorMapLayer,
-    FMVLayer,
-    FMVVectorFeature
 )
 
 
@@ -76,7 +76,16 @@ def get_map_layer_index(self, obj):
 
 
 class FMVLayerAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'dataset', 'get_dataset_name', 'index', 'geojson_file', 'fmv_video', 'bounds']
+    list_display = [
+        'id',
+        'name',
+        'dataset',
+        'get_dataset_name',
+        'index',
+        'geojson_file',
+        'fmv_video',
+        'bounds',
+    ]
 
     def get_dataset_name(self, obj):
         return obj.dataset.name