diff --git a/examples/autonomy_engine_adapter/planning_configuration.json b/examples/autonomy_engine_adapter/planning_configuration.json
index d151d10f9412bd35d173ed0a5ec67706a0e87a3b..013cb3230f5aa9544fd8afe8d0cb481baec91158 100644
--- a/examples/autonomy_engine_adapter/planning_configuration.json
+++ b/examples/autonomy_engine_adapter/planning_configuration.json
@@ -77,6 +77,7 @@
"operator": "hydrosurv",
"model": "reav",
"platform_ID": "reav-60-1",
+ "active": true,
"emergency": {
"target_waypoint_latitude": 50.33611100020795,
"target_waypoint_longitude": -4.189772466767039,
@@ -105,6 +106,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-1",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32933594228737,
@@ -124,6 +126,7 @@
},
"scan_sensor": {
"sensor_type": "SIDESCAN",
+ "warmup_time": 60.0,
"swath_width": 38.0,
"frequency": 700.0,
"angle": 110.0
@@ -137,6 +140,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-2",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32775207068519,
@@ -156,6 +160,7 @@
},
"scan_sensor": {
"sensor_type": "SIDESCAN",
+ "warmup_time": 60.0,
"swath_width": 38.0,
"frequency": 700.0,
"angle": 110.0
@@ -169,6 +174,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-3",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.326744124905844,
@@ -188,6 +194,7 @@
},
"scan_sensor": {
"sensor_type": "SIDESCAN",
+ "warmup_time": 60.0,
"swath_width": 38.0,
"frequency": 700.0,
"angle": 110.0
@@ -201,6 +208,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-4",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32616814629094,
@@ -215,6 +223,7 @@
"turning_radius": 1.5,
"scan_sensor": {
"sensor_type": "SIDESCAN",
+ "warmup_time": 60.0,
"swath_width": 38.0,
"frequency": 700.0,
"angle": 110.0
@@ -235,6 +244,7 @@
"operator": "noc",
"platform_ID": "ah-1",
"model": "autosub",
+ "active": true,
"beacon_ID": 2407,
"emergency": {
"target_waypoint_latitude": 50.3342284629413,
@@ -254,6 +264,7 @@
},
"scan_sensor": {
"sensor_type": "SIDESCAN",
+ "warmup_time": 60.0,
"swath_width": 38.0,
"frequency": 700.0,
"angle": 110.0
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index d151d10f9412bd35d173ed0a5ec67706a0e87a3b..7234f227bd8105f5afe3cdb9e1e142b7b2896971 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -77,6 +77,7 @@
"operator": "hydrosurv",
"model": "reav",
"platform_ID": "reav-60-1",
+ "active": true,
"emergency": {
"target_waypoint_latitude": 50.33611100020795,
"target_waypoint_longitude": -4.189772466767039,
@@ -105,6 +106,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-1",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32933594228737,
@@ -137,6 +139,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-2",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32775207068519,
@@ -169,6 +172,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-3",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.326744124905844,
@@ -201,6 +205,7 @@
"operator": "planet-ocean",
"platform_ID": "ecosub-4",
"model": "ecosub",
+ "active": true,
"beacon_ID": 10021,
"emergency": {
"target_waypoint_latitude": 50.32616814629094,
@@ -235,6 +240,7 @@
"operator": "noc",
"platform_ID": "ah-1",
"model": "autosub",
+ "active": true,
"beacon_ID": 2407,
"emergency": {
"target_waypoint_latitude": 50.3342284629413,
diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index 2a61479cf08f2ebf79517cbb602e4815119ceb02..6bc00b8163cc4e180bece31afb3616151a25480f 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -58,7 +58,10 @@ endurance_relative_water_speed_schema = {
"avg_battery_rating": {
"type": "number",
"format": "float",
- "description": "Battery endurance rating during standard operational speed usage (m/s)",
+ "description": (
+ "Battery endurance rating during standard operational"
+ + " speed usage (m/s)"
+ ),
"example": 1.9,
},
},
@@ -162,7 +165,7 @@ platform_schema = {
"description": "Turning radius of platform (in metres)",
"example": 1.0,
},
- "battery_endurance_relative_to_water_speed": endurance_relative_water_speed_schema,
+ "endurance_relative_to_water_speed": endurance_relative_water_speed_schema,
"scan_sensor": scan_sensor_schema,
"additional_data": {
"description": "Any addition fields/data to be added here",
@@ -173,6 +176,7 @@ platform_schema = {
"required": [
"operator",
"platform_ID",
+ "active",
"model",
"emergency",
"min_altitude",
diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index 9830a51ad8f7d8a7ce622093efe9048d179df896..c5441a175e422add399d178f5061846adbd306fd 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -512,29 +512,6 @@
},
"type":"object"
},
- "battery_endurance_relative_to_water_speed":{
- "properties":{
- "avg_battery_rating":{
- "description":"Battery endurance rating during standard operational speed usage (m/s)",
- "example":1.9,
- "format":"float",
- "type":"number"
- },
- "max_battery_rating":{
- "description":"Battery endurance rating during maximum speed usage (m/s)",
- "example":1.23,
- "format":"float",
- "type":"number"
- },
- "min_battery_rating":{
- "description":"Battery endurance rating during maximum speed usage (m/s)",
- "example":3.32,
- "format":"float",
- "type":"number"
- }
- },
- "type":"object"
- },
"beacon_ID":{
"description":"Unique identifier (number) for the beacon associated to this platform",
"example":2407,
@@ -578,6 +555,29 @@
],
"type":"object"
},
+ "endurance_relative_to_water_speed":{
+ "properties":{
+ "avg_battery_rating":{
+ "description":"Battery endurance rating during standard operational speed usage (m/s)",
+ "example":1.9,
+ "format":"float",
+ "type":"number"
+ },
+ "max_battery_rating":{
+ "description":"Battery endurance rating during maximum speed usage (m/s)",
+ "example":1.23,
+ "format":"float",
+ "type":"number"
+ },
+ "min_battery_rating":{
+ "description":"Battery endurance rating during maximum speed usage (m/s)",
+ "example":3.32,
+ "format":"float",
+ "type":"number"
+ }
+ },
+ "type":"object"
+ },
"max_velocity":{
"description":"Maximum velocity set for platform",
"example":0.9,
@@ -664,6 +664,7 @@
"required":[
"operator",
"platform_ID",
+ "active",
"model",
"emergency",
"min_altitude",