Skip to content

GitLab

Commit 627c99cd authored by Trishna Saeharaseelan's avatar Trishna Saeharaseelan
Browse files

refactor(mission plan): remove send environmental data where observation message captures this

parent 097e4728
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 50 deletions
examples/autonomy_engine_adapter/mission_plan_AH1.json
View file @ 627c99cd
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "dive", "action": "dive",
...@@ -32,8 +31,7 @@ ...@@ -32,8 +31,7 @@
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "scanline", "action": "scanline",
...@@ -43,8 +41,7 @@ ...@@ -43,8 +41,7 @@
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true
"send_environmental_data": false
}, },
{ {
"action": "climb", "action": "climb",
...@@ -54,8 +51,7 @@ ...@@ -54,8 +51,7 @@
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": true
} }
] ]
} }
......
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
View file @ 627c99cd
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "dive", "action": "dive",
...@@ -30,8 +29,7 @@ ...@@ -30,8 +29,7 @@
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "scanline", "action": "scanline",
...@@ -40,8 +38,7 @@ ...@@ -40,8 +38,7 @@
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true
"send_environmental_data": false
}, },
{ {
"action": "climb", "action": "climb",
...@@ -50,8 +47,7 @@ ...@@ -50,8 +47,7 @@
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": true
} }
] ]
} }
......
examples/ecosub_adapter/mission_plan.json
View file @ 627c99cd
...@@ -15,47 +15,39 @@ ...@@ -15,47 +15,39 @@
"plan": [ "plan": [
{ {
"action": "move", "action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706, "start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642, "start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "dive", "action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706, "start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642, "start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false
"send_environmental_data": false
}, },
{ {
"action": "scanline", "action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706, "start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642, "start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true
"send_environmental_data": false
}, },
{ {
"action": "climb", "action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706, "start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000, "start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false
"send_environmental_data": true
} }
] ]
} }
......
formats/mission_plan.py
View file @ 627c99cd
...@@ -55,12 +55,6 @@ action_schema = { ...@@ -55,12 +55,6 @@ action_schema = {
+ "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`",
"example": True, "example": True,
}, },
"send_environmental_data": {
"type": "boolean",
"description": "To trigger the platform to send list of"
+ " observations if any found",
"example": False,
},
}, },
"required": [ "required": [
"target_waypoint_latitude", "target_waypoint_latitude",
......
project/soar/swagger.json
View file @ 627c99cd
...@@ -136,11 +136,6 @@ ...@@ -136,11 +136,6 @@
"format":"float", "format":"float",
"type":"number" "type":"number"
}, },
"send_environmental_data":{
"description":"To trigger the platform to send list of observations if any found",
"example":false,
"type":"boolean"
},
"start_point_latitude":{ "start_point_latitude":{
"description":"Start point, x-coordinate", "description":"Start point, x-coordinate",
"example":-4.187143188645706, "example":-4.187143188645706,
......
tests/fixtures/schemas.py
View file @ 627c99cd
...@@ -133,12 +133,6 @@ action_schema = { ...@@ -133,12 +133,6 @@ action_schema = {
+ "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`",
"example": True, "example": True,
}, },
"send_environmental_data": {
"type": "boolean",
"description": "To trigger the platform to send list of"
+ " observations if any found",
"example": False,
},
}, },
"required": [ "required": [
"target_waypoint_latitude", "target_waypoint_latitude",
......
tests/fixtures/swagger.json
View file @ 627c99cd
...@@ -146,11 +146,6 @@ ...@@ -146,11 +146,6 @@
"example": 50.37072283932642, "example": 50.37072283932642,
"format": "float", "format": "float",
"type": "number" "type": "number"
},
"send_environmental_data": {
"description": "To trigger the platform to send list of observations if any found",
"example": false,
"type": "boolean"
} }
}, },
"required": [ "required": [
......
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