Skip to content

Commit

Permalink
Merge pull request #34 from dnv-opensource/32-prepare-for-release-006
Browse files Browse the repository at this point in the history 
32 prepare for release 006
  • Loading branch information
@minhemdnv
minhemdnv authored Apr 4, 2024
2 parents 1b3950b + 1b2c324 commit d0aa2b8
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 80 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

## [Unreleased]

## [0.0.6] - 2024-04-04

### Changed

- Updated README.md with a getting started section.
Expand Down Expand Up @@ -103,7 +105,8 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

<!-- Markdown link & img dfn's -->

[unreleased]: https://github.com/dnv-opensource/maritime-schema/compare/v0.0.5...HEAD
[unreleased]: https://github.com/dnv-opensource/maritime-schema/compare/v0.0.6...HEAD
[0.0.6]: https://github.com/dnv-opensource/maritime-schema/releases/tag/v0.0.5...v0.0.6
[0.0.5]: https://github.com/dnv-opensource/maritime-schema/releases/tag/v0.0.4...v0.0.5
[0.0.4]: https://github.com/dnv-opensource/maritime-schema/releases/tag/v0.0.3...v0.0.4
[0.0.3]: https://github.com/dnv-opensource/maritime-schema/releases/tag/v0.0.2...v0.0.3
Expand Down
8 changes: 4 additions & 4 deletions docs/schema/caga/input_schema.html
View file

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions docs/schema/caga/output_schema.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Minos Hemrich, Tom Arne Pedersen, Claas Rostock"

# The full version, including alpha/beta/rc tags
release = "0.0.5"
release = "0.0.6"

# -- General configuration ---------------------------------------------------

