From b49de814df1f09314457b64acce5bf2d8d4dcab9 Mon Sep 17 00:00:00 2001 From: Tom Arne Pedersen Date: Thu, 25 Jan 2024 12:24:53 +0100 Subject: [PATCH] #17 Fixed some plotting problems, adjusted number of digits used for lat lon. --- .../traffic_situation_01.json | 45 ++++---- .../traffic_situation_02.json | 47 ++++---- .../traffic_situation_03.json | 45 ++++---- .../traffic_situation_04.json | 35 +++--- .../traffic_situation_05.json | 45 ++++---- .../traffic_situation_06.json | 72 ++++++------- .../traffic_situation_07.json | 64 ++++++----- .../traffic_situation_08.json | 70 ++++++------ .../traffic_situation_09.json | 72 ++++++------- .../traffic_situation_10.json | 70 ++++++------ .../traffic_situation_11.json | 72 ++++++------- .../traffic_situation_12.json | 72 ++++++------- .../traffic_situation_13.json | 72 ++++++------- .../traffic_situation_14.json | 70 ++++++------ .../traffic_situation_15.json | 50 +++++---- .../traffic_situation_16.json | 60 +++++------ .../traffic_situation_17.json | 60 +++++------ .../traffic_situation_18.json | 62 ++++++----- .../traffic_situation_19.json | 60 +++++------ .../traffic_situation_20.json | 72 ++++++------- .../traffic_situation_21.json | 87 ++++++++------- .../traffic_situation_22.json | 85 +++++++-------- .../traffic_situation_23.json | 95 ++++++++-------- .../traffic_situation_24.json | 97 ++++++++--------- .../traffic_situation_25.json | 77 +++++++------ .../traffic_situation_26.json | 101 +++++++++--------- .../traffic_situation_27.json | 75 +++++++------ .../traffic_situation_28.json | 89 ++++++++------- .../traffic_situation_29.json | 85 +++++++-------- .../traffic_situation_30.json | 91 ++++++++-------- .../traffic_situation_31.json | 83 +++++++------- .../traffic_situation_32.json | 85 +++++++-------- .../traffic_situation_33.json | 77 +++++++------ .../traffic_situation_34.json | 95 ++++++++-------- .../traffic_situation_35.json | 97 ++++++++--------- .../traffic_situation_36.json | 99 +++++++++-------- .../traffic_situation_37.json | 79 +++++++------- .../traffic_situation_38.json | 77 +++++++------ .../traffic_situation_39.json | 95 ++++++++-------- .../traffic_situation_40.json | 89 ++++++++------- .../traffic_situation_41.json | 87 ++++++++------- .../traffic_situation_42.json | 85 +++++++-------- .../traffic_situation_43.json | 99 +++++++++-------- .../traffic_situation_44.json | 85 +++++++-------- .../traffic_situation_45.json | 95 ++++++++-------- .../traffic_situation_46.json | 87 ++++++++------- .../traffic_situation_47.json | 93 ++++++++-------- .../traffic_situation_48.json | 77 +++++++------ .../traffic_situation_49.json | 79 +++++++------- .../traffic_situation_50.json | 75 +++++++------ .../traffic_situation_51.json | 79 +++++++------- .../traffic_situation_52.json | 79 +++++++------- .../traffic_situation_53.json | 81 +++++++------- .../traffic_situation_54.json | 97 ++++++++--------- .../traffic_situation_55.json | 95 ++++++++-------- src/trafficgen/encounter.py | 14 ++- src/trafficgen/plot_traffic_situation.py | 6 +- src/trafficgen/read_files.py | 10 +- src/trafficgen/types.py | 10 +- 59 files changed, 2089 insertions(+), 2217 deletions(-) diff --git a/data/baseline_situations_generated/traffic_situation_01.json b/data/baseline_situations_generated/traffic_situation_01.json index 54f7bdf..1fab715 100644 --- a/data/baseline_situations_generated/traffic_situation_01.json +++ b/data/baseline_situations_generated/traffic_situation_01.json @@ -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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,24 +45,23 @@ "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 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_02.json b/data/baseline_situations_generated/traffic_situation_02.json index 8294cf0..4ac53be 100644 --- a/data/baseline_situations_generated/traffic_situation_02.json +++ b/data/baseline_situations_generated/traffic_situation_02.json @@ -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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,24 +45,23 @@ "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 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_03.json b/data/baseline_situations_generated/traffic_situation_03.json index 5d4d904..b7ef476 100644 --- a/data/baseline_situations_generated/traffic_situation_03.json +++ b/data/baseline_situations_generated/traffic_situation_03.json @@ -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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,24 +45,23 @@ "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 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_04.json b/data/baseline_situations_generated/traffic_situation_04.json index e516de4..f3c6fba 100644 --- a/data/baseline_situations_generated/traffic_situation_04.json +++ b/data/baseline_situations_generated/traffic_situation_04.json @@ -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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,24 +45,23 @@ "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 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_05.json b/data/baseline_situations_generated/traffic_situation_05.json index b5465f8..c21cc69 100644 --- a/data/baseline_situations_generated/traffic_situation_05.json +++ b/data/baseline_situations_generated/traffic_situation_05.json @@ -1,10 +1,10 @@ { "title": "OT-SO", "inputFileName": "baseline_situation_05_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,24 +45,23 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "40834dfa-2444-435c-86ee-7763e1da7ede", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -3472.2532721437688, - "east": -930.3874601872462, - "latitude": 58.732277, - "longitude": 10.474577 + "north": -3443.0, + "east": -923.0, + "latitude": 1.02507619, + "longitude": 0.18281807 }, - "sog": 16.0, - "cog": 5.7 + "sog": 8.2, + "cog": 0.099 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_06.json b/data/baseline_situations_generated/traffic_situation_06.json index c7418ec..16e064c 100644 --- a/data/baseline_situations_generated/traffic_situation_06.json +++ b/data/baseline_situations_generated/traffic_situation_06.json @@ -1,10 +1,10 @@ { "title": "HO, HO", "inputFileName": "baseline_situation_06_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "7095c64e-b493-4a55-8daa-d184f1c6dd8c", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 6448.502086505275, - "east": -112.55902260969614, - "latitude": 58.82134, - "longitude": 10.488709 + "north": 6426.0, + "east": -112.0, + "latitude": 1.02662252, + "longitude": 0.18306267 }, - "sog": 9.0, - "cog": 177.9 + "sog": 4.6, + "cog": 3.105 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "4e67a874-66c2-45d0-9914-4a32472c1465", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9031.868717584715, - "east": 631.569785313021, - "latitude": 58.844532, - "longitude": 10.501568 + "north": 9063.0, + "east": 634.0, + "latitude": 1.0270357, + "longitude": 0.18328766 }, - "sog": 11.0, - "cog": 187.6 + "sog": 5.7, + "cog": 3.274 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_07.json b/data/baseline_situations_generated/traffic_situation_07.json index 9c9477a..8ef9b90 100644 --- a/data/baseline_situations_generated/traffic_situation_07.json +++ b/data/baseline_situations_generated/traffic_situation_07.json @@ -1,10 +1,10 @@ { "title": "HO, CR-GW", "inputFileName": "baseline_situation_07_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "de9e9dc6-4221-450f-b294-308c4ffac688", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 14752.924197042525, - "east": -1031.624955943457, - "latitude": 58.895892, - "longitude": 10.472827 + "north": 14746.0, + "east": -1031.0, + "latitude": 1.02792614, + "longitude": 0.1827855 }, - "sog": 14.0, - "cog": 173.1 + "sog": 7.2, + "cog": 3.022 } }, { "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": "e54a70c0-7602-4083-9184-a4528939b90c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 3375.1357875151252, - "east": 2452.179687422604, - "latitude": 58.793749, - "longitude": 10.533029 + "north": 3364.0, + "east": 2444.0, + "latitude": 1.02614275, + "longitude": 0.18383356 }, - "sog": 8.0, - "cog": 263.3 + "sog": 4.1, + "cog": 4.598 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_08.json b/data/baseline_situations_generated/traffic_situation_08.json index 5176e71..1fcedd8 100644 --- a/data/baseline_situations_generated/traffic_situation_08.json +++ b/data/baseline_situations_generated/traffic_situation_08.json @@ -1,10 +1,10 @@ { "title": "HO, CR-SO", "inputFileName": "baseline_situation_08_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "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": "788a9d9f-f3ff-443f-b7eb-17ae4d575a8b", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 12451.608449189438, - "east": 870.7012824206953, - "latitude": 58.875232, - "longitude": 10.5057 + "north": 12408.0, + "east": 867.0, + "latitude": 1.02755981, + "longitude": 0.18335794 }, - "sog": 17.0, - "cog": 186.4 + "sog": 8.7, + "cog": 3.253 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "578437ef-da90-4770-808d-ef0c76ba0298", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 4387.6765237696645, - "east": -3187.833593649386, - "latitude": 58.802839, - "longitude": 10.435567 + "north": 4373.0, + "east": -3177.0, + "latitude": 1.02630084, + "longitude": 0.18213827 }, - "sog": 8.0, - "cog": 96.7 + "sog": 4.1, + "cog": 1.685 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_09.json b/data/baseline_situations_generated/traffic_situation_09.json index 64f8325..c96b4fd 100644 --- a/data/baseline_situations_generated/traffic_situation_09.json +++ b/data/baseline_situations_generated/traffic_situation_09.json @@ -1,10 +1,10 @@ { "title": "HO, OT-GW", "inputFileName": "baseline_situation_09_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "f858e479-6b3e-497d-b5f0-b03e2b6b6dd9", + "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": 8416.07595225535, - "east": -293.89584835375035, - "latitude": 58.839003, - "longitude": 10.485575 + "north": 8445.0, + "east": -295.0, + "latitude": 1.02693886, + "longitude": 0.18300748 }, - "sog": 11.0, - "cog": 176.2 + "sog": 5.7, + "cog": 3.075 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "4d721876-b52d-4cfc-88d0-48de3605608f", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2509.079757780466, - "east": 442.41845804615616, - "latitude": 58.785974, - "longitude": 10.498299 + "north": 2477.0, + "east": 437.0, + "latitude": 1.02600377, + "longitude": 0.18322825 }, - "sog": 5.0, - "cog": 349.7 + "sog": 2.6, + "cog": 6.107 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_10.json b/data/baseline_situations_generated/traffic_situation_10.json index 5e88b28..abdde4f 100644 --- a/data/baseline_situations_generated/traffic_situation_10.json +++ b/data/baseline_situations_generated/traffic_situation_10.json @@ -1,10 +1,10 @@ { "title": "HO, OT-SO", "inputFileName": "baseline_situation_10_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "ef01bd19-f374-4aae-8ab9-c134e3f8f078", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 10493.76, + "north": 10445.0, "east": 0.0, - "latitude": 58.857656, - "longitude": 10.490654 + "latitude": 1.02725223, + "longitude": 0.18309645 }, - "sog": 10.0, - "cog": 180.0 + "sog": 5.1, + "cog": 3.142 } }, { "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": "36563699-7a7a-4732-b9e5-de89c500ae0d", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -3237.4633981434645, - "east": 226.38549421597696, - "latitude": 58.734385, - "longitude": 10.494566 + "north": -4189.0, + "east": 293.0, + "latitude": 1.02495931, + "longitude": 0.18318482 }, - "sog": 17.0, - "cog": 358.4 + "sog": 9.8, + "cog": 6.25 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_11.json b/data/baseline_situations_generated/traffic_situation_11.json index 07960e1..1e304ce 100644 --- a/data/baseline_situations_generated/traffic_situation_11.json +++ b/data/baseline_situations_generated/traffic_situation_11.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-GW", "inputFileName": "baseline_situation_11_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "11190a95-2d81-4290-8b10-255e260b9547", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 12346.661470055144, - "east": 4011.6734943408455, - "latitude": 58.87429, - "longitude": 10.559977 + "north": 12357.0, + "east": 4016.0, + "latitude": 1.02755182, + "longitude": 0.18430768 }, - "sog": 13.0, - "cog": 211.8 + "sog": 6.7, + "cog": 3.695 } }, { "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": "acaf188e-b2d4-4b11-b22e-5ef45aa217f7", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -763.9749396791793, - "east": 3594.219504101653, - "latitude": 58.756591, - "longitude": 10.552764 + "north": -764.0, + "east": 3596.0, + "latitude": 1.02549595, + "longitude": 0.184181 }, - "sog": 14.0, - "cog": 326.3 + "sog": 7.2, + "cog": 5.695 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_12.json b/data/baseline_situations_generated/traffic_situation_12.json index c15d971..ee5d084 100644 --- a/data/baseline_situations_generated/traffic_situation_12.json +++ b/data/baseline_situations_generated/traffic_situation_12.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-SO", "inputFileName": "baseline_situation_12_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "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", + "id": "1809ccc6-3348-4b50-a679-fb9bcb8df2fb", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 6952.345548148778, - "east": 6952.345548148778, - "latitude": 58.825863, - "longitude": 10.610793 + "north": 6979.0, + "east": 6979.0, + "latitude": 1.02670916, + "longitude": 0.18520132 }, - "sog": 12.0, - "cog": 261.1 + "sog": 6.2, + "cog": 4.553 } }, { "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": "c3216bcd-ef93-42c4-8b15-d6777e6ba3e2", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -532.1285805190903, - "east": -3359.7276312542886, - "latitude": 58.758672, - "longitude": 10.432597 + "north": -536.0, + "east": -3383.0, + "latitude": 1.02553168, + "longitude": 0.18207614 }, - "sog": 13.0, - "cog": 31.6 + "sog": 6.7, + "cog": 0.554 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_13.json b/data/baseline_situations_generated/traffic_situation_13.json index 79be623..11a53f4 100644 --- a/data/baseline_situations_generated/traffic_situation_13.json +++ b/data/baseline_situations_generated/traffic_situation_13.json @@ -1,10 +1,10 @@ { "title": "CR-GW, OT-GW", "inputFileName": "baseline_situation_13_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "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": "1297dc47-5b02-420f-8871-b938f075521b", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 4790.9273139567, - "east": 8298.129523142494, - "latitude": 58.806459, - "longitude": 10.634049 + "north": 4781.0, + "east": 8280.0, + "latitude": 1.02636477, + "longitude": 0.1855937 }, - "sog": 15.0, - "cog": 275.3 + "sog": 7.7, + "cog": 4.805 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "1ece7236-6a51-4497-b201-a02007d02f3a", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 1584.7890622706364, - "east": 1109.6812478741967, - "latitude": 58.777676, - "longitude": 10.50983 + "north": 1581.0, + "east": 1107.0, + "latitude": 1.02586338, + "longitude": 0.18343032 }, - "sog": 7.0, - "cog": 340.0 + "sog": 3.6, + "cog": 5.934 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_14.json b/data/baseline_situations_generated/traffic_situation_14.json index 5fdeb64..e40e2bb 100644 --- a/data/baseline_situations_generated/traffic_situation_14.json +++ b/data/baseline_situations_generated/traffic_situation_14.json @@ -1,10 +1,10 @@ { "title": "CR-GW, OT-SO", "inputFileName": "baseline_situation_14_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "fa6ac1e3-6b7d-4ad9-b49f-d812f6e902d1", + "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": 552.6644073315534, - "east": 3134.315605649234, - "latitude": 58.76841, - "longitude": 10.544816 + "north": 559.0, + "east": 3171.0, + "latitude": 1.02570325, + "longitude": 0.18405282 }, - "sog": 12.0, - "cog": 315.2 + "sog": 6.2, + "cog": 5.493 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "3827c43c-ed48-469c-88f8-64a6ae7a3cd8", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -3042.224640503565, - "east": -1756.4292151300453, - "latitude": 58.736138, - "longitude": 10.460302 + "north": -3009.0, + "east": -1737.0, + "latitude": 1.0251442, + "longitude": 0.18257257 }, - "sog": 17.0, - "cog": 12.9 + "sog": 8.7, + "cog": 0.224 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_15.json b/data/baseline_situations_generated/traffic_situation_15.json index d59851f..981b2a0 100644 --- a/data/baseline_situations_generated/traffic_situation_15.json +++ b/data/baseline_situations_generated/traffic_situation_15.json @@ -1,10 +1,10 @@ { "title": "CR-SO, CR-SO", "inputFileName": "baseline_situation_15_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "1432efb7-d12e-4a16-8d94-dad754238668", "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": 552.6792318882533, - "east": -6317.152527132703, - "latitude": 58.768411, - "longitude": 10.381491 + "north": 551.0, + "east": -6299.0, + "latitude": 1.02570199, + "longitude": 0.18119667 }, - "sog": 15.0, - "cog": 53.4 + "sog": 7.7, + "cog": 0.931 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "78704726-2dd2-4b42-880f-4d07a3a989b5", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": -769.9885484080899, - "east": -4366.822055900632, - "latitude": 58.756537, - "longitude": 10.415194 + "north": -869.0, + "east": -4927.0, + "latitude": 1.0254795, + "longitude": 0.18161047 }, - "sog": 15.0, - "cog": 39.0 + "sog": 8.2, + "cog": 0.731 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_16.json b/data/baseline_situations_generated/traffic_situation_16.json index a343e4d..7d31d2e 100644 --- a/data/baseline_situations_generated/traffic_situation_16.json +++ b/data/baseline_situations_generated/traffic_situation_16.json @@ -1,10 +1,10 @@ { "title": "CR-SO, OT-SO", "inputFileName": "baseline_situation_16_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "f899d592-efde-47ef-bdf8-ab7510d0d0e2", "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": -781.2209559651523, - "east": -2915.556299599476, - "latitude": 58.756436, - "longitude": 10.440272 + "north": -787.0, + "east": -2938.0, + "latitude": 1.02549235, + "longitude": 0.18221035 }, - "sog": 13.0, - "cog": 27.0 + "sog": 6.7, + "cog": 0.474 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "d175a7ec-06d6-48f5-9673-1385a31c7ec7", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -2741.2525832713973, - "east": -734.5164159373006, - "latitude": 58.73884, - "longitude": 10.477961 + "north": -2718.0, + "east": -728.0, + "latitude": 1.02518979, + "longitude": 0.18287689 }, - "sog": 16.0, - "cog": 5.7 + "sog": 8.2, + "cog": 0.099 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_17.json b/data/baseline_situations_generated/traffic_situation_17.json index ae5129a..7a8ae8f 100644 --- a/data/baseline_situations_generated/traffic_situation_17.json +++ b/data/baseline_situations_generated/traffic_situation_17.json @@ -1,10 +1,10 @@ { "title": "CR-SO, OT-GW", "inputFileName": "baseline_situation_17_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "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": "54cddf32-688d-46c1-853f-c602ca66e1f0", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -470.644058621812, - "east": -1756.467539057027, - "latitude": 58.759224, - "longitude": 10.460302 + "north": -481.0, + "east": -1796.0, + "latitude": 1.02554029, + "longitude": 0.18255478 }, - "sog": 12.0, - "cog": 21.4 + "sog": 6.2, + "cog": 0.38 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "a1c36e7c-f820-4f7b-a42d-67284e7c33be", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 645.573981511191, - "east": 372.72231200730454, - "latitude": 58.769245, - "longitude": 10.497095 + "north": 653.0, + "east": 377.0, + "latitude": 1.02571798, + "longitude": 0.18321015 }, - "sog": 8.0, - "cog": 351.3 + "sog": 4.1, + "cog": 6.129 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_18.json b/data/baseline_situations_generated/traffic_situation_18.json index d6e1acb..152f087 100644 --- a/data/baseline_situations_generated/traffic_situation_18.json +++ b/data/baseline_situations_generated/traffic_situation_18.json @@ -1,10 +1,10 @@ { "title": "OT-GW, OT-GW", "inputFileName": "baseline_situation_18_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "20d0c5bd-00f3-458a-8f3d-e39692ec82b2", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 1411.0098704623483, - "east": 378.07895530272924, - "latitude": 58.776116, - "longitude": 10.497187 + "north": 1408.0, + "east": 377.0, + "latitude": 1.02583627, + "longitude": 0.18321015 }, - "sog": 7.0, - "cog": 353.3 + "sog": 3.6, + "cog": 6.167 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "a5f73f85-d5b6-49e1-9e69-639fd62f66e5", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 2553.220852348756, - "east": 1190.5864364112579, - "latitude": 58.78637, - "longitude": 10.511228 + "north": 2528.0, + "east": 1179.0, + "latitude": 1.02601176, + "longitude": 0.18345204 }, - "sog": 6.0, - "cog": 340.2 + "sog": 3.1, + "cog": 5.943 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_19.json b/data/baseline_situations_generated/traffic_situation_19.json index 073b372..ee64b81 100644 --- a/data/baseline_situations_generated/traffic_situation_19.json +++ b/data/baseline_situations_generated/traffic_situation_19.json @@ -1,10 +1,10 @@ { "title": "OT-GW, OT-SO", "inputFileName": "baseline_situation_19_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "aa4f1188-6cc3-4227-b765-56e80bf0c25d", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 2591.213545812898, - "east": 943.1246013032771, - "latitude": 58.786711, - "longitude": 10.506952 + "north": 2567.0, + "east": 935.0, + "latitude": 1.02601787, + "longitude": 0.18337845 }, - "sog": 6.0, - "cog": 345.2 + "sog": 3.1, + "cog": 6.029 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "deae7fa6-5fcb-4331-87b3-5c37ef7e3a28", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2588.8648485589842, - "east": 226.49632564966922, - "latitude": 58.740208, - "longitude": 10.494568 + "north": -2567.0, + "east": 225.0, + "latitude": 1.02521345, + "longitude": 0.18316431 }, - "sog": 16.0, - "cog": 358.1 + "sog": 8.2, + "cog": 6.251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_20.json b/data/baseline_situations_generated/traffic_situation_20.json index 312ae32..5e4fdbe 100644 --- a/data/baseline_situations_generated/traffic_situation_20.json +++ b/data/baseline_situations_generated/traffic_situation_20.json @@ -1,10 +1,10 @@ { "title": "OT-SO, OT-SO", "inputFileName": "baseline_situation_20_2_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,46 +45,44 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "804e32f7-4c11-4521-a98f-ba7c8bc44ed6", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2265.6642830094406, - "east": 824.6343598555138, - "latitude": 58.743109, - "longitude": 10.504904 + "north": -3639.0, + "east": 1324.0, + "latitude": 1.02504548, + "longitude": 0.18349577 }, - "sog": 15.0, - "cog": 353.2 + "sog": 9.3, + "cog": 6.124 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "1610799f-4ab1-44d3-8244-081ca6583993", + "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": -1995.8619866568267, - "east": 351.9243180179967, - "latitude": 58.745531, - "longitude": 10.496735 + "north": -1987.0, + "east": 350.0, + "latitude": 1.02530433, + "longitude": 0.18320201 }, - "sog": 15.0, - "cog": 356.6 + "sog": 7.7, + "cog": 6.225 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_21.json b/data/baseline_situations_generated/traffic_situation_21.json index 6ff7fa3..5262e54 100644 --- a/data/baseline_situations_generated/traffic_situation_21.json +++ b/data/baseline_situations_generated/traffic_situation_21.json @@ -1,10 +1,10 @@ { "title": "HO, HO, HO", "inputFileName": "baseline_situation_21_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "00d956c1-d620-4689-992b-35c194f20370", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 12886.748039023943, - "east": -450.01515776898714, - "latitude": 58.879138, - "longitude": 10.482878 + "north": 12913.0, + "east": -451.0, + "latitude": 1.02763893, + "longitude": 0.18296043 }, - "sog": 12.0, - "cog": 176.3 + "sog": 6.2, + "cog": 3.078 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "cad96cee-0ad1-4f0a-b05a-91385bac9d31", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9876.48, + "north": 9830.0, "east": 0.0, - "latitude": 58.852114, - "longitude": 10.490654 + "latitude": 1.02715587, + "longitude": 0.18309645 }, - "sog": 10.0, - "cog": 180.0 + "sog": 5.1, + "cog": 3.142 } }, { "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": "02973831-f152-44c9-8a0c-1ee8d397aba8", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 10758.590635801655, - "east": 752.3139441669146, - "latitude": 58.860033, - "longitude": 10.503654 + "north": 10742.0, + "east": 751.0, + "latitude": 1.02729877, + "longitude": 0.18332295 }, - "sog": 15.0, - "cog": 186.7 + "sog": 7.7, + "cog": 3.258 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_22.json b/data/baseline_situations_generated/traffic_situation_22.json index ebe4a43..7915f42 100644 --- a/data/baseline_situations_generated/traffic_situation_22.json +++ b/data/baseline_situations_generated/traffic_situation_22.json @@ -1,10 +1,10 @@ { "title": "HO, HO, CR-GW", "inputFileName": "baseline_situation_22_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "5f48f1f7-0a48-4c03-bf65-718a4bf927bd", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 14040.939824736264, - "east": -735.8544752612414, - "latitude": 58.8895, - "longitude": 10.477938 + "north": 14035.0, + "east": -736.0, + "latitude": 1.02781473, + "longitude": 0.18287447 }, - "sog": 14.0, - "cog": 174.9 + "sog": 7.2, + "cog": 3.052 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "8cccb110-e92a-4e81-a3be-c2a2facfa49a", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 12330.563369443842, - "east": 430.5927611277366, - "latitude": 58.874145, - "longitude": 10.498095 + "north": 12273.0, + "east": 429.0, + "latitude": 1.02753865, + "longitude": 0.18322584 }, - "sog": 10.0, - "cog": 184.0 + "sog": 5.1, + "cog": 3.212 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "8681e868-25fd-4ac5-baf2-0960ba212100", + "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": 5686.135920136679, - "east": 4442.496264766336, - "latitude": 58.814496, - "longitude": 10.567422 + "north": 5666.0, + "east": 4427.0, + "latitude": 1.02650344, + "longitude": 0.18443163 }, - "sog": 8.0, - "cog": 268.3 + "sog": 4.1, + "cog": 4.686 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_23.json b/data/baseline_situations_generated/traffic_situation_23.json index fe92e4e..9863ade 100644 --- a/data/baseline_situations_generated/traffic_situation_23.json +++ b/data/baseline_situations_generated/traffic_situation_23.json @@ -1,10 +1,10 @@ { "title": "HO, HO, CR-SO", "inputFileName": "baseline_situation_23_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" - }, - "initial": { - "position": { - "north": 12267.434500823312, - "east": 1073.261449368842, - "latitude": 58.873578, - "longitude": 10.5092 - }, - "sog": 15.0, - "cog": 188.3 - } - }, - { - "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "54a8d1f7-c9dd-42f5-b0ce-8e6853715987", "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": 12087.226056133923, - "east": 422.0952349008997, - "latitude": 58.871961, - "longitude": 10.497948 + "north": 12248.0, + "east": 1072.0, + "latitude": 1.02753474, + "longitude": 0.18341977 }, - "sog": 18.0, - "cog": 183.1 + "sog": 7.7, + "cog": 3.287 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "94a5ddf1-8917-48b0-b4a0-aa49380fc9c8", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 4844.679123119294, - "east": -3650.7275746749974, - "latitude": 58.806942, - "longitude": 10.427568 + "north": 12118.0, + "east": 423.0, + "latitude": 1.02751437, + "longitude": 0.18322403 + }, + "sog": 9.3, + "cog": 3.196 + } + }, + { + "static": { + "id": "b9294614-0f38-43d0-957a-41e526e6f99c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" + }, + "initial": { + "position": { + "north": 4844.0, + "east": -3650.0, + "latitude": 1.02637464, + "longitude": 0.18199561 }, - "sog": 7.0, - "cog": 83.7 + "sog": 3.6, + "cog": 1.462 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_24.json b/data/baseline_situations_generated/traffic_situation_24.json index 2c18c30..5687d5a 100644 --- a/data/baseline_situations_generated/traffic_situation_24.json +++ b/data/baseline_situations_generated/traffic_situation_24.json @@ -1,10 +1,10 @@ { "title": "HO, HO, OT-GW", "inputFileName": "baseline_situation_24_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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", + "id": "c79ef1e0-5b7f-4985-a5e3-3f6172a4ddf4", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 10836.849849561579, - "east": -567.9352350392816, - "latitude": 58.860736, - "longitude": 10.48084 + "north": 10859.0, + "east": -570.0, + "latitude": 1.0273171, + "longitude": 0.18292454 }, - "sog": 12.0, - "cog": 174.5 + "sog": 6.2, + "cog": 3.046 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "f1728733-300c-4826-a8c9-188205f25d5b", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 11655.30731023318, - "east": 407.0122999361351, - "latitude": 58.868083, - "longitude": 10.497687 + "north": 12118.0, + "east": 423.0, + "latitude": 1.02751437, + "longitude": 0.18322403 }, - "sog": 17.0, - "cog": 183.2 + "sog": 9.3, + "cog": 3.196 } }, { "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": "5a8997a0-cf31-4b98-9141-90d8260c3148", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 3117.659726855691, - "east": 438.1585003303285, - "latitude": 58.791437, - "longitude": 10.498226 + "north": 3078.0, + "east": 433.0, + "latitude": 1.02609794, + "longitude": 0.18322704 }, - "sog": 5.0, - "cog": 351.8 + "sog": 2.6, + "cog": 6.144 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_25.json b/data/baseline_situations_generated/traffic_situation_25.json index d668d3b..135ad7b 100644 --- a/data/baseline_situations_generated/traffic_situation_25.json +++ b/data/baseline_situations_generated/traffic_situation_25.json @@ -1,10 +1,10 @@ { "title": "HO, HO, OT-SO", "inputFileName": "baseline_situation_25_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "f88b5544-b816-4542-9391-9e6ca42174eb", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 14111.822909081362, - "east": -986.7947867434546, - "latitude": 58.890136, - "longitude": 10.473602 + "north": 14062.0, + "east": -983.0, + "latitude": 1.02781896, + "longitude": 0.18279998 }, - "sog": 17.0, - "cog": 173.6 + "sog": 8.7, + "cog": 3.031 } }, { "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": "b2ffe5f6-190a-4348-8350-8f49bc16b4a5", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 10648.079999999998, + "north": 10656.0, "east": 0.0, - "latitude": 58.859041, - "longitude": 10.490654 + "latitude": 1.02728529, + "longitude": 0.18309645 }, - "sog": 13.0, - "cog": 180.0 + "sog": 6.7, + "cog": 3.142 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "8c64fb80-98e6-4673-9d08-afa469d95789", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": -1820.2678771189646, - "east": 591.4408856960115, - "latitude": 58.747108, - "longitude": 10.500874 + "north": -3275.0, + "east": 1064.0, + "latitude": 1.02510252, + "longitude": 0.18341735 }, - "sog": 15.0, - "cog": 353.9 + "sog": 9.8, + "cog": 6.132 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_26.json b/data/baseline_situations_generated/traffic_situation_26.json index 89d30dc..2bc09ab 100644 --- a/data/baseline_situations_generated/traffic_situation_26.json +++ b/data/baseline_situations_generated/traffic_situation_26.json @@ -1,10 +1,10 @@ { "title": "HO, CR-GW, CR-GW", "inputFileName": "baseline_situation_26_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "93f84547-4e32-4d70-bd46-1fb7dfa7b26c", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 15396.773101878747, - "east": 806.9106863943272, - "latitude": 58.901672, - "longitude": 10.504598 + "north": 15373.0, + "east": 806.0, + "latitude": 1.02802438, + "longitude": 0.18333954 }, - "sog": 15.0, - "cog": 185.0 + "sog": 7.7, + "cog": 3.229 } }, { "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": "35aa3cde-7996-4d36-9fb1-ea8cb313340d", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 11326.595700501843, - "east": 4122.543690550216, - "latitude": 58.865132, - "longitude": 10.561893 + "north": 11322.0, + "east": 4121.0, + "latitude": 1.02738965, + "longitude": 0.18433934 }, - "sog": 14.0, - "cog": 214.1 + "sog": 7.2, + "cog": 3.737 } }, { "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": "9b54ef58-f83a-4941-b9a8-ff72e7ed6f44", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -406.4544591425364, - "east": 1912.217886613757, - "latitude": 58.7598, - "longitude": 10.523698 + "north": -415.0, + "east": 1953.0, + "latitude": 1.02555064, + "longitude": 0.18368547 }, - "sog": 12.0, - "cog": 336.6 + "sog": 6.2, + "cog": 5.867 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_27.json b/data/baseline_situations_generated/traffic_situation_27.json index 3a737d7..a590062 100644 --- a/data/baseline_situations_generated/traffic_situation_27.json +++ b/data/baseline_situations_generated/traffic_situation_27.json @@ -1,10 +1,10 @@ { "title": "HO, CR-GW, CR-SO", "inputFileName": "baseline_situation_27_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "a8bf3fc6-9854-4cdd-8209-d48d1ad8d1a9", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 14799.253366635234, - "east": -516.8013154662406, - "latitude": 58.896308, - "longitude": 10.481723 + "north": 14793.0, + "east": -516.0, + "latitude": 1.0279335, + "longitude": 0.18294082 }, - "sog": 14.0, - "cog": 176.6 + "sog": 7.2, + "cog": 3.082 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "e9928d0f-596b-44b7-8f78-ad44477ad7e0", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 6220.519700975223, - "east": 6220.519700975223, - "latitude": 58.819293, - "longitude": 10.598147 + "north": 6244.0, + "east": 6244.0, + "latitude": 1.026594, + "longitude": 0.18497964 }, - "sog": 12.0, - "cog": 261.1 + "sog": 6.2, + "cog": 4.553 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "a70e8044-8240-4737-8523-a9960984c5ff", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -605.2896158174369, - "east": -3821.648228684419, - "latitude": 58.758015, - "longitude": 10.424614 + "north": -606.0, + "east": -3824.0, + "latitude": 1.02552071, + "longitude": 0.18194313 }, - "sog": 14.0, - "cog": 36.1 + "sog": 7.2, + "cog": 0.631 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_28.json b/data/baseline_situations_generated/traffic_situation_28.json index 03059b1..d48e3f9 100644 --- a/data/baseline_situations_generated/traffic_situation_28.json +++ b/data/baseline_situations_generated/traffic_situation_28.json @@ -1,10 +1,10 @@ { "title": "HO, CR-GW, OT-GW", "inputFileName": "baseline_situation_28_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "918adfb8-4903-4935-b159-956afd72d77e", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 13546.062311951975, - "east": -709.9190437991019, - "latitude": 58.885057, - "longitude": 10.478386 + "north": 13574.0, + "east": -712.0, + "latitude": 1.0277425, + "longitude": 0.18288171 }, - "sog": 12.0, - "cog": 174.5 + "sog": 6.2, + "cog": 3.046 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "17039288-1613-4cf6-aebd-e7893ae3d033", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 5142.952081205606, - "east": 7344.896763543996, - "latitude": 58.809619, - "longitude": 10.617577 + "north": 5142.0, + "east": 7343.0, + "latitude": 1.02642133, + "longitude": 0.1853111 }, - "sog": 14.0, - "cog": 270.8 + "sog": 7.2, + "cog": 4.726 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "6f46b5a9-bbe7-4757-a350-65390d9c3bcb", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 2142.448638579377, - "east": 1236.9432982087503, - "latitude": 58.782683, - "longitude": 10.512029 + "north": 2118.0, + "east": 1223.0, + "latitude": 1.02594752, + "longitude": 0.18346531 }, - "sog": 6.0, - "cog": 333.6 + "sog": 3.1, + "cog": 5.829 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_29.json b/data/baseline_situations_generated/traffic_situation_29.json index c3ee748..8538920 100644 --- a/data/baseline_situations_generated/traffic_situation_29.json +++ b/data/baseline_situations_generated/traffic_situation_29.json @@ -1,10 +1,10 @@ { "title": "HO, CR-GW, OT-SO", "inputFileName": "baseline_situation_29_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "d836310a-fb6a-41a2-822e-9319becaa73a", + "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": 10552.094323372268, - "east": -184.18749154313912, - "latitude": 58.858179, - "longitude": 10.487471 + "north": 10516.0, + "east": -184.0, + "latitude": 1.02726336, + "longitude": 0.18304096 }, - "sog": 9.0, - "cog": 177.9 + "sog": 4.6, + "cog": 3.105 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "949314a1-8080-4f2e-abc4-07d0efc517ca", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 921.1073455525889, - "east": 5223.859342748722, - "latitude": 58.771718, - "longitude": 10.580924 + "north": 932.0, + "east": 5285.0, + "latitude": 1.02576169, + "longitude": 0.18469041 }, - "sog": 12.0, - "cog": 315.2 + "sog": 6.2, + "cog": 5.493 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "bf99328b-db4b-4384-8312-46e014270c86", "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": -3042.224640503565, - "east": -1756.4292151300453, - "latitude": 58.736138, - "longitude": 10.460302 + "north": -3009.0, + "east": -1737.0, + "latitude": 1.0251442, + "longitude": 0.18257257 }, - "sog": 17.0, - "cog": 12.9 + "sog": 8.7, + "cog": 0.224 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_30.json b/data/baseline_situations_generated/traffic_situation_30.json index eff6897..3d7a347 100644 --- a/data/baseline_situations_generated/traffic_situation_30.json +++ b/data/baseline_situations_generated/traffic_situation_30.json @@ -1,10 +1,10 @@ { "title": "HO, CR-SO, CR-SO", "inputFileName": "baseline_situation_30_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "116b4e8c-ec12-4480-ac75-be47fd35caed", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9441.147773843159, - "east": 164.79584738932925, - "latitude": 58.848206, - "longitude": 10.493502 + "north": 9422.0, + "east": 165.0, + "latitude": 1.02709195, + "longitude": 0.18314621 }, - "sog": 8.0, - "cog": 182.3 + "sog": 4.1, + "cog": 3.181 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "c39573a5-f7ab-4a66-9cc3-ca3df5dd5f07", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 487.65814578375284, - "east": -5573.958112175914, - "latitude": 58.767827, - "longitude": 10.394334 + "north": 486.0, + "east": -5558.0, + "latitude": 1.02569181, + "longitude": 0.18142016 }, - "sog": 15.0, - "cog": 53.4 + "sog": 7.7, + "cog": 0.931 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "7aed74ad-b687-44c1-a64d-22f5c2fca800", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -1026.651397877453, - "east": -5822.429407867508, - "latitude": 58.754232, - "longitude": 10.39004 + "north": -1158.0, + "east": -6569.0, + "latitude": 1.02543422, + "longitude": 0.18111524 }, - "sog": 15.0, - "cog": 39.0 + "sog": 8.2, + "cog": 0.731 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_31.json b/data/baseline_situations_generated/traffic_situation_31.json index 77e8a03..b47b54a 100644 --- a/data/baseline_situations_generated/traffic_situation_31.json +++ b/data/baseline_situations_generated/traffic_situation_31.json @@ -1,10 +1,10 @@ { "title": "HO, CR-SO, OT-SO", "inputFileName": "baseline_situation_31_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "1f069940-5c62-4bd6-a3fe-1a90a5598c87", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9876.48, + "north": 9888.0, "east": 0.0, - "latitude": 58.852114, - "longitude": 10.490654 + "latitude": 1.02716496, + "longitude": 0.18309645 }, - "sog": 6.0, - "cog": 180.0 + "sog": 3.1, + "cog": 3.142 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "dbf0d770-4448-4ae0-b6c9-1557b01f9c79", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -466.51566186886697, - "east": -2645.7417917238286, - "latitude": 58.759261, - "longitude": 10.444935 + "north": -476.0, + "east": -2700.0, + "latitude": 1.02554108, + "longitude": 0.18228213 }, - "sog": 12.0, - "cog": 24.8 + "sog": 6.2, + "cog": 0.441 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "815d4445-cfbf-4ddc-aa6b-9a06531103d2", "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": -3106.2798206140164, - "east": -1448.4820687246515, - "latitude": 58.735563, - "longitude": 10.465624 + "north": -3072.0, + "east": -1432.0, + "latitude": 1.02513432, + "longitude": 0.18266456 }, - "sog": 17.0, - "cog": 10.6 + "sog": 8.7, + "cog": 0.184 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_32.json b/data/baseline_situations_generated/traffic_situation_32.json index 393da3f..313dac3 100644 --- a/data/baseline_situations_generated/traffic_situation_32.json +++ b/data/baseline_situations_generated/traffic_situation_32.json @@ -1,10 +1,10 @@ { "title": "HO, CR-SO, OT-GW", "inputFileName": "baseline_situation_32_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "28a51e0e-08dc-4375-a95c-be606beb919d", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 9254.969336779746, - "east": -161.5460906821533, - "latitude": 58.846534, - "longitude": 10.487862 + "north": 9284.0, + "east": -162.0, + "latitude": 1.02707032, + "longitude": 0.18304759 }, - "sog": 5.0, - "cog": 177.0 + "sog": 2.6, + "cog": 3.09 } }, { "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": "ed0ac584-068e-44a7-b146-5e302cb0ef0e", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -880.8534272093098, - "east": -2420.124901106795, - "latitude": 58.755541, - "longitude": 10.448833 + "north": -888.0, + "east": -2440.0, + "latitude": 1.02547652, + "longitude": 0.18236055 }, - "sog": 13.0, - "cog": 23.7 + "sog": 6.7, + "cog": 0.417 } }, { "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": "b43cd70c-3cc7-433b-9dfa-eb60cde9df75", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 1123.7929752839086, - "east": 786.8883126809109, - "latitude": 58.773538, - "longitude": 10.504252 + "north": 1137.0, + "east": 796.0, + "latitude": 1.02579381, + "longitude": 0.18333652 }, - "sog": 8.0, - "cog": 349.2 + "sog": 4.1, + "cog": 6.092 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_33.json b/data/baseline_situations_generated/traffic_situation_33.json index fdbdbce..f846192 100644 --- a/data/baseline_situations_generated/traffic_situation_33.json +++ b/data/baseline_situations_generated/traffic_situation_33.json @@ -1,10 +1,10 @@ { "title": "HO, OT-GW, OT-GW", "inputFileName": "baseline_situation_33_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "675c8b73-5ac4-4d8d-ab33-a001efecaff1", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 10989.639554025553, - "east": 575.9426041475506, - "latitude": 58.862107, - "longitude": 10.500607 + "north": 11028.0, + "east": 578.0, + "latitude": 1.02734358, + "longitude": 0.18327077 }, - "sog": 11.0, - "cog": 185.7 + "sog": 5.7, + "cog": 3.241 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "aa810952-9b7a-4165-8d25-834931177635", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 3335.136315206419, - "east": 1213.8903459553992, - "latitude": 58.79339, - "longitude": 10.511631 + "north": 3286.0, + "east": 1196.0, + "latitude": 1.02613053, + "longitude": 0.18345716 }, - "sog": 5.0, - "cog": 336.8 + "sog": 2.6, + "cog": 5.89 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "bc76f6d6-edd7-48c6-8a85-097a6d65c08a", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 1753.5990859550616, - "east": 817.7166831144508, - "latitude": 58.779192, - "longitude": 10.504784 + "north": 1750.0, + "east": 816.0, + "latitude": 1.02588986, + "longitude": 0.18334256 }, - "sog": 7.0, - "cog": 347.9 + "sog": 3.6, + "cog": 6.072 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_34.json b/data/baseline_situations_generated/traffic_situation_34.json index c2b51b0..60b5839 100644 --- a/data/baseline_situations_generated/traffic_situation_34.json +++ b/data/baseline_situations_generated/traffic_situation_34.json @@ -1,10 +1,10 @@ { "title": "HO, OT-GW, OT-SO", "inputFileName": "baseline_situation_34_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "265dbe7c-66b0-4f7b-a902-36ecf7036e0a", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 12038.582499472359, - "east": -630.91537451303, - "latitude": 58.871524, - "longitude": 10.479752 + "north": 12048.0, + "east": -632.0, + "latitude": 1.0275034, + "longitude": 0.18290584 }, - "sog": 13.0, - "cog": 174.7 + "sog": 6.7, + "cog": 3.049 } }, { "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": "c52edbb9-1f0e-407f-9acd-16ec0b63d481", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2072.9708366503187, - "east": 754.4996810426219, - "latitude": 58.782059, - "longitude": 10.503692 + "north": 2054.0, + "east": 748.0, + "latitude": 1.02593749, + "longitude": 0.18332205 }, - "sog": 6.0, - "cog": 345.2 + "sog": 3.1, + "cog": 6.029 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "17c14bff-533d-43ee-be6d-96d090e99e02", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -2588.8648485589842, - "east": 226.49632564966922, - "latitude": 58.740208, - "longitude": 10.494568 + "north": -2567.0, + "east": 225.0, + "latitude": 1.02521345, + "longitude": 0.18316431 }, - "sog": 16.0, - "cog": 358.1 + "sog": 8.2, + "cog": 6.251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_35.json b/data/baseline_situations_generated/traffic_situation_35.json index e687870..c6bde34 100644 --- a/data/baseline_situations_generated/traffic_situation_35.json +++ b/data/baseline_situations_generated/traffic_situation_35.json @@ -1,10 +1,10 @@ { "title": "HO, OT-SO, OT-SO", "inputFileName": "baseline_situation_35_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "1b97b112-8897-4f90-82b2-5851a791e977", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9927.500010245602, - "east": 346.6759394871098, - "latitude": 58.852572, - "longitude": 10.496645 + "north": 9935.0, + "east": 347.0, + "latitude": 1.02717232, + "longitude": 0.18320111 }, - "sog": 13.0, - "cog": 183.5 + "sog": 6.7, + "cog": 3.203 } }, { "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": "123c7719-72fa-49f9-9499-c95c067943e1", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -3313.365141988284, - "east": 1545.0475399729614, - "latitude": 58.733704, - "longitude": 10.517353 + "north": -4261.0, + "east": 1987.0, + "latitude": 1.02494803, + "longitude": 0.18369573 }, - "sog": 17.0, - "cog": 349.4 + "sog": 9.8, + "cog": 6.07 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "1e7f3f7f-1dff-45bc-b555-fd85c24b9aa7", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -2763.5012122940657, - "east": 487.2798249479951, - "latitude": 58.73864, - "longitude": 10.499074 + "north": -2751.0, + "east": 485.0, + "latitude": 1.02518462, + "longitude": 0.18324273 }, - "sog": 15.0, - "cog": 356.6 + "sog": 7.7, + "cog": 6.225 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_36.json b/data/baseline_situations_generated/traffic_situation_36.json index 9054cf0..d931db5 100644 --- a/data/baseline_situations_generated/traffic_situation_36.json +++ b/data/baseline_situations_generated/traffic_situation_36.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-GW, CR-GW", "inputFileName": "baseline_situation_36_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "ad466539-53d9-48de-af2c-ec4d664310ce", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 10198.201110429192, - "east": 2732.5997517896803, - "latitude": 58.855002, - "longitude": 10.537874 + "north": 10182.0, + "east": 2728.0, + "latitude": 1.02721103, + "longitude": 0.18391921 }, - "sog": 15.0, - "cog": 204.9 + "sog": 7.7, + "cog": 3.577 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "66c5e909-a598-4660-8e86-e53843fd5f7c", + "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": 9009.718699751105, - "east": 6308.672950714708, - "latitude": 58.844333, - "longitude": 10.59967 + "north": 9006.0, + "east": 6307.0, + "latitude": 1.02702676, + "longitude": 0.18499864 }, - "sog": 14.0, - "cog": 239.2 + "sog": 7.2, + "cog": 4.174 } }, { "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": "05f20d0b-f28e-490b-bb1c-905e888778cb", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -375.1887315161876, - "east": 1765.124203028084, - "latitude": 58.760081, - "longitude": 10.521156 + "north": -383.0, + "east": 1803.0, + "latitude": 1.02555565, + "longitude": 0.18364023 }, - "sog": 12.0, - "cog": 336.6 + "sog": 6.2, + "cog": 5.867 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_37.json b/data/baseline_situations_generated/traffic_situation_37.json index a0aff08..725e8c0 100644 --- a/data/baseline_situations_generated/traffic_situation_37.json +++ b/data/baseline_situations_generated/traffic_situation_37.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-GW, CR-SO", "inputFileName": "baseline_situation_37_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "7016556e-3086-4ba2-955d-05c36a01f38c", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 520.1686888360031, - "east": 5945.555319654308, - "latitude": 58.768119, - "longitude": 10.593396 + "north": 574.0, + "east": 6554.0, + "latitude": 1.0257056, + "longitude": 0.18507314 }, - "sog": 15.0, - "cog": 306.6 + "sog": 8.2, + "cog": 5.299 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "18ccfc81-32a0-413c-910b-9a4718b12246", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 6586.4326245620005, - "east": 6586.4326245620005, - "latitude": 58.822578, - "longitude": 10.60447 + "north": 6611.0, + "east": 6612.0, + "latitude": 1.0266515, + "longitude": 0.18509063 }, - "sog": 12.0, - "cog": 261.1 + "sog": 6.2, + "cog": 4.553 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "f2de57d7-d7a2-4555-a692-86d2ce37c111", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -904.1650945145093, - "east": -3374.390071158464, - "latitude": 58.755332, - "longitude": 10.432343 + "north": -905.0, + "east": -3377.0, + "latitude": 1.02547386, + "longitude": 0.18207795 }, - "sog": 14.0, - "cog": 31.4 + "sog": 7.2, + "cog": 0.548 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_38.json b/data/baseline_situations_generated/traffic_situation_38.json index 03d2fbc..5a89a06 100644 --- a/data/baseline_situations_generated/traffic_situation_38.json +++ b/data/baseline_situations_generated/traffic_situation_38.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-GW, OT-GW", "inputFileName": "baseline_situation_38_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "13e1811d-db8d-4b07-9ee2-466e6d59196a", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 13275.471144058321, - "east": 2102.6280671962086, - "latitude": 58.882628, - "longitude": 10.526988 + "north": 13303.0, + "east": 2107.0, + "latitude": 1.02770004, + "longitude": 0.18373192 }, - "sog": 12.0, - "cog": 196.5 + "sog": 6.2, + "cog": 3.429 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "2393acbc-2f7b-471c-bd4c-17ec04f4e578", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 7106.376237123163, - "east": 7106.376237123163, - "latitude": 58.827246, - "longitude": 10.613455 + "north": 7104.0, + "east": 7104.0, + "latitude": 1.02672875, + "longitude": 0.18523902 }, - "sog": 14.0, - "cog": 255.3 + "sog": 7.2, + "cog": 4.456 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "7177fc25-db9c-4c95-9dd4-a2551816c6bb", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 3822.825918424448, - "east": 1391.3948450878563, - "latitude": 58.797768, - "longitude": 10.514698 + "north": 3736.0, + "east": 1360.0, + "latitude": 1.02620103, + "longitude": 0.18350663 }, - "sog": 4.0, - "cog": 321.2 + "sog": 2.1, + "cog": 5.64 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_39.json b/data/baseline_situations_generated/traffic_situation_39.json index 7646ca4..cb56ab9 100644 --- a/data/baseline_situations_generated/traffic_situation_39.json +++ b/data/baseline_situations_generated/traffic_situation_39.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-GW, OT-SO", "inputFileName": "baseline_situation_39_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "40136888-c027-4d12-9e65-eaf95a401fb7", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 14640.254037415676, - "east": 2581.47179122242, - "latitude": 58.89488, - "longitude": 10.535263 + "north": 15230.0, + "east": 2685.0, + "latitude": 1.02800197, + "longitude": 0.18390625 }, - "sog": 17.0, - "cog": 195.9 + "sog": 9.3, + "cog": 3.412 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "id": "d96de547-74b9-468a-ae09-225b566a304a", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 921.1073455525889, - "east": 5223.859342748722, - "latitude": 58.771718, - "longitude": 10.580924 + "north": 932.0, + "east": 5285.0, + "latitude": 1.02576169, + "longitude": 0.18469041 }, - "sog": 12.0, - "cog": 315.2 + "sog": 6.2, + "cog": 5.493 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "9b157f35-fbb9-402b-9377-533f92a670eb", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -3434.8914566996837, - "east": -605.664039621156, - "latitude": 58.732613, - "longitude": 10.480188 + "north": -3396.0, + "east": -599.0, + "latitude": 1.02508356, + "longitude": 0.18291579 }, - "sog": 17.0, - "cog": 4.1 + "sog": 8.7, + "cog": 0.072 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_40.json b/data/baseline_situations_generated/traffic_situation_40.json index c0ee31f..512a10a 100644 --- a/data/baseline_situations_generated/traffic_situation_40.json +++ b/data/baseline_situations_generated/traffic_situation_40.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-SO, CR-SO", "inputFileName": "baseline_situation_40_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "4a170bc9-414e-4f10-801e-807932c48e0f", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 9477.985889126163, - "east": 1671.224635027052, - "latitude": 58.848537, - "longitude": 10.519533 + "north": 9491.0, + "east": 1673.0, + "latitude": 1.02710276, + "longitude": 0.18360103 }, - "sog": 6.0, - "cog": 206.8 + "sog": 3.1, + "cog": 3.608 } }, { "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": "3c2c2e68-2ade-4f0c-8297-cd30223d36f4", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 1685.2123984265043, - "east": -6289.29829247272, - "latitude": 58.778578, - "longitude": 10.381972 + "north": 1681.0, + "east": -6273.0, + "latitude": 1.02587905, + "longitude": 0.18120451 }, - "sog": 15.0, - "cog": 64.9 + "sog": 7.7, + "cog": 1.132 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "946ebb91-133d-4112-9afc-854fc920acd7", "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": -1883.82358864211, - "east": -10683.694469632992, - "latitude": 58.746537, - "longitude": 10.306035 + "north": -1868.0, + "east": -10596.0, + "latitude": 1.02532297, + "longitude": 0.1799007 }, - "sog": 17.0, - "cog": 44.6 + "sog": 8.7, + "cog": 0.775 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_41.json b/data/baseline_situations_generated/traffic_situation_41.json index 7c36fa3..e47e071 100644 --- a/data/baseline_situations_generated/traffic_situation_41.json +++ b/data/baseline_situations_generated/traffic_situation_41.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-SO, OT-SO", "inputFileName": "baseline_situation_41_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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", + "id": "13836d9f-2ed6-432e-a9d9-940a3637df3e", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2982.1208443726337, - "east": 11129.42650550887, - "latitude": 58.790221, - "longitude": 10.682975 + "north": 2998.0, + "east": 11190.0, + "latitude": 1.0260854, + "longitude": 0.18647135 }, - "sog": 18.0, - "cog": 287.5 + "sog": 9.3, + "cog": 5.014 } }, { "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": "b5775e3a-ec3d-4754-acae-683cf471d282", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 9009.718699751105, - "east": -6308.672950714708, - "latitude": 58.844333, - "longitude": 10.381638 + "north": 9006.0, + "east": -6307.0, + "latitude": 1.02702676, + "longitude": 0.18119426 }, - "sog": 14.0, - "cog": 120.8 + "sog": 7.2, + "cog": 2.109 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "0f31685e-de10-47c9-892e-020ca01904ac", "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": -3106.2798206140164, - "east": -1448.4820687246515, - "latitude": 58.735563, - "longitude": 10.465624 + "north": -3072.0, + "east": -1432.0, + "latitude": 1.02513432, + "longitude": 0.18266456 }, - "sog": 17.0, - "cog": 10.6 + "sog": 8.7, + "cog": 0.184 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_42.json b/data/baseline_situations_generated/traffic_situation_42.json index e9294dc..dfede2e 100644 --- a/data/baseline_situations_generated/traffic_situation_42.json +++ b/data/baseline_situations_generated/traffic_situation_42.json @@ -1,10 +1,10 @@ { "title": "CR-GW, CR-SO, OT-GW", "inputFileName": "baseline_situation_42_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "b39a2c8b-bce8-4605-b52b-bac121f48595", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 4964.970411211504, - "east": 4964.970411211504, - "latitude": 58.808021, - "longitude": 10.576451 + "north": 4929.0, + "east": 4929.0, + "latitude": 1.02638796, + "longitude": 0.18458304 }, - "sog": 9.0, - "cog": 276.8 + "sog": 4.6, + "cog": 4.838 } }, { "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": "58c4d866-374b-4128-85ee-d35da18ca1ba", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 6499.209035817461, - "east": -7745.455717456211, - "latitude": 58.821795, - "longitude": 10.356809 + "north": 6477.0, + "east": -7719.0, + "latitude": 1.02663051, + "longitude": 0.1807684 }, - "sog": 16.0, - "cog": 101.4 + "sog": 8.2, + "cog": 1.768 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "5bfdfc83-55aa-43a2-a1d4-722f23783d13", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 1056.5260415137575, - "east": 739.7874985827978, - "latitude": 58.772934, - "longitude": 10.503438 + "north": 1054.0, + "east": 738.0, + "latitude": 1.02578081, + "longitude": 0.18331903 }, - "sog": 7.0, - "cog": 340.0 + "sog": 3.6, + "cog": 5.934 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_43.json b/data/baseline_situations_generated/traffic_situation_43.json index ba99fdf..89c4f25 100644 --- a/data/baseline_situations_generated/traffic_situation_43.json +++ b/data/baseline_situations_generated/traffic_situation_43.json @@ -1,10 +1,10 @@ { "title": "CR-GW, OT-GW, OT-GW", "inputFileName": "baseline_situation_43_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "8f2307b8-1cca-4e38-96f5-39a53473d2ec", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 10218.180705154564, - "east": 4764.815915225217, - "latitude": 58.855182, - "longitude": 10.572992 + "north": 10244.0, + "east": 4776.0, + "latitude": 1.02722074, + "longitude": 0.18453689 }, - "sog": 12.0, - "cog": 225.6 + "sog": 6.2, + "cog": 3.936 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "aebed261-fa83-4d73-a9d5-c4af7b10b48f", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 3208.558411526545, - "east": 859.7306352366235, - "latitude": 58.792253, - "longitude": 10.50551 + "north": 3166.0, + "east": 848.0, + "latitude": 1.02611172, + "longitude": 0.18335221 }, - "sog": 5.0, - "cog": 343.8 + "sog": 2.6, + "cog": 6.008 } }, { "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": "59aa4e26-7634-4a5d-ae13-194d79fded42", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 2435.554286048698, - "east": -1135.717615436738, - "latitude": 58.785314, - "longitude": 10.471028 + "north": 2430.0, + "east": -1133.0, + "latitude": 1.0259964, + "longitude": 0.18275474 }, - "sog": 7.0, - "cog": 12.1 + "sog": 3.6, + "cog": 0.211 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_44.json b/data/baseline_situations_generated/traffic_situation_44.json index 60e12af..f729fb3 100644 --- a/data/baseline_situations_generated/traffic_situation_44.json +++ b/data/baseline_situations_generated/traffic_situation_44.json @@ -1,10 +1,10 @@ { "title": "CR-GW, OT-GW, OT-SO", "inputFileName": "baseline_situation_44_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "df40a398-da54-4a2b-8840-6dd6ecf9d603", "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": 5634.9422038056355, - "east": 12084.172552732569, - "latitude": 58.814036, - "longitude": 10.699473 + "north": 5634.0, + "east": 12083.0, + "latitude": 1.02649842, + "longitude": 0.18674068 }, - "sog": 14.0, - "cog": 285.3 + "sog": 7.2, + "cog": 4.98 } }, { "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": "9c8f8901-955c-4a48-9662-ac2c04844ba9", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 3335.136315206419, - "east": 1213.8903459553992, - "latitude": 58.79339, - "longitude": 10.511631 + "north": 3286.0, + "east": 1196.0, + "latitude": 1.02613053, + "longitude": 0.18345716 }, - "sog": 5.0, - "cog": 336.8 + "sog": 2.6, + "cog": 5.89 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "27894d1a-eda3-443c-86ed-e1ad0daa61c7", + "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": -2157.7302797647667, - "east": 188.7769384260376, - "latitude": 58.744078, - "longitude": 10.493916 + "north": -2567.0, + "east": 225.0, + "latitude": 1.02521345, + "longitude": 0.18316431 }, - "sog": 15.0, - "cog": 358.3 + "sog": 8.2, + "cog": 6.251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_45.json b/data/baseline_situations_generated/traffic_situation_45.json index a46423e..a7aef1c 100644 --- a/data/baseline_situations_generated/traffic_situation_45.json +++ b/data/baseline_situations_generated/traffic_situation_45.json @@ -1,10 +1,10 @@ { "title": "CR-GW, OT-SO, OT-SO", "inputFileName": "baseline_situation_45_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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", - "shipType": "Passenger/Ro-Ro Cargo Ship" - }, - "initial": { - "position": { - "north": 9650.503999312643, - "east": 4500.103919934927, - "latitude": 58.850085, - "longitude": 10.568418 - }, - "sog": 12.0, - "cog": 225.6 - } - }, - { - "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "31a7e039-e7b5-4e88-89dd-5691712fe621", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": -2236.073447010553, - "east": 1042.6981725380665, - "latitude": 58.743375, - "longitude": 10.508672 + "north": 9675.0, + "east": 4511.0, + "latitude": 1.02713159, + "longitude": 0.18445697 }, - "sog": 15.0, - "cog": 351.4 + "sog": 6.2, + "cog": 3.936 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "b3b396ca-7b64-4da7-a112-abb8fb3c5c0c", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -3070.5569025489635, - "east": -541.4220277199948, - "latitude": 58.735883, - "longitude": 10.481298 + "north": -3576.0, + "east": 1667.0, + "latitude": 1.02505535, + "longitude": 0.18359922 + }, + "sog": 9.3, + "cog": 6.083 + } + }, + { + "static": { + "id": "b814863c-5dd4-40b5-a6c3-fcc1de918129", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" + }, + "initial": { + "position": { + "north": -3056.0, + "east": -539.0, + "latitude": 1.02513683, + "longitude": 0.18293389 }, - "sog": 15.0, - "cog": 3.4 + "sog": 7.7, + "cog": 0.058 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_46.json b/data/baseline_situations_generated/traffic_situation_46.json index c25e25a..220054e 100644 --- a/data/baseline_situations_generated/traffic_situation_46.json +++ b/data/baseline_situations_generated/traffic_situation_46.json @@ -1,10 +1,10 @@ { "title": "CR-SO, CR-SO, CR-SO", "inputFileName": "baseline_situation_46_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "944730c8-be15-455e-b89a-c8010a0298d6", + "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": 9477.985889126163, - "east": -1671.224635027052, - "latitude": 58.848537, - "longitude": 10.461775 + "north": 9491.0, + "east": -1673.0, + "latitude": 1.02710276, + "longitude": 0.18259187 }, - "sog": 6.0, - "cog": 153.2 + "sog": 3.1, + "cog": 2.675 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "85b50ce5-4c37-45a9-a249-0fd2193d30e9", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 1685.2123984265043, - "east": -6289.29829247272, - "latitude": 58.778578, - "longitude": 10.381972 + "north": 1681.0, + "east": -6273.0, + "latitude": 1.02587905, + "longitude": 0.18120451 }, - "sog": 15.0, - "cog": 64.9 + "sog": 7.7, + "cog": 1.132 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "bac733cc-cd26-419b-b81c-f22630e57e9f", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 12649.724544637851, - "east": -7303.321871021278, - "latitude": 58.87701, - "longitude": 10.36445 + "north": 12601.0, + "east": -7275.0, + "latitude": 1.02759005, + "longitude": 0.18090231 }, - "sog": 17.0, - "cog": 132.9 + "sog": 8.7, + "cog": 2.318 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_47.json b/data/baseline_situations_generated/traffic_situation_47.json index facd3e1..1e6af76 100644 --- a/data/baseline_situations_generated/traffic_situation_47.json +++ b/data/baseline_situations_generated/traffic_situation_47.json @@ -1,10 +1,10 @@ { "title": "CR-SO, CR-SO, OT-SO", "inputFileName": "baseline_situation_47_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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", - "shipType": "Passenger/Ro-Ro Cargo Ship" - }, - "initial": { - "position": { - "north": 13598.998448794535, - "east": -4949.630651193469, - "latitude": 58.885532, - "longitude": 10.405122 - }, - "sog": 17.0, - "cog": 148.4 - } - }, - { - "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "a62b3774-3a5f-4efe-8586-f8f15e472b39", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 5760.017814725071, - "east": -6864.521924105253, - "latitude": 58.815159, - "longitude": 10.372032 + "north": 14170.0, + "east": -5158.0, + "latitude": 1.02783589, + "longitude": 0.1815408 }, - "sog": 14.0, - "cog": 96.8 + "sog": 9.3, + "cog": 2.602 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "e8a6d548-ed73-4a66-8b24-aef0d76d9de4", "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": -6010.1650743841365, - "east": -1610.4188780589698, - "latitude": 58.709493, - "longitude": 10.462825 + "north": 5758.0, + "east": -6863.0, + "latitude": 1.02651785, + "longitude": 0.18102657 + }, + "sog": 7.2, + "cog": 1.69 + } + }, + { + "static": { + "id": "bf97349c-71d5-45ac-b9c4-ea0cdd06d8db", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" + }, + "initial": { + "position": { + "north": -6049.0, + "east": -1621.0, + "latitude": 1.02466787, + "longitude": 0.18260756 }, - "sog": 19.0, - "cog": 7.2 + "sog": 9.8, + "cog": 0.126 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_48.json b/data/baseline_situations_generated/traffic_situation_48.json index abc88d4..70def88 100644 --- a/data/baseline_situations_generated/traffic_situation_48.json +++ b/data/baseline_situations_generated/traffic_situation_48.json @@ -1,10 +1,10 @@ { "title": "CR-SO, CR-SO, OT-GW", "inputFileName": "baseline_situation_48_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "a0eb4ad7-6fbb-457d-885b-8536efd5c1a0", "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": 5516.633790235007, - "east": -5516.633790235007, - "latitude": 58.812974, - "longitude": 10.395324 + "north": 5476.0, + "east": -5477.0, + "latitude": 1.02647367, + "longitude": 0.18144459 }, - "sog": 9.0, - "cog": 83.2 + "sog": 4.6, + "cog": 1.445 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "d39445d4-3f94-4cc1-992f-0f45f22c14e6", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 4556.421220711065, - "east": -7891.953054956568, - "latitude": 58.804354, - "longitude": 10.354278 + "north": 4539.0, + "east": -7862.0, + "latitude": 1.02632685, + "longitude": 0.18072527 }, - "sog": 16.0, - "cog": 87.2 + "sog": 8.2, + "cog": 1.521 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "76431f2c-ef2e-4695-888b-da66c63e527c", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 1901.746874724764, - "east": 1331.6174974490361, - "latitude": 58.780522, - "longitude": 10.513665 + "north": 1897.0, + "east": 1329.0, + "latitude": 1.02591289, + "longitude": 0.18349728 }, - "sog": 7.0, - "cog": 340.0 + "sog": 3.6, + "cog": 5.934 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_49.json b/data/baseline_situations_generated/traffic_situation_49.json index 843ee44..b3bcce8 100644 --- a/data/baseline_situations_generated/traffic_situation_49.json +++ b/data/baseline_situations_generated/traffic_situation_49.json @@ -1,10 +1,10 @@ { "title": "CR-SO, OT-GW, OT-GW", "inputFileName": "baseline_situation_49_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "98943a40-d3f2-4742-b937-7a5c6e7b1ed5", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 11283.44181783944, - "east": -5261.5553300048905, - "latitude": 58.864745, - "longitude": 10.399732 + "north": 11279.0, + "east": -5259.0, + "latitude": 1.02738291, + "longitude": 0.18151034 }, - "sog": 14.0, - "cog": 137.4 + "sog": 7.2, + "cog": 2.399 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "79145fd8-bb11-4496-9cb6-8792496e4482", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 2531.7788332657265, - "east": 678.3880937877614, - "latitude": 58.786178, - "longitude": 10.502377 + "north": 2509.0, + "east": 672.0, + "latitude": 1.02600878, + "longitude": 0.18329913 }, - "sog": 6.0, - "cog": 349.4 + "sog": 3.1, + "cog": 6.102 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "49aa4c77-47f1-455d-826a-bb4e82a3da95", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2435.554286048698, - "east": -1135.717615436738, - "latitude": 58.785314, - "longitude": 10.471028 + "north": 2430.0, + "east": -1133.0, + "latitude": 1.0259964, + "longitude": 0.18275474 }, - "sog": 7.0, - "cog": 12.1 + "sog": 3.6, + "cog": 0.211 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_50.json b/data/baseline_situations_generated/traffic_situation_50.json index 11a6653..96bb0bf 100644 --- a/data/baseline_situations_generated/traffic_situation_50.json +++ b/data/baseline_situations_generated/traffic_situation_50.json @@ -1,10 +1,10 @@ { "title": "CR-SO, OT-GW, OT-SO", "inputFileName": "baseline_situation_50_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "8d9fc941-466c-4da0-a7dd-770b245b3395", "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": 3303.2419815412345, - "east": -7083.825289532885, - "latitude": 58.793103, - "longitude": 10.368243 + "north": 3303.0, + "east": -7083.0, + "latitude": 1.02613319, + "longitude": 0.18096022 }, - "sog": 14.0, - "cog": 74.7 + "sog": 7.2, + "cog": 1.303 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "422e6edb-3f73-4730-b95a-698b91d32131", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 4926.085752065764, - "east": 1319.940699112481, - "latitude": 58.807672, - "longitude": 10.513463 + "north": 4839.0, + "east": 1297.0, + "latitude": 1.02637386, + "longitude": 0.18348763 }, - "sog": 4.0, - "cog": 334.7 + "sog": 2.1, + "cog": 5.859 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "90bbd01f-ef8a-45d0-b01a-94a7a44a851c", "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": -3698.3783550842654, - "east": 323.56617949952766, - "latitude": 58.730247, - "longitude": 10.496245 + "north": -3667.0, + "east": 321.0, + "latitude": 1.0250411, + "longitude": 0.18319326 }, - "sog": 16.0, - "cog": 358.1 + "sog": 8.2, + "cog": 6.251 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_51.json b/data/baseline_situations_generated/traffic_situation_51.json index cf34698..16e2991 100644 --- a/data/baseline_situations_generated/traffic_situation_51.json +++ b/data/baseline_situations_generated/traffic_situation_51.json @@ -1,10 +1,10 @@ { "title": "CR-SO, OT-SO, OT-SO", "inputFileName": "baseline_situation_51_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "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": "bdf60f3d-3c0b-4364-80f5-29da96ae0149", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 9558.44418661095, - "east": -4457.175724263812, - "latitude": 58.849259, - "longitude": 10.413632 + "north": 9568.0, + "east": -4461.0, + "latitude": 1.02711482, + "longitude": 0.18175101 }, - "sog": 13.0, - "cog": 136.0 + "sog": 6.7, + "cog": 2.375 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "558eeaaf-2f5b-4338-8c0f-f4a944224628", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2277.938535116946, - "east": 1062.2201837314112, - "latitude": 58.742999, - "longitude": 10.50901 + "north": -2623.0, + "east": 1223.0, + "latitude": 1.02520468, + "longitude": 0.18346531 }, - "sog": 17.0, - "cog": 349.4 + "sog": 9.3, + "cog": 6.083 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "c2245963-8721-40cb-940f-a993aad41e5b", "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": -3615.6147817217475, - "east": -1315.9761591196093, - "latitude": 58.73099, - "longitude": 10.467913 + "north": -3585.0, + "east": -1305.0, + "latitude": 1.02505394, + "longitude": 0.18270286 }, - "sog": 16.0, - "cog": 7.7 + "sog": 8.2, + "cog": 0.133 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_52.json b/data/baseline_situations_generated/traffic_situation_52.json index bea8dec..5fbad8b 100644 --- a/data/baseline_situations_generated/traffic_situation_52.json +++ b/data/baseline_situations_generated/traffic_situation_52.json @@ -1,10 +1,10 @@ { "title": "OT-GW, OT-GW, OT-GW", "inputFileName": "baseline_situation_52_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "b3ba4c4e-54b7-4438-9e36-48797492957d", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 1693.2118445548176, - "east": -453.69474636327504, - "latitude": 58.77865, - "longitude": 10.482814 + "north": 1690.0, + "east": -453.0, + "latitude": 1.02588046, + "longitude": 0.18295983 }, - "sog": 7.0, - "cog": 6.7 + "sog": 3.6, + "cog": 0.117 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "673f97ba-d7f2-4e79-90d5-430af2df8135", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2531.7788332657265, - "east": 678.3880937877614, - "latitude": 58.786178, - "longitude": 10.502377 + "north": 2509.0, + "east": 672.0, + "latitude": 1.02600878, + "longitude": 0.18329913 }, - "sog": 6.0, - "cog": 349.4 + "sog": 3.1, + "cog": 6.102 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "id": "ca2525d4-f51f-4d8e-b36c-a5e69bf178fb", "length": 50.0, "width": 10.0, "height": 8.0, "speedMax": 15.0, - "mmsi": 257083180, "name": "CANOLE", "shipType": "Cargo" }, "initial": { "position": { - "north": 4111.804474502215, - "east": -1917.3659152963728, - "latitude": 58.800362, - "longitude": 10.457521 + "north": 4039.0, + "east": -1883.0, + "latitude": 1.02624851, + "longitude": 0.18252854 }, - "sog": 5.0, - "cog": 32.7 + "sog": 2.6, + "cog": 0.552 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_53.json b/data/baseline_situations_generated/traffic_situation_53.json index bf5d8d3..89a87dc 100644 --- a/data/baseline_situations_generated/traffic_situation_53.json +++ b/data/baseline_situations_generated/traffic_situation_53.json @@ -1,10 +1,10 @@ { "title": "OT-GW, OT-GW, OT-SO", "inputFileName": "baseline_situation_53_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "097deb10-9509-41f0-a2a6-b731dce50572", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 1574.0640000000008, + "north": 1571.0, "east": 0.0, - "latitude": 58.77758, - "longitude": 10.490654 + "latitude": 1.02586181, + "longitude": 0.18309645 }, - "sog": 7.0, + "sog": 3.6, "cog": 0.0 } }, { "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", - "length": 122.0, - "width": 20.0, + "id": "185c057e-52d2-46b8-b825-b1cab0761f9d", + "length": 50.0, + "width": 10.0, "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": 5694.2115077012695, - "east": 1004.0431226683609, - "latitude": 58.814568, - "longitude": 10.508004 + "north": 5603.0, + "east": 988.0, + "latitude": 1.02649357, + "longitude": 0.18339443 }, - "sog": 4.0, - "cog": 344.3 + "sog": 2.1, + "cog": 6.019 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "2e02e469-de6d-4b67-9189-e53d3fbd4d49", "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": -4314.169879882742, - "east": -377.44095701473725, - "latitude": 58.724719, - "longitude": 10.484132 + "north": -4265.0, + "east": -373.0, + "latitude": 1.0249474, + "longitude": 0.18298395 }, - "sog": 17.0, - "cog": 2.1 + "sog": 8.7, + "cog": 0.036 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_54.json b/data/baseline_situations_generated/traffic_situation_54.json index 3c1559d..5971440 100644 --- a/data/baseline_situations_generated/traffic_situation_54.json +++ b/data/baseline_situations_generated/traffic_situation_54.json @@ -1,10 +1,10 @@ { "title": "OT-GW, OT-SO, OT-SO", "inputFileName": "baseline_situation_54_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "id": "b4843e2f-44f2-4bb8-8d40-609ba4d8b74e", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 2010.702756655007, - "east": -1160.8797778150906, - "latitude": 58.7815, - "longitude": 10.470594 + "north": 2006.0, + "east": -1158.0, + "latitude": 1.02592997, + "longitude": 0.1827472 }, - "sog": 7.0, - "cog": 15.6 + "sog": 3.6, + "cog": 0.271 } }, { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, + "id": "f3b9c20d-cf11-4121-83b3-aa0edf0e47ad", + "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": -2385.14501014459, - "east": 1112.2113840406043, - "latitude": 58.742037, - "longitude": 10.509873 + "north": -3815.0, + "east": 1779.0, + "latitude": 1.02501791, + "longitude": 0.183633 }, - "sog": 15.0, - "cog": 351.4 + "sog": 9.3, + "cog": 6.083 } }, { "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": "e0391032-6991-474a-91d6-bcd8198f6f5b", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -3787.70322415819, - "east": -1378.6112298277071, - "latitude": 58.729445, - "longitude": 10.466831 + "north": -4366.0, + "east": -1589.0, + "latitude": 1.02493157, + "longitude": 0.18261721 }, - "sog": 17.0, - "cog": 8.4 + "sog": 9.3, + "cog": 0.159 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_55.json b/data/baseline_situations_generated/traffic_situation_55.json index 4942e11..839d16f 100644 --- a/data/baseline_situations_generated/traffic_situation_55.json +++ b/data/baseline_situations_generated/traffic_situation_55.json @@ -1,10 +1,10 @@ { "title": "OT-SO, OT-SO, OT-SO", "inputFileName": "baseline_situation_55_3_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, @@ -17,10 +17,10 @@ "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": [ @@ -28,16 +28,16 @@ "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 } } ] @@ -45,68 +45,65 @@ "targetShips": [ { "static": { - "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" - }, - "initial": { - "position": { - "north": -2456.445522039171, - "east": 433.13762217599594, - "latitude": 58.741397, - "longitude": 10.498139 - }, - "sog": 15.0, - "cog": 356.6 - } - }, - { - "static": { - "id": "29376342-9c27-4875-8377-0a9a569e1505", + "id": "5fa4adc6-8c11-496a-8125-6befee571a8f", "length": 122.0, "width": 20.0, "height": 8.0, "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "name": "BASTO", "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -3520.4504633625534, - "east": 1641.6130112212722, - "latitude": 58.731845, - "longitude": 10.519022 + "north": -4441.0, + "east": 783.0, + "latitude": 1.02491982, + "longitude": 0.1833326 }, - "sog": 17.0, - "cog": 349.4 + "sog": 9.8, + "cog": 6.2 } }, { "static": { - "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", + "id": "b49b3eb0-0915-4d44-83b1-3a8abcc9b659", "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": -4208.559137953545, - "east": -1531.7902553641193, - "latitude": 58.725667, - "longitude": 10.464184 + "north": -4053.0, + "east": 1890.0, + "latitude": 1.02498062, + "longitude": 0.18366647 + }, + "sog": 9.3, + "cog": 6.083 + } + }, + { + "static": { + "id": "7e1564f7-3bb4-4f55-b5d3-83cd7d5d35c8", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger/Ro-Ro Cargo Ship" + }, + "initial": { + "position": { + "north": -4162.0, + "east": -1515.0, + "latitude": 1.02496354, + "longitude": 0.18263953 }, - "sog": 17.0, - "cog": 8.4 + "sog": 8.7, + "cog": 0.146 } } ] diff --git a/src/trafficgen/encounter.py b/src/trafficgen/encounter.py index 5b75320..1bdcb69 100644 --- a/src/trafficgen/encounter.py +++ b/src/trafficgen/encounter.py @@ -6,6 +6,7 @@ import random from typing import List, Optional, Tuple, Union +from uuid import uuid4 import numpy as np @@ -119,7 +120,9 @@ def generate_encounter( else: target_ship.initial.sog = relative_sog * own_ship.initial.sog - target_ship.initial.sog = np.minimum(target_ship.initial.sog, target_ship.static.speed_max) + target_ship.initial.sog = round( + np.minimum(target_ship.initial.sog, target_ship.static.speed_max), 1 + ) target_ship_vector_length = target_ship.initial.sog * vector_time start_position_target_ship, position_found = find_start_position_target_ship( @@ -157,6 +160,7 @@ def generate_encounter( encounter_found = encounter_ok and not trajectory_on_land if encounter_found: + target_ship.static.id = uuid4() target_ship = update_position_data_target_ship(target_ship, lat_lon0) return target_ship, encounter_found @@ -663,8 +667,8 @@ def update_position_data_target_ship( lat_0, lon_0, ) - target_ship.initial.position.latitude = round(lat, 6) - target_ship.initial.position.longitude = round(lon, 6) + target_ship.initial.position.latitude = round(lat, 8) + target_ship.initial.position.longitude = round(lon, 8) return target_ship @@ -704,8 +708,8 @@ def update_position_data_own_ship( lat_0, lon_0, ) - ship_position_future.latitude = round(lat_future, 6) - ship_position_future.longitude = round(lon_future, 6) + ship_position_future.latitude = round(lat_future, 8) + ship_position_future.longitude = round(lon_future, 8) ship.waypoints = [ Waypoint(position=ship.initial.position.model_copy()), diff --git a/src/trafficgen/plot_traffic_situation.py b/src/trafficgen/plot_traffic_situation.py index 5052064..eeaf9b1 100644 --- a/src/trafficgen/plot_traffic_situation.py +++ b/src/trafficgen/plot_traffic_situation.py @@ -164,7 +164,7 @@ def plot_specific_traffic_situation( lat_0 = situation.own_ship.initial.position.latitude lon_0 = situation.own_ship.initial.position.longitude - map_plot = Map(location=(lat_0, lon_0), zoom_start=10) + map_plot = Map(location=(rad_2_deg(lat_0), rad_2_deg(lon_0)), zoom_start=10) map_plot = add_ship_to_map( situation.own_ship, situation.common_vector, @@ -343,7 +343,7 @@ def add_ship_to_plot( Params: ship: Ship information - vector_time: Vector time [min] + vector_time: Vector time [sec] axes: Instance of figure axis. If not set, instance is set to None color: Color of the ship. If not set, color is 'black' """ @@ -373,7 +373,7 @@ def add_ship_to_plot( ) circle = Circle( xy=(pos_0_east, pos_0_north), - radius=vector_time / 100.0, # type: ignore + radius=vector_time / 3000.0, # type: ignore color=color, ) _ = axes.add_patch(circle) diff --git a/src/trafficgen/read_files.py b/src/trafficgen/read_files.py index 7c0c902..88dfb80 100644 --- a/src/trafficgen/read_files.py +++ b/src/trafficgen/read_files.py @@ -84,14 +84,16 @@ def convert_situation_data_from_maritime_to_si_units(situation: TrafficSituation assert situation.own_ship is not None assert situation.own_ship.initial is not None situation.own_ship.initial.position.longitude = round( - deg_2_rad(situation.own_ship.initial.position.longitude), 6 + deg_2_rad(situation.own_ship.initial.position.longitude), 8 ) situation.own_ship.initial.position.latitude = round( - deg_2_rad(situation.own_ship.initial.position.latitude), 6 + deg_2_rad(situation.own_ship.initial.position.latitude), 8 ) situation.own_ship.initial.cog = round(deg_2_rad(situation.own_ship.initial.cog), 4) situation.own_ship.initial.sog = round(knot_2_m_pr_s(situation.own_ship.initial.sog), 2) + situation.common_vector = min_2_s(situation.common_vector) + assert situation.encounter is not None for i in range(len(situation.encounter)): beta: Union[float, None] = situation.encounter[i].beta @@ -147,8 +149,8 @@ def read_target_ship_files(target_ship_folder: Path) -> List[TargetShip]: data = convert_keys_to_snake_case(data) if "static" in data and "id" not in data["static"]: - ship_id: UUID = uuid4() - data["static"].update({"id": ship_id}) + temp_id: UUID = uuid4() + data["static"].update({"id": temp_id}) if "initial" in data and "nav_status" not in data["initial"]: data["initial"].update({"nav_status": AISNavStatus.UNDER_WAY_USING_ENGINE}) target_ship: TargetShip = TargetShip(**data) diff --git a/src/trafficgen/types.py b/src/trafficgen/types.py index 8a12874..3ceda65 100644 --- a/src/trafficgen/types.py +++ b/src/trafficgen/types.py @@ -99,7 +99,13 @@ class ShipStatic(BaseModel): width: float height: float speed_max: float - mmsi: Optional[int] = Field(None, ge=100000000, le=999999999, description="Maritime Mobile Service Identity (MMSI)", examples=[123456789]) + mmsi: Optional[int] = Field( + None, + ge=100000000, + le=999999999, + description="Maritime Mobile Service Identity (MMSI)", + examples=[123456789], + ) name: str ship_type: GeneralShipType @@ -161,7 +167,7 @@ class TrafficSituation(BaseModel): title: str input_file_name: Union[str, None] = None - common_vector: Union[float, None] = None + common_vector: float own_ship: Union[Ship, None] = None num_situations: Union[int, None] = None encounter: Union[List[Encounter], None] = None