From 76a2df00c436b1c821343655315acbc86d09236e Mon Sep 17 00:00:00 2001
From: Trishna Saeharaseelan <trishna.saeharaseelan@noc.ac.uk>
Date: Fri, 22 Nov 2024 11:03:54 +0000
Subject: [PATCH] fix: rebase to latest 67 branch
---
CHANGELOG.md | 8 ++++++++
formats/planning_configuration.py | 2 +-
project/soar/swagger.json | 8 ++++----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f763be9..5888624 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
+### Removed
+
+- Removed "repeat" primitive instruction's enum (planning config)
+
### Added
+<<<<<<< HEAD
- Goal object in mission_plan message that consists of a GeoJSON feature (representing the part of primitive that is currently the goal of the given mission plan).
- A `partial` flag that indicates if a mission plan is a partial plan or the entire mission plan
+=======
+- Added "informational" to enum for primitive's instruction enum (planning configuration)
+>>>>>>> 7f768c7 (refactor(planning_configuration): update primitive instruction's enum and new goal obj)
- Options to primitives (under planning_configuration message) which is only a property when a primitive has an instruction of "follow" or "navigate_to"
- Validate message_ID matches uuid format
- Add definition of instruction_set message
diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index c679e85..71c9aa7 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -229,8 +229,8 @@ primitive_schema = {
"enum": [
"stay_inside",
"stay_outside",
- "repeat",
"cover",
+ "informational",
],
"description": "How the associated feature should be used",
},
diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index 8dc6f11..734c742 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -1998,8 +1998,8 @@
"enum": [
"stay_inside",
"stay_outside",
- "repeat",
- "cover"
+ "cover",
+ "informational"
],
"type": "string"
}
@@ -2251,8 +2251,8 @@
"enum": [
"stay_inside",
"stay_outside",
- "repeat",
- "cover"
+ "cover",
+ "informational"
],
"type": "string"
}
--
GitLab