Skip to content

Commit

Permalink
Removed the max speed output, updated the generated traffic situation…
Browse files Browse the repository at this point in the history 
… files. #36
  • Loading branch information
@tomarnepedersen
tomarnepedersen committed Jan 17, 2025
1 parent d8babdd commit 3e35232
Show file tree
Hide file tree
Showing 57 changed files with 4,889 additions and 3,110 deletions.
83 changes: 47 additions & 36 deletions data/baseline_situations_generated/traffic_situation_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
{
"version": "0.6.0",
"title": "HO",
"description": "A head on situation with one target ship.",
"ownShip": {
"static": {
"id": "27b8e920-d131-49d1-be47-284c99a128d9",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
},
"initial": {
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
},
"sog": 10.0,
"cog": 0.0,
Expand All @@ -25,53 +16,73 @@
"waypoints": [
{
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
}
},
{
"position": {
"lat": 58.7911568,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.8465724
}
}
]
],
"static": {
"id": 0,
"mmsi": 257847600,
"name": "BASTO VI",
"dimensions": {
"length": 122.0,
"width": 20.0,
"height": 8.0,
"a": 61.0,
"b": 61.0,
"c": 10.0,
"d": 10.0
},
"shipType": "Passenger"
}
},
"targetShips": [
{
"static": {
"id": "831e1ab2-8600-42cf-a91b-512230d49af7",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"name": "target_ship_1",
"shipType": "Passenger"
},
"initial": {
"position": {
"lat": 58.84117519,
"lon": 10.49587268
"lon": 10.49680582,
"lat": 58.85500037
},
"sog": 12.1,
"cog": 183.12,
"heading": 183.12,
"cog": 183.63,
"heading": 183.63,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"lat": 58.84117519,
"lon": 10.49587268
"lon": 10.49680582,
"lat": 58.85500037
}
},
{
"position": {
"lat": 58.80782874,
"lon": 10.49237693
"lon": 10.48458595,
"lat": 58.75501409
}
}
]
],
"static": {
"id": 10,
"name": "target_ship_1",
"dimensions": {
"length": 122.0,
"width": 20.0,
"height": 8.0,
"a": 61.0,
"b": 61.0,
"c": 10.0,
"d": 10.0
},
"shipType": "Passenger"
}
}
]
}
}
81 changes: 46 additions & 35 deletions data/baseline_situations_generated/traffic_situation_02.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
{
"version": "0.6.0",
"title": "CR-GW",
"description": "A crossing situation with one target ship. Own ship is give-way.",
"ownShip": {
"static": {
"id": "27b8e920-d131-49d1-be47-284c99a128d9",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
},
"initial": {
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
},
"sog": 10.0,
"cog": 0.0,
Expand All @@ -25,53 +16,73 @@
"waypoints": [
{
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
}
},
{
"position": {
"lat": 58.7911568,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.8465724
}
}
]
},
"targetShips": [
{
"static": {
"id": "0482dfbe-fe16-46db-8dfc-eab8cd6bca1f",
],
"static": {
"id": 0,
"mmsi": 257847600,
"name": "BASTO VI",
"dimensions": {
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"name": "target_ship_1",
"shipType": "Passenger"
"a": 61.0,
"b": 61.0,
"c": 10.0,
"d": 10.0
},
"shipType": "Passenger"
}
},
"targetShips": [
{
"initial": {
"position": {
"lat": 58.81117278,
"lon": 10.52409158
"lon": 10.52697741,
"lat": 58.81530237
},
"sog": 8.0,
"cog": 220.93,
"heading": 220.93,
"cog": 225.4,
"heading": 225.4,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"lat": 58.81117278,
"lon": 10.52409158
"lon": 10.52697741,
"lat": 58.81530237
}
},
{
"position": {
"lat": 58.79448844,
"lon": 10.49624045
"lon": 10.43617067,
"lat": 58.76878387
}
}
]
],
"static": {
"id": 10,
"name": "target_ship_1",
"dimensions": {
"length": 122.0,
"width": 20.0,
"height": 8.0,
"a": 61.0,
"b": 61.0,
"c": 10.0,
"d": 10.0
},
"shipType": "Passenger"
}
}
]
}
}
83 changes: 47 additions & 36 deletions data/baseline_situations_generated/traffic_situation_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
{
"version": "0.6.0",
"title": "CR-SO",
"description": "A crossing situation with one target ship. Own ship is stand-on.",
"ownShip": {
"static": {
"id": "27b8e920-d131-49d1-be47-284c99a128d9",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"shipType": "Passenger"
},
"initial": {
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
},
"sog": 10.0,
"cog": 0.0,
Expand All @@ -25,53 +16,73 @@
"waypoints": [
{
"position": {
"lat": 58.763449,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.763449
}
},
{
"position": {
"lat": 58.7911568,
"lon": 10.490654
"lon": 10.490654,
"lat": 58.8465724
}
}
]
],
"static": {
"id": 0,
"mmsi": 257847600,
"name": "BASTO VI",
"dimensions": {
"length": 122.0,
"width": 20.0,
"height": 8.0,
"a": 61.0,
"b": 61.0,
"c": 10.0,
"d": 10.0
},
"shipType": "Passenger"
}
},
"targetShips": [
{
"static": {
"id": "8a650f7e-fb26-426d-8549-dd11fc370fb1",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"name": "target_ship_1",
"shipType": "Passenger"
},
"initial": {
"position": {
"lat": 58.80568759,
"lon": 10.44372042
"lon": 10.43613433,
"lat": 58.81250143
},
"sog": 6.0,
"cog": 120.78,
"heading": 120.78,
"cog": 93.97,
"heading": 93.97,
"navStatus": "Under way using engine"
},
"waypoints": [
{
"position": {
"lat": 58.80568759,
"lon": 10.44372042
"lon": 10.43613433,
"lat": 58.81250143
}
},
{
"position": {
"lat": 58.79714267,
"lon": 10.47133461
"lon": 10.53232818,
"lat": 58.80903752
}
}
]
],
"static": {
"id": 10,
"name": "target_ship_1",
"dimensions": {
"length": 50.0,
"width": 10.0,
"height": 8.0,
"a": 25.0,
"b": 25.0,
"c": 5.0,
"d": 5.0
},
"shipType": "Cargo"
}
}
]
}
}
Loading

0 comments on commit 3e35232

Please sign in to comment.