Skip to content

Commit

Permalink
Merge pull request #22 from dnv-opensource/16-last-waypoint-seems-to-…
Browse files Browse the repository at this point in the history 
…be-too-early

Working on #16. Added encounter length, which may be specified by the…
  • Loading branch information
@tomarnepedersen
tomarnepedersen authored Jan 11, 2024
2 parents 180ce46 + 68fd465 commit e0fc37d
Show file tree
Hide file tree
Showing 59 changed files with 2,221 additions and 2,041 deletions.
42 changes: 23 additions & 19 deletions ...ations_generated/traffic_situation_1.json → ...tions_generated/traffic_situation_01.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,61 @@
],
"own_ship": {
"static": {
"length": 122,
"width": 20,
"height": 8,
"speed_max": 17,
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"start_pose": {
"speed": 10.0,
"course": 0.0,
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
"speed": 10.0,
"course": 0.0
}
},
"waypoints": [
{
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
{
"latitude": 58.791157,
"north": 18518.399999999998,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
}
]
},
"target_ship": [
{
"static": {
"length": 50,
"width": 10,
"height": 8,
"speed_max": 15,
"mmsi": 257083180,
"name": "CANOLE",
"ship_type": "General Cargo Ship"
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"id": 1,
"start_pose": {
"speed": 12.0,
"course": 183.7,
"position": {
"north": 10173.748451861007,
"east": 355.2751245544635,
"latitude": 58.854783,
"longitude": 10.496793
},
"course": 183.7
}
}
},
"id": 1
}
]
}
42 changes: 23 additions & 19 deletions ...ations_generated/traffic_situation_2.json → ...tions_generated/traffic_situation_02.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,61 @@
],
"own_ship": {
"static": {
"length": 122,
"width": 20,
"height": 8,
"speed_max": 17,
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"start_pose": {
"speed": 10.0,
"course": 0.0,
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
"speed": 10.0,
"course": 0.0
}
},
"waypoints": [
{
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
{
"latitude": 58.791157,
"north": 18518.399999999998,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
}
]
},
"target_ship": [
{
"static": {
"length": 178,
"width": 30,
"height": 30,
"speed_max": 21,
"mmsi": 219945000,
"name": "BASTO VI",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speed_max": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"ship_type": "General Cargo Ship"
},
"id": 1,
"start_pose": {
"speed": 8.0,
"course": 225.3,
"position": {
"north": 5787.409299728726,
"east": 2106.4447186166626,
"latitude": 58.815405,
"longitude": 10.527054
},
"course": 225.3
}
}
},
"id": 1
}
]
}
42 changes: 23 additions & 19 deletions ...ations_generated/traffic_situation_3.json → ...tions_generated/traffic_situation_03.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,61 @@
],
"own_ship": {
"static": {
"length": 122,
"width": 20,
"height": 8,
"speed_max": 17,
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"start_pose": {
"speed": 10.0,
"course": 0.0,
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
"speed": 10.0,
"course": 0.0
}
},
"waypoints": [
{
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
{
"latitude": 58.791157,
"north": 18518.399999999998,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
}
]
},
"target_ship": [
{
"static": {
"length": 50,
"width": 10,
"height": 8,
"speed_max": 15,
"mmsi": 257083180,
"name": "CANOLE",
"ship_type": "General Cargo Ship"
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"id": 1,
"start_pose": {
"speed": 6.0,
"course": 93.6,
"position": {
"north": 5442.211542943373,
"east": -3142.062299305245,
"latitude": 58.812306,
"longitude": 10.436358
},
"course": 93.6
}
}
},
"id": 1
}
]
}
36 changes: 20 additions & 16 deletions ...ations_generated/traffic_situation_4.json → ...tions_generated/traffic_situation_04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,61 @@
],
"own_ship": {
"static": {
"length": 122,
"width": 20,
"height": 8,
"speed_max": 17,
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257847600,
"name": "BASTO VI",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"start_pose": {
"speed": 10.0,
"course": 0.0,
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
"speed": 10.0,
"course": 0.0
}
},
"waypoints": [
{
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
},
{
"latitude": 58.791157,
"north": 18518.399999999998,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
}
]
},
"target_ship": [
{
"static": {
"length": 122,
"width": 20,
"height": 8,
"speed_max": 17,
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speed_max": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"ship_type": "Passenger/Ro-Ro Cargo Ship"
},
"id": 1,
"start_pose": {
"speed": 5.0,
"course": 343.8,
"position": {
"north": 2245.9908880685816,
"east": 601.8114446656365,
"latitude": 58.783612,
"longitude": 10.501054
},
"course": 343.8
}
}
},
"id": 1
}
]
}
Loading

0 comments on commit e0fc37d

Please sign in to comment.