From 106caf4734c239f504a56097aa5d4c5a7bc054bb Mon Sep 17 00:00:00 2001 From: Trishna Saeharaseelan <trishna.saeharaseelan@noc.ac.uk> Date: Thu, 30 Mar 2023 15:38:38 +0100 Subject: [PATCH] refactor(mission plan): emeregncy examples and description --- examples/autonomy_engine_adapter/mission_plan_AH1.json | 1 - examples/autonomy_engine_adapter/mission_plan_ECOSUB.json | 1 - examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json | 1 - examples/ecosub_adapter/mission_plan.json | 1 - formats/mission_plan.py | 2 +- project/soar/swagger.json | 2 +- tests/fixtures/schemas.py | 2 +- tests/fixtures/swagger.json | 2 +- 8 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/autonomy_engine_adapter/mission_plan_AH1.json b/examples/autonomy_engine_adapter/mission_plan_AH1.json index 187ce42..0131915 100644 --- a/examples/autonomy_engine_adapter/mission_plan_AH1.json +++ b/examples/autonomy_engine_adapter/mission_plan_AH1.json @@ -12,7 +12,6 @@ "message_type": "mission_plan", "platform_ID": "5-ah1", "autonomy_engine_plan_ID": 1, - "emergency": false, "plan": [ { "action": "move", diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json index 235cecc..b9d5a8b 100644 --- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json +++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json @@ -12,7 +12,6 @@ "message_type": "mission_plan", "platform_ID": "ecosub-2", "autonomy_engine_plan_ID": 1, - "emergency": false, "plan": [ { "action": "move", diff --git a/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json b/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json index 482c58a..54ffbeb 100644 --- a/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json +++ b/examples/autonomy_engine_adapter/mission_plan_HYDROSURV.json @@ -12,7 +12,6 @@ "message_type": "mission_plan", "platform_ID": "reav-60-1", "autonomy_engine_plan_ID": 1, - "emergency": false, "plan": [ { "target_waypoint_latitude": -4.187143188645706, diff --git a/examples/ecosub_adapter/mission_plan.json b/examples/ecosub_adapter/mission_plan.json index 235cecc..b9d5a8b 100644 --- a/examples/ecosub_adapter/mission_plan.json +++ b/examples/ecosub_adapter/mission_plan.json @@ -12,7 +12,6 @@ "message_type": "mission_plan", "platform_ID": "ecosub-2", "autonomy_engine_plan_ID": 1, - "emergency": false, "plan": [ { "action": "move", diff --git a/formats/mission_plan.py b/formats/mission_plan.py index 30fba21..6e430e0 100644 --- a/formats/mission_plan.py +++ b/formats/mission_plan.py @@ -91,7 +91,7 @@ mission_plan_schema = { "emergency": { "type": "boolean", "description": "To indicate if this is an emergency. " - + "1 = emergency and 0 = no emergency", + + "True = emergency and False = no emergency", "default": False, "example": False, }, diff --git a/project/soar/swagger.json b/project/soar/swagger.json index c99d720..bfdc3a4 100644 --- a/project/soar/swagger.json +++ b/project/soar/swagger.json @@ -117,7 +117,7 @@ }, "emergency": { "default": false, - "description": "To indicate if this is an emergency. 1 = emergency and 0 = no emergency", + "description": "To indicate if this is an emergency. True = emergency and False = no emergency", "example": false, "type": "boolean" }, diff --git a/tests/fixtures/schemas.py b/tests/fixtures/schemas.py index 71d0ae1..0a828c0 100644 --- a/tests/fixtures/schemas.py +++ b/tests/fixtures/schemas.py @@ -168,7 +168,7 @@ mission_plan_schema = { "emergency": { "default": False, "description": "To indicate if this is an emergency. " - + "1 = emergency and 0 = no emergency", + + "True = emergency and False = no emergency", "example": False, "type": "boolean", }, diff --git a/tests/fixtures/swagger.json b/tests/fixtures/swagger.json index b7178ad..3b5677c 100644 --- a/tests/fixtures/swagger.json +++ b/tests/fixtures/swagger.json @@ -112,7 +112,7 @@ }, "emergency": { "default": false, - "description": "To indicate if this is an emergency. 1 = emergency and 0 = no emergency", + "description": "To indicate if this is an emergency. True = emergency and False = no emergency", "example": false, "type": "boolean" }, -- GitLab