diff --git a/data/baseline_situations_generated/traffic_situation_01.json b/data/baseline_situations_generated/traffic_situation_01.json index ee2b4a8..54f7bdf 100644 --- a/data/baseline_situations_generated/traffic_situation_01.json +++ b/data/baseline_situations_generated/traffic_situation_01.json @@ -2,13 +2,9 @@ "title": "HO", "inputFileName": "baseline_situation_01_1_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_02.json b/data/baseline_situations_generated/traffic_situation_02.json index 45bb65c..8294cf0 100644 --- a/data/baseline_situations_generated/traffic_situation_02.json +++ b/data/baseline_situations_generated/traffic_situation_02.json @@ -2,13 +2,9 @@ "title": "CR-GW", "inputFileName": "baseline_situation_02_1_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,21 +45,21 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { - "north": 8348.609313788964, - "east": 3038.6452877367683, - "latitude": 58.838398, - "longitude": 10.543163 + "north": 13805.59842063799, + "east": 5024.826891344722, + "latitude": 58.887387, + "longitude": 10.577485 }, "sog": 8.0, "cog": 225.3 diff --git a/data/baseline_situations_generated/traffic_situation_03.json b/data/baseline_situations_generated/traffic_situation_03.json index d4fbbdc..5d4d904 100644 --- a/data/baseline_situations_generated/traffic_situation_03.json +++ b/data/baseline_situations_generated/traffic_situation_03.json @@ -2,13 +2,9 @@ "title": "CR-SO", "inputFileName": "baseline_situation_03_1_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_04.json b/data/baseline_situations_generated/traffic_situation_04.json index 0d747f6..e516de4 100644 --- a/data/baseline_situations_generated/traffic_situation_04.json +++ b/data/baseline_situations_generated/traffic_situation_04.json @@ -2,13 +2,9 @@ "title": "OT-GW", "inputFileName": "baseline_situation_04_1_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_05.json b/data/baseline_situations_generated/traffic_situation_05.json index 581d6f4..b5465f8 100644 --- a/data/baseline_situations_generated/traffic_situation_05.json +++ b/data/baseline_situations_generated/traffic_situation_05.json @@ -2,13 +2,9 @@ "title": "OT-SO", "inputFileName": "baseline_situation_05_1_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,24 +45,24 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2897.7442608687784, - "east": -776.4482345717098, - "latitude": 58.737435, - "longitude": 10.477237 + "north": -3472.2532721437688, + "east": -930.3874601872462, + "latitude": 58.732277, + "longitude": 10.474577 }, - "sog": 15.0, - "cog": 5.1 + "sog": 16.0, + "cog": 5.7 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_06.json b/data/baseline_situations_generated/traffic_situation_06.json index 1cf7bf3..c7418ec 100644 --- a/data/baseline_situations_generated/traffic_situation_06.json +++ b/data/baseline_situations_generated/traffic_situation_06.json @@ -2,13 +2,9 @@ "title": "HO, HO", "inputFileName": "baseline_situation_06_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_07.json b/data/baseline_situations_generated/traffic_situation_07.json index e167ff8..9c9477a 100644 --- a/data/baseline_situations_generated/traffic_situation_07.json +++ b/data/baseline_situations_generated/traffic_situation_07.json @@ -2,13 +2,9 @@ "title": "HO, CR-GW", "inputFileName": "baseline_situation_07_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_08.json b/data/baseline_situations_generated/traffic_situation_08.json index e3067b3..5176e71 100644 --- a/data/baseline_situations_generated/traffic_situation_08.json +++ b/data/baseline_situations_generated/traffic_situation_08.json @@ -2,13 +2,9 @@ "title": "HO, CR-SO", "inputFileName": "baseline_situation_08_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -71,13 +67,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { diff --git a/data/baseline_situations_generated/traffic_situation_09.json b/data/baseline_situations_generated/traffic_situation_09.json index 3e9db03..64f8325 100644 --- a/data/baseline_situations_generated/traffic_situation_09.json +++ b/data/baseline_situations_generated/traffic_situation_09.json @@ -2,13 +2,9 @@ "title": "HO, OT-GW", "inputFileName": "baseline_situation_09_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,7 +67,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_10.json b/data/baseline_situations_generated/traffic_situation_10.json index fee914f..5e88b28 100644 --- a/data/baseline_situations_generated/traffic_situation_10.json +++ b/data/baseline_situations_generated/traffic_situation_10.json @@ -2,13 +2,9 @@ "title": "HO, OT-SO", "inputFileName": "baseline_situation_10_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,24 +67,24 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": -4161.824439996086, - "east": 291.02311495751275, - "latitude": 58.726087, - "longitude": 10.495683 + "north": -3237.4633981434645, + "east": 226.38549421597696, + "latitude": 58.734385, + "longitude": 10.494566 }, - "sog": 19.0, - "cog": 358.1 + "sog": 17.0, + "cog": 358.4 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_11.json b/data/baseline_situations_generated/traffic_situation_11.json index 15ff454..07960e1 100644 --- a/data/baseline_situations_generated/traffic_situation_11.json +++ b/data/baseline_situations_generated/traffic_situation_11.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-GW", "inputFileName": "baseline_situation_11_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_12.json b/data/baseline_situations_generated/traffic_situation_12.json index 0db4772..c15d971 100644 --- a/data/baseline_situations_generated/traffic_situation_12.json +++ b/data/baseline_situations_generated/traffic_situation_12.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-SO", "inputFileName": "baseline_situation_12_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_13.json b/data/baseline_situations_generated/traffic_situation_13.json index 61b6ef4..79be623 100644 --- a/data/baseline_situations_generated/traffic_situation_13.json +++ b/data/baseline_situations_generated/traffic_situation_13.json @@ -2,13 +2,9 @@ "title": "CR-GW, OT-GW", "inputFileName": "baseline_situation_13_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_14.json b/data/baseline_situations_generated/traffic_situation_14.json index c871810..5fdeb64 100644 --- a/data/baseline_situations_generated/traffic_situation_14.json +++ b/data/baseline_situations_generated/traffic_situation_14.json @@ -2,13 +2,9 @@ "title": "CR-GW, OT-SO", "inputFileName": "baseline_situation_14_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_15.json b/data/baseline_situations_generated/traffic_situation_15.json index 527d2af..d59851f 100644 --- a/data/baseline_situations_generated/traffic_situation_15.json +++ b/data/baseline_situations_generated/traffic_situation_15.json @@ -2,13 +2,9 @@ "title": "CR-SO, CR-SO", "inputFileName": "baseline_situation_15_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -71,24 +67,24 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": -874.1560405910731, - "east": -4957.585260513154, - "latitude": 58.755601, - "longitude": 10.404985 + "north": -769.9885484080899, + "east": -4366.822055900632, + "latitude": 58.756537, + "longitude": 10.415194 }, - "sog": 16.0, - "cog": 42.0 + "sog": 15.0, + "cog": 39.0 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_16.json b/data/baseline_situations_generated/traffic_situation_16.json index 7b412a6..a343e4d 100644 --- a/data/baseline_situations_generated/traffic_situation_16.json +++ b/data/baseline_situations_generated/traffic_situation_16.json @@ -2,13 +2,9 @@ "title": "CR-SO, OT-SO", "inputFileName": "baseline_situation_16_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_17.json b/data/baseline_situations_generated/traffic_situation_17.json index 614d466..ae5129a 100644 --- a/data/baseline_situations_generated/traffic_situation_17.json +++ b/data/baseline_situations_generated/traffic_situation_17.json @@ -2,13 +2,9 @@ "title": "CR-SO, OT-GW", "inputFileName": "baseline_situation_17_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -71,7 +67,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_18.json b/data/baseline_situations_generated/traffic_situation_18.json index dbe65a1..d6e1acb 100644 --- a/data/baseline_situations_generated/traffic_situation_18.json +++ b/data/baseline_situations_generated/traffic_situation_18.json @@ -2,13 +2,9 @@ "title": "OT-GW, OT-GW", "inputFileName": "baseline_situation_18_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_19.json b/data/baseline_situations_generated/traffic_situation_19.json index 3bf3595..073b372 100644 --- a/data/baseline_situations_generated/traffic_situation_19.json +++ b/data/baseline_situations_generated/traffic_situation_19.json @@ -2,13 +2,9 @@ "title": "OT-GW, OT-SO", "inputFileName": "baseline_situation_19_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -71,24 +67,24 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { - "north": -2157.7302797647667, - "east": 188.7769384260376, - "latitude": 58.744078, - "longitude": 10.493916 + "north": -2588.8648485589842, + "east": 226.49632564966922, + "latitude": 58.740208, + "longitude": 10.494568 }, - "sog": 15.0, - "cog": 358.3 + "sog": 16.0, + "cog": 358.1 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_20.json b/data/baseline_situations_generated/traffic_situation_20.json index 3acd7f1..312ae32 100644 --- a/data/baseline_situations_generated/traffic_situation_20.json +++ b/data/baseline_situations_generated/traffic_situation_20.json @@ -2,13 +2,9 @@ "title": "OT-SO, OT-SO", "inputFileName": "baseline_situation_20_2_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,36 +45,36 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": -3600.0213669214063, - "east": 1310.300620281719, - "latitude": 58.73113, - "longitude": 10.513297 + "north": -2265.6642830094406, + "east": 824.6343598555138, + "latitude": 58.743109, + "longitude": 10.504904 }, - "sog": 18.0, - "cog": 351.0 + "sog": 15.0, + "cog": 353.2 } }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_21.json b/data/baseline_situations_generated/traffic_situation_21.json index b3d2d77..6ff7fa3 100644 --- a/data/baseline_situations_generated/traffic_situation_21.json +++ b/data/baseline_situations_generated/traffic_situation_21.json @@ -2,13 +2,9 @@ "title": "HO, HO, HO", "inputFileName": "baseline_situation_21_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,14 +67,14 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_22.json b/data/baseline_situations_generated/traffic_situation_22.json index 46f293d..ebe4a43 100644 --- a/data/baseline_situations_generated/traffic_situation_22.json +++ b/data/baseline_situations_generated/traffic_situation_22.json @@ -2,13 +2,9 @@ "title": "HO, HO, CR-GW", "inputFileName": "baseline_situation_22_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_23.json b/data/baseline_situations_generated/traffic_situation_23.json index df78a47..fe92e4e 100644 --- a/data/baseline_situations_generated/traffic_situation_23.json +++ b/data/baseline_situations_generated/traffic_situation_23.json @@ -2,13 +2,9 @@ "title": "HO, HO, CR-SO", "inputFileName": "baseline_situation_23_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -93,13 +89,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_24.json b/data/baseline_situations_generated/traffic_situation_24.json index 8373113..2c18c30 100644 --- a/data/baseline_situations_generated/traffic_situation_24.json +++ b/data/baseline_situations_generated/traffic_situation_24.json @@ -2,13 +2,9 @@ "title": "HO, HO, OT-GW", "inputFileName": "baseline_situation_24_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -71,36 +67,36 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 10791.435418944757, - "east": 376.84522875005194, - "latitude": 58.860328, - "longitude": 10.497166 + "north": 11655.30731023318, + "east": 407.0122999361351, + "latitude": 58.868083, + "longitude": 10.497687 }, - "sog": 15.0, - "cog": 183.3 + "sog": 17.0, + "cog": 183.2 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_25.json b/data/baseline_situations_generated/traffic_situation_25.json index 0c66c4d..d668d3b 100644 --- a/data/baseline_situations_generated/traffic_situation_25.json +++ b/data/baseline_situations_generated/traffic_situation_25.json @@ -2,13 +2,9 @@ "title": "HO, HO, OT-SO", "inputFileName": "baseline_situation_25_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -93,24 +89,24 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": -3253.4580164036865, - "east": 1057.1125903964, - "latitude": 58.734241, - "longitude": 10.508921 + "north": -1820.2678771189646, + "east": 591.4408856960115, + "latitude": 58.747108, + "longitude": 10.500874 }, - "sog": 19.0, - "cog": 351.4 + "sog": 15.0, + "cog": 353.9 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_26.json b/data/baseline_situations_generated/traffic_situation_26.json index 90c71f2..89d30dc 100644 --- a/data/baseline_situations_generated/traffic_situation_26.json +++ b/data/baseline_situations_generated/traffic_situation_26.json @@ -2,13 +2,9 @@ "title": "HO, CR-GW, CR-GW", "inputFileName": "baseline_situation_26_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -71,13 +67,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { @@ -93,13 +89,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { diff --git a/data/baseline_situations_generated/traffic_situation_27.json b/data/baseline_situations_generated/traffic_situation_27.json index 502fa06..3a737d7 100644 --- a/data/baseline_situations_generated/traffic_situation_27.json +++ b/data/baseline_situations_generated/traffic_situation_27.json @@ -2,13 +2,9 @@ "title": "HO, CR-GW, CR-SO", "inputFileName": "baseline_situation_27_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_28.json b/data/baseline_situations_generated/traffic_situation_28.json index bb4888a..03059b1 100644 --- a/data/baseline_situations_generated/traffic_situation_28.json +++ b/data/baseline_situations_generated/traffic_situation_28.json @@ -2,13 +2,9 @@ "title": "HO, CR-GW, OT-GW", "inputFileName": "baseline_situation_28_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_29.json b/data/baseline_situations_generated/traffic_situation_29.json index 51aca38..c3ee748 100644 --- a/data/baseline_situations_generated/traffic_situation_29.json +++ b/data/baseline_situations_generated/traffic_situation_29.json @@ -2,13 +2,9 @@ "title": "HO, CR-GW, OT-SO", "inputFileName": "baseline_situation_29_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,7 +67,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -93,24 +89,24 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { - "north": -2197.878856594501, - "east": -1268.9459495010217, - "latitude": 58.743718, - "longitude": 10.468726 + "north": -3042.224640503565, + "east": -1756.4292151300453, + "latitude": 58.736138, + "longitude": 10.460302 }, - "sog": 15.0, - "cog": 10.5 + "sog": 17.0, + "cog": 12.9 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_30.json b/data/baseline_situations_generated/traffic_situation_30.json index a366c54..eff6897 100644 --- a/data/baseline_situations_generated/traffic_situation_30.json +++ b/data/baseline_situations_generated/traffic_situation_30.json @@ -2,13 +2,9 @@ "title": "HO, CR-SO, CR-SO", "inputFileName": "baseline_situation_30_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -71,14 +67,14 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -93,7 +89,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_31.json b/data/baseline_situations_generated/traffic_situation_31.json index 4ac90c7..77e8a03 100644 --- a/data/baseline_situations_generated/traffic_situation_31.json +++ b/data/baseline_situations_generated/traffic_situation_31.json @@ -2,13 +2,9 @@ "title": "HO, CR-SO, OT-SO", "inputFileName": "baseline_situation_31_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_32.json b/data/baseline_situations_generated/traffic_situation_32.json index 8507d13..393da3f 100644 --- a/data/baseline_situations_generated/traffic_situation_32.json +++ b/data/baseline_situations_generated/traffic_situation_32.json @@ -2,13 +2,9 @@ "title": "HO, CR-SO, OT-GW", "inputFileName": "baseline_situation_32_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_33.json b/data/baseline_situations_generated/traffic_situation_33.json index 93594c3..fdbdbce 100644 --- a/data/baseline_situations_generated/traffic_situation_33.json +++ b/data/baseline_situations_generated/traffic_situation_33.json @@ -2,13 +2,9 @@ "title": "HO, OT-GW, OT-GW", "inputFileName": "baseline_situation_33_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_34.json b/data/baseline_situations_generated/traffic_situation_34.json index 740fc25..c2b51b0 100644 --- a/data/baseline_situations_generated/traffic_situation_34.json +++ b/data/baseline_situations_generated/traffic_situation_34.json @@ -2,13 +2,9 @@ "title": "HO, OT-GW, OT-SO", "inputFileName": "baseline_situation_34_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -93,13 +89,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_35.json b/data/baseline_situations_generated/traffic_situation_35.json index 045a760..e687870 100644 --- a/data/baseline_situations_generated/traffic_situation_35.json +++ b/data/baseline_situations_generated/traffic_situation_35.json @@ -2,13 +2,9 @@ "title": "HO, OT-SO, OT-SO", "inputFileName": "baseline_situation_35_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,29 +67,29 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2385.14501014459, - "east": 1112.2113840406043, - "latitude": 58.742037, - "longitude": 10.509873 + "north": -3313.365141988284, + "east": 1545.0475399729614, + "latitude": 58.733704, + "longitude": 10.517353 }, - "sog": 15.0, - "cog": 351.4 + "sog": 17.0, + "cog": 349.4 } }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_36.json b/data/baseline_situations_generated/traffic_situation_36.json index 056ff09..9054cf0 100644 --- a/data/baseline_situations_generated/traffic_situation_36.json +++ b/data/baseline_situations_generated/traffic_situation_36.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-GW, CR-GW", "inputFileName": "baseline_situation_36_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -93,14 +89,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_37.json b/data/baseline_situations_generated/traffic_situation_37.json index aaaa17c..a0aff08 100644 --- a/data/baseline_situations_generated/traffic_situation_37.json +++ b/data/baseline_situations_generated/traffic_situation_37.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-GW, CR-SO", "inputFileName": "baseline_situation_37_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,35 +45,35 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": 576.3830759299258, - "east": 6588.088704305517, - "latitude": 58.768623, - "longitude": 10.604499 + "north": 520.1686888360031, + "east": 5945.555319654308, + "latitude": 58.768119, + "longitude": 10.593396 }, - "sog": 16.0, - "cog": 303.5 + "sog": 15.0, + "cog": 306.6 } }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -93,14 +89,14 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_38.json b/data/baseline_situations_generated/traffic_situation_38.json index 871c7c2..03d2fbc 100644 --- a/data/baseline_situations_generated/traffic_situation_38.json +++ b/data/baseline_situations_generated/traffic_situation_38.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-GW, OT-GW", "inputFileName": "baseline_situation_38_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_39.json b/data/baseline_situations_generated/traffic_situation_39.json index 704c4fd..7646ca4 100644 --- a/data/baseline_situations_generated/traffic_situation_39.json +++ b/data/baseline_situations_generated/traffic_situation_39.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-GW, OT-SO", "inputFileName": "baseline_situation_39_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,29 +45,29 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 13539.502360922594, - "east": 2387.379571596614, - "latitude": 58.884998, - "longitude": 10.531909 + "north": 14640.254037415676, + "east": 2581.47179122242, + "latitude": 58.89488, + "longitude": 10.535263 }, - "sog": 15.0, - "cog": 196.6 + "sog": 17.0, + "cog": 195.9 } }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -93,13 +89,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { diff --git a/data/baseline_situations_generated/traffic_situation_40.json b/data/baseline_situations_generated/traffic_situation_40.json index c5f5ac3..c0ee31f 100644 --- a/data/baseline_situations_generated/traffic_situation_40.json +++ b/data/baseline_situations_generated/traffic_situation_40.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-SO, CR-SO", "inputFileName": "baseline_situation_40_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,13 +67,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { @@ -93,13 +89,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { diff --git a/data/baseline_situations_generated/traffic_situation_41.json b/data/baseline_situations_generated/traffic_situation_41.json index 8901d72..7c36fa3 100644 --- a/data/baseline_situations_generated/traffic_situation_41.json +++ b/data/baseline_situations_generated/traffic_situation_41.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-SO, OT-SO", "inputFileName": "baseline_situation_41_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,29 +45,29 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { "position": { - "north": 2780.896662821702, - "east": 10378.447636249331, - "latitude": 58.788414, - "longitude": 10.669998 + "north": 2982.1208443726337, + "east": 11129.42650550887, + "latitude": 58.790221, + "longitude": 10.682975 }, - "sog": 17.0, - "cog": 289.6 + "sog": 18.0, + "cog": 287.5 } }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_42.json b/data/baseline_situations_generated/traffic_situation_42.json index 6b3b962..e9294dc 100644 --- a/data/baseline_situations_generated/traffic_situation_42.json +++ b/data/baseline_situations_generated/traffic_situation_42.json @@ -2,13 +2,9 @@ "title": "CR-GW, CR-SO, OT-GW", "inputFileName": "baseline_situation_42_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,29 +67,29 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 6133.993660230819, - "east": -7310.208981530185, - "latitude": 58.818516, - "longitude": 10.364331 + "north": 6499.209035817461, + "east": -7745.455717456211, + "latitude": 58.821795, + "longitude": 10.356809 }, - "sog": 15.0, - "cog": 99.3 + "sog": 16.0, + "cog": 101.4 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_43.json b/data/baseline_situations_generated/traffic_situation_43.json index ce6bd7a..ba99fdf 100644 --- a/data/baseline_situations_generated/traffic_situation_43.json +++ b/data/baseline_situations_generated/traffic_situation_43.json @@ -2,13 +2,9 @@ "title": "CR-GW, OT-GW, OT-GW", "inputFileName": "baseline_situation_43_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -93,13 +89,13 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { diff --git a/data/baseline_situations_generated/traffic_situation_44.json b/data/baseline_situations_generated/traffic_situation_44.json index 92197a7..60e12af 100644 --- a/data/baseline_situations_generated/traffic_situation_44.json +++ b/data/baseline_situations_generated/traffic_situation_44.json @@ -2,13 +2,9 @@ "title": "CR-GW, OT-GW, OT-SO", "inputFileName": "baseline_situation_44_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -93,24 +89,24 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -2588.8648485589842, - "east": 226.49632564966922, - "latitude": 58.740208, - "longitude": 10.494568 + "north": -2157.7302797647667, + "east": 188.7769384260376, + "latitude": 58.744078, + "longitude": 10.493916 }, - "sog": 16.0, - "cog": 358.1 + "sog": 15.0, + "cog": 358.3 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_45.json b/data/baseline_situations_generated/traffic_situation_45.json index a9e6196..a46423e 100644 --- a/data/baseline_situations_generated/traffic_situation_45.json +++ b/data/baseline_situations_generated/traffic_situation_45.json @@ -2,13 +2,9 @@ "title": "CR-GW, OT-SO, OT-SO", "inputFileName": "baseline_situation_45_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,29 +67,29 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -3106.2798206140164, - "east": 1448.4820687246515, - "latitude": 58.735563, - "longitude": 10.515684 + "north": -2236.073447010553, + "east": 1042.6981725380665, + "latitude": 58.743375, + "longitude": 10.508672 }, - "sog": 17.0, - "cog": 349.4 + "sog": 15.0, + "cog": 351.4 } }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_46.json b/data/baseline_situations_generated/traffic_situation_46.json index e9c0d73..c25e25a 100644 --- a/data/baseline_situations_generated/traffic_situation_46.json +++ b/data/baseline_situations_generated/traffic_situation_46.json @@ -2,13 +2,9 @@ "title": "CR-SO, CR-SO, CR-SO", "inputFileName": "baseline_situation_46_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,7 +45,7 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -71,14 +67,14 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -93,24 +89,24 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 11580.2198850197, - "east": -6685.84306789118, - "latitude": 58.867409, - "longitude": 10.37512 + "north": 12649.724544637851, + "east": -7303.321871021278, + "latitude": 58.87701, + "longitude": 10.36445 }, - "sog": 15.0, - "cog": 130.5 + "sog": 17.0, + "cog": 132.9 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_47.json b/data/baseline_situations_generated/traffic_situation_47.json index 278647e..facd3e1 100644 --- a/data/baseline_situations_generated/traffic_situation_47.json +++ b/data/baseline_situations_generated/traffic_situation_47.json @@ -2,13 +2,9 @@ "title": "CR-SO, CR-SO, OT-SO", "inputFileName": "baseline_situation_47_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,29 +45,29 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": 12530.092364247672, - "east": -4560.580653192378, - "latitude": 58.875936, - "longitude": 10.411845 + "north": 13598.998448794535, + "east": -4949.630651193469, + "latitude": 58.885532, + "longitude": 10.405122 }, - "sog": 15.0, - "cog": 146.8 + "sog": 17.0, + "cog": 148.4 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -93,24 +89,24 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { "position": { - "north": -4684.603947243145, - "east": -1255.2358445234518, - "latitude": 58.721394, - "longitude": 10.468963 + "north": -6010.1650743841365, + "east": -1610.4188780589698, + "latitude": 58.709493, + "longitude": 10.462825 }, - "sog": 17.0, - "cog": 6.2 + "sog": 19.0, + "cog": 7.2 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_48.json b/data/baseline_situations_generated/traffic_situation_48.json index a48d56f..abc88d4 100644 --- a/data/baseline_situations_generated/traffic_situation_48.json +++ b/data/baseline_situations_generated/traffic_situation_48.json @@ -2,13 +2,9 @@ "title": "CR-SO, CR-SO, OT-GW", "inputFileName": "baseline_situation_48_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257845600, - "name": "BASTO IV", + "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" }, "initial": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -93,7 +89,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_49.json b/data/baseline_situations_generated/traffic_situation_49.json index da1abf0..843ee44 100644 --- a/data/baseline_situations_generated/traffic_situation_49.json +++ b/data/baseline_situations_generated/traffic_situation_49.json @@ -2,13 +2,9 @@ "title": "CR-SO, OT-GW, OT-GW", "inputFileName": "baseline_situation_49_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -93,7 +89,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_50.json b/data/baseline_situations_generated/traffic_situation_50.json index d7b7391..11a6653 100644 --- a/data/baseline_situations_generated/traffic_situation_50.json +++ b/data/baseline_situations_generated/traffic_situation_50.json @@ -2,13 +2,9 @@ "title": "CR-SO, OT-GW, OT-SO", "inputFileName": "baseline_situation_50_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -71,13 +67,13 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_51.json b/data/baseline_situations_generated/traffic_situation_51.json index 6db8112..cf34698 100644 --- a/data/baseline_situations_generated/traffic_situation_51.json +++ b/data/baseline_situations_generated/traffic_situation_51.json @@ -2,13 +2,9 @@ "title": "CR-SO, OT-SO, OT-SO", "inputFileName": "baseline_situation_51_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { @@ -71,46 +67,46 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": -2595.027182104609, - "east": 1210.0810481357655, - "latitude": 58.740152, - "longitude": 10.511565 + "north": -2277.938535116946, + "east": 1062.2201837314112, + "latitude": 58.742999, + "longitude": 10.50901 }, - "sog": 18.0, - "cog": 348.6 + "sog": 17.0, + "cog": 349.4 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { - "north": -3020.8857106792534, - "east": -1099.5124798073516, - "latitude": 58.736329, - "longitude": 10.471654 + "north": -3615.6147817217475, + "east": -1315.9761591196093, + "latitude": 58.73099, + "longitude": 10.467913 }, - "sog": 15.0, - "cog": 6.8 + "sog": 16.0, + "cog": 7.7 } } ] diff --git a/data/baseline_situations_generated/traffic_situation_52.json b/data/baseline_situations_generated/traffic_situation_52.json index c126226..bea8dec 100644 --- a/data/baseline_situations_generated/traffic_situation_52.json +++ b/data/baseline_situations_generated/traffic_situation_52.json @@ -2,13 +2,9 @@ "title": "OT-GW, OT-GW, OT-GW", "inputFileName": "baseline_situation_52_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,13 +45,13 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", + "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": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", "length": 50.0, "width": 10.0, "height": 8.0, @@ -93,14 +89,14 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { diff --git a/data/baseline_situations_generated/traffic_situation_53.json b/data/baseline_situations_generated/traffic_situation_53.json index 912af60..bf5d8d3 100644 --- a/data/baseline_situations_generated/traffic_situation_53.json +++ b/data/baseline_situations_generated/traffic_situation_53.json @@ -2,13 +2,9 @@ "title": "OT-GW, OT-GW, OT-SO", "inputFileName": "baseline_situation_53_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { @@ -71,7 +67,7 @@ }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, @@ -93,7 +89,7 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", + "id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2", "length": 178.0, "width": 30.0, "height": 30.0, diff --git a/data/baseline_situations_generated/traffic_situation_54.json b/data/baseline_situations_generated/traffic_situation_54.json index df354a7..3c1559d 100644 --- a/data/baseline_situations_generated/traffic_situation_54.json +++ b/data/baseline_situations_generated/traffic_situation_54.json @@ -2,13 +2,9 @@ "title": "OT-GW, OT-SO, OT-SO", "inputFileName": "baseline_situation_54_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,14 +45,14 @@ "targetShips": [ { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": { @@ -71,29 +67,29 @@ }, { "static": { - "id": "500c1686-6076-43e4-baec-2d01db90422c", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "mmsi": 219945000, - "name": "BASTO VI", - "shipType": "Passenger/Ro-Ro Cargo Ship" + "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": -3774.584992152159, - "east": 1760.1178881974772, - "latitude": 58.729563, - "longitude": 10.52107 + "north": -2385.14501014459, + "east": 1112.2113840406043, + "latitude": 58.742037, + "longitude": 10.509873 }, - "sog": 18.0, - "cog": 348.6 + "sog": 15.0, + "cog": 351.4 } }, { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", + "id": "29376342-9c27-4875-8377-0a9a569e1505", "length": 122.0, "width": 20.0, "height": 8.0, diff --git a/data/baseline_situations_generated/traffic_situation_55.json b/data/baseline_situations_generated/traffic_situation_55.json index 350cf9d..4942e11 100644 --- a/data/baseline_situations_generated/traffic_situation_55.json +++ b/data/baseline_situations_generated/traffic_situation_55.json @@ -2,13 +2,9 @@ "title": "OT-SO, OT-SO, OT-SO", "inputFileName": "baseline_situation_55_3_ts.json", "commonVector": 10.0, - "latLon0": [ - 58.763449, - 10.490654 - ], "ownShip": { "static": { - "id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f", + "id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5", "length": 122.0, "width": 20.0, "height": 8.0, @@ -49,68 +45,68 @@ "targetShips": [ { "static": { - "id": "a85975ef-54bc-4e92-a95e-f7925e347f63", - "length": 122.0, - "width": 20.0, + "id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d", + "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, + "mmsi": 257083180, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "north": -3434.8914566996837, - "east": 605.664039621156, - "latitude": 58.732613, - "longitude": 10.50112 + "north": -2456.445522039171, + "east": 433.13762217599594, + "latitude": 58.741397, + "longitude": 10.498139 }, - "sog": 17.0, - "cog": 355.9 + "sog": 15.0, + "cog": 356.6 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, + "id": "29376342-9c27-4875-8377-0a9a569e1505", + "length": 122.0, + "width": 20.0, "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "speedMax": 17.0, + "mmsi": 257845600, + "name": "BASTO IV", + "shipType": "Passenger/Ro-Ro Cargo Ship" }, "initial": { "position": { - "north": -2534.216573278628, - "east": 1181.7245955431424, - "latitude": 58.740698, - "longitude": 10.511075 + "north": -3520.4504633625534, + "east": 1641.6130112212722, + "latitude": 58.731845, + "longitude": 10.519022 }, - "sog": 15.0, - "cog": 351.4 + "sog": 17.0, + "cog": 349.4 } }, { "static": { - "id": "76a84885-8e48-463c-8ba2-6669c70f02cd", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "mmsi": 257083180, - "name": "CANOLE", - "shipType": "Cargo" + "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" }, "initial": { "position": { - "north": -3020.8857106792534, - "east": -1099.5124798073516, - "latitude": 58.736329, - "longitude": 10.471654 + "north": -4208.559137953545, + "east": -1531.7902553641193, + "latitude": 58.725667, + "longitude": 10.464184 }, - "sog": 15.0, - "cog": 6.8 + "sog": 17.0, + "cog": 8.4 } } ] diff --git a/data/baseline_situations_input/baseline_situation_01_1_ts.json b/data/baseline_situations_input/baseline_situation_01_1_ts.json index 74a8222..e7f8b25 100644 --- a/data/baseline_situations_input/baseline_situation_01_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_01_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_02_1_ts.json b/data/baseline_situations_input/baseline_situation_02_1_ts.json index 86daf7e..ba4f042 100644 --- a/data/baseline_situations_input/baseline_situation_02_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_02_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_03_1_ts.json b/data/baseline_situations_input/baseline_situation_03_1_ts.json index c595ff8..0691630 100644 --- a/data/baseline_situations_input/baseline_situation_03_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_03_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_04_1_ts.json b/data/baseline_situations_input/baseline_situation_04_1_ts.json index 7359398..f00c5d0 100644 --- a/data/baseline_situations_input/baseline_situation_04_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_04_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_05_1_ts.json b/data/baseline_situations_input/baseline_situation_05_1_ts.json index 4d8354e..7e2db6d 100644 --- a/data/baseline_situations_input/baseline_situation_05_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_05_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_06_2_ts.json b/data/baseline_situations_input/baseline_situation_06_2_ts.json index 9687a9a..54aa2fd 100644 --- a/data/baseline_situations_input/baseline_situation_06_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_06_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_07_2_ts.json b/data/baseline_situations_input/baseline_situation_07_2_ts.json index ca45261..8830412 100644 --- a/data/baseline_situations_input/baseline_situation_07_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_07_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_08_2_ts.json b/data/baseline_situations_input/baseline_situation_08_2_ts.json index 2369c46..662ca2b 100644 --- a/data/baseline_situations_input/baseline_situation_08_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_08_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_09_2_ts.json b/data/baseline_situations_input/baseline_situation_09_2_ts.json index 7a8c8ba..a47fbae 100644 --- a/data/baseline_situations_input/baseline_situation_09_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_09_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_10_2_ts.json b/data/baseline_situations_input/baseline_situation_10_2_ts.json index 87dfc3b..23c63fe 100644 --- a/data/baseline_situations_input/baseline_situation_10_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_10_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_11_2_ts.json b/data/baseline_situations_input/baseline_situation_11_2_ts.json index 8f026ab..6724480 100644 --- a/data/baseline_situations_input/baseline_situation_11_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_11_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_12_2_ts.json b/data/baseline_situations_input/baseline_situation_12_2_ts.json index 58a8cc6..5ddff4d 100644 --- a/data/baseline_situations_input/baseline_situation_12_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_12_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_13_2_ts.json b/data/baseline_situations_input/baseline_situation_13_2_ts.json index 8d75bf5..7740bf0 100644 --- a/data/baseline_situations_input/baseline_situation_13_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_13_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_14_2_ts.json b/data/baseline_situations_input/baseline_situation_14_2_ts.json index 8ea26fb..06ef3c6 100644 --- a/data/baseline_situations_input/baseline_situation_14_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_14_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_15_2_ts.json b/data/baseline_situations_input/baseline_situation_15_2_ts.json index 91f5814..2071beb 100644 --- a/data/baseline_situations_input/baseline_situation_15_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_15_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_16_2_ts.json b/data/baseline_situations_input/baseline_situation_16_2_ts.json index 745ed02..442b0e3 100644 --- a/data/baseline_situations_input/baseline_situation_16_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_16_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_17_2_ts.json b/data/baseline_situations_input/baseline_situation_17_2_ts.json index 2a50aa0..cdddf7c 100644 --- a/data/baseline_situations_input/baseline_situation_17_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_17_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_18_2_ts.json b/data/baseline_situations_input/baseline_situation_18_2_ts.json index 2ca25e4..740f5fe 100644 --- a/data/baseline_situations_input/baseline_situation_18_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_18_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_19_2_ts.json b/data/baseline_situations_input/baseline_situation_19_2_ts.json index 90fb905..1170a17 100644 --- a/data/baseline_situations_input/baseline_situation_19_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_19_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_20_2_ts.json b/data/baseline_situations_input/baseline_situation_20_2_ts.json index a1cdc5f..8a14b31 100644 --- a/data/baseline_situations_input/baseline_situation_20_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_20_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_21_3_ts.json b/data/baseline_situations_input/baseline_situation_21_3_ts.json index da85ef9..95b5394 100644 --- a/data/baseline_situations_input/baseline_situation_21_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_21_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_22_3_ts.json b/data/baseline_situations_input/baseline_situation_22_3_ts.json index c69aef5..c9c9704 100644 --- a/data/baseline_situations_input/baseline_situation_22_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_22_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_23_3_ts.json b/data/baseline_situations_input/baseline_situation_23_3_ts.json index 81a3ebf..8c34fd7 100644 --- a/data/baseline_situations_input/baseline_situation_23_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_23_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_24_3_ts.json b/data/baseline_situations_input/baseline_situation_24_3_ts.json index 1a406a1..1480d1e 100644 --- a/data/baseline_situations_input/baseline_situation_24_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_24_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_25_3_ts.json b/data/baseline_situations_input/baseline_situation_25_3_ts.json index cd5bed4..1bc5336 100644 --- a/data/baseline_situations_input/baseline_situation_25_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_25_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_26_3_ts.json b/data/baseline_situations_input/baseline_situation_26_3_ts.json index bb5e602..cf9ef49 100644 --- a/data/baseline_situations_input/baseline_situation_26_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_26_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_27_3_ts.json b/data/baseline_situations_input/baseline_situation_27_3_ts.json index 1fabfb6..9d1e2b6 100644 --- a/data/baseline_situations_input/baseline_situation_27_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_27_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_28_3_ts.json b/data/baseline_situations_input/baseline_situation_28_3_ts.json index 76e4370..8bc486f 100644 --- a/data/baseline_situations_input/baseline_situation_28_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_28_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_29_3_ts.json b/data/baseline_situations_input/baseline_situation_29_3_ts.json index 9fad4b1..6332f46 100644 --- a/data/baseline_situations_input/baseline_situation_29_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_29_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_30_3_ts.json b/data/baseline_situations_input/baseline_situation_30_3_ts.json index 94e33c6..a260856 100644 --- a/data/baseline_situations_input/baseline_situation_30_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_30_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_31_3_ts.json b/data/baseline_situations_input/baseline_situation_31_3_ts.json index f824ba2..99d6b1e 100644 --- a/data/baseline_situations_input/baseline_situation_31_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_31_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_32_3_ts.json b/data/baseline_situations_input/baseline_situation_32_3_ts.json index 2595dc5..9dcffec 100644 --- a/data/baseline_situations_input/baseline_situation_32_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_32_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_33_3_ts.json b/data/baseline_situations_input/baseline_situation_33_3_ts.json index cbc4fa7..00fdf42 100644 --- a/data/baseline_situations_input/baseline_situation_33_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_33_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_34_3_ts.json b/data/baseline_situations_input/baseline_situation_34_3_ts.json index 798fab7..df4d134 100644 --- a/data/baseline_situations_input/baseline_situation_34_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_34_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_35_3_ts.json b/data/baseline_situations_input/baseline_situation_35_3_ts.json index 3caeb22..073b6cf 100644 --- a/data/baseline_situations_input/baseline_situation_35_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_35_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_36_3_ts.json b/data/baseline_situations_input/baseline_situation_36_3_ts.json index 2f12fcf..0086773 100644 --- a/data/baseline_situations_input/baseline_situation_36_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_36_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_37_3_ts.json b/data/baseline_situations_input/baseline_situation_37_3_ts.json index 5efe679..7e9c98f 100644 --- a/data/baseline_situations_input/baseline_situation_37_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_37_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_38_3_ts.json b/data/baseline_situations_input/baseline_situation_38_3_ts.json index 78d5ca7..5aa7875 100644 --- a/data/baseline_situations_input/baseline_situation_38_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_38_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_39_3_ts.json b/data/baseline_situations_input/baseline_situation_39_3_ts.json index d77b08e..3f08295 100644 --- a/data/baseline_situations_input/baseline_situation_39_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_39_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_40_3_ts.json b/data/baseline_situations_input/baseline_situation_40_3_ts.json index fd71bc7..94a0b8b 100644 --- a/data/baseline_situations_input/baseline_situation_40_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_40_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_41_3_ts.json b/data/baseline_situations_input/baseline_situation_41_3_ts.json index d326bb5..df4f61b 100644 --- a/data/baseline_situations_input/baseline_situation_41_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_41_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_42_3_ts.json b/data/baseline_situations_input/baseline_situation_42_3_ts.json index 7010ded..7809d56 100644 --- a/data/baseline_situations_input/baseline_situation_42_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_42_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_43_3_ts.json b/data/baseline_situations_input/baseline_situation_43_3_ts.json index 4b99e2d..d405658 100644 --- a/data/baseline_situations_input/baseline_situation_43_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_43_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_44_3_ts.json b/data/baseline_situations_input/baseline_situation_44_3_ts.json index bf9d311..2e14f94 100644 --- a/data/baseline_situations_input/baseline_situation_44_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_44_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_45_3_ts.json b/data/baseline_situations_input/baseline_situation_45_3_ts.json index 4479dcc..f6495cb 100644 --- a/data/baseline_situations_input/baseline_situation_45_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_45_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_46_3_ts.json b/data/baseline_situations_input/baseline_situation_46_3_ts.json index 3147016..458a89e 100644 --- a/data/baseline_situations_input/baseline_situation_46_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_46_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_47_3_ts.json b/data/baseline_situations_input/baseline_situation_47_3_ts.json index 4cd8364..20b1007 100644 --- a/data/baseline_situations_input/baseline_situation_47_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_47_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_48_3_ts.json b/data/baseline_situations_input/baseline_situation_48_3_ts.json index 71ac5e6..3edfbf4 100644 --- a/data/baseline_situations_input/baseline_situation_48_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_48_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_49_3_ts.json b/data/baseline_situations_input/baseline_situation_49_3_ts.json index 0132ee4..0af5fa4 100644 --- a/data/baseline_situations_input/baseline_situation_49_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_49_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_50_3_ts.json b/data/baseline_situations_input/baseline_situation_50_3_ts.json index c7138f1..a6e9d2f 100644 --- a/data/baseline_situations_input/baseline_situation_50_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_50_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_51_3_ts.json b/data/baseline_situations_input/baseline_situation_51_3_ts.json index ade428c..f6281de 100644 --- a/data/baseline_situations_input/baseline_situation_51_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_51_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_52_3_ts.json b/data/baseline_situations_input/baseline_situation_52_3_ts.json index 5988f2a..d08c522 100644 --- a/data/baseline_situations_input/baseline_situation_52_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_52_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_53_3_ts.json b/data/baseline_situations_input/baseline_situation_53_3_ts.json index e8df8ca..4899a72 100644 --- a/data/baseline_situations_input/baseline_situation_53_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_53_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_54_3_ts.json b/data/baseline_situations_input/baseline_situation_54_3_ts.json index 2fbbf18..aaad6f6 100644 --- a/data/baseline_situations_input/baseline_situation_54_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_54_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/baseline_situations_input/baseline_situation_55_3_ts.json b/data/baseline_situations_input/baseline_situation_55_3_ts.json index 511fc7e..468032d 100644 --- a/data/baseline_situations_input/baseline_situation_55_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_55_3_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/example_situations_input/example_several_situations_01_1_ts.json b/data/example_situations_input/example_several_situations_01_1_ts.json index d317f42..dada755 100644 --- a/data/example_situations_input/example_several_situations_01_1_ts.json +++ b/data/example_situations_input/example_several_situations_01_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 7.0, "cog": 0.0 diff --git a/data/example_situations_input/example_several_situations_02_2_ts.json b/data/example_situations_input/example_several_situations_02_2_ts.json index 2257b40..3b66553 100644 --- a/data/example_situations_input/example_several_situations_02_2_ts.json +++ b/data/example_situations_input/example_several_situations_02_2_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 7.0, "cog": 0.0 diff --git a/data/example_situations_input/example_situation_01_1_ts.json b/data/example_situations_input/example_situation_01_1_ts.json index e2f046b..857303c 100644 --- a/data/example_situations_input/example_situation_01_1_ts.json +++ b/data/example_situations_input/example_situation_01_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 270.0 diff --git a/data/example_situations_input/example_situation_02_1_ts.json b/data/example_situations_input/example_situation_02_1_ts.json index cbff093..2380f18 100644 --- a/data/example_situations_input/example_situation_02_1_ts.json +++ b/data/example_situations_input/example_situation_02_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/example_situations_input/example_situation_03_1_ts.json b/data/example_situations_input/example_situation_03_1_ts.json index b542e4b..5deb8f6 100644 --- a/data/example_situations_input/example_situation_03_1_ts.json +++ b/data/example_situations_input/example_situation_03_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/data/example_situations_input/example_situation_04_1_ts.json b/data/example_situations_input/example_situation_04_1_ts.json index 8a108d5..e9dc8ab 100644 --- a/data/example_situations_input/example_situation_04_1_ts.json +++ b/data/example_situations_input/example_situation_04_1_ts.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 7.0, "cog": 0.0 diff --git a/src/trafficgen/encounter.py b/src/trafficgen/encounter.py index ad7d61f..56d77f7 100644 --- a/src/trafficgen/encounter.py +++ b/src/trafficgen/encounter.py @@ -61,6 +61,9 @@ def generate_encounter( """ encounter_found: bool = False outer_counter: int = 0 + # Initial posision of own ship used as reference point for lat_lon0 + assert own_ship.initial is not None + lat_lon0 = [own_ship.initial.position.latitude, own_ship.initial.position.longitude] target_ship = decide_target_ship(target_ships) assert target_ship.static is not None @@ -152,13 +155,13 @@ def generate_encounter( target_ship.initial.position, target_ship.initial.sog, target_ship.initial.cog, - settings.lat_lon0, + lat_lon0, ) encounter_found = encounter_ok and not trajectory_on_land if encounter_found: - target_ship = update_position_data_target_ship(target_ship, settings.lat_lon0) + target_ship = update_position_data_target_ship(target_ship, lat_lon0) return target_ship, encounter_found @@ -666,16 +669,13 @@ def update_position_data_target_ship( def update_position_data_own_ship( ship: OwnShip, - lat_lon0: List[float], delta_time: float, ) -> OwnShip: """ - Update position data of the target ship to also include latitude and longitude - position of the target ship. + Update ship data of the own ship to also include waypoints. Params: * ship: Own ship data - * lat_lon0: Reference point, latitudinal [degree] and longitudinal [degree] * delta_time: Delta time from now to the time new position is being calculated [minutes] Returns @@ -684,8 +684,11 @@ def update_position_data_own_ship( """ assert ship.initial is not None - lat_0 = lat_lon0[0] - lon_0 = lat_lon0[1] + lat_0 = ship.initial.position.latitude + lon_0 = ship.initial.position.longitude + + ship.initial.position.east = 0 + ship.initial.position.north = 0 ship_position_future = calculate_position_at_certain_time( ship.initial.position, @@ -693,14 +696,6 @@ def update_position_data_own_ship( ship.initial.cog, delta_time, ) - lat, lon, _ = flat2llh( - ship.initial.position.north, - ship.initial.position.east, - deg_2_rad(lat_0), - deg_2_rad(lon_0), - ) - ship.initial.position.latitude = round(rad_2_deg(lat), 6) - ship.initial.position.longitude = round(rad_2_deg(lon), 6) lat_future, lon_future, _ = flat2llh( ship_position_future.north, diff --git a/src/trafficgen/plot_traffic_situation.py b/src/trafficgen/plot_traffic_situation.py index 01d215b..7e306e5 100644 --- a/src/trafficgen/plot_traffic_situation.py +++ b/src/trafficgen/plot_traffic_situation.py @@ -185,15 +185,18 @@ def plot_specific_traffic_situation( situation_number = num_situations situation: TrafficSituation = traffic_situations[situation_number - 1] - assert situation.lat_lon0 is not None assert situation.own_ship is not None + assert situation.own_ship.initial is not None assert situation.common_vector is not None - map_plot = Map(location=(situation.lat_lon0[0], situation.lat_lon0[1]), zoom_start=10) + 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 = add_ship_to_map( situation.own_ship, situation.common_vector, - situation.lat_lon0, + [lat_0, lon_0], map_plot, "black", ) @@ -204,7 +207,7 @@ def plot_specific_traffic_situation( map_plot = add_ship_to_map( target_ship, situation.common_vector, - situation.lat_lon0, + [lat_0, lon_0], map_plot, "red", ) diff --git a/src/trafficgen/settings/encounter_settings.json b/src/trafficgen/settings/encounter_settings.json index b093e60..302d71f 100644 --- a/src/trafficgen/settings/encounter_settings.json +++ b/src/trafficgen/settings/encounter_settings.json @@ -36,9 +36,5 @@ ], "situation_length": 60.0, "max_meeting_distance": 0.0, - "evolve_time": 120.0, - "lat_lon0": [ - 58.763449, - 10.490654 - ] -} + "evolve_time": 120.0 +} \ No newline at end of file diff --git a/src/trafficgen/ship_traffic_generator.py b/src/trafficgen/ship_traffic_generator.py index 900fd14..6227ea7 100644 --- a/src/trafficgen/ship_traffic_generator.py +++ b/src/trafficgen/ship_traffic_generator.py @@ -55,13 +55,11 @@ def generate_traffic_situations( title=desired_traffic_situation.title, input_file_name=desired_traffic_situation.input_file_name, common_vector=desired_traffic_situation.common_vector, - lat_lon0=encounter_settings.lat_lon0, ) assert traffic_situation.common_vector is not None own_ship.initial = desired_traffic_situation.own_ship.initial own_ship = update_position_data_own_ship( own_ship, - encounter_settings.lat_lon0, encounter_settings.situation_length, ) traffic_situation.own_ship = own_ship diff --git a/src/trafficgen/types.py b/src/trafficgen/types.py index 197afe7..47807c3 100644 --- a/src/trafficgen/types.py +++ b/src/trafficgen/types.py @@ -162,7 +162,6 @@ class TrafficSituation(BaseModel): title: str input_file_name: Union[str, None] = None common_vector: Union[float, None] = None - lat_lon0: Union[List[float], None] = None own_ship: Union[Ship, None] = None num_situations: Union[int, None] = None encounter: Union[List[Encounter], None] = None @@ -215,7 +214,6 @@ class EncounterSettings(BaseModel): situation_length: float max_meeting_distance: float evolve_time: float - lat_lon0: List[float] class Config: """For converting parameters written to file from snake to camel case.""" diff --git a/tests/data/test_01/test_01_1.json b/tests/data/test_01/test_01_1.json index e2f046b..857303c 100644 --- a/tests/data/test_01/test_01_1.json +++ b/tests/data/test_01/test_01_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 270.0 diff --git a/tests/data/test_01/test_01_2.json b/tests/data/test_01/test_01_2.json index 4db0ba2..d6b0e88 100644 --- a/tests/data/test_01/test_01_2.json +++ b/tests/data/test_01/test_01_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 12.0, "cog": 0.0 diff --git a/tests/data/test_01/test_01_3.json b/tests/data/test_01/test_01_3.json index b638f84..10f7dd2 100644 --- a/tests/data/test_01/test_01_3.json +++ b/tests/data/test_01/test_01_3.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 110.0 diff --git a/tests/data/test_01/test_01_4.json b/tests/data/test_01/test_01_4.json index 67ae63d..2520252 100644 --- a/tests/data/test_01/test_01_4.json +++ b/tests/data/test_01/test_01_4.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_01/test_01_5.json b/tests/data/test_01/test_01_5.json index f3c1058..0220d42 100644 --- a/tests/data/test_01/test_01_5.json +++ b/tests/data/test_01/test_01_5.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 11.0, "cog": 45.0 diff --git a/tests/data/test_02/test_02_1.json b/tests/data/test_02/test_02_1.json index 1f332f3..32c5814 100644 --- a/tests/data/test_02/test_02_1.json +++ b/tests/data/test_02/test_02_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 270.0 diff --git a/tests/data/test_02/test_02_2.json b/tests/data/test_02/test_02_2.json index 57d1b87..912028c 100644 --- a/tests/data/test_02/test_02_2.json +++ b/tests/data/test_02/test_02_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_03/test_03_1.json b/tests/data/test_03/test_03_1.json index c1b1f87..e315087 100644 --- a/tests/data/test_03/test_03_1.json +++ b/tests/data/test_03/test_03_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_03/test_03_2.json b/tests/data/test_03/test_03_2.json index e91c216..3478e7b 100644 --- a/tests/data/test_03/test_03_2.json +++ b/tests/data/test_03/test_03_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 12.0, "cog": 230.0 diff --git a/tests/data/test_04/test_04_1.json b/tests/data/test_04/test_04_1.json index 5b4dd5d..aff903f 100644 --- a/tests/data/test_04/test_04_1.json +++ b/tests/data/test_04/test_04_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_05/test_05_1.json b/tests/data/test_05/test_05_1.json index 2ad159f..274f9ce 100644 --- a/tests/data/test_05/test_05_1.json +++ b/tests/data/test_05/test_05_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_05/test_05_2.json b/tests/data/test_05/test_05_2.json index ba86688..7a567be 100644 --- a/tests/data/test_05/test_05_2.json +++ b/tests/data/test_05/test_05_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_05/test_05_3.json b/tests/data/test_05/test_05_3.json index 9d7ffac..48f0f47 100644 --- a/tests/data/test_05/test_05_3.json +++ b/tests/data/test_05/test_05_3.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 270.0 diff --git a/tests/data/test_06/test_06_1.json b/tests/data/test_06/test_06_1.json index 1752003..3852bdf 100644 --- a/tests/data/test_06/test_06_1.json +++ b/tests/data/test_06/test_06_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_06/test_06_2.json b/tests/data/test_06/test_06_2.json index 5f7f81e..4370d43 100644 --- a/tests/data/test_06/test_06_2.json +++ b/tests/data/test_06/test_06_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_07/test_07_1.json b/tests/data/test_07/test_07_1.json index 58d6336..7589f59 100644 --- a/tests/data/test_07/test_07_1.json +++ b/tests/data/test_07/test_07_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 270.0 diff --git a/tests/data/test_07/test_07_2.json b/tests/data/test_07/test_07_2.json index a2a0239..306c3a3 100644 --- a/tests/data/test_07/test_07_2.json +++ b/tests/data/test_07/test_07_2.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_07/test_07_3.json b/tests/data/test_07/test_07_3.json index cba42e4..ec41134 100644 --- a/tests/data/test_07/test_07_3.json +++ b/tests/data/test_07/test_07_3.json @@ -4,8 +4,8 @@ "ownShip": { "startPose": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "speed": 8.0, "course": 110.0 diff --git a/tests/data/test_07/test_07_4.json b/tests/data/test_07/test_07_4.json index c8a9674..d0808d6 100644 --- a/tests/data/test_07/test_07_4.json +++ b/tests/data/test_07/test_07_4.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 8.0, "cog": 0.0 diff --git a/tests/data/test_07/test_07_5.json b/tests/data/test_07/test_07_5.json index 65c7e47..f1f9ddd 100644 --- a/tests/data/test_07/test_07_5.json +++ b/tests/data/test_07/test_07_5.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 11.0, "cog": 45.0 diff --git a/tests/data/test_08/baseline_situation_01_1_ts.json b/tests/data/test_08/test_08_1.json similarity index 82% rename from tests/data/test_08/baseline_situation_01_1_ts.json rename to tests/data/test_08/test_08_1.json index 74a8222..e7f8b25 100644 --- a/tests/data/test_08/baseline_situation_01_1_ts.json +++ b/tests/data/test_08/test_08_1.json @@ -4,8 +4,8 @@ "ownShip": { "initial": { "position": { - "north": 0.0, - "east": 0.0 + "latitude": 58.763449, + "longitude": 10.490654 }, "sog": 10.0, "cog": 0.0 diff --git a/tests/test_read_files.py b/tests/test_read_files.py index 74b9c04..93e253a 100644 --- a/tests/test_read_files.py +++ b/tests/test_read_files.py @@ -195,5 +195,4 @@ def test_read_encounter_settings_file(settings_file: Path): assert settings.vector_range is not None assert settings.max_meeting_distance == 0.0 assert settings.evolve_time == 120.0 - assert settings.lat_lon0 is not None - assert len(settings.lat_lon0) == 2 + diff --git a/tests/test_trafficgen.py b/tests/test_trafficgen.py index dcd9573..8ed73a8 100644 --- a/tests/test_trafficgen.py +++ b/tests/test_trafficgen.py @@ -122,7 +122,6 @@ def test_gen_situations_1_ts_full_spec_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None # @TODO: See comment in test_gen_situations_1_ts_partly_spec_cli(). # Same behaviour and reason for below change here. @@ -167,7 +166,6 @@ def test_gen_situations_1_ts_partly_spec_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None # @TODO: @TomArne: As again the tests on GitHub failed here, # I have for now adapted the assertion to not test for @@ -221,7 +219,6 @@ def test_gen_situations_1_ts_minimum_spec_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None assert len(situation.target_ships) == 1 @@ -263,7 +260,6 @@ def test_gen_situations_2_ts_one_to_many_situations_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None assert len(situation.target_ships) == 2 @@ -305,7 +301,6 @@ def test_gen_situations_one_to_many_situations_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None assert len(situation.target_ships) in {1, 2, 3} @@ -348,7 +343,6 @@ def test_gen_situations_ot_gw_target_ship_speed_too_high_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None assert len(situation.target_ships) == 0 @@ -391,6 +385,5 @@ def test_gen_situations_baseline_cli( # sourcery skip: no-loop-in-tests for situation in situations: - assert situation.lat_lon0 is not None assert situation.target_ships is not None assert len(situation.target_ships) in {1, 2, 3}