Skip to content

GitLab

Merged
Created by Dan Jones@danjonOwner

Resolve "Test validating messages with references to GeoJson schema in both JS and python"

Compare
and
10 files
+ 227
- 172
Show latest version
examples/autonom‎y_engine_adapter‎
planning_conf‎iguration.json‎ +44 -48
for‎mats‎
planning_con‎figuration.py‎ +20 -3
projec‎t/soar‎
swagge‎r.json‎ +19 -31
te‎sts‎
test_sc‎hemas.py‎ +2 -1
CHANGE‎LOG.md‎ +13 -2
READ‎ME.md‎ +1 -1
generate_sch‎ema_config.py‎ +120 -83
requiremen‎ts-dev.txt‎ +2 -2
setu‎p.py‎ +1 -1
test-‎js.sh‎ +5 -0
examples/autonomy_engine_adapter/planning_configuration.json
+ 44
- 48
Show all unchanged lines Show 20 lines
"planning_config_ID": 1,
"exclusion_zones": [
{
"geometry": {
"type": "Polygon",
"coordinates": [
"type": "Polygon",
"coordinates": [
[
[
[
-4.1777839187560915,
50.34173405662855
],
[
-4.1777839187560915,
50.33820949229701
],
[
-4.143667777943875,
50.33820949229701
],
[
-4.143667777943875,
50.34173405662855
],
[
-4.1777839187560915,
50.34173405662855
]
-4.1777839187560915,
50.34173405662855
],
[
-4.1777839187560915,
50.33820949229701
],
[
-4.143667777943875,
50.33820949229701
],
[
-4.143667777943875,
50.34173405662855
],
[
-4.1777839187560915,
50.34173405662855
]
]
}
]
}
],
"region_of_interest": [
{
"geometry": {
"type": "Polygon",
"coordinates": [
"type": "Polygon",
"coordinates": [
[
[
[
-4.1777839187560915,
50.34173405662855
],
[
-4.1777839187560915,
50.33820949229701
],
[
-4.143667777943875,
50.33820949229701
],
[
-4.143667777943875,
50.34173405662855
],
[
-4.1777839187560915,
50.34173405662855
]
-4.1777839187560915,
50.34173405662855
],
[
-4.1777839187560915,
50.33820949229701
],
[
-4.143667777943875,
50.33820949229701
],
[
-4.143667777943875,
50.34173405662855
],
[
-4.1777839187560915,
50.34173405662855
]
]
}
]
}
],
"squads": [
Show 20 lines Show all unchanged lines
formats/planning_configuration.py
+ 20
- 3
Show all unchanged lines Show 20 lines
+ " partner's platform/C2",
"example": "go_home",
},
"target_waypoint": {
"$ref": "https://geojson.org/schema/Point.json",
"target_waypoint_latitude": {
"type": "number",
"format": "float",
"description": "Y-coordinate safe place for respective platform",
"example": 50.365,
},
"target_waypoint_longitude": {
"type": "number",
"format": "float",
"description": "X-coordinate safe place for respective platform",
"example": -7.432,
},
"target_depth": {
"type": "number",
"format": "float",
"description": "Z-coordinate safe place for respective platform"
+ " . If platform to NOT stay at depth, key in `0.0`",
"example": 10.0,
},
},
"required": [
"target_waypoint",
"target_waypoint_latitude",
"target_waypoint_longitude",
],
}
Show 20 lines Show all unchanged lines
project/soar/swagger.json
+ 19
- 31
Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.Feature.json": {
"$id": "https://geojson.org/schema/Feature.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
},
"geometry": {
"oneOf": [
{
"type": "null"
},
{
"properties": {
"bbox": {
Show 20 lines Show all unchanged lines Show 20 lines
},
"properties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.FeatureCollection.json": {
"$id": "https://geojson.org/schema/FeatureCollection.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
},
"geometry": {
"oneOf": [
{
"type": "null"
},
{
"properties": {
"bbox": {
Show 20 lines Show all unchanged lines Show 20 lines
},
"properties": {
"oneOf": [
{
"type": "null"
},
{
"type": "object"
}
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.LineString.json": {
"$id": "https://geojson.org/schema/LineString.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.MultiLineString.json": {
"$id": "https://geojson.org/schema/MultiLineString.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.MultiPoint.json": {
"$id": "https://geojson.org/schema/MultiPoint.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.MultiPolygon.json": {
"$id": "https://geojson.org/schema/MultiPolygon.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.Point.json": {
"$id": "https://geojson.org/schema/Point.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"type": "object"
},
"geojson.org.schema.Polygon.json": {
"$id": "https://geojson.org/schema/Polygon.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"bbox": {
"items": {
Show 20 lines Show all unchanged lines Show 20 lines
"example": "go_home",
"type": "string"
},
"target_waypoint": {
"$ref": "#/components/schemas/geojson.org.schema.Point.json"
"target_depth": {
"description": "Z-coordinate safe place for respective platform . If platform to NOT stay at depth, key in `0.0`",
"example": 10.0,
"format": "float",
"type": "number"
},
"target_waypoint_latitude": {
"description": "Y-coordinate safe place for respective platform",
"example": 50.365,
"format": "float",
"type": "number"
},
"target_waypoint_longitude": {
"description": "X-coordinate safe place for respective platform",
"example": -7.432,
"format": "float",
"type": "number"
}
},
"required": [
"target_waypoint"
"target_waypoint_latitude",
"target_waypoint_longitude"
],
"type": "object"
},
Show 20 lines Show all unchanged lines
tests/test_schemas.py
+ 2
- 1
Show all unchanged lines Show 20 lines
import unittest
import json
import os
from generate_schema_config import write_schema, swagger_config
from generate_schema_config import write_schema, get_swagger_config
MOCK_DATA_DIR = "examples/"
Show 20 lines Show all unchanged lines Show 20 lines
def setUpClass(cls):
test_schema_path = "tests/test_swagger.json"
os.environ["SCHEMA_PATH"] = test_schema_path
swagger_config = get_swagger_config()
write_schema(swagger_config, test_schema_path)
Show 20 lines Show all unchanged lines
CHANGELOG.md
+ 13
- 2
Show all unchanged lines Show 20 lines
## [Unreleased]
### Changed
- Upgraded openapi-spec-validator to latest release (0.7.1)
- Upgraded openapi-schema-validator to latest release (0.6.2)
## [v1.0.0] - 2024-08-28
### Changed
- Updated README to run tests against JS dependencies
- Use discover to find all unit tests
- Run tests against current format definitions
- Test that formats match saved schema
Show 20 lines Show all unchanged lines Show 20 lines
- Emergency flag in mission plan schemas
- Added additional battery and fuel fields to platform status for SPINE project
### Changed
- Updated README to run tests against JS dependencies
## [v0.1.0] - 2023-03-24
### Added
Show 20 lines Show all unchanged lines Show 20 lines
Example messages matching the schema for each partner
[unreleased]: https://git.noc.ac.uk/communications-backbone-system/backbone-message-format/compare/v0.2.0...dev
[unreleased]: https://git.noc.ac.uk/communications-backbone-system/backbone-message-format/compare/v1.0.0...dev
[v1.0.0]: https://git.noc.ac.uk/communications-backbone-system/backbone-message-format/compare/v0.2.0...v1.0.0
[v0.2.0]: https://git.noc.ac.uk/communications-backbone-system/backbone-message-format/compare/v0.1.0...v0.2.0
[v0.1.0]: https://git.noc.ac.uk/communications-backbone-system/backbone-message-format/compare/9e6ce245...v0.1.0
README.md
+ 1
- 1
generate_schema_config.py
+ 120
- 83
requirements-dev.txt
+ 2
- 2
setup.py
+ 1
- 1
test-js.sh
+ 5
- 0