From 68844c95386ec55ea397c3923f72c84657ad984c Mon Sep 17 00:00:00 2001 From: ashley Date: Mon, 10 Aug 2026 14:37:09 -0500 Subject: [PATCH 1/4] updating automap keywords --- package-lock.json | 4 ++-- .../visualization/services/autoMapDataStreams.service.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7adef53f..109fde8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "osh-viewer", - "version": "3.1.0", + "version": "3.2.0-alpha", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "osh-viewer", - "version": "3.1.0", + "version": "3.2.0-alpha", "dependencies": { "@cesium/engine": "latest", "@cesium/widgets": "latest", diff --git a/src/modules/visualization/services/autoMapDataStreams.service.ts b/src/modules/visualization/services/autoMapDataStreams.service.ts index f9c3c8d3..1471e549 100644 --- a/src/modules/visualization/services/autoMapDataStreams.service.ts +++ b/src/modules/visualization/services/autoMapDataStreams.service.ts @@ -19,7 +19,10 @@ const dsRoleKeywords: Record = { // lob bearing: ['bearing', 'azimuth', 'angle', 'line of bearing'], // text - stream: [], //tbd + stream: [''], + // ellipse + semiMajorAxis: [''], + semiMinorAxis: [''], }; export function autoMapDataStreams( From d8fa85add3fbe61fa260b571cac20ad6c90b3d5c Mon Sep 17 00:00:00 2001 From: ashley Date: Mon, 17 Aug 2026 17:17:45 -0500 Subject: [PATCH 2/4] commmiting changes --- .../services/autoMapControlStreams.service.ts | 16 ++++++++-------- .../services/autoMapDataStreams.service.ts | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/visualization/services/autoMapControlStreams.service.ts b/src/modules/visualization/services/autoMapControlStreams.service.ts index d28d452a..2f871da1 100644 --- a/src/modules/visualization/services/autoMapControlStreams.service.ts +++ b/src/modules/visualization/services/autoMapControlStreams.service.ts @@ -5,19 +5,19 @@ const csRoleKeywords: Record = { plan: ['qgc mission', 'qgroundcontrol', 'mission plan', 'mission control', 'unmanned mission', 'unmanned control mission'], roverPlan: ['rover mission', 'rover plan', 'ground mission', 'ugv mission'], takeoff: ['takeoff', 'take off', 'take-off'], - land: ['landing', 'land control', 'land command'], + land: ['landing', 'land control', 'land command', 'landing control'], pause: ['pause', 'pause mission'], - rtl: ['rtl', 'return to launch', 'return home', 'return to home'], + rtl: ['rtl', 'return to launch', 'return home', 'return to home', 'return'], offboard: ['offboard', 'off-board', 'offboard control'], - arm: ['arming', 'arm control', 'arm command', 'arm/disarm'], - driveVelocity: ['drive velocity', 'velocity control'], - driveLocation: ['drive to location', 'drive location'], + arm: ['arming', 'arm control', 'arm command', 'arm/disarm', 'arming control'], + driveVelocity: ['drive velocity', 'velocity control', 'drive velocity control'], + driveLocation: ['drive to location', 'drive location', 'drive location control'], reboot: ['reboot', 'reboot control'], hold: ['hold control', 'hold command', 'loiter'], - homePos: ['home position', 'home pos', 'set home'], - driveMode: ['flight mode', 'drive mode', 'mode control'], + homePos: ['home position', 'home pos', 'set home', 'home position control'], + driveMode: ['flight mode', 'drive mode', 'mode control', 'drive mode control'], // vid - ptz: ['ptz control', 'ptzcontrol', 'ptz', 'pan tilt', 'pan-tilt-zoom', 'camera control'], + ptz: ['ptz control', 'ptzcontrol', 'ptz', 'pan tilt', 'pan-tilt-zoom', 'camera control', 'control'], // geoptz lla: ['location', 'lla', 'gps', 'position', 'platform location'], flyToLocation: ['location'], diff --git a/src/modules/visualization/services/autoMapDataStreams.service.ts b/src/modules/visualization/services/autoMapDataStreams.service.ts index 1471e549..12782ff5 100644 --- a/src/modules/visualization/services/autoMapDataStreams.service.ts +++ b/src/modules/visualization/services/autoMapDataStreams.service.ts @@ -17,12 +17,14 @@ const dsRoleKeywords: Record = { x: ['time', 'timestamp'], y: [], //tbd // lob - bearing: ['bearing', 'azimuth', 'angle', 'line of bearing'], + bearing: ['bearing', 'azimuth', 'angle', 'line of bearing', 'LOB'], // text stream: [''], // ellipse semiMajorAxis: [''], semiMinorAxis: [''], + // point marker + iconLabel: [''], }; export function autoMapDataStreams( From e8712618603dab3e242385f0a5c5d76f2e39e9fd Mon Sep 17 00:00:00 2001 From: ashley Date: Thu, 20 Aug 2026 09:54:42 -0500 Subject: [PATCH 3/4] adding more keywords --- .../services/autoMapControlStreams.service.ts | 1 + .../services/autoMapDataStreams.service.ts | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modules/visualization/services/autoMapControlStreams.service.ts b/src/modules/visualization/services/autoMapControlStreams.service.ts index 2f871da1..344c06fe 100644 --- a/src/modules/visualization/services/autoMapControlStreams.service.ts +++ b/src/modules/visualization/services/autoMapControlStreams.service.ts @@ -16,6 +16,7 @@ const csRoleKeywords: Record = { hold: ['hold control', 'hold command', 'loiter'], homePos: ['home position', 'home pos', 'set home', 'home position control'], driveMode: ['flight mode', 'drive mode', 'mode control', 'drive mode control'], + video: ['video', 'camera', 'image', 'stream'], // vid ptz: ['ptz control', 'ptzcontrol', 'ptz', 'pan tilt', 'pan-tilt-zoom', 'camera control', 'control'], // geoptz diff --git a/src/modules/visualization/services/autoMapDataStreams.service.ts b/src/modules/visualization/services/autoMapDataStreams.service.ts index 12782ff5..ee614399 100644 --- a/src/modules/visualization/services/autoMapDataStreams.service.ts +++ b/src/modules/visualization/services/autoMapDataStreams.service.ts @@ -15,16 +15,26 @@ const dsRoleKeywords: Record = { video: ['video', 'camera', 'image', 'stream'], // chart x: ['time', 'timestamp'], - y: [], //tbd + y: [''], //tbd // lob bearing: ['bearing', 'azimuth', 'angle', 'line of bearing', 'LOB'], + lobId: ['id'], // text stream: [''], // ellipse - semiMajorAxis: [''], - semiMinorAxis: [''], + ellipseId: ['id'], + semiMajorAxis: ['ellipse major', 'ellipse axis 1'], + semiMinorAxis: ['ellipse minor', 'ellipse axis 0'], // point marker - iconLabel: [''], + markerId: ['id'], + milSymbol: [''], + pmIconColor: [''], + pmLabel: ['id'], + // audio + sampleRate: ['audio', 'samples'], + samples: ['audio', 'samples'], + // polyline + polylineId: ['id'], }; export function autoMapDataStreams( From 566361947da1fcb5b606e31d27b307474c3a855f Mon Sep 17 00:00:00 2001 From: ashley Date: Fri, 21 Aug 2026 09:19:56 -0500 Subject: [PATCH 4/4] finishing up keywords, adding automap to audio vis --- .../services/autoMapDataStreams.service.ts | 16 ++-------------- .../visualizations/audio/Config.vue | 12 +++++++++++- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/modules/visualization/services/autoMapDataStreams.service.ts b/src/modules/visualization/services/autoMapDataStreams.service.ts index ee614399..61630e98 100644 --- a/src/modules/visualization/services/autoMapDataStreams.service.ts +++ b/src/modules/visualization/services/autoMapDataStreams.service.ts @@ -15,26 +15,14 @@ const dsRoleKeywords: Record = { video: ['video', 'camera', 'image', 'stream'], // chart x: ['time', 'timestamp'], - y: [''], //tbd // lob bearing: ['bearing', 'azimuth', 'angle', 'line of bearing', 'LOB'], - lobId: ['id'], - // text - stream: [''], // ellipse - ellipseId: ['id'], semiMajorAxis: ['ellipse major', 'ellipse axis 1'], semiMinorAxis: ['ellipse minor', 'ellipse axis 0'], - // point marker - markerId: ['id'], - milSymbol: [''], - pmIconColor: [''], - pmLabel: ['id'], // audio - sampleRate: ['audio', 'samples'], - samples: ['audio', 'samples'], - // polyline - polylineId: ['id'], + sampleRate: ['audio', 'samples', 'AAC', 'AMR-NB', 'AMR-WB', 'FLAC', 'VORBIS', 'OPUS', 'PCM'], + samples: ['audio', 'samples', 'AAC', 'AMR-NB', 'AMR-WB', 'FLAC', 'VORBIS', 'OPUS', 'PCM'], }; export function autoMapDataStreams( diff --git a/src/modules/visualization/visualizations/audio/Config.vue b/src/modules/visualization/visualizations/audio/Config.vue index 4c144247..0478f5e5 100644 --- a/src/modules/visualization/visualizations/audio/Config.vue +++ b/src/modules/visualization/visualizations/audio/Config.vue @@ -14,7 +14,7 @@ const props = withDefaults( optional: false, } ); -const { checkedRoles, validRoles, valid, include } = useConfig(props.configRoles, !props.optional); +const { checkedRoles, validRoles, valid, include, autoMap } = useConfig(props.configRoles, !props.optional); // Validation const emit = defineEmits(); const effectiveValid = computed(() => { @@ -35,6 +35,16 @@ useComponentValidation(effectiveValid, emit);
+ + + Auto Map Streams + +