Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maritime schema integration #24

Closed
wants to merge 8 commits into from
Closed

Maritime schema integration #24

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a793021
add maritime-schema
minhemdnv Feb 27, 2024
3a2754e
more changes for maritime-schema
minhemdnv Feb 27, 2024
2f6b05d
re-run commands to generate situations
minhemdnv Feb 27, 2024
4cd0428
remove types not used
minhemdnv Feb 27, 2024
2fa6e03
fix target vessels not showing
minhemdnv Feb 28, 2024
46f1ab0
update maritime-schema to PyPI
minhemdnv Feb 28, 2024
8cbb831
imports on a single line
minhemdnv Feb 28, 2024
c56a5e5
pyproject.toml : updated poetry dependency specifications for maritim…
ClaasRostock Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 17 additions & 38 deletions data/baseline_situations_generated/traffic_situation_01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,47 @@
{
"title": "HO",
"inputFileName": "baseline_situation_01_1_ts.json",
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "0216291f-1ce2-4e76-b752-7cf93e48f6ab",
"id": "6983e2ad-4f17-414d-9c07-5c12214926cc",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
"shipType": "Passenger",
"speed_max": 17
},
"initial": {
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
},
"sog": 5.14,
"cog": 0.0
"cog": 0.0,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
}
},
{
"position": {
"north": 18504.0,
"east": 0.0,
"latitude": 1.02851496,
"longitude": 0.18309645
"longitude": 0.18309645,
"north": 18504.0,
"east": 0.0
}
}
]
},
"targetShips": [
{
"static": {
"id": "da107b8a-0009-42c2-a4e3-0d139123d45c",
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speedMax": 15.0,
"name": "CANOLE",
"shipType": "Cargo"
},
"initial": {
"position": {
"north": 10195.0,
"east": 356.0,
"latitude": 1.02721306,
"longitude": 0.18320382
},
"sog": 6.2,
"cog": 3.205
}
}
]
"targetShips": [],
"input_file_name": "baseline_situation_01_1_ts.json",
"common_vector": 600.0
}
55 changes: 17 additions & 38 deletions data/baseline_situations_generated/traffic_situation_02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,47 @@
{
"title": "CR-GW",
"inputFileName": "baseline_situation_02_1_ts.json",
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "0216291f-1ce2-4e76-b752-7cf93e48f6ab",
"id": "6983e2ad-4f17-414d-9c07-5c12214926cc",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
"shipType": "Passenger",
"speed_max": 17
},
"initial": {
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
},
"sog": 5.14,
"cog": 0.0
"cog": 0.0,
"navStatus": "Under way using engine"
ClaasRostock marked this conversation as resolved.
Show resolved Hide resolved
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
}
},
{
"position": {
"north": 18504.0,
"east": 0.0,
"latitude": 1.02851496,
"longitude": 0.18309645
"longitude": 0.18309645,
"north": 18504.0,
"east": 0.0
}
}
]
},
"targetShips": [
{
"static": {
"id": "5b1dbefb-9c43-4edb-ade7-e3f90620bb41",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"name": "BASTO",
"shipType": "Passenger"
},
"initial": {
"position": {
"north": 5774.0,
"east": 2102.0,
"latitude": 1.02652036,
"longitude": 0.18373041
},
"sog": 4.1,
"cog": 3.934
}
}
]
"targetShips": [],
minhemdnv marked this conversation as resolved.
Show resolved Hide resolved
"input_file_name": "baseline_situation_02_1_ts.json",
"common_vector": 600.0
}
55 changes: 17 additions & 38 deletions data/baseline_situations_generated/traffic_situation_03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,47 @@
{
"title": "CR-SO",
"inputFileName": "baseline_situation_03_1_ts.json",
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "0216291f-1ce2-4e76-b752-7cf93e48f6ab",
"id": "6983e2ad-4f17-414d-9c07-5c12214926cc",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
"shipType": "Passenger",
"speed_max": 17
},
"initial": {
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
},
"sog": 5.14,
"cog": 0.0
"cog": 0.0,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
}
},
{
"position": {
"north": 18504.0,
"east": 0.0,
"latitude": 1.02851496,
"longitude": 0.18309645
"longitude": 0.18309645,
"north": 18504.0,
"east": 0.0
}
}
]
},
"targetShips": [
{
"static": {
"id": "12fc70ac-d00e-4889-9205-55186b0208b4",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"name": "BASTO VI",
"shipType": "Passenger"
},
"initial": {
"position": {
"north": 5463.0,
"east": -3154.0,
"latitude": 1.02647163,
"longitude": 0.1821452
},
"sog": 3.1,
"cog": 1.64
}
}
]
"targetShips": [],
"input_file_name": "baseline_situation_03_1_ts.json",
"common_vector": 600.0
}
55 changes: 17 additions & 38 deletions data/baseline_situations_generated/traffic_situation_04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,47 @@
{
"title": "OT-GW",
"inputFileName": "baseline_situation_04_1_ts.json",
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "0216291f-1ce2-4e76-b752-7cf93e48f6ab",
"id": "6983e2ad-4f17-414d-9c07-5c12214926cc",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
"shipType": "Passenger",
"speed_max": 17
},
"initial": {
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
},
"sog": 5.14,
"cog": 0.0
"cog": 0.0,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 1.02561566,
"longitude": 0.18309645
"longitude": 0.18309645,
"east": 0,
"north": 0
}
},
{
"position": {
"north": 18504.0,
"east": 0.0,
"latitude": 1.02851496,
"longitude": 0.18309645
"longitude": 0.18309645,
"north": 18504.0,
"east": 0.0
}
}
]
},
"targetShips": [
{
"static": {
"id": "52e81631-135c-43a3-b121-cc3b106801ab",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"name": "BASTO",
"shipType": "Passenger"
},
"initial": {
"position": {
"north": 2216.0,
"east": 594.0,
"latitude": 1.02596287,
"longitude": 0.1832756
},
"sog": 2.6,
"cog": 6.008
}
}
]
"targetShips": [],
"input_file_name": "baseline_situation_04_1_ts.json",
"common_vector": 600.0
}
Loading
Loading