Skip to content

Commit

Permalink
#17 Fixed some plotting problems, adjusted number of digits used for …
Browse files Browse the repository at this point in the history 
…lat lon.
  • Loading branch information
@tomarnepedersen
tomarnepedersen committed Jan 25, 2024
1 parent 6843adc commit b49de81
Show file tree
Hide file tree
Showing 59 changed files with 2,089 additions and 2,217 deletions.
45 changes: 22 additions & 23 deletions data/baseline_situations_generated/traffic_situation_01.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "HO",
"inputFileName": "baseline_situation_01_1_ts.json",
"commonVector": 10.0,
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"id": "0f26a475-32d8-434d-8f43-e87f9bfb8409",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand All @@ -17,52 +17,51 @@
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
},
"sog": 10.0,
"sog": 5.14,
"cog": 0.0
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
}
},
{
"position": {
"north": 18518.399999999998,
"north": 18504.0,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
"latitude": 1.02851496,
"longitude": 0.18309645
}
}
]
},
"targetShips": [
{
"static": {
"id": "29376342-9c27-4875-8377-0a9a569e1505",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"id": "69e22046-d7c3-4e22-aadd-becbd6c77953",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
"north": 10173.748451861007,
"east": 355.2751245544635,
"latitude": 58.854783,
"longitude": 10.496793
"north": 10195.0,
"east": 356.0,
"latitude": 1.02721306,
"longitude": 0.18320382
},
"sog": 12.0,
"cog": 183.7
"sog": 6.2,
"cog": 3.205
}
}
]
Expand Down
47 changes: 23 additions & 24 deletions data/baseline_situations_generated/traffic_situation_02.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "CR-GW",
"inputFileName": "baseline_situation_02_1_ts.json",
"commonVector": 10.0,
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"id": "0f26a475-32d8-434d-8f43-e87f9bfb8409",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand All @@ -17,52 +17,51 @@
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
},
"sog": 10.0,
"sog": 5.14,
"cog": 0.0
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
}
},
{
"position": {
"north": 18518.399999999998,
"north": 18504.0,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
"latitude": 1.02851496,
"longitude": 0.18309645
}
}
]
},
"targetShips": [
{
"static": {
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
"id": "8014b4dd-4d85-4bbe-ae78-5ba36106f262",
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speedMax": 15.0,
"name": "CANOLE",
"shipType": "Cargo"
},
"initial": {
"position": {
"north": 13805.59842063799,
"east": 5024.826891344722,
"latitude": 58.887387,
"longitude": 10.577485
"north": 14053.0,
"east": 5115.0,
"latitude": 1.02781755,
"longitude": 0.18463913
},
"sog": 8.0,
"cog": 225.3
"sog": 4.1,
"cog": 3.934
}
}
]
Expand Down
45 changes: 22 additions & 23 deletions data/baseline_situations_generated/traffic_situation_03.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "CR-SO",
"inputFileName": "baseline_situation_03_1_ts.json",
"commonVector": 10.0,
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"id": "0f26a475-32d8-434d-8f43-e87f9bfb8409",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand All @@ -17,52 +17,51 @@
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
},
"sog": 10.0,
"sog": 5.14,
"cog": 0.0
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
}
},
{
"position": {
"north": 18518.399999999998,
"north": 18504.0,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
"latitude": 1.02851496,
"longitude": 0.18309645
}
}
]
},
"targetShips": [
{
"static": {
"id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d",
"length": 50.0,
"width": 10.0,
"id": "ee208442-cd2d-4e45-9486-0321ed71f0a7",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
"speedMax": 17.0,
"name": "BASTO",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
"north": 5442.211542943373,
"east": -3142.062299305245,
"latitude": 58.812306,
"longitude": 10.436358
"north": 5463.0,
"east": -3154.0,
"latitude": 1.02647163,
"longitude": 0.1821452
},
"sog": 6.0,
"cog": 93.6
"sog": 3.1,
"cog": 1.64
}
}
]
Expand Down
35 changes: 17 additions & 18 deletions data/baseline_situations_generated/traffic_situation_04.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "OT-GW",
"inputFileName": "baseline_situation_04_1_ts.json",
"commonVector": 10.0,
"commonVector": 600.0,
"ownShip": {
"static": {
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"id": "0f26a475-32d8-434d-8f43-e87f9bfb8409",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand All @@ -17,52 +17,51 @@
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
},
"sog": 10.0,
"sog": 5.14,
"cog": 0.0
},
"waypoints": [
{
"position": {
"north": 0.0,
"east": 0.0,
"latitude": 58.763449,
"longitude": 10.490654
"latitude": 1.02561566,
"longitude": 0.18309645
}
},
{
"position": {
"north": 18518.399999999998,
"north": 18504.0,
"east": 0.0,
"latitude": 58.929696,
"longitude": 10.490654
"latitude": 1.02851496,
"longitude": 0.18309645
}
}
]
},
"targetShips": [
{
"static": {
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"id": "18f0a186-158c-47df-b660-79395c9f489d",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
"north": 2245.9908880685816,
"east": 601.8114446656365,
"latitude": 58.783612,
"longitude": 10.501054
"north": 2216.0,
"east": 594.0,
"latitude": 1.02596287,
"longitude": 0.1832756
},
"sog": 5.0,
"cog": 343.8
"sog": 2.6,
"cog": 6.008
}
}
]
Expand Down
Loading

0 comments on commit b49de81

Please sign in to comment.