diff --git a/data/baseline_situations_generated/traffic_situation_01.json b/data/baseline_situations_generated/traffic_situation_01.json index ad90917..62bdb2c 100644 --- a/data/baseline_situations_generated/traffic_situation_01.json +++ b/data/baseline_situations_generated/traffic_situation_01.json @@ -1,42 +1,38 @@ { "title": "HO", + "description": "A head on situation with one target ship.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,26 +40,38 @@ "targetShips": [ { "static": { - "id": "ba02a5fa-f39d-4fe4-8d0a-af87ab417e7b", - "length": 122.0, - "width": 20.0, + "id": "dfd6b5f6-7b3c-402f-affd-e089840bc6e8", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02721306, - "longitude": 0.18320382, - "north": 10195.0, - "east": 356.0 + "latitude": 58.85500037, + "longitude": 10.49680582 }, - "sog": 6.2, - "cog": 3.205 - } + "sog": 12.1, + "cog": 183.63, + "heading": 183.63, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85500037, + "longitude": 10.49680582 + } + }, + { + "position": { + "latitude": 58.65502782, + "longitude": 10.47236608 + } + } + ] } - ], - "input_file_name": "baseline_situation_01_1_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_02.json b/data/baseline_situations_generated/traffic_situation_02.json index 6aa7149..a881eb2 100644 --- a/data/baseline_situations_generated/traffic_situation_02.json +++ b/data/baseline_situations_generated/traffic_situation_02.json @@ -1,42 +1,38 @@ { "title": "CR-GW", + "description": "A crossing situation with one target ship. Own ship is give-way.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,26 +40,38 @@ "targetShips": [ { "static": { - "id": "f4088510-a8b5-4070-8269-31878443d6bd", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "f93d0740-146c-4515-869e-7921ad857771", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02652036, - "longitude": 0.18373041, - "north": 5774.0, - "east": 2102.0 + "latitude": 58.81530237, + "longitude": 10.52697741 }, - "sog": 4.1, - "cog": 3.934 - } + "sog": 8.0, + "cog": 225.4, + "heading": 225.4, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81530237, + "longitude": 10.52697741 + } + }, + { + "position": { + "latitude": 58.72226537, + "longitude": 10.34536394 + } + } + ] } - ], - "input_file_name": "baseline_situation_02_1_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_03.json b/data/baseline_situations_generated/traffic_situation_03.json index 2af465f..3d83048 100644 --- a/data/baseline_situations_generated/traffic_situation_03.json +++ b/data/baseline_situations_generated/traffic_situation_03.json @@ -1,42 +1,38 @@ { "title": "CR-SO", + "description": "A crossing situation with one target ship. Own ship is stand-on.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,26 +40,38 @@ "targetShips": [ { "static": { - "id": "cfb5c414-7aeb-442f-b581-16c428d898fe", - "length": 122.0, - "width": 20.0, + "id": "dac921cc-344e-4e19-a98a-b8b3d78c29ae", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02647163, - "longitude": 0.1821452, - "north": 5463.0, - "east": -3154.0 + "latitude": 58.81250143, + "longitude": 10.43613433 }, - "sog": 3.1, - "cog": 1.64 - } + "sog": 6.0, + "cog": 93.97, + "heading": 93.97, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81250143, + "longitude": 10.43613433 + } + }, + { + "position": { + "latitude": 58.80557361, + "longitude": 10.62852203 + } + } + ] } - ], - "input_file_name": "baseline_situation_03_1_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_04.json b/data/baseline_situations_generated/traffic_situation_04.json index aa46984..0436bc9 100644 --- a/data/baseline_situations_generated/traffic_situation_04.json +++ b/data/baseline_situations_generated/traffic_situation_04.json @@ -1,42 +1,38 @@ { "title": "OT-GW", + "description": "A overting situation with one target ship. Own ship is give-way.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,26 +40,38 @@ "targetShips": [ { "static": { - "id": "d9bb9671-9833-4e36-9674-f00cb4dfdec8", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "8fdc3b9d-cf9f-412f-8c05-0b290e2eb1cd", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02596287, - "longitude": 0.1832756, - "north": 2216.0, - "east": 594.0 + "latitude": 58.78336982, + "longitude": 10.50093584 }, - "sog": 2.6, - "cog": 6.008 - } + "sog": 5.1, + "cog": 344.18, + "heading": 344.18, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78336982, + "longitude": 10.50093584 + } + }, + { + "position": { + "latitude": 58.86421368, + "longitude": 10.45683011 + } + } + ] } - ], - "input_file_name": "baseline_situation_04_1_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_05.json b/data/baseline_situations_generated/traffic_situation_05.json index f0b63d8..94eecd0 100644 --- a/data/baseline_situations_generated/traffic_situation_05.json +++ b/data/baseline_situations_generated/traffic_situation_05.json @@ -1,42 +1,38 @@ { "title": "OT-SO", + "description": "A overtaking situation with one target ship. Own ship is stand-on.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,26 +40,38 @@ "targetShips": [ { "static": { - "id": "5b67964d-45e9-416b-bade-49615b27065d", - "length": 122.0, - "width": 20.0, + "id": "05e8e127-1457-4e38-a4eb-91ae3cb42434", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02507619, - "longitude": 0.18281807, - "north": -3443.0, - "east": -923.0 + "latitude": 58.73258475, + "longitude": 10.47473875 }, - "sog": 8.2, - "cog": 0.099 - } + "sog": 15.9, + "cog": 5.67, + "heading": 5.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73258475, + "longitude": 10.47473875 + } + }, + { + "position": { + "latitude": 58.99629951, + "longitude": 10.52515793 + } + } + ] } - ], - "input_file_name": "baseline_situation_05_1_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_06.json b/data/baseline_situations_generated/traffic_situation_06.json index 928e93c..ed91d9c 100644 --- a/data/baseline_situations_generated/traffic_situation_06.json +++ b/data/baseline_situations_generated/traffic_situation_06.json @@ -1,42 +1,38 @@ { "title": "HO, HO", + "description": "Head-on situations with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "e89ba25c-e93d-45c1-a6ae-9ebe2a723a40", + "id": "8252388c-6a5c-422c-8ff7-f03202555195", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02662252, - "longitude": 0.18306267, - "north": 6426.0, - "east": -112.0 + "latitude": 58.8211646, + "longitude": 10.48871859 }, - "sog": 4.6, - "cog": 3.105 - } + "sog": 8.9, + "cog": 177.9, + "heading": 177.9, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8211646, + "longitude": 10.48871859 + } + }, + { + "position": { + "latitude": 58.67259864, + "longitude": 10.49918774 + } + } + ] }, { "static": { - "id": "d27bf0f0-6676-40d1-a183-7d5e2f67cc04", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "158f8e0f-067c-4832-906b-ec5574022da9", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0270357, - "longitude": 0.18328766, - "north": 9063.0, - "east": 634.0 + "latitude": 58.84484694, + "longitude": 10.50160978 }, - "sog": 5.7, - "cog": 3.274 - } + "sog": 11.1, + "cog": 187.59, + "heading": 187.59, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84484694, + "longitude": 10.50160978 + } + }, + { + "position": { + "latitude": 58.66224347, + "longitude": 10.45479601 + } + } + ] } - ], - "input_file_name": "baseline_situation_06_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_07.json b/data/baseline_situations_generated/traffic_situation_07.json index 2876875..4f70ce8 100644 --- a/data/baseline_situations_generated/traffic_situation_07.json +++ b/data/baseline_situations_generated/traffic_situation_07.json @@ -1,42 +1,38 @@ { "title": "HO, CR-GW", + "description": "A head-on and crossing give-way situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "fe663062-2b70-4070-b5d4-1ef8d80621a9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "7e28fa7c-3944-4b3f-8e51-f24452cdff77", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02792614, - "longitude": 0.1827855, - "north": 14746.0, - "east": -1031.0 + "latitude": 58.8958744, + "longitude": 10.4728379 }, - "sog": 7.2, - "cog": 3.022 - } + "sog": 14.0, + "cog": 173.15, + "heading": 173.15, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8958744, + "longitude": 10.4728379 + } + }, + { + "position": { + "latitude": 58.66484265, + "longitude": 10.52627682 + } + } + ] }, { "static": { - "id": "f7c9d51d-8a31-4f76-b2b5-976a2237af3f", + "id": "2cc0c318-a03b-4f5f-a526-5d832012135d", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02614275, - "longitude": 0.18383356, - "north": 3364.0, - "east": 2444.0 + "latitude": 58.79364892, + "longitude": 10.53288731 }, - "sog": 4.1, - "cog": 4.598 - } + "sog": 8.0, + "cog": 263.5, + "heading": 263.5, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79364892, + "longitude": 10.53288731 + } + }, + { + "position": { + "latitude": 58.77865635, + "longitude": 10.27946644 + } + } + ] } - ], - "input_file_name": "baseline_situation_07_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_08.json b/data/baseline_situations_generated/traffic_situation_08.json index c2b5fd2..f69dfd4 100644 --- a/data/baseline_situations_generated/traffic_situation_08.json +++ b/data/baseline_situations_generated/traffic_situation_08.json @@ -1,42 +1,38 @@ { "title": "HO, CR-SO", + "description": "A head-on and crossing stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "258bb5ab-e211-492e-88a6-716a3298b228", - "length": 122.0, - "width": 20.0, + "id": "320bda36-a3a6-426e-a38d-aa8607595dc0", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02755981, - "longitude": 0.18335794, - "north": 12408.0, - "east": 867.0 + "latitude": 58.87486732, + "longitude": 10.50565339 }, - "sog": 8.7, - "cog": 3.253 - } + "sog": 16.9, + "cog": 186.38, + "heading": 186.38, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87486732, + "longitude": 10.50565339 + } + }, + { + "position": { + "latitude": 58.59543873, + "longitude": 10.44548191 + } + } + ] }, { "static": { - "id": "82761c8b-f2e9-4be8-9ae0-382505431915", + "id": "60e9e953-a03a-40f4-bd99-f39c88b13e37", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02630084, - "longitude": 0.18213827, - "north": 4373.0, - "east": -3177.0 + "latitude": 58.80271608, + "longitude": 10.43573688 }, - "sog": 4.1, - "cog": 1.685 - } + "sog": 8.0, + "cog": 96.49, + "heading": 96.49, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.80271608, + "longitude": 10.43573688 + } + }, + { + "position": { + "latitude": 58.78774791, + "longitude": 10.68916308 + } + } + ] } - ], - "input_file_name": "baseline_situation_08_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_09.json b/data/baseline_situations_generated/traffic_situation_09.json index 5ef3f89..92b336d 100644 --- a/data/baseline_situations_generated/traffic_situation_09.json +++ b/data/baseline_situations_generated/traffic_situation_09.json @@ -1,42 +1,38 @@ { "title": "HO, OT-GW", + "description": "A head-on and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "8ff1a086-25cd-4c14-9570-fb59677a5052", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "2f478fe4-0d80-475a-893b-4af9029cc16a", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02693886, - "longitude": 0.18300748, - "north": 8445.0, - "east": -295.0 + "latitude": 58.83929892, + "longitude": 10.48555628 }, - "sog": 5.7, - "cog": 3.075 - } + "sog": 11.1, + "cog": 176.18, + "heading": 176.18, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.83929892, + "longitude": 10.48555628 + } + }, + { + "position": { + "latitude": 58.6554913, + "longitude": 10.50915218 + } + } + ] }, { "static": { - "id": "ae3942b3-9085-4541-8dd0-9354de7f374f", + "id": "d818ad2e-af8c-4ca9-bd73-fb727a4f45ae", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02600377, - "longitude": 0.18322825, - "north": 2477.0, - "east": 437.0 + "latitude": 58.78572189, + "longitude": 10.49820554 }, - "sog": 2.6, - "cog": 6.107 - } + "sog": 5.1, + "cog": 349.91, + "heading": 349.91, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78572189, + "longitude": 10.49820554 + } + }, + { + "position": { + "latitude": 58.86844941, + "longitude": 10.46985572 + } + } + ] } - ], - "input_file_name": "baseline_situation_09_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_10.json b/data/baseline_situations_generated/traffic_situation_10.json index fd7e662..3f9a640 100644 --- a/data/baseline_situations_generated/traffic_situation_10.json +++ b/data/baseline_situations_generated/traffic_situation_10.json @@ -1,42 +1,38 @@ { "title": "HO, OT-SO", + "description": "A head-on and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "f5ac7446-10f3-400d-8850-520b15314a39", + "id": "35f2184b-04bd-494b-a9ef-3d5709bf681e", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02725223, - "longitude": 0.18309645, - "north": 10445.0, - "east": 0.0 + "latitude": 58.85725369, + "longitude": 10.490654 }, - "sog": 5.1, - "cog": 3.142 - } + "sog": 9.9, + "cog": 180.02, + "heading": 180.02, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85725369, + "longitude": 10.490654 + } + }, + { + "position": { + "latitude": 58.69242893, + "longitude": 10.49052476 + } + } + ] }, { "static": { - "id": "403686b9-8324-475f-a2bf-88edb393ea29", + "id": "06e96af4-67f1-413b-923b-c49cc1ce6ad4", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02495931, - "longitude": 0.18318482, - "north": -4189.0, - "east": 293.0 + "latitude": 58.72586967, + "longitude": 10.49571716 }, - "sog": 9.8, - "cog": 6.25 - } + "sog": 19.1, + "cog": 358.1, + "heading": 358.1, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72586967, + "longitude": 10.49571716 + } + }, + { + "position": { + "latitude": 59.04241741, + "longitude": 10.47548936 + } + } + ] } - ], - "input_file_name": "baseline_situation_10_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_11.json b/data/baseline_situations_generated/traffic_situation_11.json index 14db6e2..ed1c41f 100644 --- a/data/baseline_situations_generated/traffic_situation_11.json +++ b/data/baseline_situations_generated/traffic_situation_11.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-GW", + "description": "Two crossing give-way situations with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "5315621e-7536-45f9-9e57-b953a53dfa15", - "length": 122.0, - "width": 20.0, + "id": "9d63f390-e416-4dd2-bfaa-4420e86bd311", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02755182, - "longitude": 0.18430768, - "north": 12357.0, - "east": 4016.0 + "latitude": 58.87441845, + "longitude": 10.5600521 }, - "sog": 6.7, - "cog": 3.695 - } + "sog": 13.0, + "cog": 211.71, + "heading": 211.71, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87441845, + "longitude": 10.5600521 + } + }, + { + "position": { + "latitude": 58.69020418, + "longitude": 10.34098484 + } + } + ] }, { "static": { - "id": "a1527d13-526b-4748-b4bd-896ab65a9c29", - "length": 122.0, - "width": 20.0, + "id": "0991fdaa-4607-4814-970b-d078a1a92804", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02549595, - "longitude": 0.184181, - "north": -764.0, - "east": 3596.0 + "latitude": 58.75659028, + "longitude": 10.55272521 }, - "sog": 7.2, - "cog": 5.695 - } + "sog": 14.0, + "cog": 326.36, + "heading": 326.36, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75659028, + "longitude": 10.55272521 + } + }, + { + "position": { + "latitude": 58.95030865, + "longitude": 10.30457519 + } + } + ] } - ], - "input_file_name": "baseline_situation_11_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_12.json b/data/baseline_situations_generated/traffic_situation_12.json index 4d5924b..d719df2 100644 --- a/data/baseline_situations_generated/traffic_situation_12.json +++ b/data/baseline_situations_generated/traffic_situation_12.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-SO", + "description": "A crossing give-way and crossing stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "b1985bdc-c30d-4af6-ad82-affcf9c6ad61", - "length": 122.0, - "width": 20.0, + "id": "0367c82d-83b1-4577-9105-85011bb19fee", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02670916, - "longitude": 0.18520132, - "north": 6979.0, - "east": 6979.0 + "latitude": 58.82610217, + "longitude": 10.61125394 }, - "sog": 6.2, - "cog": 4.553 - } + "sog": 12.1, + "cog": 260.92, + "heading": 260.92, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.82610217, + "longitude": 10.61125394 + } + }, + { + "position": { + "latitude": 58.79449747, + "longitude": 10.23038324 + } + } + ] }, { "static": { - "id": "5eef6a50-f273-4713-9884-6a80d584ab90", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "df8cdef7-1708-4cba-962c-9b25ee7678f2", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02553168, - "longitude": 0.18207614, - "north": -536.0, - "east": -3383.0 + "latitude": 58.7586461, + "longitude": 10.4322808 }, - "sog": 6.7, - "cog": 0.554 - } + "sog": 13.0, + "cog": 31.68, + "heading": 31.68, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7586461, + "longitude": 10.4322808 + } + }, + { + "position": { + "latitude": 58.94290671, + "longitude": 10.6512036 + } + } + ] } - ], - "input_file_name": "baseline_situation_12_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_13.json b/data/baseline_situations_generated/traffic_situation_13.json index d23c30b..6dacd1e 100644 --- a/data/baseline_situations_generated/traffic_situation_13.json +++ b/data/baseline_situations_generated/traffic_situation_13.json @@ -1,42 +1,38 @@ { "title": "CR-GW, OT-GW", + "description": "A crossing give-way and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "47914e9e-bd1d-4a32-bd1b-e849ee595106", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "9cdfaf2f-c653-44c7-9aed-ccd159d13037", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02636477, - "longitude": 0.1855937, - "north": 4781.0, - "east": 8280.0 + "latitude": 58.8063609, + "longitude": 10.63373574 }, - "sog": 7.7, - "cog": 4.805 - } + "sog": 15.0, + "cog": 275.36, + "heading": 275.36, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8063609, + "longitude": 10.63373574 + } + }, + { + "position": { + "latitude": 58.82962228, + "longitude": 10.15682022 + } + } + ] }, { "static": { - "id": "5ff65514-29a1-410d-8ae5-eac5a7d45c69", - "length": 122.0, - "width": 20.0, + "id": "08c0c3d8-748d-400f-8e43-1dfb5411e789", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02586338, - "longitude": 0.18343032, - "north": 1581.0, - "east": 1107.0 + "latitude": 58.77768713, + "longitude": 10.50983525 }, - "sog": 3.6, - "cog": 5.934 - } + "sog": 7.0, + "cog": 339.94, + "heading": 339.94, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77768713, + "longitude": 10.50983525 + } + }, + { + "position": { + "latitude": 58.88697284, + "longitude": 10.43300292 + } + } + ] } - ], - "input_file_name": "baseline_situation_13_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_14.json b/data/baseline_situations_generated/traffic_situation_14.json index 410d3a7..1f17375 100644 --- a/data/baseline_situations_generated/traffic_situation_14.json +++ b/data/baseline_situations_generated/traffic_situation_14.json @@ -1,42 +1,38 @@ { "title": "CR-GW, OT-SO", + "description": "A crossing give-way and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "31c31b79-3293-4f69-bef0-ac5e365416ad", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "f506ab6a-25b4-4c76-948e-f822eb0f7708", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02570325, - "longitude": 0.18405282, - "north": 559.0, - "east": 3171.0 + "latitude": 58.76846736, + "longitude": 10.54539832 }, - "sog": 6.2, - "cog": 5.493 - } + "sog": 12.1, + "cog": 314.78, + "heading": 314.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76846736, + "longitude": 10.54539832 + } + }, + { + "position": { + "latitude": 58.90961643, + "longitude": 10.2716373 + } + } + ] }, { "static": { - "id": "a1a3126f-6d2a-4c80-bce7-e86e80eafcad", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "406838b2-99e4-43df-9e62-75381aa085d2", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.0251442, - "longitude": 0.18257257, - "north": -3009.0, - "east": -1737.0 + "latitude": 58.73646298, + "longitude": 10.4606725 }, - "sog": 8.7, - "cog": 0.224 - } + "sog": 16.9, + "cog": 12.78, + "heading": 12.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73646298, + "longitude": 10.4606725 + } + }, + { + "position": { + "latitude": 59.01067239, + "longitude": 10.58036723 + } + } + ] } - ], - "input_file_name": "baseline_situation_14_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_15.json b/data/baseline_situations_generated/traffic_situation_15.json index d8b5c70..c04fefd 100644 --- a/data/baseline_situations_generated/traffic_situation_15.json +++ b/data/baseline_situations_generated/traffic_situation_15.json @@ -1,42 +1,38 @@ { "title": "CR-SO, CR-SO", + "description": "Two crossing stand-on situations with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "524b66bb-e108-4f07-8989-66ed2e7eeee3", + "id": "d435f772-b6a7-4ec9-b7f9-e7b058229fc6", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02570199, - "longitude": 0.18119667, - "north": 551.0, - "east": -6299.0 + "latitude": 58.76839554, + "longitude": 10.38187386 }, - "sog": 7.7, - "cog": 0.931 - } + "sog": 15.0, + "cog": 53.29, + "heading": 53.29, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76839554, + "longitude": 10.38187386 + } + }, + { + "position": { + "latitude": 58.91716838, + "longitude": 10.76586007 + } + } + ] }, { "static": { - "id": "2dbbfbe8-ec42-4ffe-b056-babb997ccf6d", - "length": 50.0, - "width": 10.0, + "id": "87d7e4b3-5b7c-4eed-ad55-d7f3d564b2b4", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0254795, - "longitude": 0.18161047, - "north": -869.0, - "east": -4927.0 + "latitude": 58.75565663, + "longitude": 10.40558257 }, - "sog": 8.2, - "cog": 0.731 - } + "sog": 15.9, + "cog": 41.83, + "heading": 41.83, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75565663, + "longitude": 10.40558257 + } + }, + { + "position": { + "latitude": 58.95313708, + "longitude": 10.74576446 + } + } + ] } - ], - "input_file_name": "baseline_situation_15_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_16.json b/data/baseline_situations_generated/traffic_situation_16.json index a7b9f19..abf31bf 100644 --- a/data/baseline_situations_generated/traffic_situation_16.json +++ b/data/baseline_situations_generated/traffic_situation_16.json @@ -1,42 +1,38 @@ { "title": "CR-SO, OT-SO", + "description": "A crossing stand-on and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "24938777-0bb3-4a13-9157-3e5aa80fad98", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "eb17a50b-d8a0-4e7e-a1e5-d982423b1a98", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02549235, - "longitude": 0.18221035, - "north": -787.0, - "east": -2938.0 + "latitude": 58.75639278, + "longitude": 10.43997058 }, - "sog": 6.7, - "cog": 0.474 - } + "sog": 13.0, + "cog": 27.16, + "heading": 27.16, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75639278, + "longitude": 10.43997058 + } + }, + { + "position": { + "latitude": 58.94905427, + "longitude": 10.63022001 + } + } + ] }, { "static": { - "id": "ad70d1dc-650f-4b97-8a9f-f72a2038fa34", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "9e0ed8e7-1432-464a-a526-c73426294184", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02518979, - "longitude": 0.18287689, - "north": -2718.0, - "east": -728.0 + "latitude": 58.73908438, + "longitude": 10.47809115 }, - "sog": 8.2, - "cog": 0.099 - } + "sog": 15.9, + "cog": 5.67, + "heading": 5.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73908438, + "longitude": 10.47809115 + } + }, + { + "position": { + "latitude": 59.00279913, + "longitude": 10.52851033 + } + } + ] } - ], - "input_file_name": "baseline_situation_16_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_17.json b/data/baseline_situations_generated/traffic_situation_17.json index 1253064..e447081 100644 --- a/data/baseline_situations_generated/traffic_situation_17.json +++ b/data/baseline_situations_generated/traffic_situation_17.json @@ -1,42 +1,38 @@ { "title": "CR-SO, OT-GW", + "description": "A crossing stand-on and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "06ac6cca-7afd-4cd6-baff-d38944454298", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "9816c55d-04d1-4213-8b44-7a90d5502a68", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02554029, - "longitude": 0.18255478, - "north": -481.0, - "east": -1796.0 + "latitude": 58.75913986, + "longitude": 10.4597048 }, - "sog": 6.2, - "cog": 0.38 - } + "sog": 12.1, + "cog": 21.72, + "heading": 21.72, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75913986, + "longitude": 10.4597048 + } + }, + { + "position": { + "latitude": 58.94529547, + "longitude": 10.60241005 + } + } + ] }, { "static": { - "id": "38278ede-a0a3-48e0-8574-335af5d6cd83", - "length": 50.0, - "width": 10.0, + "id": "e2bd1916-2390-4d93-8980-f522c343d112", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02571798, - "longitude": 0.18321015, - "north": 653.0, - "east": 377.0 + "latitude": 58.76933816, + "longitude": 10.49720327 }, - "sog": 4.1, - "cog": 6.129 - } + "sog": 8.0, + "cog": 351.11, + "heading": 351.11, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76933816, + "longitude": 10.49720327 + } + }, + { + "position": { + "latitude": 58.90025202, + "longitude": 10.45778058 + } + } + ] } - ], - "input_file_name": "baseline_situation_17_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_18.json b/data/baseline_situations_generated/traffic_situation_18.json index be0f184..8902a33 100644 --- a/data/baseline_situations_generated/traffic_situation_18.json +++ b/data/baseline_situations_generated/traffic_situation_18.json @@ -1,42 +1,38 @@ { "title": "OT-GW, OT-GW", + "description": "A overtaking give-way and overtaking give-way situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "824c1698-f425-40dc-90b7-b80861f6e616", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "60d045a5-cbb1-4fcb-840b-52b5916e1316", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02583627, - "longitude": 0.18321015, - "north": 1408.0, - "east": 377.0 + "latitude": 58.77612507, + "longitude": 10.49718599 }, - "sog": 3.6, - "cog": 6.167 - } + "sog": 7.0, + "cog": 353.29, + "heading": 353.29, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77612507, + "longitude": 10.49718599 + } + }, + { + "position": { + "latitude": 58.89167402, + "longitude": 10.47100189 + } + } + ] }, { "static": { - "id": "41cd9f7e-7960-4117-97a2-960abced0120", - "length": 122.0, - "width": 20.0, + "id": "bac7d12b-04a8-4b07-8d06-f8ff945e2294", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02601176, - "longitude": 0.18345204, - "north": 2528.0, - "east": 1179.0 + "latitude": 58.78618871, + "longitude": 10.51106216 }, - "sog": 3.1, - "cog": 5.943 - } + "sog": 6.0, + "cog": 340.45, + "heading": 340.45, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78618871, + "longitude": 10.51106216 + } + }, + { + "position": { + "latitude": 58.88060138, + "longitude": 10.44653395 + } + } + ] } - ], - "input_file_name": "baseline_situation_18_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_19.json b/data/baseline_situations_generated/traffic_situation_19.json index eda45af..dfc34b1 100644 --- a/data/baseline_situations_generated/traffic_situation_19.json +++ b/data/baseline_situations_generated/traffic_situation_19.json @@ -1,42 +1,38 @@ { "title": "OT-GW, OT-SO", + "description": "A overtaking give-way and overtaking stand-on situation with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "1d84d628-1315-4f47-a4fe-34d66cd722ec", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "f9db6f8e-a57c-4ebe-aeb8-afa0b3ea5044", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02601787, - "longitude": 0.18337845, - "north": 2567.0, - "east": 935.0 + "latitude": 58.78654781, + "longitude": 10.50682846 }, - "sog": 3.1, - "cog": 6.029 - } + "sog": 6.0, + "cog": 345.44, + "heading": 345.44, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78654781, + "longitude": 10.50682846 + } + }, + { + "position": { + "latitude": 58.88351624, + "longitude": 10.45833515 + } + } + ] }, { "static": { - "id": "49531b90-e22d-4ef7-8bf5-1b71a521f2d6", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "e6970e52-16d0-47af-915c-67f920fab81e", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02521345, - "longitude": 0.18316431, - "north": -2567.0, - "east": 225.0 + "latitude": 58.74043996, + "longitude": 10.49452481 }, - "sog": 8.2, - "cog": 6.251 - } + "sog": 15.9, + "cog": 358.16, + "heading": 358.16, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.74043996, + "longitude": 10.49452481 + } + }, + { + "position": { + "latitude": 59.0053151, + "longitude": 10.47810936 + } + } + ] } - ], - "input_file_name": "baseline_situation_19_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_20.json b/data/baseline_situations_generated/traffic_situation_20.json index 0b20d63..cca705b 100644 --- a/data/baseline_situations_generated/traffic_situation_20.json +++ b/data/baseline_situations_generated/traffic_situation_20.json @@ -1,42 +1,38 @@ { "title": "OT-SO, OT-SO", + "description": "Two overtaking stand-on situations with two target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,47 +40,73 @@ "targetShips": [ { "static": { - "id": "a9c6930b-a854-49fc-bd25-5138175000b9", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "8825270d-cab0-4139-8441-06f52555fa7c", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02504548, - "longitude": 0.18349577, - "north": -3639.0, - "east": 1324.0 + "latitude": 58.73081621, + "longitude": 10.51351597 }, - "sog": 9.3, - "cog": 6.124 - } + "sog": 18.1, + "cog": 350.88, + "heading": 350.88, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73081621, + "longitude": 10.51351597 + } + }, + { + "position": { + "latitude": 59.02757895, + "longitude": 10.42180811 + } + } + ] }, { "static": { - "id": "72882b55-5546-467b-af89-643f54846691", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "a87c4746-8e8c-4959-a24e-91da40785159", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02530433, - "longitude": 0.18320201, - "north": -1987.0, - "east": 350.0 + "latitude": 58.74564685, + "longitude": 10.49670214 }, - "sog": 7.7, - "cog": 6.225 - } + "sog": 15.0, + "cog": 356.67, + "heading": 356.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.74564685, + "longitude": 10.49670214 + } + }, + { + "position": { + "latitude": 58.99407881, + "longitude": 10.46884636 + } + } + ] } - ], - "input_file_name": "baseline_situation_20_2_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_21.json b/data/baseline_situations_generated/traffic_situation_21.json index bb434df..ccbc9a9 100644 --- a/data/baseline_situations_generated/traffic_situation_21.json +++ b/data/baseline_situations_generated/traffic_situation_21.json @@ -1,42 +1,38 @@ { "title": "HO, HO, HO", + "description": "Three head-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "c2b7211f-e1ae-4ab7-90cb-2bd8ffdb28e7", + "id": "193e0862-fa7b-47dc-ad79-0e56323524a5", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02763893, - "longitude": 0.18296043, - "north": 12913.0, - "east": -451.0 + "latitude": 58.87941885, + "longitude": 10.48286054 }, - "sog": 6.2, - "cog": 3.078 - } + "sog": 12.1, + "cog": 176.36, + "heading": 176.36, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87941885, + "longitude": 10.48286054 + } + }, + { + "position": { + "latitude": 58.67944866, + "longitude": 10.50737161 + } + } + ] }, { "static": { - "id": "cc8ec473-3c2d-4f57-a896-4cd612044b02", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "05ba1624-d24f-495c-a664-df08689a8305", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02715587, - "longitude": 0.18309645, - "north": 9830.0, - "east": 0.0 + "latitude": 58.8517326, + "longitude": 10.490654 }, - "sog": 5.1, - "cog": 3.142 - } + "sog": 9.9, + "cog": 180.02, + "heading": 180.02, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8517326, + "longitude": 10.490654 + } + }, + { + "position": { + "latitude": 58.68690783, + "longitude": 10.49052476 + } + } + ] }, { "static": { - "id": "16c6647a-b82c-48e4-99d6-703ca164e2e8", - "length": 122.0, - "width": 20.0, + "id": "90c7b363-5fec-4ce6-a423-69fdd9a22a47", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02729877, - "longitude": 0.18332295, - "north": 10742.0, - "east": 751.0 + "latitude": 58.85991099, + "longitude": 10.50363158 }, - "sog": 7.7, - "cog": 3.258 - } + "sog": 15.0, + "cog": 186.67, + "heading": 186.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85991099, + "longitude": 10.50363158 + } + }, + { + "position": { + "latitude": 58.61274206, + "longitude": 10.44799682 + } + } + ] } - ], - "input_file_name": "baseline_situation_21_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_22.json b/data/baseline_situations_generated/traffic_situation_22.json index fa78a15..bdc8184 100644 --- a/data/baseline_situations_generated/traffic_situation_22.json +++ b/data/baseline_situations_generated/traffic_situation_22.json @@ -1,42 +1,38 @@ { "title": "HO, HO, CR-GW", + "description": "Two head-on situations and one grossing give-way situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "dac3be99-f8a5-45cc-bac8-7cf162e08de8", + "id": "4f8622ee-7bc3-448e-bc5c-cfcf2f06b2d1", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02781473, - "longitude": 0.18287447, - "north": 14035.0, - "east": -736.0 + "latitude": 58.8894825, + "longitude": 10.47793562 }, - "sog": 7.2, - "cog": 3.052 - } + "sog": 14.0, + "cog": 174.87, + "heading": 174.87, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8894825, + "longitude": 10.47793562 + } + }, + { + "position": { + "latitude": 58.65772197, + "longitude": 10.51801123 + } + } + ] }, { "static": { - "id": "8a57f412-fe7a-49e6-80f3-93184349a97b", - "length": 122.0, - "width": 20.0, + "id": "2b87a765-a599-4203-b65a-ddf29ace0b41", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02753865, - "longitude": 0.18322584, - "north": 12273.0, - "east": 429.0 + "latitude": 58.87367333, + "longitude": 10.49806729 }, - "sog": 5.1, - "cog": 3.212 - } + "sog": 9.9, + "cog": 184.03, + "heading": 184.03, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87367333, + "longitude": 10.49806729 + } + }, + { + "position": { + "latitude": 58.70925691, + "longitude": 10.47574773 + } + } + ] }, { "static": { - "id": "009827ba-b1bb-4be0-8d88-f4c9ceb7f91e", + "id": "ff928890-a914-44e4-84d6-49ca67281a06", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02650344, - "longitude": 0.18443163, - "north": 5666.0, - "east": 4427.0 + "latitude": 58.81431486, + "longitude": 10.56715435 }, - "sog": 4.1, - "cog": 4.686 - } + "sog": 8.0, + "cog": 268.55, + "heading": 268.55, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81431486, + "longitude": 10.56715435 + } + }, + { + "position": { + "latitude": 58.81095102, + "longitude": 10.31217779 + } + } + ] } - ], - "input_file_name": "baseline_situation_22_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_23.json b/data/baseline_situations_generated/traffic_situation_23.json index 3650e49..f32d645 100644 --- a/data/baseline_situations_generated/traffic_situation_23.json +++ b/data/baseline_situations_generated/traffic_situation_23.json @@ -1,42 +1,38 @@ { "title": "HO, HO, CR-SO", + "description": "Two head-on situations and one grossing stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "66900f12-0a0b-48b4-9460-f48911fb0e8d", + "id": "ef3a597b-6468-42b7-8dcb-d37bf47f9b5e", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02753474, - "longitude": 0.18341977, - "north": 12248.0, - "east": 1072.0 + "latitude": 58.87343991, + "longitude": 10.50917859 }, - "sog": 7.7, - "cog": 3.287 - } + "sog": 15.0, + "cog": 188.33, + "heading": 188.33, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87343991, + "longitude": 10.50917859 + } + }, + { + "position": { + "latitude": 58.62721297, + "longitude": 10.4397718 + } + } + ] }, { "static": { - "id": "879b6c74-5415-4755-84b5-37f030f9b8f3", + "id": "580169b7-269b-4f2a-902d-4ef052160f09", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02751437, - "longitude": 0.18322403, - "north": 12118.0, - "east": 423.0 + "latitude": 58.87226388, + "longitude": 10.49796361 }, - "sog": 9.3, - "cog": 3.196 - } + "sog": 18.1, + "cog": 183.12, + "heading": 183.12, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87226388, + "longitude": 10.49796361 + } + }, + { + "position": { + "latitude": 58.57214579, + "longitude": 10.46650188 + } + } + ] }, { "static": { - "id": "7218b8e4-7adc-4f11-b014-d2bfe2a8cb65", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "a58b3722-e5b6-43d1-85cc-1ea7ed103e82", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02637464, - "longitude": 0.18199561, - "north": 4844.0, - "east": -3650.0 + "latitude": 58.80692647, + "longitude": 10.42758053 }, - "sog": 3.6, - "cog": 1.462 - } + "sog": 7.0, + "cog": 83.71, + "heading": 83.71, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.80692647, + "longitude": 10.42758053 + } + }, + { + "position": { + "latitude": 58.81967528, + "longitude": 10.65018601 + } + } + ] } - ], - "input_file_name": "baseline_situation_23_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_24.json b/data/baseline_situations_generated/traffic_situation_24.json index d091379..47195b9 100644 --- a/data/baseline_situations_generated/traffic_situation_24.json +++ b/data/baseline_situations_generated/traffic_situation_24.json @@ -1,42 +1,38 @@ { "title": "HO, HO, OT-GW", + "description": "Two head-on situations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "efd7eb84-6998-4a56-a1f5-2153b7df446f", - "length": 122.0, - "width": 20.0, + "id": "1de83fc3-5eba-4b41-8165-8c6187ba541e", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.0273171, - "longitude": 0.18292454, - "north": 10859.0, - "east": -570.0 + "latitude": 58.86097033, + "longitude": 10.48082145 }, - "sog": 6.2, - "cog": 3.046 - } + "sog": 12.1, + "cog": 174.52, + "heading": 174.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.86097033, + "longitude": 10.48082145 + } + }, + { + "position": { + "latitude": 58.66150992, + "longitude": 10.51763528 + } + } + ] }, { "static": { - "id": "18367da3-c192-4162-a8c6-fc54adf44def", + "id": "252a8181-f3e0-4d3d-9205-f3f4daea3f99", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02751437, - "longitude": 0.18322403, - "north": 12118.0, - "east": 423.0 + "latitude": 58.87226388, + "longitude": 10.49796361 }, - "sog": 9.3, - "cog": 3.196 - } + "sog": 18.1, + "cog": 183.12, + "heading": 183.12, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87226388, + "longitude": 10.49796361 + } + }, + { + "position": { + "latitude": 58.57214579, + "longitude": 10.46650188 + } + } + ] }, { "static": { - "id": "61986750-b4c3-4d16-a4ce-65cd50e9bc4f", - "length": 122.0, - "width": 20.0, + "id": "7d13b221-30d9-49ee-92b7-ce326f59df28", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02609794, - "longitude": 0.18322704, - "north": 3078.0, - "east": 433.0 + "latitude": 58.79112628, + "longitude": 10.49813641 }, - "sog": 2.6, - "cog": 6.144 - } + "sog": 5.1, + "cog": 352.03, + "heading": 352.03, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79112628, + "longitude": 10.49813641 + } + }, + { + "position": { + "latitude": 58.87434199, + "longitude": 10.47569656 + } + } + ] } - ], - "input_file_name": "baseline_situation_24_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_25.json b/data/baseline_situations_generated/traffic_situation_25.json index ed35abb..52e5095 100644 --- a/data/baseline_situations_generated/traffic_situation_25.json +++ b/data/baseline_situations_generated/traffic_situation_25.json @@ -1,42 +1,38 @@ { "title": "HO, HO, OT-SO", + "description": "Two head-on situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "5cfd50cf-b010-4f67-8776-72d56c26c9af", + "id": "19709995-8c34-4d43-a43b-2978769fca18", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02781896, - "longitude": 0.18279998, - "north": 14062.0, - "east": -983.0 + "latitude": 58.88972489, + "longitude": 10.47365008 }, - "sog": 8.7, - "cog": 3.031 - } + "sog": 16.9, + "cog": 173.61, + "heading": 173.61, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.88972489, + "longitude": 10.47365008 + } + }, + { + "position": { + "latitude": 58.6103021, + "longitude": 10.53392124 + } + } + ] }, { "static": { - "id": "a2e5c6f9-4807-48a5-8030-f96da519abd3", - "length": 50.0, - "width": 10.0, + "id": "1e009538-e08b-4194-af0e-621c8c48f859", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02728529, - "longitude": 0.18309645, - "north": 10656.0, - "east": 0.0 + "latitude": 58.85914792, + "longitude": 10.490654 }, - "sog": 6.7, - "cog": 3.142 - } + "sog": 13.0, + "cog": 180.02, + "heading": 180.02, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85914792, + "longitude": 10.490654 + } + }, + { + "position": { + "latitude": 58.64261342, + "longitude": 10.49048422 + } + } + ] }, { "static": { - "id": "e84ddff1-cf6e-46b9-84e5-9ef0f4f48e64", + "id": "a6b4573a-abbc-4f39-9e86-a975c6c3faf7", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02510252, - "longitude": 0.18341735, - "north": -3275.0, - "east": 1064.0 + "latitude": 58.734075, + "longitude": 10.50902307 }, - "sog": 9.8, - "cog": 6.132 - } + "sog": 19.1, + "cog": 351.34, + "heading": 351.34, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.734075, + "longitude": 10.50902307 + } + }, + { + "position": { + "latitude": 59.04718435, + "longitude": 10.41720327 + } + } + ] } - ], - "input_file_name": "baseline_situation_25_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_26.json b/data/baseline_situations_generated/traffic_situation_26.json index 1993ef2..ea8ac26 100644 --- a/data/baseline_situations_generated/traffic_situation_26.json +++ b/data/baseline_situations_generated/traffic_situation_26.json @@ -1,42 +1,38 @@ { "title": "HO, CR-GW, CR-GW", + "description": "Head-on situation and two grossing give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "64f87b99-e0ac-4f05-a6d7-cace779c5215", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 - }, - "initial": { - "position": { - "latitude": 1.02802438, - "longitude": 0.18333954, - "north": 15373.0, - "east": 806.0 - }, - "sog": 7.7, - "cog": 3.229 - } - }, - { - "static": { - "id": "9da284c8-62f8-427c-99d1-66316314a84d", + "id": "e0563c68-9af6-4d55-9045-35d9f2881d26", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02738965, - "longitude": 0.18433934, - "north": 11322.0, - "east": 4121.0 + "latitude": 58.90150322, + "longitude": 10.50458201 }, - "sog": 7.2, - "cog": 3.737 - } + "sog": 15.0, + "cog": 185.01, + "heading": 185.01, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.90150322, + "longitude": 10.50458201 + } + }, + { + "position": { + "latitude": 58.65360014, + "longitude": 10.46276606 + } + } + ] }, { "static": { - "id": "afc4d793-b52c-4649-9e62-454c89123c81", + "id": "8ec5383b-e730-4c09-8669-2fb16f66451c", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02555064, - "longitude": 0.18368547, - "north": -415.0, - "east": 1953.0 + "latitude": 58.86511788, + "longitude": 10.56188382 }, - "sog": 6.2, - "cog": 5.867 - } + "sog": 14.0, + "cog": 214.17, + "heading": 214.17, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.86511788, + "longitude": 10.56188382 + } + }, + { + "position": { + "latitude": 58.6725966, + "longitude": 10.31030565 + } + } + ] + }, + { + "static": { + "id": "2bdfded1-e1e1-487a-8c5e-3c9e6509330f", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" + }, + "initial": { + "position": { + "latitude": 58.75973236, + "longitude": 10.52431623 + }, + "sog": 12.1, + "cog": 336.27, + "heading": 336.27, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75973236, + "longitude": 10.52431623 + } + }, + { + "position": { + "latitude": 58.94316475, + "longitude": 10.36909403 + } + } + ] } - ], - "input_file_name": "baseline_situation_26_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_27.json b/data/baseline_situations_generated/traffic_situation_27.json index 012503d..b701115 100644 --- a/data/baseline_situations_generated/traffic_situation_27.json +++ b/data/baseline_situations_generated/traffic_situation_27.json @@ -1,42 +1,38 @@ { "title": "HO, CR-GW, CR-SO", + "description": "Head-on, crossing give-way and crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "11699ed5-9295-4142-b78e-786c16dcfe94", + "id": "fca5ee52-2c25-4501-bbdf-c7e982e64c10", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.0279335, - "longitude": 0.18294082, - "north": 14793.0, - "east": -516.0 + "latitude": 58.89628736, + "longitude": 10.48172003 }, - "sog": 7.2, - "cog": 3.082 - } + "sog": 14.0, + "cog": 176.59, + "heading": 176.59, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.89628736, + "longitude": 10.48172003 + } + }, + { + "position": { + "latitude": 58.66400661, + "longitude": 10.50839627 + } + } + ] }, { "static": { - "id": "8195560f-b14d-4f3b-8d52-2bcccf67e2b6", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "fca2e7b5-4aea-4ac2-a56e-95ce9f7c16b0", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.026594, - "longitude": 0.18497964, - "north": 6244.0, - "east": 6244.0 + "latitude": 58.81951277, + "longitude": 10.59857012 }, - "sog": 6.2, - "cog": 4.553 - } + "sog": 12.1, + "cog": 260.92, + "heading": 260.92, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81951277, + "longitude": 10.59857012 + } + }, + { + "position": { + "latitude": 58.78790807, + "longitude": 10.21769943 + } + } + ] }, { "static": { - "id": "aa0272d1-5833-47e1-8263-2f961e69f127", - "length": 122.0, - "width": 20.0, + "id": "cd45c079-c2fa-4f42-8b2f-75d332a648dd", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02552071, - "longitude": 0.18194313, - "north": -606.0, - "east": -3824.0 + "latitude": 58.75801768, + "longitude": 10.42464286 }, - "sog": 7.2, - "cog": 0.631 - } + "sog": 14.0, + "cog": 36.1, + "heading": 36.1, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75801768, + "longitude": 10.42464286 + } + }, + { + "position": { + "latitude": 58.94604068, + "longitude": 10.68852555 + } + } + ] } - ], - "input_file_name": "baseline_situation_27_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_28.json b/data/baseline_situations_generated/traffic_situation_28.json index 1808068..604ac7a 100644 --- a/data/baseline_situations_generated/traffic_situation_28.json +++ b/data/baseline_situations_generated/traffic_situation_28.json @@ -1,42 +1,38 @@ { "title": "HO, CR-GW, OT-GW", + "description": "Head-on, crossing give-way and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "9d03356e-62c3-4dbd-83c8-949e41ce8ee5", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 - }, - "initial": { - "position": { - "latitude": 1.0277425, - "longitude": 0.18288171, - "north": 13574.0, - "east": -712.0 - }, - "sog": 6.2, - "cog": 3.046 - } - }, - { - "static": { - "id": "92839e24-81eb-4d8c-bd19-4bdda3a28aac", + "id": "afa79672-f721-41f3-8166-c2f5b0a66d26", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02642133, - "longitude": 0.1853111, - "north": 5142.0, - "east": 7343.0 + "latitude": 58.8853529, + "longitude": 10.47835035 }, - "sog": 7.2, - "cog": 4.726 - } + "sog": 12.1, + "cog": 174.52, + "heading": 174.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8853529, + "longitude": 10.47835035 + } + }, + { + "position": { + "latitude": 58.6858925, + "longitude": 10.51516418 + } + } + ] }, { "static": { - "id": "a5412698-6b0a-4173-bed6-ff95da2ebb87", + "id": "2afc7c58-bceb-4a1f-ac4f-3af320b1b2fa", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02594752, - "longitude": 0.18346531, - "north": 2118.0, - "east": 1223.0 + "latitude": 58.80961071, + "longitude": 10.61754401 }, - "sog": 3.1, - "cog": 5.829 - } + "sog": 14.0, + "cog": 270.84, + "heading": 270.84, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.80961071, + "longitude": 10.61754401 + } + }, + { + "position": { + "latitude": 58.81301048, + "longitude": 10.16968375 + } + } + ] + }, + { + "static": { + "id": "317dfa81-2499-4681-a7d7-a12b6dec6e95", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" + }, + "initial": { + "position": { + "latitude": 58.78250799, + "longitude": 10.51183978 + }, + "sog": 6.0, + "cog": 333.92, + "heading": 333.92, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78250799, + "longitude": 10.51183978 + } + }, + { + "position": { + "latitude": 58.87249445, + "longitude": 10.42705767 + } + } + ] } - ], - "input_file_name": "baseline_situation_28_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_29.json b/data/baseline_situations_generated/traffic_situation_29.json index dcd60b7..1318c4b 100644 --- a/data/baseline_situations_generated/traffic_situation_29.json +++ b/data/baseline_situations_generated/traffic_situation_29.json @@ -1,42 +1,38 @@ { "title": "HO, CR-GW, OT-SO", + "description": "Head-on, crossing give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "d62997b5-0802-459f-a34f-1700bb2ce243", + "id": "75eb10ce-670e-44fe-8a24-b12ab71266d2", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02726336, - "longitude": 0.18304096, - "north": 10516.0, - "east": -184.0 + "latitude": 58.85789108, + "longitude": 10.48747441 }, - "sog": 4.6, - "cog": 3.105 - } + "sog": 8.9, + "cog": 177.9, + "heading": 177.9, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85789108, + "longitude": 10.48747441 + } + }, + { + "position": { + "latitude": 58.70932512, + "longitude": 10.49794355 + } + } + ] }, { "static": { - "id": "c627f19e-f66f-490f-8422-8b39dcc6896d", - "length": 122.0, - "width": 20.0, + "id": "c7b12623-5607-4b42-9f8a-ecd5341a48f5", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02576169, - "longitude": 0.18469041, - "north": 932.0, - "east": 5285.0 + "latitude": 58.77180694, + "longitude": 10.58189453 }, - "sog": 6.2, - "cog": 5.493 - } + "sog": 12.1, + "cog": 314.78, + "heading": 314.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77180694, + "longitude": 10.58189453 + } + }, + { + "position": { + "latitude": 58.91295602, + "longitude": 10.30813352 + } + } + ] }, { "static": { - "id": "9bebae61-c7a0-4a9f-8d99-df81dfc97581", - "length": 50.0, - "width": 10.0, + "id": "4df159dc-cdd6-4304-a572-f6a2c8f340c2", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0251442, - "longitude": 0.18257257, - "north": -3009.0, - "east": -1737.0 + "latitude": 58.73646298, + "longitude": 10.4606725 }, - "sog": 8.7, - "cog": 0.224 - } + "sog": 16.9, + "cog": 12.78, + "heading": 12.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73646298, + "longitude": 10.4606725 + } + }, + { + "position": { + "latitude": 59.01067239, + "longitude": 10.58036723 + } + } + ] } - ], - "input_file_name": "baseline_situation_29_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_30.json b/data/baseline_situations_generated/traffic_situation_30.json index 3d46fab..6faf353 100644 --- a/data/baseline_situations_generated/traffic_situation_30.json +++ b/data/baseline_situations_generated/traffic_situation_30.json @@ -1,42 +1,38 @@ { "title": "HO, CR-SO, CR-SO", + "description": "Head-on and two crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "7215a315-e853-4754-b0fe-70988212b459", - "length": 50.0, - "width": 10.0, + "id": "4c36cfab-6738-453e-857c-d8ef578716ee", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02709195, - "longitude": 0.18314621, - "north": 9422.0, - "east": 165.0 + "latitude": 58.84806982, + "longitude": 10.49350527 }, - "sog": 4.1, - "cog": 3.181 - } + "sog": 8.0, + "cog": 182.26, + "heading": 182.26, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84806982, + "longitude": 10.49350527 + } + }, + { + "position": { + "latitude": 58.71566651, + "longitude": 10.48345668 + } + } + ] }, { "static": { - "id": "6d2eb34c-d1ff-48ae-a719-1d2b1146bde3", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "7b5d75ce-c918-4015-9683-7944b2370b06", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02569181, - "longitude": 0.18142016, - "north": 486.0, - "east": -5558.0 + "latitude": 58.76781201, + "longitude": 10.39466136 }, - "sog": 7.7, - "cog": 0.931 - } + "sog": 15.0, + "cog": 53.29, + "heading": 53.29, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76781201, + "longitude": 10.39466136 + } + }, + { + "position": { + "latitude": 58.91658485, + "longitude": 10.77864756 + } + } + ] }, { "static": { - "id": "fb108786-4936-4d7c-b8bf-ee87141ce4cb", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "0039e740-ef69-48e2-b5f1-149b2129dd03", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02543422, - "longitude": 0.18111524, - "north": -1158.0, - "east": -6569.0 + "latitude": 58.75306217, + "longitude": 10.37722543 }, - "sog": 8.2, - "cog": 0.731 - } + "sog": 15.9, + "cog": 41.83, + "heading": 41.83, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75306217, + "longitude": 10.37722543 + } + }, + { + "position": { + "latitude": 58.95054261, + "longitude": 10.71740731 + } + } + ] } - ], - "input_file_name": "baseline_situation_30_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_31.json b/data/baseline_situations_generated/traffic_situation_31.json index cc52813..ca252f7 100644 --- a/data/baseline_situations_generated/traffic_situation_31.json +++ b/data/baseline_situations_generated/traffic_situation_31.json @@ -1,42 +1,38 @@ { "title": "HO, CR-SO, OT-SO", + "description": "Head-on, crossing stand-on and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "ef2149e8-771f-44f9-8b8a-ca1d37311650", - "length": 50.0, - "width": 10.0, + "id": "9f7096ae-3fb5-4c1f-babe-bce729a98057", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02716496, - "longitude": 0.18309645, - "north": 9888.0, - "east": 0.0 + "latitude": 58.85226226, + "longitude": 10.490654 }, - "sog": 3.1, - "cog": 3.142 - } + "sog": 6.0, + "cog": 180.02, + "heading": 180.02, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85226226, + "longitude": 10.490654 + } + }, + { + "position": { + "latitude": 58.75207466, + "longitude": 10.49057544 + } + } + ] }, { "static": { - "id": "2e45f6fe-2216-4647-bf87-927b1f6c6460", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "387030d1-fd08-402d-ac95-a7a139e91d40", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02554108, - "longitude": 0.18228213, - "north": -476.0, - "east": -2700.0 + "latitude": 58.75918474, + "longitude": 10.44411787 }, - "sog": 6.2, - "cog": 0.441 - } + "sog": 12.1, + "cog": 25.21, + "heading": 25.21, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75918474, + "longitude": 10.44411787 + } + }, + { + "position": { + "latitude": 58.94047455, + "longitude": 10.60840213 + } + } + ] }, { "static": { - "id": "9da23dc2-9c0c-42a3-b85f-3b28595c404f", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "be1bde85-05a4-4e0c-942c-c780c2dff360", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02513432, - "longitude": 0.18266456, - "north": -3072.0, - "east": -1432.0 + "latitude": 58.73589741, + "longitude": 10.46592574 }, - "sog": 8.7, - "cog": 0.184 - } + "sog": 16.9, + "cog": 10.54, + "heading": 10.54, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73589741, + "longitude": 10.46592574 + } + }, + { + "position": { + "latitude": 59.01232282, + "longitude": 10.56494966 + } + } + ] } - ], - "input_file_name": "baseline_situation_31_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_32.json b/data/baseline_situations_generated/traffic_situation_32.json index 175703d..6ec7ac5 100644 --- a/data/baseline_situations_generated/traffic_situation_32.json +++ b/data/baseline_situations_generated/traffic_situation_32.json @@ -1,42 +1,38 @@ { "title": "HO, CR-SO, OT-GW", + "description": "Head-on, crossing stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "51e75c70-f4dc-4c52-8ec3-fc59fd33340b", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "c8b46b86-7bb6-4fd6-ade6-b7a1abed1636", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02707032, - "longitude": 0.18304759, - "north": 9284.0, - "east": -162.0 + "latitude": 58.84683992, + "longitude": 10.48785457 }, - "sog": 2.6, - "cog": 3.09 - } + "sog": 5.1, + "cog": 177.04, + "heading": 177.04, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84683992, + "longitude": 10.48785457 + } + }, + { + "position": { + "latitude": 58.76292341, + "longitude": 10.49619571 + } + } + ] }, { "static": { - "id": "0bdecf25-50e6-4f00-82ec-52be5f966b80", + "id": "f8b24e61-7566-434d-bbb0-b51197ef9747", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02547652, - "longitude": 0.18236055, - "north": -888.0, - "east": -2440.0 + "latitude": 58.75548606, + "longitude": 10.44855894 }, - "sog": 6.7, - "cog": 0.417 - } + "sog": 13.0, + "cog": 23.84, + "heading": 23.84, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75548606, + "longitude": 10.44855894 + } + }, + { + "position": { + "latitude": 58.95355292, + "longitude": 10.61699119 + } + } + ] }, { "static": { - "id": "e8331cef-e1e8-4f7d-a98b-7ab45a0b7377", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "83654c0b-d2cd-4c50-af53-bd59b6f1d704", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02579381, - "longitude": 0.18333652, - "north": 1137.0, - "east": 796.0 + "latitude": 58.77370117, + "longitude": 10.50447832 }, - "sog": 4.1, - "cog": 6.092 - } + "sog": 8.0, + "cog": 348.99, + "heading": 348.99, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77370117, + "longitude": 10.50447832 + } + }, + { + "position": { + "latitude": 58.90376782, + "longitude": 10.45576097 + } + } + ] } - ], - "input_file_name": "baseline_situation_32_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_33.json b/data/baseline_situations_generated/traffic_situation_33.json index 644576d..7f73945 100644 --- a/data/baseline_situations_generated/traffic_situation_33.json +++ b/data/baseline_situations_generated/traffic_situation_33.json @@ -1,42 +1,38 @@ { "title": "HO, OT-GW, OT-GW", + "description": "Head-on and two overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "e9948664-252b-4934-b295-f37a5ddbebbf", + "id": "128c0a31-c18e-47c6-8714-2028c1bc6a40", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02734358, - "longitude": 0.18327077, - "north": 11028.0, - "east": 578.0 + "latitude": 58.8624875, + "longitude": 10.50064207 }, - "sog": 5.7, - "cog": 3.241 - } + "sog": 11.1, + "cog": 185.7, + "heading": 185.7, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8624875, + "longitude": 10.50064207 + } + }, + { + "position": { + "latitude": 58.67918102, + "longitude": 10.46545086 + } + } + ] }, { "static": { - "id": "7f35ceda-4613-48ab-8a63-11aeca39d91e", - "length": 122.0, - "width": 20.0, + "id": "1fada211-2724-4b0c-a6e1-b8fc87d18570", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02613053, - "longitude": 0.18345716, - "north": 3286.0, - "east": 1196.0 + "latitude": 58.79300255, + "longitude": 10.51135592 }, - "sog": 2.6, - "cog": 5.89 - } + "sog": 5.1, + "cog": 337.41, + "heading": 337.41, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79300255, + "longitude": 10.51135592 + } + }, + { + "position": { + "latitude": 58.87058671, + "longitude": 10.44923693 + } + } + ] }, { "static": { - "id": "ceef119b-c35d-46e5-87af-402b0097a3da", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "372ef36a-0641-4392-822d-d8b8f4df406b", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02588986, - "longitude": 0.18334256, - "north": 1750.0, - "east": 816.0 + "latitude": 58.77920431, + "longitude": 10.50478937 }, - "sog": 3.6, - "cog": 6.072 - } + "sog": 7.0, + "cog": 347.84, + "heading": 347.84, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77920431, + "longitude": 10.50478937 + } + }, + { + "position": { + "latitude": 58.8929419, + "longitude": 10.45762539 + } + } + ] } - ], - "input_file_name": "baseline_situation_33_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_34.json b/data/baseline_situations_generated/traffic_situation_34.json index 0217cfd..8f353d9 100644 --- a/data/baseline_situations_generated/traffic_situation_34.json +++ b/data/baseline_situations_generated/traffic_situation_34.json @@ -1,42 +1,38 @@ { "title": "HO, OT-GW, OT-SO", + "description": "Head-on, overtaking give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "a995e0bf-5e8a-482b-b50f-2764ecc6127d", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "9f07762f-f8d3-4606-8702-6da1dc04ea7a", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0275034, - "longitude": 0.18290584, - "north": 12048.0, - "east": -632.0 + "latitude": 58.87164444, + "longitude": 10.47973278 }, - "sog": 6.7, - "cog": 3.049 - } + "sog": 13.0, + "cog": 174.69, + "heading": 174.69, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87164444, + "longitude": 10.47973278 + } + }, + { + "position": { + "latitude": 58.65603748, + "longitude": 10.51827059 + } + } + ] }, { "static": { - "id": "8151ce0e-82a7-4d38-bd41-c868347abf63", + "id": "d9ef0afc-cfbc-4cd4-9c72-0ef75634e0b3", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02593749, - "longitude": 0.18332205, - "north": 2054.0, - "east": 748.0 + "latitude": 58.78192446, + "longitude": 10.50359702 }, - "sog": 3.1, - "cog": 6.029 - } + "sog": 6.0, + "cog": 345.44, + "heading": 345.44, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78192446, + "longitude": 10.50359702 + } + }, + { + "position": { + "latitude": 58.87889289, + "longitude": 10.45510372 + } + } + ] }, { "static": { - "id": "c46047bc-d76c-4bcf-9aa5-577d0c56601b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "dd757fba-62e9-4d59-9c24-00486b78af7b", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02521345, - "longitude": 0.18316431, - "north": -2567.0, - "east": 225.0 + "latitude": 58.74043996, + "longitude": 10.49452481 }, - "sog": 8.2, - "cog": 6.251 - } + "sog": 15.9, + "cog": 358.16, + "heading": 358.16, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.74043996, + "longitude": 10.49452481 + } + }, + { + "position": { + "latitude": 59.0053151, + "longitude": 10.47810936 + } + } + ] } - ], - "input_file_name": "baseline_situation_34_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_35.json b/data/baseline_situations_generated/traffic_situation_35.json index 42ddda3..b71a3da 100644 --- a/data/baseline_situations_generated/traffic_situation_35.json +++ b/data/baseline_situations_generated/traffic_situation_35.json @@ -1,42 +1,38 @@ { "title": "HO, OT-SO, OT-SO", + "description": "Head-on and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "67c93246-6815-4e9c-829f-f6e34dc79e4d", + "id": "2ced6eb8-4b5e-4a39-9c8b-2a022b6801de", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02717232, - "longitude": 0.18320111, - "north": 9935.0, - "east": 347.0 + "latitude": 58.85266625, + "longitude": 10.4966503 }, - "sog": 6.7, - "cog": 3.203 - } + "sog": 13.0, + "cog": 183.52, + "heading": 183.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85266625, + "longitude": 10.4966503 + } + }, + { + "position": { + "latitude": 58.63653987, + "longitude": 10.4710716 + } + } + ] }, { "static": { - "id": "4e57c5de-f247-486b-85ee-fb83aa1b0ebc", + "id": "40844889-5700-409d-b769-1798c008e1ad", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02494803, - "longitude": 0.18369573, - "north": -4261.0, - "east": 1987.0 + "latitude": 58.7252233, + "longitude": 10.5249556 }, - "sog": 9.8, - "cog": 6.07 - } + "sog": 19.1, + "cog": 347.84, + "heading": 347.84, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7252233, + "longitude": 10.5249556 + } + }, + { + "position": { + "latitude": 59.0348423, + "longitude": 10.39656477 + } + } + ] }, { "static": { - "id": "2b8acc1a-2a93-434b-ae44-efae8ab46257", + "id": "9a0af39e-4c95-4ffd-b366-1f886593389b", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02518462, - "longitude": 0.18324273, - "north": -2751.0, - "east": 485.0 + "latitude": 58.7387971, + "longitude": 10.49901772 }, - "sog": 7.7, - "cog": 6.225 - } + "sog": 15.0, + "cog": 356.67, + "heading": 356.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7387971, + "longitude": 10.49901772 + } + }, + { + "position": { + "latitude": 58.98722907, + "longitude": 10.47116193 + } + } + ] } - ], - "input_file_name": "baseline_situation_35_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_36.json b/data/baseline_situations_generated/traffic_situation_36.json index 99cd227..0d130da 100644 --- a/data/baseline_situations_generated/traffic_situation_36.json +++ b/data/baseline_situations_generated/traffic_situation_36.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-GW, CR-GW", + "description": "Three crossing give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "4de3b7b1-428b-4141-a04d-6d06b5c1ec0e", + "id": "b2a3af95-2b67-4c19-b69d-1fe3ca94c2f6", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02721103, - "longitude": 0.18391921, - "north": 10182.0, - "east": 2728.0 + "latitude": 58.85488366, + "longitude": 10.53781222 }, - "sog": 7.7, - "cog": 3.577 - } + "sog": 15.0, + "cog": 204.95, + "heading": 204.95, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85488366, + "longitude": 10.53781222 + } + }, + { + "position": { + "latitude": 58.62924898, + "longitude": 10.33577431 + } + } + ] }, { "static": { - "id": "176e90c9-5b9c-46ef-a37f-6b80192d6edc", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "a5a748de-262c-4798-9501-7bfc393f6082", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02702676, - "longitude": 0.18499864, - "north": 9006.0, - "east": 6307.0 + "latitude": 58.84431728, + "longitude": 10.59965879 }, - "sog": 7.2, - "cog": 4.174 - } + "sog": 14.0, + "cog": 239.21, + "heading": 239.21, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84431728, + "longitude": 10.59965879 + } + }, + { + "position": { + "latitude": 58.72520254, + "longitude": 10.21488418 + } + } + ] }, { "static": { - "id": "278b908a-dbd9-400b-a53a-e8f63a76ad3a", + "id": "9cf74299-5782-4726-8e65-1ad1c4f2931d", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02555565, - "longitude": 0.18364023, - "north": -383.0, - "east": 1803.0 + "latitude": 58.76001964, + "longitude": 10.52172417 }, - "sog": 6.2, - "cog": 5.867 - } + "sog": 12.1, + "cog": 336.27, + "heading": 336.27, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76001964, + "longitude": 10.52172417 + } + }, + { + "position": { + "latitude": 58.94345203, + "longitude": 10.36650197 + } + } + ] } - ], - "input_file_name": "baseline_situation_36_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_37.json b/data/baseline_situations_generated/traffic_situation_37.json index 31cdab5..18cdbbe 100644 --- a/data/baseline_situations_generated/traffic_situation_37.json +++ b/data/baseline_situations_generated/traffic_situation_37.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-GW, CR-SO", + "description": "Two crossing give-waysituations and one crossing give-way situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "a65c27bb-f4bc-468d-8d41-abe771e4cc17", - "length": 50.0, - "width": 10.0, + "id": "fde91636-2992-4440-832b-ff6d778170c6", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0257056, - "longitude": 0.18507314, - "north": 574.0, - "east": 6554.0 + "latitude": 58.76859304, + "longitude": 10.60385793 }, - "sog": 8.2, - "cog": 5.299 - } + "sog": 15.9, + "cog": 303.67, + "heading": 303.67, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.76859304, + "longitude": 10.60385793 + } + }, + { + "position": { + "latitude": 58.91550911, + "longitude": 10.17930372 + } + } + ] }, { "static": { - "id": "1269255f-fcbd-4b37-92ef-49a1c76516be", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "7c16717d-1121-41d7-8a26-fdcbeacd2488", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0266515, - "longitude": 0.18509063, - "north": 6611.0, - "east": 6612.0 + "latitude": 58.82280747, + "longitude": 10.60491203 }, - "sog": 6.2, - "cog": 4.553 - } + "sog": 12.1, + "cog": 260.92, + "heading": 260.92, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.82280747, + "longitude": 10.60491203 + } + }, + { + "position": { + "latitude": 58.79120277, + "longitude": 10.22404133 + } + } + ] }, { "static": { - "id": "3818fca7-775a-49d2-af10-0d0546c3392b", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "0d7094e4-6595-4000-bc0f-981d01381238", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02547386, - "longitude": 0.18207795, - "north": -905.0, - "east": -3377.0 + "latitude": 58.75533344, + "longitude": 10.43238448 }, - "sog": 7.2, - "cog": 0.548 - } + "sog": 14.0, + "cog": 31.34, + "heading": 31.34, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.75533344, + "longitude": 10.43238448 + } + }, + { + "position": { + "latitude": 58.9540746, + "longitude": 10.6653537 + } + } + ] } - ], - "input_file_name": "baseline_situation_37_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_38.json b/data/baseline_situations_generated/traffic_situation_38.json index 18735df..9e23ab5 100644 --- a/data/baseline_situations_generated/traffic_situation_38.json +++ b/data/baseline_situations_generated/traffic_situation_38.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-GW, OT-GW", + "description": "Two crossing give-waysituations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "dbf37a6b-4ad3-4489-9470-7fe1ce12f1ca", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "869b0704-a628-44ec-a9d8-5cb1c258f617", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02770004, - "longitude": 0.18373192, - "north": 13303.0, - "east": 2107.0 + "latitude": 58.88292003, + "longitude": 10.52708109 }, - "sog": 6.2, - "cog": 3.429 - } + "sog": 12.1, + "cog": 196.47, + "heading": 196.47, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.88292003, + "longitude": 10.52708109 + } + }, + { + "position": { + "latitude": 58.6907638, + "longitude": 10.41774831 + } + } + ] }, { "static": { - "id": "53bc5366-36f0-4a19-baf2-46672ed14a08", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "713c6cda-b9ff-427a-aa1e-0276bb62ff94", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02672875, - "longitude": 0.18523902, - "north": 7104.0, - "east": 7104.0 + "latitude": 58.82723332, + "longitude": 10.61343127 }, - "sog": 7.2, - "cog": 4.456 - } + "sog": 14.0, + "cog": 255.37, + "heading": 255.37, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.82723332, + "longitude": 10.61343127 + } + }, + { + "position": { + "latitude": 58.76844979, + "longitude": 10.18005105 + } + } + ] }, { "static": { - "id": "bee285cf-9926-46a2-8926-420e3007d98e", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "29ac00fc-bfd4-4eb1-a8ef-b8f31a447ce6", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02620103, - "longitude": 0.18350663, - "north": 3736.0, - "east": 1360.0 + "latitude": 58.79704237, + "longitude": 10.51418991 }, - "sog": 2.1, - "cog": 5.64 - } + "sog": 4.1, + "cog": 323.09, + "heading": 323.09, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79704237, + "longitude": 10.51418991 + } + }, + { + "position": { + "latitude": 58.85130972, + "longitude": 10.43573451 + } + } + ] } - ], - "input_file_name": "baseline_situation_38_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_39.json b/data/baseline_situations_generated/traffic_situation_39.json index e2dfc54..e39dcf3 100644 --- a/data/baseline_situations_generated/traffic_situation_39.json +++ b/data/baseline_situations_generated/traffic_situation_39.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-GW, OT-SO", + "description": "Two crossing give-waysituations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "0b1fc5cc-770e-49a3-bb01-31f46a7973f0", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "39245179-a637-4036-826e-d294dd8113e6", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02800197, - "longitude": 0.18390625, - "north": 15230.0, - "east": 2685.0 + "latitude": 58.90021047, + "longitude": 10.53706916 }, - "sog": 9.3, - "cog": 3.412 - } + "sog": 18.1, + "cog": 195.49, + "heading": 195.49, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.90021047, + "longitude": 10.53706916 + } + }, + { + "position": { + "latitude": 58.61056945, + "longitude": 10.38252513 + } + } + ] }, { "static": { - "id": "d5b637e6-0e30-42f0-a1ed-fbfdb355754d", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "18cd68f9-26f9-49ca-8790-7c51b0a15f36", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02576169, - "longitude": 0.18469041, - "north": 932.0, - "east": 5285.0 + "latitude": 58.77180694, + "longitude": 10.58189453 }, - "sog": 6.2, - "cog": 5.493 - } + "sog": 12.1, + "cog": 314.78, + "heading": 314.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77180694, + "longitude": 10.58189453 + } + }, + { + "position": { + "latitude": 58.91295602, + "longitude": 10.30813352 + } + } + ] }, { "static": { - "id": "d5fda7bb-be0a-4e7e-9a35-c7c363e879b5", - "length": 122.0, - "width": 20.0, + "id": "130fec8d-dc66-4cc3-b574-88c23e902fb0", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02508356, - "longitude": 0.18291579, - "north": -3396.0, - "east": -599.0 + "latitude": 58.73299771, + "longitude": 10.48032032 }, - "sog": 8.7, - "cog": 0.072 - } + "sog": 16.9, + "cog": 4.13, + "heading": 4.13, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73299771, + "longitude": 10.48032032 + } + }, + { + "position": { + "latitude": 59.01344091, + "longitude": 10.51925466 + } + } + ] } - ], - "input_file_name": "baseline_situation_39_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_40.json b/data/baseline_situations_generated/traffic_situation_40.json index 3bfe4fe..8964c5e 100644 --- a/data/baseline_situations_generated/traffic_situation_40.json +++ b/data/baseline_situations_generated/traffic_situation_40.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-SO, CR-SO", + "description": "One crossing give way and two crossing stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "703b365d-5d54-47a0-a8c9-cd0e4048daa2", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "77c72f46-0b4a-4e51-9919-fbb85460ff41", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02710276, - "longitude": 0.18360103, - "north": 9491.0, - "east": 1673.0 + "latitude": 58.84868926, + "longitude": 10.5195814 }, - "sog": 3.1, - "cog": 3.608 - } + "sog": 6.0, + "cog": 206.72, + "heading": 206.72, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84868926, + "longitude": 10.5195814 + } + }, + { + "position": { + "latitude": 58.75920273, + "longitude": 10.43286087 + } + } + ] }, { "static": { - "id": "aa27f844-f5bb-4a41-b347-4df121ba20a3", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "18832bf9-cf66-4552-8957-b75870b8f2c1", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02587905, - "longitude": 0.18120451, - "north": 1681.0, - "east": -6273.0 + "latitude": 58.77853101, + "longitude": 10.38228859 }, - "sog": 7.7, - "cog": 1.132 - } + "sog": 15.0, + "cog": 64.8, + "heading": 64.8, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77853101, + "longitude": 10.38228859 + } + }, + { + "position": { + "latitude": 58.8844815, + "longitude": 10.81571776 + } + } + ] }, { "static": { - "id": "92e1143c-ab61-4f6a-9c33-c09c595d21ee", - "length": 122.0, - "width": 20.0, + "id": "3091ea3b-6233-4146-8bea-b7a74848768c", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02532297, - "longitude": 0.1799007, - "north": -1868.0, - "east": -10596.0 + "latitude": 58.74668822, + "longitude": 10.3076718 }, - "sog": 8.7, - "cog": 0.775 - } + "sog": 16.9, + "cog": 44.4, + "heading": 44.4, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.74668822, + "longitude": 10.3076718 + } + }, + { + "position": { + "latitude": 58.94756318, + "longitude": 10.68637371 + } + } + ] } - ], - "input_file_name": "baseline_situation_40_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_41.json b/data/baseline_situations_generated/traffic_situation_41.json index 1d68f18..e491a33 100644 --- a/data/baseline_situations_generated/traffic_situation_41.json +++ b/data/baseline_situations_generated/traffic_situation_41.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-SO, OT-SO", + "description": "Crossing give way, crossing stand-on and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "1ec7485b-7143-4dab-bfb6-d649abe2c124", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "f36cc0da-f654-4d1b-9b19-7b1069f0adff", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0260854, - "longitude": 0.18647135, - "north": 2998.0, - "east": 11190.0 + "latitude": 58.7903632, + "longitude": 10.68398716 }, - "sog": 9.3, - "cog": 5.014 - } + "sog": 18.1, + "cog": 287.28, + "heading": 287.28, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7903632, + "longitude": 10.68398716 + } + }, + { + "position": { + "latitude": 58.87964806, + "longitude": 10.13155538 + } + } + ] }, { "static": { - "id": "923904e0-440f-4420-8dbc-550c644ab991", + "id": "33b62a5d-7b7e-43a6-b5c7-c32d83c9713e", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02702676, - "longitude": 0.18119426, - "north": 9006.0, - "east": -6307.0 + "latitude": 58.84431728, + "longitude": 10.38164921 }, - "sog": 7.2, - "cog": 2.109 - } + "sog": 14.0, + "cog": 120.78, + "heading": 120.78, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84431728, + "longitude": 10.38164921 + } + }, + { + "position": { + "latitude": 58.72523959, + "longitude": 10.7664663 + } + } + ] }, { "static": { - "id": "0134588c-7732-4d5b-ac48-74e13752f450", - "length": 50.0, - "width": 10.0, + "id": "107b77d1-03f4-4ac8-a280-a0e2bb1d7914", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02513432, - "longitude": 0.18266456, - "north": -3072.0, - "east": -1432.0 + "latitude": 58.73589741, + "longitude": 10.46592574 }, - "sog": 8.7, - "cog": 0.184 - } + "sog": 16.9, + "cog": 10.54, + "heading": 10.54, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73589741, + "longitude": 10.46592574 + } + }, + { + "position": { + "latitude": 59.01232282, + "longitude": 10.56494966 + } + } + ] } - ], - "input_file_name": "baseline_situation_41_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_42.json b/data/baseline_situations_generated/traffic_situation_42.json index b21616f..e06a0b0 100644 --- a/data/baseline_situations_generated/traffic_situation_42.json +++ b/data/baseline_situations_generated/traffic_situation_42.json @@ -1,42 +1,38 @@ { "title": "CR-GW, CR-SO, OT-GW", + "description": "Crossing give way, crossing stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "a08087a9-fdcc-4f54-92f0-cc84bb5f1cf4", + "id": "f14cbb10-243c-42b8-9051-76a0d564065e", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02638796, - "longitude": 0.18458304, - "north": 4929.0, - "east": 4929.0 + "latitude": 58.80768955, + "longitude": 10.57581183 }, - "sog": 4.6, - "cog": 4.838 - } + "sog": 8.9, + "cog": 277.25, + "heading": 277.25, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.80768955, + "longitude": 10.57581183 + } + }, + { + "position": { + "latitude": 58.82646199, + "longitude": 10.29193893 + } + } + ] }, { "static": { - "id": "6bcddf4a-1ab2-412a-a312-c8ab8de1e19a", + "id": "b52e1b4e-138b-44be-80f5-1932a48dff62", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02663051, - "longitude": 0.1807684, - "north": 6477.0, - "east": -7719.0 + "latitude": 58.8216045, + "longitude": 10.35724928 }, - "sog": 8.2, - "cog": 1.768 - } + "sog": 15.9, + "cog": 101.3, + "heading": 101.3, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8216045, + "longitude": 10.35724928 + } + }, + { + "position": { + "latitude": 58.76968116, + "longitude": 10.85747985 + } + } + ] }, { "static": { - "id": "3b5654ba-d1b9-4b85-927e-1275d5c431c8", - "length": 122.0, - "width": 20.0, + "id": "a1b6116c-646c-42ae-9f78-2554d1a6ef7f", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02578081, - "longitude": 0.18331903, - "north": 1054.0, - "east": 738.0 + "latitude": 58.7729381, + "longitude": 10.5034415 }, - "sog": 3.6, - "cog": 5.934 - } + "sog": 7.0, + "cog": 339.99, + "heading": 339.99, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7729381, + "longitude": 10.5034415 + } + }, + { + "position": { + "latitude": 58.88226367, + "longitude": 10.42681957 + } + } + ] } - ], - "input_file_name": "baseline_situation_42_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_43.json b/data/baseline_situations_generated/traffic_situation_43.json index 82eb027..526784c 100644 --- a/data/baseline_situations_generated/traffic_situation_43.json +++ b/data/baseline_situations_generated/traffic_situation_43.json @@ -1,42 +1,38 @@ { "title": "CR-GW, OT-GW, OT-GW", + "description": "Crossing give way, overtaking stand-on and overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "e4f7b4c6-2e11-4dee-a6ca-b87e2c40c7d9", + "id": "f23150f4-c391-421c-9c03-e4c71eabb7f1", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02722074, - "longitude": 0.18453689, - "north": 10244.0, - "east": 4776.0 + "latitude": 58.85544026, + "longitude": 10.57321977 }, - "sog": 6.2, - "cog": 3.936 - } + "sog": 12.1, + "cog": 225.52, + "heading": 225.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85544026, + "longitude": 10.57321977 + } + }, + { + "position": { + "latitude": 58.7150358, + "longitude": 10.29804369 + } + } + ] }, { "static": { - "id": "0244ec1f-a148-4b10-aaf4-d25f9e89c0c3", + "id": "c26305fa-f322-43e7-882d-c30c505d9ac0", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02611172, - "longitude": 0.18335221, - "north": 3166.0, - "east": 848.0 + "latitude": 58.79191629, + "longitude": 10.50534234 }, - "sog": 2.6, - "cog": 6.008 - } + "sog": 5.1, + "cog": 344.18, + "heading": 344.18, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79191629, + "longitude": 10.50534234 + } + }, + { + "position": { + "latitude": 58.87276015, + "longitude": 10.46123662 + } + } + ] }, { "static": { - "id": "0d9753a1-b167-45db-8d90-c2fd6370c6f2", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "2e1c178b-ec5d-4d85-8545-0fc133246fd5", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0259964, - "longitude": 0.18275474, - "north": 2430.0, - "east": -1133.0 + "latitude": 58.78532689, + "longitude": 10.47102346 }, - "sog": 3.6, - "cog": 0.211 - } + "sog": 7.0, + "cog": 12.15, + "heading": 12.15, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78532689, + "longitude": 10.47102346 + } + }, + { + "position": { + "latitude": 58.89906902, + "longitude": 10.51814687 + } + } + ] } - ], - "input_file_name": "baseline_situation_43_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_44.json b/data/baseline_situations_generated/traffic_situation_44.json index 4b9fda2..d46e89d 100644 --- a/data/baseline_situations_generated/traffic_situation_44.json +++ b/data/baseline_situations_generated/traffic_situation_44.json @@ -1,42 +1,38 @@ { "title": "CR-GW, OT-GW, OT-SO", + "description": "Crossing give way, overtaking give-way and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "9589562f-761f-4e85-9982-24f0c2d2d7a1", + "id": "175d1dee-353b-4056-b8ee-3a47923a519f", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02649842, - "longitude": 0.18674068, - "north": 5634.0, - "east": 12083.0 + "latitude": 58.81401861, + "longitude": 10.69941856 }, - "sog": 7.2, - "cog": 4.98 - } + "sog": 14.0, + "cog": 285.33, + "heading": 285.33, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81401861, + "longitude": 10.69941856 + } + }, + { + "position": { + "latitude": 58.87554942, + "longitude": 10.26745362 + } + } + ] }, { "static": { - "id": "2bac4f67-3f37-42f1-a40a-e9efadf14e4c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "b091ce4d-8e8e-4782-be27-34ae928e614a", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02613053, - "longitude": 0.18345716, - "north": 3286.0, - "east": 1196.0 + "latitude": 58.79300255, + "longitude": 10.51135592 }, - "sog": 2.6, - "cog": 5.89 - } + "sog": 5.1, + "cog": 337.41, + "heading": 337.41, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79300255, + "longitude": 10.51135592 + } + }, + { + "position": { + "latitude": 58.87058671, + "longitude": 10.44923693 + } + } + ] }, { "static": { - "id": "5224428e-c7eb-4fd4-ba3b-534d7994be53", + "id": "48719157-5c18-4998-8134-7c553508de64", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02521345, - "longitude": 0.18316431, - "north": -2567.0, - "east": 225.0 + "latitude": 58.74043996, + "longitude": 10.49452481 }, - "sog": 8.2, - "cog": 6.251 - } + "sog": 15.9, + "cog": 358.16, + "heading": 358.16, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.74043996, + "longitude": 10.49452481 + } + }, + { + "position": { + "latitude": 59.0053151, + "longitude": 10.47810936 + } + } + ] } - ], - "input_file_name": "baseline_situation_44_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_45.json b/data/baseline_situations_generated/traffic_situation_45.json index aad7da2..53416fa 100644 --- a/data/baseline_situations_generated/traffic_situation_45.json +++ b/data/baseline_situations_generated/traffic_situation_45.json @@ -1,42 +1,38 @@ { "title": "CR-GW, OT-SO, OT-SO", + "description": "Crossing give way and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "7fefb596-bbd8-4ff7-9511-348023019b19", - "length": 122.0, - "width": 20.0, + "id": "814320aa-bb96-43ae-b978-cb89e5f9e81f", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02713159, - "longitude": 0.18445697, - "north": 9675.0, - "east": 4511.0 + "latitude": 58.85032315, + "longitude": 10.56864046 }, - "sog": 6.2, - "cog": 3.936 - } + "sog": 12.1, + "cog": 225.52, + "heading": 225.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.85032315, + "longitude": 10.56864046 + } + }, + { + "position": { + "latitude": 58.70991869, + "longitude": 10.29346438 + } + } + ] }, { "static": { - "id": "f4523fae-08f6-4653-acee-d3ac4d4a1d2e", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "19ae7064-973f-441e-a60e-52d9de40459b", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02505535, - "longitude": 0.18359922, - "north": -3576.0, - "east": 1667.0 + "latitude": 58.73137281, + "longitude": 10.51944315 }, - "sog": 9.3, - "cog": 6.083 - } + "sog": 18.1, + "cog": 348.53, + "heading": 348.53, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73137281, + "longitude": 10.51944315 + } + }, + { + "position": { + "latitude": 59.02593332, + "longitude": 10.40439835 + } + } + ] }, { "static": { - "id": "23835a9d-0442-4b0a-bef4-5f6d57f11e78", + "id": "bffa09e8-04d7-455a-920b-fdc0bf2cff79", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02513683, - "longitude": 0.18293389, - "north": -3056.0, - "east": -539.0 + "latitude": 58.73605002, + "longitude": 10.48135714 }, - "sog": 7.7, - "cog": 0.058 - } + "sog": 15.0, + "cog": 3.32, + "heading": 3.32, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73605002, + "longitude": 10.48135714 + } + }, + { + "position": { + "latitude": 58.98448466, + "longitude": 10.50912431 + } + } + ] } - ], - "input_file_name": "baseline_situation_45_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_46.json b/data/baseline_situations_generated/traffic_situation_46.json index cf5c375..d56edc6 100644 --- a/data/baseline_situations_generated/traffic_situation_46.json +++ b/data/baseline_situations_generated/traffic_situation_46.json @@ -1,42 +1,38 @@ { "title": "CR-SO, CR-SO, CR-SO", + "description": "Two crossing stand-on and one crossing stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "71b72dc8-177c-407a-8aeb-fc7757192580", - "length": 122.0, - "width": 20.0, + "id": "6a936971-8d15-4f37-bfda-5484f0685103", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02710276, - "longitude": 0.18259187, - "north": 9491.0, - "east": -1673.0 + "latitude": 58.84868926, + "longitude": 10.4617266 }, - "sog": 3.1, - "cog": 2.675 - } + "sog": 6.0, + "cog": 153.27, + "heading": 153.27, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84868926, + "longitude": 10.4617266 + } + }, + { + "position": { + "latitude": 58.75921108, + "longitude": 10.54847905 + } + } + ] }, { "static": { - "id": "9da8f07d-8418-4469-9b2d-a8497befe646", + "id": "b9df4b7d-5350-4730-8db3-793a909e7dd4", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02587905, - "longitude": 0.18120451, - "north": 1681.0, - "east": -6273.0 + "latitude": 58.77853101, + "longitude": 10.38228859 }, - "sog": 7.7, - "cog": 1.132 - } + "sog": 15.0, + "cog": 64.8, + "heading": 64.8, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77853101, + "longitude": 10.38228859 + } + }, + { + "position": { + "latitude": 58.8844815, + "longitude": 10.81571776 + } + } + ] }, { "static": { - "id": "56098f72-64b3-4fc9-9295-842466fe1178", + "id": "f2f94536-a76c-4352-b398-d2a8dd86b4e6", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02759005, - "longitude": 0.18090231, - "north": 12601.0, - "east": -7275.0 + "latitude": 58.87659098, + "longitude": 10.3649045 }, - "sog": 8.7, - "cog": 2.318 - } + "sog": 16.9, + "cog": 132.81, + "heading": 132.81, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.87659098, + "longitude": 10.3649045 + } + }, + { + "position": { + "latitude": 58.6855095, + "longitude": 10.76194086 + } + } + ] } - ], - "input_file_name": "baseline_situation_46_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_47.json b/data/baseline_situations_generated/traffic_situation_47.json index 44b0f97..fb0d480 100644 --- a/data/baseline_situations_generated/traffic_situation_47.json +++ b/data/baseline_situations_generated/traffic_situation_47.json @@ -1,42 +1,38 @@ { "title": "CR-SO, CR-SO, OT-SO", + "description": "Two crossing stand-on situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "4829e16b-e923-48ab-8889-bd83f4d61ab6", + "id": "2c591fd2-8ea5-4312-a274-565fb2cf45c8", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02783589, - "longitude": 0.1815408, - "north": 14170.0, - "east": -5158.0 + "latitude": 58.89068547, + "longitude": 10.4015044 }, - "sog": 9.3, - "cog": 2.602 - } + "sog": 18.1, + "cog": 149.08, + "heading": 149.08, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.89068547, + "longitude": 10.4015044 + } + }, + { + "position": { + "latitude": 58.6328272, + "longitude": 10.69875455 + } + } + ] }, { "static": { - "id": "c34729df-97e2-4979-9bbc-9788966800bf", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "e6cca8e9-97a8-4cfc-a8ff-5133453d7713", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02651785, - "longitude": 0.18102657, - "north": 5758.0, - "east": -6863.0 + "latitude": 58.81514976, + "longitude": 10.37205859 }, - "sog": 7.2, - "cog": 1.69 - } + "sog": 14.0, + "cog": 96.83, + "heading": 96.83, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81514976, + "longitude": 10.37205859 + } + }, + { + "position": { + "latitude": 58.78747744, + "longitude": 10.81678814 + } + } + ] }, { "static": { - "id": "7bcb5cf6-4be7-4d33-b1b0-40bd678a8e8b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "3b822464-ccd5-465f-bb58-f6cad231b8cb", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02466787, - "longitude": 0.18260756, - "north": -6049.0, - "east": -1621.0 + "latitude": 58.70918969, + "longitude": 10.46265975 }, - "sog": 9.8, - "cog": 0.126 - } + "sog": 19.1, + "cog": 7.22, + "heading": 7.22, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.70918969, + "longitude": 10.46265975 + } + }, + { + "position": { + "latitude": 59.02340099, + "longitude": 10.53927288 + } + } + ] } - ], - "input_file_name": "baseline_situation_47_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_48.json b/data/baseline_situations_generated/traffic_situation_48.json index 25c36fa..75a642b 100644 --- a/data/baseline_situations_generated/traffic_situation_48.json +++ b/data/baseline_situations_generated/traffic_situation_48.json @@ -1,42 +1,38 @@ { "title": "CR-SO, CR-SO, OT-GW", + "description": "Two crossing stand-on situations and one overtaking give-way situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "6f4416e0-df18-48b3-8c1f-6be20ffadbb8", + "id": "07b8badf-4b7a-49bc-9ec3-5e14cc8e5f9d", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02647367, - "longitude": 0.18144459, - "north": 5476.0, - "east": -5477.0 + "latitude": 58.81260916, + "longitude": 10.39602651 }, - "sog": 4.6, - "cog": 1.445 - } + "sog": 8.9, + "cog": 82.74, + "heading": 82.74, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.81260916, + "longitude": 10.39602651 + } + }, + { + "position": { + "latitude": 58.83140892, + "longitude": 10.67989271 + } + } + ] }, { "static": { - "id": "4599f8cc-b523-4920-8ff4-c1ebe7fede8d", + "id": "a7d22fb8-649c-40f5-8bc2-7e6a434699bf", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02632685, - "longitude": 0.18072527, - "north": 4539.0, - "east": -7862.0 + "latitude": 58.80419735, + "longitude": 10.35479546 }, - "sog": 8.2, - "cog": 1.521 - } + "sog": 15.9, + "cog": 87.09, + "heading": 87.09, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.80419735, + "longitude": 10.35479546 + } + }, + { + "position": { + "latitude": 58.81765321, + "longitude": 10.86425501 + } + } + ] }, { "static": { - "id": "fbbc6827-c06d-4d84-bc01-e28e646bbd1f", + "id": "cf1a2829-a148-4264-b416-452c5380c1fb", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02591289, - "longitude": 0.18349728, - "north": 1897.0, - "east": 1329.0 + "latitude": 58.78053296, + "longitude": 10.5136715 }, - "sog": 3.6, - "cog": 5.934 - } + "sog": 7.0, + "cog": 339.94, + "heading": 339.94, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78053296, + "longitude": 10.5136715 + } + }, + { + "position": { + "latitude": 58.88981867, + "longitude": 10.43683917 + } + } + ] } - ], - "input_file_name": "baseline_situation_48_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_49.json b/data/baseline_situations_generated/traffic_situation_49.json index 7ae2cf1..9c981dd 100644 --- a/data/baseline_situations_generated/traffic_situation_49.json +++ b/data/baseline_situations_generated/traffic_situation_49.json @@ -1,42 +1,38 @@ { "title": "CR-SO, OT-GW, OT-GW", + "description": "One crossing stand-on situation and two overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "10b7ee12-64e2-49ed-a1ed-2ad5d460148b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "3363828b-653e-43a0-a794-9668260f2262", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02738291, - "longitude": 0.18151034, - "north": 11279.0, - "east": -5259.0 + "latitude": 58.86473185, + "longitude": 10.3997418 }, - "sog": 7.2, - "cog": 2.399 - } + "sog": 14.0, + "cog": 137.45, + "heading": 137.45, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.86473185, + "longitude": 10.3997418 + } + }, + { + "position": { + "latitude": 58.69330216, + "longitude": 10.70261734 + } + } + ] }, { "static": { - "id": "1692ce96-4b51-4926-b118-227a9c7265cd", - "length": 122.0, - "width": 20.0, + "id": "2760b586-c93f-4c3d-9fd4-e8fd97fd509f", + "length": 50.0, + "width": 10.0, "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02600878, - "longitude": 0.18329913, - "north": 2509.0, - "east": 672.0 + "latitude": 58.78601814, + "longitude": 10.50230099 }, - "sog": 3.1, - "cog": 6.102 - } + "sog": 6.0, + "cog": 349.56, + "heading": 349.56, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78601814, + "longitude": 10.50230099 + } + }, + { + "position": { + "latitude": 58.88454766, + "longitude": 10.46736072 + } + } + ] }, { "static": { - "id": "a6c04c5b-399b-4540-8fa5-1c26cc3fe36b", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "1ef1014e-05d2-4f43-a8a9-ef99c80c1f34", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0259964, - "longitude": 0.18275474, - "north": 2430.0, - "east": -1133.0 + "latitude": 58.78532689, + "longitude": 10.47102346 }, - "sog": 3.6, - "cog": 0.211 - } + "sog": 7.0, + "cog": 12.15, + "heading": 12.15, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78532689, + "longitude": 10.47102346 + } + }, + { + "position": { + "latitude": 58.89906902, + "longitude": 10.51814687 + } + } + ] } - ], - "input_file_name": "baseline_situation_49_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_50.json b/data/baseline_situations_generated/traffic_situation_50.json index 438324d..a126aa3 100644 --- a/data/baseline_situations_generated/traffic_situation_50.json +++ b/data/baseline_situations_generated/traffic_situation_50.json @@ -1,42 +1,38 @@ { "title": "CR-SO, OT-GW, OT-SO", + "description": "Crossing stand-on, overtaking give-way situation and overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "489497e2-3648-4b9b-98c9-7108efdd20f5", - "length": 50.0, - "width": 10.0, + "id": "fa579e7f-ba32-4fbe-a738-f82b61bfd173", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02613319, - "longitude": 0.18096022, - "north": 3303.0, - "east": -7083.0 + "latitude": 58.79309232, + "longitude": 10.36827418 }, - "sog": 7.2, - "cog": 1.303 - } + "sog": 14.0, + "cog": 74.66, + "heading": 74.66, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79309232, + "longitude": 10.36827418 + } + }, + { + "position": { + "latitude": 58.85466472, + "longitude": 10.80021717 + } + } + ] }, { "static": { - "id": "3ffb6b91-b507-431d-abd4-9c4d38701506", - "length": 50.0, - "width": 10.0, + "id": "75051751-c0a4-44f3-819b-1e780e0fce27", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02637386, - "longitude": 0.18348763, - "north": 4839.0, - "east": 1297.0 + "latitude": 58.8069534, + "longitude": 10.51310124 }, - "sog": 2.1, - "cog": 5.859 - } + "sog": 4.1, + "cog": 335.64, + "heading": 335.64, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8069534, + "longitude": 10.51310124 + } + }, + { + "position": { + "latitude": 58.86877953, + "longitude": 10.45921366 + } + } + ] }, { "static": { - "id": "f9a1d1bd-b61a-4892-b0de-04ca542f4f4d", + "id": "a19cc79b-6cb2-4413-94db-35b0df89909b", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0250411, - "longitude": 0.18319326, - "north": -3667.0, - "east": 321.0 + "latitude": 58.73057382, + "longitude": 10.49618373 }, - "sog": 8.2, - "cog": 6.251 - } + "sog": 15.9, + "cog": 358.16, + "heading": 358.16, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73057382, + "longitude": 10.49618373 + } + }, + { + "position": { + "latitude": 58.99544895, + "longitude": 10.47976827 + } + } + ] } - ], - "input_file_name": "baseline_situation_50_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_51.json b/data/baseline_situations_generated/traffic_situation_51.json index c4b6250..2026dd3 100644 --- a/data/baseline_situations_generated/traffic_situation_51.json +++ b/data/baseline_situations_generated/traffic_situation_51.json @@ -1,42 +1,38 @@ { "title": "CR-SO, OT-SO, OT-SO", + "description": "One crossing stand-on situation and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "b960a977-616b-4ac4-a134-44c2552244a1", + "id": "d7be3b22-8b40-45bc-9c2a-e8f544166013", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02711482, - "longitude": 0.18175101, - "north": 9568.0, - "east": -4461.0 + "latitude": 58.84936257, + "longitude": 10.41353156 }, - "sog": 6.7, - "cog": 2.375 - } + "sog": 13.0, + "cog": 136.08, + "heading": 136.08, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.84936257, + "longitude": 10.41353156 + } + }, + { + "position": { + "latitude": 58.69339742, + "longitude": 10.7026618 + } + } + ] }, { "static": { - "id": "c9cbd54e-a1bf-4216-9399-27915c5a1fd6", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "daa19248-67cd-437f-80b5-91c4de15f341", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02520468, - "longitude": 0.18346531, - "north": -2623.0, - "east": 1223.0 + "latitude": 58.73992825, + "longitude": 10.51177065 }, - "sog": 9.3, - "cog": 6.083 - } + "sog": 18.1, + "cog": 348.53, + "heading": 348.53, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73992825, + "longitude": 10.51177065 + } + }, + { + "position": { + "latitude": 59.03448877, + "longitude": 10.39672586 + } + } + ] }, { "static": { - "id": "df4d7700-3a73-4349-ae0e-afce79aad014", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "name": "BASTO", - "shipType": "Passenger", - "speed_max": 17 + "id": "456fca4d-8653-42ca-a87b-0d09055c5fed", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02505394, - "longitude": 0.18270286, - "north": -3585.0, - "east": -1305.0 + "latitude": 58.73130099, + "longitude": 10.46813763 }, - "sog": 8.2, - "cog": 0.133 - } + "sog": 15.9, + "cog": 7.62, + "heading": 7.62, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.73130099, + "longitude": 10.46813763 + } + }, + { + "position": { + "latitude": 58.99397292, + "longitude": 10.53578342 + } + } + ] } - ], - "input_file_name": "baseline_situation_51_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_52.json b/data/baseline_situations_generated/traffic_situation_52.json index 01296bc..79f10a7 100644 --- a/data/baseline_situations_generated/traffic_situation_52.json +++ b/data/baseline_situations_generated/traffic_situation_52.json @@ -1,42 +1,38 @@ { "title": "OT-GW, OT-GW, OT-GW", + "description": "Three overtaking give-way situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "e61b4036-aee4-412b-abc0-c267fd864aee", + "id": "e4ac3aa7-c9d3-4bc9-9d9d-afb8a71b3068", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02588046, - "longitude": 0.18295983, - "north": 1690.0, - "east": -453.0 + "latitude": 58.77865669, + "longitude": 10.4828087 }, - "sog": 3.6, - "cog": 0.117 - } + "sog": 7.0, + "cog": 6.7, + "heading": 6.7, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77865669, + "longitude": 10.4828087 + } + }, + { + "position": { + "latitude": 58.89420816, + "longitude": 10.50895158 + } + } + ] }, { "static": { - "id": "829f8e43-0939-40aa-baeb-81456e6060d6", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "id": "89d48a7e-ec60-4ffe-8af1-d57240d0fc7b", + "length": 178.0, + "width": 30.0, + "height": 30.0, + "speedMax": 21.0, + "name": "BASTO VI", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02600878, - "longitude": 0.18329913, - "north": 2509.0, - "east": 672.0 + "latitude": 58.78601814, + "longitude": 10.50230099 }, - "sog": 3.1, - "cog": 6.102 - } + "sog": 6.0, + "cog": 349.56, + "heading": 349.56, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.78601814, + "longitude": 10.50230099 + } + }, + { + "position": { + "latitude": 58.88454766, + "longitude": 10.46736072 + } + } + ] }, { "static": { - "id": "e3a8eab4-d0c4-4276-8a1c-bfc1de34d4c6", + "id": "8cff6784-207a-44a8-ac9a-94293b6243cd", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02624851, - "longitude": 0.18252854, - "north": 4039.0, - "east": -1883.0 + "latitude": 58.79978047, + "longitude": 10.45804588 }, - "sog": 2.6, - "cog": 0.552 - } + "sog": 5.1, + "cog": 31.74, + "heading": 31.74, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.79978047, + "longitude": 10.45804588 + } + }, + { + "position": { + "latitude": 58.87124042, + "longitude": 10.54313859 + } + } + ] } - ], - "input_file_name": "baseline_situation_52_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_53.json b/data/baseline_situations_generated/traffic_situation_53.json index 0508976..3b32d9e 100644 --- a/data/baseline_situations_generated/traffic_situation_53.json +++ b/data/baseline_situations_generated/traffic_situation_53.json @@ -1,42 +1,38 @@ { "title": "OT-GW, OT-GW, OT-SO", + "description": "Two overtaking give-way situations and one overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "a3508f06-ac06-4a67-95aa-435dc2fdd5bb", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "0587a5fd-87af-4e59-974f-7a2f784d1c70", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02586181, - "longitude": 0.18309645, - "north": 1571.0, - "east": 0.0 + "latitude": 58.77758838, + "longitude": 10.490654 }, - "sog": 3.6, - "cog": 0.0 - } + "sog": 7.0, + "cog": 0.0, + "heading": 0.0, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.77758838, + "longitude": 10.490654 + } + }, + { + "position": { + "latitude": 58.89393528, + "longitude": 10.490654 + } + } + ] }, { "static": { - "id": "387f9d5a-43ff-4a8a-b71b-b6a876084e16", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "0c261ce8-b79c-4c0b-bcfa-154b9a677bdd", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02649357, - "longitude": 0.18339443, - "north": 5603.0, - "east": 988.0 + "latitude": 58.8138211, + "longitude": 10.50774432 }, - "sog": 2.1, - "cog": 6.019 - } + "sog": 4.1, + "cog": 344.81, + "heading": 344.81, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.8138211, + "longitude": 10.50774432 + } + }, + { + "position": { + "latitude": 58.8793177, + "longitude": 10.47350517 + } + } + ] }, { "static": { - "id": "c2f9e2d2-41f4-4f66-9f59-f424d7c3fc34", + "id": "4d6cbdff-6902-4bd5-908c-9271776c8803", "length": 178.0, "width": 30.0, "height": 30.0, + "speedMax": 21.0, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.0249474, - "longitude": 0.18298395, - "north": -4265.0, - "east": -373.0 + "latitude": 58.72519637, + "longitude": 10.48420841 }, - "sog": 8.7, - "cog": 0.036 - } + "sog": 16.9, + "cog": 2.06, + "heading": 2.06, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72519637, + "longitude": 10.48420841 + } + }, + { + "position": { + "latitude": 59.00618586, + "longitude": 10.5036882 + } + } + ] } - ], - "input_file_name": "baseline_situation_53_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_54.json b/data/baseline_situations_generated/traffic_situation_54.json index ead0852..61e9dd3 100644 --- a/data/baseline_situations_generated/traffic_situation_54.json +++ b/data/baseline_situations_generated/traffic_situation_54.json @@ -1,42 +1,38 @@ { "title": "OT-GW, OT-SO, OT-SO", + "description": "One overtaking give-way situation and two overtaking stand-on situations with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "105a6da6-c68b-498e-9ca7-f05c9a54fc41", + "id": "6600f3c7-f17a-4277-9063-11e19f67a2d5", "length": 50.0, "width": 10.0, "height": 8.0, + "speedMax": 15.0, "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02592997, - "longitude": 0.1827472, - "north": 2006.0, - "east": -1158.0 + "latitude": 58.7815115, + "longitude": 10.47057417 }, - "sog": 3.6, - "cog": 0.271 - } + "sog": 7.0, + "cog": 15.58, + "heading": 15.58, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.7815115, + "longitude": 10.47057417 + } + }, + { + "position": { + "latitude": 58.89358096, + "longitude": 10.53074131 + } + } + ] }, { "static": { - "id": "aed871bd-e9cd-41fa-89fa-a80a3ec05ee0", - "length": 50.0, - "width": 10.0, + "id": "2477f8ce-dbb7-4df1-94d3-39c0c22e062b", + "length": 122.0, + "width": 20.0, "height": 8.0, - "name": "CANOLE", - "shipType": "Cargo", - "speed_max": 15 + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02501791, - "longitude": 0.183633, - "north": -3815.0, - "east": 1779.0 + "latitude": 58.72923619, + "longitude": 10.52136128 }, - "sog": 9.3, - "cog": 6.083 - } + "sog": 18.1, + "cog": 348.53, + "heading": 348.53, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72923619, + "longitude": 10.52136128 + } + }, + { + "position": { + "latitude": 59.0237967, + "longitude": 10.40631648 + } + } + ] }, { "static": { - "id": "4b9185bd-4172-4bbf-a261-d5e21a4751b5", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "ee76f960-436e-44af-a827-0a77abc405bb", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02493157, - "longitude": 0.18261721, - "north": -4366.0, - "east": -1589.0 + "latitude": 58.72428965, + "longitude": 10.46321272 }, - "sog": 9.3, - "cog": 0.159 - } + "sog": 18.1, + "cog": 9.11, + "heading": 9.11, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72428965, + "longitude": 10.46321272 + } + }, + { + "position": { + "latitude": 59.02106121, + "longitude": 10.55481473 + } + } + ] } - ], - "input_file_name": "baseline_situation_54_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file diff --git a/data/baseline_situations_generated/traffic_situation_55.json b/data/baseline_situations_generated/traffic_situation_55.json index 1f7c0b3..9c70b47 100644 --- a/data/baseline_situations_generated/traffic_situation_55.json +++ b/data/baseline_situations_generated/traffic_situation_55.json @@ -1,42 +1,38 @@ { "title": "OT-SO, OT-SO, OT-SO", + "description": "Three overtaking stand-on situation with three target ships.", "ownShip": { "static": { - "id": "0e798a2d-9ac7-478e-881d-987c1d0de238", + "id": "ce433df5-bea2-4f5e-8679-92b43e3140be", "length": 122.0, "width": 20.0, "height": 8.0, + "speedMax": 17.0, "mmsi": 257847600, "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 17 + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 }, - "sog": 5.14, + "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "latitude": 1.02561566, - "longitude": 0.18309645, - "east": 0, - "north": 0 + "latitude": 58.763449, + "longitude": 10.490654 } }, { "position": { - "latitude": 1.02851496, - "longitude": 0.18309645, - "north": 18504.0, - "east": 0.0 + "latitude": 58.92969579, + "longitude": 10.490654 } } ] @@ -44,68 +40,108 @@ "targetShips": [ { "static": { - "id": "4552bd3e-2156-4212-9fa7-5291c6480f45", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "2aabc0f4-1527-4d9a-ac4a-f201fdb78356", + "length": 122.0, + "width": 20.0, + "height": 8.0, + "speedMax": 17.0, + "name": "BASTO", + "shipType": "Passenger" }, "initial": { "position": { - "latitude": 1.02491982, - "longitude": 0.1833326, - "north": -4441.0, - "east": 783.0 + "latitude": 58.72361635, + "longitude": 10.50416728 }, - "sog": 9.8, - "cog": 6.2 - } + "sog": 19.1, + "cog": 355.23, + "heading": 355.23, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72361635, + "longitude": 10.50416728 + } + }, + { + "position": { + "latitude": 59.03924327, + "longitude": 10.4535116 + } + } + ] }, { "static": { - "id": "6feab185-e345-47cb-8721-70de3f58d8a8", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "eea3aee9-6765-4d14-bd86-71a824c33509", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02498062, - "longitude": 0.18366647, - "north": -4053.0, - "east": 1890.0 + "latitude": 58.72709957, + "longitude": 10.5232794 }, - "sog": 9.3, - "cog": 6.083 - } + "sog": 18.1, + "cog": 348.53, + "heading": 348.53, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72709957, + "longitude": 10.5232794 + } + }, + { + "position": { + "latitude": 59.02166008, + "longitude": 10.4082346 + } + } + ] }, { "static": { - "id": "d59ecf09-5866-4d97-af38-db4e3c2d5209", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "name": "BASTO VI", - "shipType": "Passenger", - "speed_max": 21 + "id": "8735ff51-f5ed-4a02-9995-ca0a917ffa37", + "length": 50.0, + "width": 10.0, + "height": 8.0, + "speedMax": 15.0, + "name": "CANOLE", + "shipType": "Cargo" }, "initial": { "position": { - "latitude": 1.02496354, - "longitude": 0.18263953, - "north": -4162.0, - "east": -1515.0 + "latitude": 58.72613001, + "longitude": 10.46450875 }, - "sog": 8.7, - "cog": 0.146 - } + "sog": 16.9, + "cog": 8.31, + "heading": 8.31, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "latitude": 58.72613001, + "longitude": 10.46450875 + } + }, + { + "position": { + "latitude": 59.00435105, + "longitude": 10.54271127 + } + } + ] } - ], - "input_file_name": "baseline_situation_55_3_ts.json", - "common_vector": 600.0 + ] } \ No newline at end of file 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 043ad31..aedb77f 100644 --- a/data/baseline_situations_input/baseline_situation_01_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_01_1_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -20,4 +21,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 16a43e1..20f061b 100644 --- a/data/baseline_situations_input/baseline_situation_02_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_02_1_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -20,4 +21,4 @@ "vectorTime": 12.0 } ] -} \ No newline at end of file +} 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 ad83ceb..c8863de 100644 --- a/data/baseline_situations_input/baseline_situation_03_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_03_1_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -20,4 +21,4 @@ "vectorTime": 17.0 } ] -} \ No newline at end of file +} 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 8b15756..987ea46 100644 --- a/data/baseline_situations_input/baseline_situation_04_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_04_1_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -20,4 +21,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 a17bec2..d85a6f1 100644 --- a/data/baseline_situations_input/baseline_situation_05_1_ts.json +++ b/data/baseline_situations_input/baseline_situation_05_1_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -20,4 +21,4 @@ "vectorTime": 19.0 } ] -} \ No newline at end of file +} 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 66f53b3..d35546e 100644 --- a/data/baseline_situations_input/baseline_situation_06_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_06_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 cef3fa9..a0383d4 100644 --- a/data/baseline_situations_input/baseline_situation_07_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_07_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 10.0 } ] -} \ No newline at end of file +} 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 6eede51..a2b29b0 100644 --- a/data/baseline_situations_input/baseline_situation_08_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_08_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 13.0 } ] -} \ No newline at end of file +} 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 8fa52db..d73b69c 100644 --- a/data/baseline_situations_input/baseline_situation_09_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_09_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 16.0 } ] -} \ No newline at end of file +} 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 5128537..efb22c7 100644 --- a/data/baseline_situations_input/baseline_situation_10_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_10_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 97ecc50..c3a73f3 100644 --- a/data/baseline_situations_input/baseline_situation_11_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_11_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 9c2d3e5..e7150df 100644 --- a/data/baseline_situations_input/baseline_situation_12_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_12_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 16.0 } ] -} \ No newline at end of file +} 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 87ff4b1..14eca11 100644 --- a/data/baseline_situations_input/baseline_situation_13_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_13_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 d6bb9a4..6c11eb7 100644 --- a/data/baseline_situations_input/baseline_situation_14_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_14_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 72d4d58..ac07975 100644 --- a/data/baseline_situations_input/baseline_situation_15_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_15_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 56f45f3..786fb31 100644 --- a/data/baseline_situations_input/baseline_situation_16_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_16_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 aa7ee83..077438c 100644 --- a/data/baseline_situations_input/baseline_situation_17_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_17_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 10.0 } ] -} \ No newline at end of file +} 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 ad0bf5a..ea4c3e1 100644 --- a/data/baseline_situations_input/baseline_situation_18_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_18_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 19.0 } ] -} \ No newline at end of file +} 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 aa0a07b..2c11539 100644 --- a/data/baseline_situations_input/baseline_situation_19_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_19_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 4608e04..f908edc 100644 --- a/data/baseline_situations_input/baseline_situation_20_2_ts.json +++ b/data/baseline_situations_input/baseline_situation_20_2_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -26,4 +27,4 @@ "vectorTime": 13.0 } ] -} \ No newline at end of file +} 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 5d5e7e7..0d0cd7b 100644 --- a/data/baseline_situations_input/baseline_situation_21_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_21_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 1aa9f03..5377893 100644 --- a/data/baseline_situations_input/baseline_situation_22_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_22_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 37888f1..54c9b93 100644 --- a/data/baseline_situations_input/baseline_situation_23_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_23_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 17.0 } ] -} \ No newline at end of file +} 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 799b9aa..35f041e 100644 --- a/data/baseline_situations_input/baseline_situation_24_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_24_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 b5a74f9..d921884 100644 --- a/data/baseline_situations_input/baseline_situation_25_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_25_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 12.0 } ] -} \ No newline at end of file +} 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 ceaf50b..99dec7e 100644 --- a/data/baseline_situations_input/baseline_situation_26_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_26_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 13.0 } ] -} \ No newline at end of file +} 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 e9559e4..c88b8ab 100644 --- a/data/baseline_situations_input/baseline_situation_27_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_27_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 0f16ed4..d3dd2ac 100644 --- a/data/baseline_situations_input/baseline_situation_28_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_28_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 6de9bf8..569ff81 100644 --- a/data/baseline_situations_input/baseline_situation_29_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_29_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 2e2503e..7ad7abd 100644 --- a/data/baseline_situations_input/baseline_situation_30_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_30_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 9ab766c..3f62120 100644 --- a/data/baseline_situations_input/baseline_situation_31_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_31_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 595a376..d594ab9 100644 --- a/data/baseline_situations_input/baseline_situation_32_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_32_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 17.0 } ] -} \ No newline at end of file +} 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 d692950..a6d171f 100644 --- a/data/baseline_situations_input/baseline_situation_33_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_33_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 1a5d217..07f8487 100644 --- a/data/baseline_situations_input/baseline_situation_34_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_34_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 cb191be..cd25e45 100644 --- a/data/baseline_situations_input/baseline_situation_35_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_35_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 37bac7b..771f5c0 100644 --- a/data/baseline_situations_input/baseline_situation_36_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_36_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 12.0 } ] -} \ No newline at end of file +} 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 8841331..39c340a 100644 --- a/data/baseline_situations_input/baseline_situation_37_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_37_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 61e3af4..99be6e2 100644 --- a/data/baseline_situations_input/baseline_situation_38_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_38_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 5051bd4..d43828b 100644 --- a/data/baseline_situations_input/baseline_situation_39_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_39_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 16.0 } ] -} \ No newline at end of file +} 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 1740ea5..fe392d7 100644 --- a/data/baseline_situations_input/baseline_situation_40_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_40_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 29.0 } ] -} \ No newline at end of file +} 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 5c08547..c2a8ad0 100644 --- a/data/baseline_situations_input/baseline_situation_41_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_41_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 15.0 } ] -} \ No newline at end of file +} 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 a36024f..af10dea 100644 --- a/data/baseline_situations_input/baseline_situation_42_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_42_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 10.0 } ] -} \ No newline at end of file +} 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 5413e9a..f244b21 100644 --- a/data/baseline_situations_input/baseline_situation_43_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_43_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 25.0 } ] -} \ No newline at end of file +} 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 ff91d20..2c35e46 100644 --- a/data/baseline_situations_input/baseline_situation_44_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_44_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 14.0 } ] -} \ No newline at end of file +} 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 f7c5308..eb3914b 100644 --- a/data/baseline_situations_input/baseline_situation_45_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_45_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 083488c..db88394 100644 --- a/data/baseline_situations_input/baseline_situation_46_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_46_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 19.0 } ] -} \ No newline at end of file +} 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 dafc1d9..501dd01 100644 --- a/data/baseline_situations_input/baseline_situation_47_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_47_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 22.0 } ] -} \ No newline at end of file +} 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 25e82fe..c8538b9 100644 --- a/data/baseline_situations_input/baseline_situation_48_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_48_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 6992371..ce20887 100644 --- a/data/baseline_situations_input/baseline_situation_49_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_49_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 25.0 } ] -} \ No newline at end of file +} 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 d283c65..5c24d2a 100644 --- a/data/baseline_situations_input/baseline_situation_50_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_50_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 2ac3248..b6bf664 100644 --- a/data/baseline_situations_input/baseline_situation_51_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_51_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 0141477..2652ccb 100644 --- a/data/baseline_situations_input/baseline_situation_52_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_52_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 23.0 } ] -} \ No newline at end of file +} 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 2fde8dc..31c5cf2 100644 --- a/data/baseline_situations_input/baseline_situation_53_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_53_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} 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 e07545b..dabc18d 100644 --- a/data/baseline_situations_input/baseline_situation_54_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_54_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 18.0 } ] -} \ No newline at end of file +} 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 7dd445f..88eb0b0 100644 --- a/data/baseline_situations_input/baseline_situation_55_3_ts.json +++ b/data/baseline_situations_input/baseline_situation_55_3_ts.json @@ -9,6 +9,7 @@ }, "sog": 10.0, "cog": 0.0, + "heading": 0.0, "navStatus": "Under way using engine" } }, @@ -32,4 +33,4 @@ "vectorTime": 20.0 } ] -} \ No newline at end of file +} diff --git a/src/trafficgen/encounter.py b/src/trafficgen/encounter.py index 04cb592..f7058bb 100644 --- a/src/trafficgen/encounter.py +++ b/src/trafficgen/encounter.py @@ -12,10 +12,9 @@ from maritime_schema.types.caga import ( AISNavStatus, Initial, - OwnShip, Position, + Ship, ShipStatic, - TargetShip, Waypoint, ) @@ -36,13 +35,13 @@ def generate_encounter( desired_encounter_type: EncounterType, - own_ship: OwnShip, + own_ship: Ship, target_ships_static: List[ShipStatic], beta_default: Optional[float], relative_sog_default: Optional[float], vector_time_default: Optional[float], settings: EncounterSettings, -) -> Tuple[TargetShip, bool]: +) -> Tuple[Ship, bool]: """ Generate an encounter. @@ -179,20 +178,32 @@ def generate_encounter( heading=target_ship_cog, nav_status=AISNavStatus.UNDER_WAY_USING_ENGINE, ) + target_ship_waypoint0 = Waypoint( + position=start_position_target_ship.model_copy(deep=True), turn_radius=None, data=None + ) + + future_position_target_ship = calculate_position_at_certain_time( + start_position_target_ship, + lat_lon0, + target_ship_sog, + target_ship_cog, + settings.situation_length, + ) - target_ship: TargetShip = TargetShip( - static=target_ship_static, initial=target_ship_initial, waypoints=None + target_ship_waypoint1 = Waypoint( + position=future_position_target_ship, turn_radius=None, data=None ) + waypoints = [target_ship_waypoint0, target_ship_waypoint1] + + target_ship = Ship(static=target_ship_static, initial=target_ship_initial, waypoints=waypoints) else: # Since encounter is not found, using initial values from own ship. Will not be taken into use. - target_ship: TargetShip = TargetShip( - static=target_ship_static, initial=own_ship.initial, waypoints=None - ) + target_ship: Ship = Ship(static=target_ship_static, initial=own_ship.initial) return target_ship, encounter_found def check_encounter_evolvement( - own_ship: OwnShip, + own_ship: Ship, own_ship_position_future: Position, lat_lon0: Position, target_ship_sog: float, @@ -264,7 +275,7 @@ def define_own_ship( own_ship_static: ShipStatic, encounter_settings: EncounterSettings, lat_lon0: Position, -) -> OwnShip: +) -> Ship: """ Define own ship based on information in desired traffic situation. @@ -279,7 +290,9 @@ def define_own_ship( * own_ship: Own ship """ own_ship_initial: Initial = desired_traffic_situation.own_ship.initial - own_ship_waypoint0 = Waypoint(position=own_ship_initial.position, turn_radius=None, data=None) + own_ship_waypoint0 = Waypoint( + position=own_ship_initial.position.model_copy(deep=True), turn_radius=None, data=None + ) ship_position_future = calculate_position_at_certain_time( own_ship_initial.position, lat_lon0, @@ -289,7 +302,7 @@ def define_own_ship( ) own_ship_waypoint1 = Waypoint(position=ship_position_future, turn_radius=None, data=None) - own_ship = OwnShip( + own_ship = Ship( static=own_ship_static, initial=own_ship_initial, waypoints=[own_ship_waypoint0, own_ship_waypoint1], @@ -401,7 +414,7 @@ def find_start_position_target_ship( # Assign conservative fallback values to return variables start_position_found: bool = False - start_position_target_ship = target_ship_position_future.model_copy() + start_position_target_ship = target_ship_position_future.model_copy(deep=True) if b**2 - 4 * a * c <= 0.0: # Do not run calculation of target ship start position. Return fallback values. diff --git a/src/trafficgen/plot_traffic_situation.py b/src/trafficgen/plot_traffic_situation.py index 46a5310..a73461f 100644 --- a/src/trafficgen/plot_traffic_situation.py +++ b/src/trafficgen/plot_traffic_situation.py @@ -7,7 +7,7 @@ import matplotlib.pyplot as plt import numpy as np from folium import Map, Polygon -from maritime_schema.types.caga import Position, Ship, TargetShip, TrafficSituation +from maritime_schema.types.caga import Position, Ship, TrafficSituation from matplotlib.axes import Axes as Axes from matplotlib.patches import Circle @@ -177,7 +177,7 @@ def plot_specific_traffic_situation( "black", ) - target_ships: Union[List[TargetShip], None] = situation.target_ships + target_ships: Union[List[Ship], None] = situation.target_ships assert target_ships is not None for target_ship in target_ships: map_plot = add_ship_to_map( diff --git a/src/trafficgen/read_files.py b/src/trafficgen/read_files.py index 178f7c9..a330d77 100644 --- a/src/trafficgen/read_files.py +++ b/src/trafficgen/read_files.py @@ -67,10 +67,9 @@ def read_generated_situation_files(situation_folder: Path) -> List[TrafficSituat file_path = os.path.join(situation_folder, file_name) with open(file_path, encoding="utf-8") as f: data = json.load(f) - data = convert_keys_to_snake_case(data) - situation: TrafficSituation = TrafficSituation(**data) + situation: TrafficSituation = TrafficSituation(**data) situation.input_file_name = file_name situations.append(situation) return situations @@ -89,21 +88,21 @@ def convert_situation_data_from_maritime_to_si_units(situation: SituationInput) """ assert situation.own_ship is not None assert situation.own_ship.initial is not None - situation.own_ship.initial.position.longitude = round( - deg_2_rad(situation.own_ship.initial.position.longitude), 8 + situation.own_ship.initial.position.longitude = deg_2_rad( + situation.own_ship.initial.position.longitude ) - situation.own_ship.initial.position.latitude = round( - deg_2_rad(situation.own_ship.initial.position.latitude), 8 + situation.own_ship.initial.position.latitude = deg_2_rad( + situation.own_ship.initial.position.latitude ) - situation.own_ship.initial.cog = round(deg_2_rad(situation.own_ship.initial.cog), 4) - situation.own_ship.initial.sog = round(knot_2_m_pr_s(situation.own_ship.initial.sog), 2) + situation.own_ship.initial.cog = deg_2_rad(situation.own_ship.initial.cog) + situation.own_ship.initial.sog = knot_2_m_pr_s(situation.own_ship.initial.sog) assert situation.encounters is not None for encounter in situation.encounters: beta: Union[float, None] = encounter.beta vector_time: Union[float, None] = encounter.vector_time if beta is not None: - encounter.beta = round(deg_2_rad(beta), 4) + encounter.beta = deg_2_rad(beta) if vector_time is not None: encounter.vector_time = min_2_s(vector_time) return situation @@ -154,8 +153,7 @@ def read_target_ship_static_files(target_ship_folder: Path) -> List[ShipStatic]: if "id" not in data: ship_id: UUID = uuid4() data.update({"id": ship_id}) - # if "initial" in data and "nav_status" not in data["initial"]: - # data["initial"].update({"nav_status": AISNavStatus.UNDER_WAY_USING_ENGINE}) + target_ship_static: ShipStatic = ShipStatic(**data) target_ships_static.append(target_ship_static) return target_ships_static diff --git a/src/trafficgen/ship_traffic_generator.py b/src/trafficgen/ship_traffic_generator.py index 009f9b2..040fbad 100644 --- a/src/trafficgen/ship_traffic_generator.py +++ b/src/trafficgen/ship_traffic_generator.py @@ -4,10 +4,9 @@ from typing import List, Union from maritime_schema.types.caga import ( - OwnShip, Position, + Ship, ShipStatic, - TargetShip, TrafficSituation, ) @@ -64,11 +63,11 @@ def generate_traffic_situations( for _ in range(num_situations): lat_lon0: Position = desired_traffic_situation.own_ship.initial.position - own_ship: OwnShip = define_own_ship( + own_ship: Ship = define_own_ship( desired_traffic_situation, own_ship_static, encounter_settings, lat_lon0 ) - target_ships: List[TargetShip] = [] + target_ships: List[Ship] = [] for encounter in desired_traffic_situation.encounters: desired_encounter_type = EncounterType(encounter.desired_encounter_type) beta: Union[float, None] = encounter.beta diff --git a/src/trafficgen/utils.py b/src/trafficgen/utils.py index 8d8a9af..c963230 100644 --- a/src/trafficgen/utils.py +++ b/src/trafficgen/utils.py @@ -22,6 +22,22 @@ def knot_2_m_pr_s(speed_in_knot: float) -> float: return speed_in_knot * knot_2_m_pr_sec +def m_pr_s_2_knot(speed_in_m_pr_s: float) -> float: + """ + Convert ship speed in knots to meters pr second. + + Params: + * speed_in_m_pr_s: Ship speed given in meters pr second + + Returns + ------- + * speed_in_knot: Ship speed in knots + """ + + knot_2_m_pr_sec: float = 0.5144 + return speed_in_m_pr_s / knot_2_m_pr_sec + + def min_2_s(time_in_min: float) -> float: """ Convert time given in minutes to time given in seconds. diff --git a/src/trafficgen/write_traffic_situation_to_file.py b/src/trafficgen/write_traffic_situation_to_file.py index f5bb715..2078bcd 100644 --- a/src/trafficgen/write_traffic_situation_to_file.py +++ b/src/trafficgen/write_traffic_situation_to_file.py @@ -3,7 +3,9 @@ from pathlib import Path from typing import List -from maritime_schema.types.caga import TrafficSituation +from maritime_schema.types.caga import Ship, TrafficSituation + +from trafficgen.utils import m_pr_s_2_knot, rad_2_deg def write_traffic_situations_to_json_file(situations: List[TrafficSituation], write_folder: Path): @@ -19,8 +21,61 @@ def write_traffic_situations_to_json_file(situations: List[TrafficSituation], wr for i, situation in enumerate(situations): file_number: int = i + 1 output_file_path: Path = write_folder / f"traffic_situation_{file_number:02d}.json" + situation = convert_situation_data_from_si_units_to__maritime(situation) data: str = situation.model_dump_json( by_alias=True, indent=4, exclude_unset=True, exclude_defaults=False, exclude_none=True ) with open(output_file_path, "w", encoding="utf-8") as outfile: _ = outfile.write(data) + + +def convert_situation_data_from_si_units_to__maritime(situation: TrafficSituation) -> TrafficSituation: + """ + Convert situation data which is given in SI units to maritime units. + + Params: + * situation: Traffic situation data + + Returns + ------- + * situation: Converted traffic situation data + """ + assert situation.own_ship is not None + situation.own_ship = convert_ship_data_from_si_units_to_maritime(situation.own_ship) + + assert situation.target_ships is not None + for target_ship in situation.target_ships: + target_ship = convert_ship_data_from_si_units_to_maritime(target_ship) + + return situation + + +def convert_ship_data_from_si_units_to_maritime(ship: Ship) -> Ship: + """ + Convert ship data which is given in SI units to maritime units. + + Params: + * ship: Ship data + + Returns + ------- + * ship: Converted ship data + """ + assert ship.initial is not None + ship.initial.position.longitude = round(rad_2_deg(ship.initial.position.longitude), 8) + ship.initial.position.latitude = round(rad_2_deg(ship.initial.position.latitude), 8) + ship.initial.cog = round(rad_2_deg(ship.initial.cog), 2) + ship.initial.sog = round(m_pr_s_2_knot(ship.initial.sog), 1) + ship.initial.heading = round(rad_2_deg(ship.initial.heading), 2) + + if ship.waypoints is not None: + for waypoint in ship.waypoints: + waypoint.position.latitude = round(rad_2_deg(waypoint.position.latitude), 8) + waypoint.position.longitude = round(rad_2_deg(waypoint.position.longitude), 8) + if waypoint.data is not None: + if waypoint.data.sog is not None: + waypoint.data.sog.value = round(m_pr_s_2_knot(waypoint.data.sog.value), 1) + if waypoint.data.heading is not None: + waypoint.data.heading.value = round(m_pr_s_2_knot(waypoint.data.heading.value), 2) + + return ship