Skip to content

GitLab

Commit df7f866a authored by Trishna Saeharaseelan's avatar Trishna Saeharaseelan
Browse files

refactor: update example

parent 52b7331c
dev 41-add-optional-operating_area-as-a-wider-zone-outside-region_of_interest 42-add-event-details-and-status-to-acknowledgement-schema 66-tag-current-dev-as-version-1 76-should-depth-and-altitude-be-coordinates 80-add-informational-type-primitive 87-remove-comment-for-platform-status-state 87-remove-todo-comment-from-platform-state action-refactor-test ci-js-test master missionmonitor v2.0.0 v2.0.0-beta.11 v2.0.0-beta.10 v2.0.0-beta.9 v2.0.0-beta.8 v2.0.0-beta.7 v2.0.0-beta.6 v2.0.0-beta.5 v2.0.0-beta.4 v2.0.0-beta.3 v2.0.0-beta.2 v2.0.0-beta.1 v1.0.0 v0.2.0
2 merge requests!30Resolve "Release v0.2",!24add endurance rating, active status, warmup time
Pipeline #132415 passed with stages
in 58 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 25 deletions
examples/autonomy_engine_adapter/planning_configuration.json
View file @ df7f866a
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
"operator": "hydrosurv", "operator": "hydrosurv",
"model": "reav", "model": "reav",
"platform_ID": "reav-60-1", "platform_ID": "reav-60-1",
"active": true,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.33611100020795, "target_waypoint_latitude": 50.33611100020795,
"target_waypoint_longitude": -4.189772466767039, "target_waypoint_longitude": -4.189772466767039,
...@@ -105,6 +106,7 @@ ...@@ -105,6 +106,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-1", "platform_ID": "ecosub-1",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32933594228737, "target_waypoint_latitude": 50.32933594228737,
...@@ -124,6 +126,7 @@ ...@@ -124,6 +126,7 @@
}, },
"scan_sensor": { "scan_sensor": {
"sensor_type": "SIDESCAN", "sensor_type": "SIDESCAN",
"warmup_time": 60.0,
"swath_width": 38.0, "swath_width": 38.0,
"frequency": 700.0, "frequency": 700.0,
"angle": 110.0 "angle": 110.0
...@@ -137,6 +140,7 @@ ...@@ -137,6 +140,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-2", "platform_ID": "ecosub-2",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32775207068519, "target_waypoint_latitude": 50.32775207068519,
...@@ -156,6 +160,7 @@ ...@@ -156,6 +160,7 @@
}, },
"scan_sensor": { "scan_sensor": {
"sensor_type": "SIDESCAN", "sensor_type": "SIDESCAN",
"warmup_time": 60.0,
"swath_width": 38.0, "swath_width": 38.0,
"frequency": 700.0, "frequency": 700.0,
"angle": 110.0 "angle": 110.0
...@@ -169,6 +174,7 @@ ...@@ -169,6 +174,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-3", "platform_ID": "ecosub-3",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.326744124905844, "target_waypoint_latitude": 50.326744124905844,
...@@ -188,6 +194,7 @@ ...@@ -188,6 +194,7 @@
}, },
"scan_sensor": { "scan_sensor": {
"sensor_type": "SIDESCAN", "sensor_type": "SIDESCAN",
"warmup_time": 60.0,
"swath_width": 38.0, "swath_width": 38.0,
"frequency": 700.0, "frequency": 700.0,
"angle": 110.0 "angle": 110.0
...@@ -201,6 +208,7 @@ ...@@ -201,6 +208,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-4", "platform_ID": "ecosub-4",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32616814629094, "target_waypoint_latitude": 50.32616814629094,
...@@ -215,6 +223,7 @@ ...@@ -215,6 +223,7 @@
"turning_radius": 1.5, "turning_radius": 1.5,
"scan_sensor": { "scan_sensor": {
"sensor_type": "SIDESCAN", "sensor_type": "SIDESCAN",
"warmup_time": 60.0,
"swath_width": 38.0, "swath_width": 38.0,
"frequency": 700.0, "frequency": 700.0,
"angle": 110.0 "angle": 110.0
...@@ -235,6 +244,7 @@ ...@@ -235,6 +244,7 @@
"operator": "noc", "operator": "noc",
"platform_ID": "ah-1", "platform_ID": "ah-1",
"model": "autosub", "model": "autosub",
"active": true,
"beacon_ID": 2407, "beacon_ID": 2407,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.3342284629413, "target_waypoint_latitude": 50.3342284629413,
...@@ -254,6 +264,7 @@ ...@@ -254,6 +264,7 @@
}, },
"scan_sensor": { "scan_sensor": {
"sensor_type": "SIDESCAN", "sensor_type": "SIDESCAN",
"warmup_time": 60.0,
"swath_width": 38.0, "swath_width": 38.0,
"frequency": 700.0, "frequency": 700.0,
"angle": 110.0 "angle": 110.0
......
examples/gui_adapter/planning_configuration.json
View file @ df7f866a
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
"operator": "hydrosurv", "operator": "hydrosurv",
"model": "reav", "model": "reav",
"platform_ID": "reav-60-1", "platform_ID": "reav-60-1",
"active": true,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.33611100020795, "target_waypoint_latitude": 50.33611100020795,
"target_waypoint_longitude": -4.189772466767039, "target_waypoint_longitude": -4.189772466767039,
...@@ -105,6 +106,7 @@ ...@@ -105,6 +106,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-1", "platform_ID": "ecosub-1",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32933594228737, "target_waypoint_latitude": 50.32933594228737,
...@@ -137,6 +139,7 @@ ...@@ -137,6 +139,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-2", "platform_ID": "ecosub-2",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32775207068519, "target_waypoint_latitude": 50.32775207068519,
...@@ -169,6 +172,7 @@ ...@@ -169,6 +172,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-3", "platform_ID": "ecosub-3",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.326744124905844, "target_waypoint_latitude": 50.326744124905844,
...@@ -201,6 +205,7 @@ ...@@ -201,6 +205,7 @@
"operator": "planet-ocean", "operator": "planet-ocean",
"platform_ID": "ecosub-4", "platform_ID": "ecosub-4",
"model": "ecosub", "model": "ecosub",
"active": true,
"beacon_ID": 10021, "beacon_ID": 10021,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.32616814629094, "target_waypoint_latitude": 50.32616814629094,
...@@ -235,6 +240,7 @@ ...@@ -235,6 +240,7 @@
"operator": "noc", "operator": "noc",
"platform_ID": "ah-1", "platform_ID": "ah-1",
"model": "autosub", "model": "autosub",
"active": true,
"beacon_ID": 2407, "beacon_ID": 2407,
"emergency": { "emergency": {
"target_waypoint_latitude": 50.3342284629413, "target_waypoint_latitude": 50.3342284629413,
......
formats/planning_configuration.py
View file @ df7f866a
...@@ -58,7 +58,10 @@ endurance_relative_water_speed_schema = { ...@@ -58,7 +58,10 @@ endurance_relative_water_speed_schema = {
"avg_battery_rating": { "avg_battery_rating": {
"type": "number", "type": "number",
"format": "float", "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, "example": 1.9,
}, },
}, },
...@@ -162,7 +165,7 @@ platform_schema = { ...@@ -162,7 +165,7 @@ platform_schema = {
"description": "Turning radius of platform (in metres)", "description": "Turning radius of platform (in metres)",
"example": 1.0, "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, "scan_sensor": scan_sensor_schema,
"additional_data": { "additional_data": {
"description": "Any addition fields/data to be added here", "description": "Any addition fields/data to be added here",
...@@ -173,6 +176,7 @@ platform_schema = { ...@@ -173,6 +176,7 @@ platform_schema = {
"required": [ "required": [
"operator", "operator",
"platform_ID", "platform_ID",
"active",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
project/soar/swagger.json
View file @ df7f866a
...@@ -512,29 +512,6 @@ ...@@ -512,29 +512,6 @@
}, },
"type":"object" "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":{ "beacon_ID":{
"description":"Unique identifier (number) for the beacon associated to this platform", "description":"Unique identifier (number) for the beacon associated to this platform",
"example":2407, "example":2407,
...@@ -578,6 +555,29 @@ ...@@ -578,6 +555,29 @@
], ],
"type":"object" "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":{ "max_velocity":{
"description":"Maximum velocity set for platform", "description":"Maximum velocity set for platform",
"example":0.9, "example":0.9,
...@@ -664,6 +664,7 @@ ...@@ -664,6 +664,7 @@
"required":[ "required":[
"operator", "operator",
"platform_ID", "platform_ID",
"active",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment