diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
index a3828b15bd490ab47dc1aac88a2c67c76ec8c785..c400cb0b0e565cd9e645b5b2df2cd97e29437583 100644
--- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
+++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
@@ -15,7 +15,6 @@
"plan": [
{
"action": "move",
- "flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
@@ -26,7 +25,6 @@
},
{
"action": "dive",
- "flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706,
@@ -37,7 +35,6 @@
},
{
"action": "scanline",
- "flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706,
@@ -48,7 +45,6 @@
},
{
"action": "climb",
- "flight_style": "go to surface",
"start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index a5da880d84ea7c4955990161cd6e22bb0da93aa0..ab0de23478e091f9dd111b24925951f0acfb10e8 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -45,7 +45,6 @@
{
"model": "reav",
"platform_ID": "reav-60-1",
- "serial": "reav-60",
"emergency": {
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
@@ -88,7 +87,6 @@
"platforms": [
{
"platform_ID": "ecosub-2",
- "serial": "ecosub-2",
"model": "ecosub",
"emergency": {
"target_waypoint_latitude": -7.432,
@@ -106,7 +104,6 @@
},
{
"platform_ID": "ecosub-5",
- "serial": "ecosub-5",
"model": "ecosub",
"emergency": {
"additional_data": {},
@@ -133,7 +130,6 @@
"platforms": [
{
"platform_ID": "139-ah-1",
- "serial": "ah-1",
"model": "autosub",
"emergency": {
"additional_data": {},
diff --git a/formats/mission_plan.py b/formats/mission_plan.py
index b0e66883a85d25b8069269c8c250e257cab6e78d..7936788581887735299af931a191e4eaff7ea948 100644
--- a/formats/mission_plan.py
+++ b/formats/mission_plan.py
@@ -13,12 +13,6 @@ action_schema = {
+ " `dive`, `send_hits`, `scanline`, `scanpoint`.",
"example": "move",
},
- "flight_style": {
- "type": "string",
- "description": "Platform-specific modes/flight styles to perform"
- + " next action",
- "example": "orbit",
- },
"start_point_latitude": {
"type": "number",
"format": "float",
diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index 872798e4f35d7b93934f3998c3851e69a4664ac9..27a315434cc4aac4913f96d07e313db21f346927 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -53,11 +53,6 @@ platform_schema = {
"description": "Unique identifier for this platform",
"example": "reav-x-1",
},
- "serial": {
- "type": "string",
- "description": "platform serial number",
- "example": "reav-60",
- },
"model": {
"type": "string",
"example": "reav",
@@ -89,7 +84,6 @@ platform_schema = {
},
"required": [
"platform_ID",
- "serial",
"model",
"emergency",
"min_altitude",
diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index cbfe13a12f8ca3f61d261a1d3519f821c14454af..fc743b6012282203d122086bdc7c1fca35655427 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -136,11 +136,6 @@
"format":"float",
"type":"number"
},
- "flight_style":{
- "description":"Platform-specific modes/flight styles to perform next action",
- "example":"orbit",
- "type":"string"
- },
"send_environmental_data":{
"description":"To trigger the platform to send list of observations if any found",
"example":false,
@@ -420,16 +415,10 @@
"description":"Unique identifier for this platform",
"example":"reav-x-1",
"type":"string"
- },
- "serial":{
- "description":"platform serial number",
- "example":"reav-60",
- "type":"string"
}
},
"required":[
"platform_ID",
- "serial",
"model",
"emergency",
"min_altitude",
diff --git a/tests/fixtures/schemas.py b/tests/fixtures/schemas.py
index 6b5953242397e180da48e0e52fc408dccd6b1f03..0994486d07fcd1af7368cd5f15de67810d4115c1 100644
--- a/tests/fixtures/schemas.py
+++ b/tests/fixtures/schemas.py
@@ -91,12 +91,6 @@ action_schema = {
+ " `dive`, `send_hits`, `scanline`, `scanpoint`.",
"example": "move",
},
- "flight_style": {
- "type": "string",
- "description": "Platform-specific modes/flight styles to perform"
- + " next action",
- "example": "orbit",
- },
"start_point_latitude": {
"type": "number",
"format": "float",
@@ -294,11 +288,6 @@ platform_schema = {
"description": "Unique identifier for this platform",
"example": "reav-x-1",
},
- "serial": {
- "type": "string",
- "description": "platform serial number",
- "example": "reav-60",
- },
"model": {
"type": "string",
"example": "reav",
@@ -329,7 +318,6 @@ platform_schema = {
},
"required": [
"platform_ID",
- "serial",
"model",
"emergency",
"min_altitude",
diff --git a/tests/fixtures/swagger.json b/tests/fixtures/swagger.json
index 1dd1d92852e300f02792714298ab12cbf458303c..f95b94e36c79722d318ea80edab6aac3a13f37de 100644
--- a/tests/fixtures/swagger.json
+++ b/tests/fixtures/swagger.json
@@ -135,11 +135,6 @@
"format": "float",
"type": "number"
},
- "flight_style": {
- "description": "Platform-specific modes/flight styles to perform next action",
- "example": "orbit",
- "type": "string"
- },
"target_waypoint_latitude": {
"description": "Next waypoint, x-coordinate",
"example": -4.187143188645706,
@@ -401,16 +396,10 @@
"description": "Unique identifier for this platform",
"example": "reav-x-1",
"type": "string"
- },
- "serial": {
- "description": "platform serial number",
- "example": "reav-60",
- "type": "string"
}
},
"required": [
"platform_ID",
- "serial",
"model",
"emergency",
"min_altitude",