Expand Down
12 changes: 6 additions & 6 deletions examples/output_schema_file.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"creationTime": "2024-04-04T09:05:32.273560",
"creationTime": "2024-04-04T12:07:44.988092",
"trafficSituation": {
"title": "example situation",
"description": "an example traffic situation generated using the python package maritime-schema",
Expand Down Expand Up @@ -56,10 +56,10 @@
},
"timeSeriesData": [
{
"time": "2024-04-04T09:05:32.273459",
"time": "2024-04-04T12:07:44.987960",
"targetShips": [
{
"id": "30193e48-3e3d-4a2d-a473-84674c90d906",
"id": "9c6a955b-2b90-4707-a660-d3bdf58e1f7a",
"position": {
"latitude": 1.23,
"longitude": 1.24
Expand All @@ -81,10 +81,10 @@
}
},
{
"time": "2024-04-04T09:05:33.273461",
"time": "2024-04-04T12:07:45.987963",
"targetShips": [
{
"id": "2525a2f1-6b2a-4e0e-908c-c759aae11488",
"id": "e2742314-23ec-41d2-b970-8306cb5d7f4f",
"position": {
"latitude": 1.231,
"longitude": 1.242
Expand All @@ -108,7 +108,7 @@
],
"eventData": [
{
"time": "2024-04-04T09:05:32.273432",
"time": "2024-04-04T12:07:44.987924",
"route": [
{
"position": {
Expand Down
4 changes: 2 additions & 2 deletions examples/traffic_situation.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "example situation",
"description": "an example traffic situation generated using the python package maritime-schema",
"startTime": "2024-04-03T14:13:21.756135",
"startTime": "2024-04-04T12:07:50.332617",
"ownShip": {
"static": {
"id": "14c94b5f-00ee-4c30-97c9-507862915076",
"id": "98561680-57a2-4c40-b0dc-018a8e68d7fc",
"length": 200.0,
"width": 30.0,
"height": 10.0,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "maritime-schema"
version = "0.0.5"
version = "0.0.6"
description = "Python data classes and JSON schemata for maritime traffic scenarios."
readme = "README.md"
requires-python = ">= 3.9"
Expand Down
4 changes: 2 additions & 2 deletions schema/caga/input_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
"id": {
"description": "Unique Identifier",
"examples": [
"eea9f050-6253-4d81-bc77-c3f0f198ec03"
"c8067411-76fe-421d-a60e-07b30948fdd3"
],
"format": "uuid",
"title": "Id",
Expand Down Expand Up @@ -795,7 +795,7 @@
"default": null,
"description": "Starting time of the situation in `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`",
"examples": [
"2024-04-04T09:29:16.243578"
"2024-04-04T15:28:16.125239"
],
"title": "Starttime"
},
Expand Down
60 changes: 30 additions & 30 deletions schema/caga/output_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,21 @@
"predictions": {
"position": [
{
"time": "2024-04-04T09:29:16.254298",
"time": "2024-04-04T15:28:16.141020",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.254304",
"time": "2024-04-04T15:28:16.141044",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.254308",
"time": "2024-04-04T15:28:16.141064",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
Expand All @@ -137,7 +137,7 @@
"tcpa": 1200.0
}
],
"time": "2024-04-04T09:29:16.254285"
"time": "2024-04-04T15:28:16.140981"
}
]
],
Expand Down Expand Up @@ -219,7 +219,7 @@
"turnRadius": 500.0
}
],
"time": "2024-04-04T09:29:16.254349"
"time": "2024-04-04T15:28:16.141188"
}
]
],
Expand Down Expand Up @@ -252,7 +252,7 @@
],
"description": "Date and Time of the event",
"examples": [
"2024-04-04T09:29:16.252730"
"2024-04-04T15:28:16.136594"
],
"title": "Time"
},
Expand Down Expand Up @@ -366,7 +366,7 @@
],
"description": "Date and Time of the predicted value `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`",
"examples": [
"2024-04-04T09:29:16.251573"
"2024-04-04T15:28:16.135180"
],
"title": "Time"
},
Expand All @@ -392,21 +392,21 @@
"predictions": {
"position": [
{
"time": "2024-04-04T09:29:16.251611",
"time": "2024-04-04T15:28:16.135228",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.251618",
"time": "2024-04-04T15:28:16.135237",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.251623",
"time": "2024-04-04T15:28:16.135243",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
Expand Down Expand Up @@ -522,7 +522,7 @@
"id": {
"description": "Unique Identifier",
"examples": [
"f253f15f-32b9-4806-87a3-a3d3a20dbb6c"
"44febc4b-3376-42d7-9573-1ddfcdea77a2"
],
"format": "uuid",
"title": "Id",
Expand Down Expand Up @@ -679,21 +679,21 @@
"examples": [
[
{
"time": "2024-04-04T09:29:16.247716",
"time": "2024-04-04T15:28:16.130246",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.247731",
"time": "2024-04-04T15:28:16.130262",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.247736",
"time": "2024-04-04T15:28:16.130269",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
Expand Down Expand Up @@ -1093,7 +1093,7 @@
],
"description": "Date and Time of the predicted value `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`",
"examples": [
"2024-04-04T09:29:16.246802"
"2024-04-04T15:28:16.129205"
],
"title": "Time"
},
Expand Down Expand Up @@ -1129,7 +1129,7 @@
"id": {
"description": "Unique Identifier",
"examples": [
"eea9f050-6253-4d81-bc77-c3f0f198ec03"
"c8067411-76fe-421d-a60e-07b30948fdd3"
],
"format": "uuid",
"title": "Id",
Expand Down Expand Up @@ -1266,7 +1266,7 @@
"id": {
"description": "Unique Identifier",
"examples": [
"a42539cc-659c-437f-8583-d7314c9fa571"
"8e8120b8-b87f-4fae-8632-e17f4c535c73"
],
"format": "uuid",
"title": "Id",
Expand Down Expand Up @@ -1423,7 +1423,7 @@
"sog": 10.0
}
],
"time": "2024-04-04T09:29:16.256655"
"time": "2024-04-04T15:28:16.146312"
},
{
"ownShip": {
Expand Down Expand Up @@ -1467,7 +1467,7 @@
"sog": 10.0
}
],
"time": "2024-04-04T09:29:16.256694"
"time": "2024-04-04T15:28:16.146397"
}
]
],
Expand Down Expand Up @@ -1508,7 +1508,7 @@
],
"description": "Date and Time of the predicted value `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`",
"examples": [
"2024-04-04T09:29:16.255666"
"2024-04-04T15:28:16.144585"
],
"title": "Time"
},
Expand Down Expand Up @@ -1546,7 +1546,7 @@
],
"description": "Date and Time of the event",
"examples": [
"2024-04-04T09:29:16.253771"
"2024-04-04T15:28:16.139551"
],
"title": "Time"
}
Expand Down Expand Up @@ -1725,7 +1725,7 @@
"default": null,
"description": "Starting time of the situation in `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`",
"examples": [
"2024-04-04T09:29:16.243578"
"2024-04-04T15:28:16.125239"
],
"title": "Starttime"
},
Expand Down Expand Up @@ -1959,7 +1959,7 @@
"creationTime": {
"description": "Date and Time that this file was created, in `ISO 8601` format `YYYY-MM-DDThh:mm:ssZ`. This should be the simulation end time.",
"examples": [
"2024-04-04T09:29:16.257939"
"2024-04-04T15:28:16.148176"
],
"format": "date-time",
"title": "Creationtime",
Expand Down Expand Up @@ -2063,7 +2063,7 @@
"turnRadius": 500.0
}
],
"time": "2024-04-04T09:29:16.258054"
"time": "2024-04-04T15:28:16.148333"
}
],
"timeSeriesData": [
Expand All @@ -2088,21 +2088,21 @@
"predictions": {
"position": [
{
"time": "2024-04-04T09:29:16.258028",
"time": "2024-04-04T15:28:16.148295",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.258034",
"time": "2024-04-04T15:28:16.148304",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
}
},
{
"time": "2024-04-04T09:29:16.258039",
"time": "2024-04-04T15:28:16.148310",
"value": {
"latitude": 57.2343,
"longitude": 10.3432
Expand All @@ -2114,7 +2114,7 @@
"tcpa": 1200.0
}
],
"time": "2024-04-04T09:29:16.258016"
"time": "2024-04-04T15:28:16.148277"
}
]
}
Expand Down Expand Up @@ -2182,7 +2182,7 @@
"sog": 10.0
}
],
"time": "2024-04-04T09:29:16.258221"
"time": "2024-04-04T15:28:16.148436"
},
{
"ownShip": {
Expand Down Expand Up @@ -2226,7 +2226,7 @@
"sog": 10.0
}
],
"time": "2024-04-04T09:29:16.258254"
"time": "2024-04-04T15:28:16.148473"
}
]
}
Expand Down

0 comments on commit d0aa2b8

Please sign in to comment.