diff --git a/examples/autonomy_engine_adapter/mission_plan_AH1.json b/examples/autonomy_engine_adapter/mission_plan_AH1.json index 2c7d2dda3d9b4bb9cadcba2f7b64578d76f989e5..7a62cda6c3b8e3247841fd943dfd7bc29ea9d275 100644 --- a/examples/autonomy_engine_adapter/mission_plan_AH1.json +++ b/examples/autonomy_engine_adapter/mission_plan_AH1.json @@ -21,8 +21,7 @@ "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "dive", @@ -32,8 +31,7 @@ "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "scanline", @@ -43,8 +41,7 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true, - "send_environmental_data": false + "activate_payload": true }, { "action": "climb", @@ -54,8 +51,7 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": true + "activate_payload": false } ] } diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json index c400cb0b0e565cd9e645b5b2df2cd97e29437583..1e48c9cb9f67db22781bf12066c5adc4944badae 100644 --- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json +++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json @@ -20,8 +20,7 @@ "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "dive", @@ -30,8 +29,7 @@ "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "scanline", @@ -40,8 +38,7 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true, - "send_environmental_data": false + "activate_payload": true }, { "action": "climb", @@ -50,8 +47,7 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": true + "activate_payload": false } ] } diff --git a/examples/ecosub_adapter/mission_plan.json b/examples/ecosub_adapter/mission_plan.json index a3828b15bd490ab47dc1aac88a2c67c76ec8c785..1e48c9cb9f67db22781bf12066c5adc4944badae 100644 --- a/examples/ecosub_adapter/mission_plan.json +++ b/examples/ecosub_adapter/mission_plan.json @@ -15,47 +15,39 @@ "plan": [ { "action": "move", - "flight_style": "go to waypoint", "start_point_latitude": -3.007143188645706, "start_point_longitude": 50.37072283932642, "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "dive", - "flight_style": "dive to depth", "start_point_latitude": -3.237143188645706, "start_point_longitude": 52.37072283932642, "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false, - "send_environmental_data": false + "activate_payload": false }, { "action": "scanline", - "flight_style": "go to waypoint", "start_point_latitude": -3.337143188645706, "start_point_longitude": 56.37072283932642, "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true, - "send_environmental_data": false + "activate_payload": true }, { "action": "climb", - "flight_style": "go to surface", "start_point_latitude": -0.237143188645706, "start_point_longitude": 60.00000000000000, "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false, - "send_environmental_data": true + "activate_payload": false } ] } diff --git a/formats/mission_plan.py b/formats/mission_plan.py index 7936788581887735299af931a191e4eaff7ea948..1b8290d107d2eea78ac0019823d0a93a15074bdf 100644 --- a/formats/mission_plan.py +++ b/formats/mission_plan.py @@ -55,12 +55,6 @@ action_schema = { + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", "example": True, }, - "send_environmental_data": { - "type": "boolean", - "description": "To trigger the platform to send list of" - + " observations if any found", - "example": False, - }, }, "required": [ "target_waypoint_latitude", diff --git a/project/soar/swagger.json b/project/soar/swagger.json index fc743b6012282203d122086bdc7c1fca35655427..0de8b7ddfb867b813134ccb3762bdc2ef8fff8b5 100644 --- a/project/soar/swagger.json +++ b/project/soar/swagger.json @@ -136,11 +136,6 @@ "format":"float", "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":{ "description":"Start point, x-coordinate", "example":-4.187143188645706, diff --git a/tests/fixtures/schemas.py b/tests/fixtures/schemas.py index 0994486d07fcd1af7368cd5f15de67810d4115c1..53406b83eb01f79e8bbd5fae56abc14b6e85a79c 100644 --- a/tests/fixtures/schemas.py +++ b/tests/fixtures/schemas.py @@ -133,12 +133,6 @@ action_schema = { + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", "example": True, }, - "send_environmental_data": { - "type": "boolean", - "description": "To trigger the platform to send list of" - + " observations if any found", - "example": False, - }, }, "required": [ "target_waypoint_latitude", diff --git a/tests/fixtures/swagger.json b/tests/fixtures/swagger.json index f95b94e36c79722d318ea80edab6aac3a13f37de..9029ada68999f91b888b753a98e511ef7ecb72cf 100644 --- a/tests/fixtures/swagger.json +++ b/tests/fixtures/swagger.json @@ -146,11 +146,6 @@ "example": 50.37072283932642, "format": "float", "type": "number" - }, - "send_environmental_data": { - "description": "To trigger the platform to send list of observations if any found", - "example": false, - "type": "boolean" } }, "required": [