diff --git a/data/baseline_situations_generated/traffic_situation_01.json b/data/baseline_situations_generated/traffic_situation_01.json index 9ac227c..b814c7e 100644 --- a/data/baseline_situations_generated/traffic_situation_01.json +++ b/data/baseline_situations_generated/traffic_situation_01.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO", "description": "A head on situation with one target ship.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,73 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "831e1ab2-8600-42cf-a91b-512230d49af7", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.84117519, - "lon": 10.49587268 + "lon": 10.49680582, + "lat": 58.85500037 }, "sog": 12.1, - "cog": 183.12, - "heading": 183.12, + "cog": 183.63, + "heading": 183.63, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84117519, - "lon": 10.49587268 + "lon": 10.49680582, + "lat": 58.85500037 } }, { "position": { - "lat": 58.80782874, - "lon": 10.49237693 + "lon": 10.48458595, + "lat": 58.75501409 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 52f4088..2041cc0 100644 --- a/data/baseline_situations_generated/traffic_situation_02.json +++ b/data/baseline_situations_generated/traffic_situation_02.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW", "description": "A crossing situation with one target ship. Own ship is give-way.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,73 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "0482dfbe-fe16-46db-8dfc-eab8cd6bca1f", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.81117278, - "lon": 10.52409158 + "lon": 10.52697741, + "lat": 58.81530237 }, "sog": 8.0, - "cog": 220.93, - "heading": 220.93, + "cog": 225.4, + "heading": 225.4, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81117278, - "lon": 10.52409158 + "lon": 10.52697741, + "lat": 58.81530237 } }, { "position": { - "lat": 58.79448844, - "lon": 10.49624045 + "lon": 10.43617067, + "lat": 58.76878387 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 62e94a9..ea479b9 100644 --- a/data/baseline_situations_generated/traffic_situation_03.json +++ b/data/baseline_situations_generated/traffic_situation_03.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-SO", "description": "A crossing situation with one target ship. Own ship is stand-on.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,73 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "8a650f7e-fb26-426d-8549-dd11fc370fb1", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.80568759, - "lon": 10.44372042 + "lon": 10.43613433, + "lat": 58.81250143 }, "sog": 6.0, - "cog": 120.78, - "heading": 120.78, + "cog": 93.97, + "heading": 93.97, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80568759, - "lon": 10.44372042 + "lon": 10.43613433, + "lat": 58.81250143 } }, { "position": { - "lat": 58.79714267, - "lon": 10.47133461 + "lon": 10.53232818, + "lat": 58.80903752 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 a581694..48c522f 100644 --- a/data/baseline_situations_generated/traffic_situation_04.json +++ b/data/baseline_situations_generated/traffic_situation_04.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-GW", "description": "A overting situation with one target ship. Own ship is give-way.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,73 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "c100dcad-206c-4ec2-83c6-86de7ca39221", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.77167228, - "lon": 10.49490498 + "lon": 10.50093584, + "lat": 58.78336982 }, "sog": 5.1, - "cog": 353.51, - "heading": 353.51, + "cog": 344.18, + "heading": 344.18, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.77167228, - "lon": 10.49490498 + "lon": 10.50093584, + "lat": 58.78336982 } }, { "position": { - "lat": 58.78558739, - "lon": 10.4918603 + "lon": 10.47888298, + "lat": 58.82379175 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 26224eb..92b9fc5 100644 --- a/data/baseline_situations_generated/traffic_situation_05.json +++ b/data/baseline_situations_generated/traffic_situation_05.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-SO", "description": "A overtaking situation with one target ship. Own ship is stand-on.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,73 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "42f738ce-1f6d-4bcb-96ec-8fbc0795741a", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.70853434, - "lon": 10.46233142 + "lon": 10.47731353, + "lat": 58.73759413 }, - "sog": 15.9, - "cog": 10.08, - "heading": 10.08, + "sog": 15.0, + "cog": 5.04, + "heading": 5.04, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70853434, - "lon": 10.46233142 + "lon": 10.47731353, + "lat": 58.73759413 } }, { "position": { - "lat": 58.75202075, - "lon": 10.47721773 + "lon": 10.4983629, + "lat": 58.86153921 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 ee1a45d..46f35a3 100644 --- a/data/baseline_situations_generated/traffic_situation_06.json +++ b/data/baseline_situations_generated/traffic_situation_06.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO", "description": "Head-on situations with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "d97b0f47-c470-44be-916b-f2e46429bff3", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.81839957, - "lon": 10.488805 + "lon": 10.48871859, + "lat": 58.8211646 }, "sog": 8.9, - "cog": 177.96, - "heading": 177.96, + "cog": 177.9, + "heading": 177.9, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81839957, - "lon": 10.488805 + "lon": 10.48871859, + "lat": 58.8211646 } }, { "position": { - "lat": 58.79363768, - "lon": 10.49050219 + "lon": 10.49395317, + "lat": 58.74688162 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "0c8db8b3-7e6b-4a4c-93f3-f01994278ae1", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.83385863, - "lon": 10.50012366 + "lon": 10.50160978, + "lat": 58.84484694 }, "sog": 11.1, - "cog": 186.56, - "heading": 186.56, + "cog": 187.59, + "heading": 187.59, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83385863, - "lon": 10.50012366 + "lon": 10.50160978, + "lat": 58.84484694 } }, { "position": { - "lat": 58.80335669, - "lon": 10.49337704 + "lon": 10.47820289, + "lat": 58.75354521 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 3970d19..53b8936 100644 --- a/data/baseline_situations_generated/traffic_situation_07.json +++ b/data/baseline_situations_generated/traffic_situation_07.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-GW", "description": "A head-on and crossing give-way situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,68 +16,79 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "3fab281a-7da8-4412-844c-5bc4a21c063f", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.86837667, - "lon": 10.47653591 + "lon": 10.4728379, + "lat": 58.8958744 }, "sog": 14.0, - "cog": 174.58, - "heading": 174.58, + "cog": 173.15, + "heading": 173.15, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86837667, - "lon": 10.47653591 + "lon": 10.4728379, + "lat": 58.8958744 } }, { "position": { - "lat": 58.82976775, - "lon": 10.48358685 + "lon": 10.49955736, + "lat": 58.78035852 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "35f3c17a-93ae-41a7-8806-96b6a6f1d3f6", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.79364892, - "lon": 10.53288731 + "lon": 10.53288731, + "lat": 58.79364892 }, "sog": 8.0, "cog": 263.5, @@ -96,17 +98,31 @@ "waypoints": [ { "position": { - "lat": 58.79364892, - "lon": 10.53288731 + "lon": 10.53288731, + "lat": 58.79364892 } }, { "position": { - "lat": 58.79115016, - "lon": 10.4906505 + "lon": 10.40617688, + "lat": 58.78615264 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 4522456..7d4faf8 100644 --- a/data/baseline_situations_generated/traffic_situation_08.json +++ b/data/baseline_situations_generated/traffic_situation_08.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-SO", "description": "A head-on and crossing stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "960f3b94-44a3-4626-bc20-3c0f613e2d75", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.86111396, - "lon": 10.50380439 + "lon": 10.50456473, + "lat": 58.86680563 }, - "sog": 16.9, - "cog": 185.58, - "heading": 185.58, + "sog": 15.0, + "cog": 186.67, + "heading": 186.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86111396, - "lon": 10.50380439 + "lon": 10.50456473, + "lat": 58.86680563 } }, { "position": { - "lat": 58.81447416, - "lon": 10.49503177 + "lon": 10.47674734, + "lat": 58.74322116 } } - ] - }, - { + ], "static": { - "id": "238c3a83-f3bb-4540-a720-5c4f5d500736", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.80071412, - "lon": 10.4385363 + "lon": 10.43573688, + "lat": 58.80271608 }, "sog": 8.0, - "cog": 109.43, - "heading": 109.43, + "cog": 96.49, + "heading": 96.49, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80071412, - "lon": 10.4385363 + "lon": 10.43573688, + "lat": 58.80271608 } }, { "position": { - "lat": 58.79336585, - "lon": 10.47862388 + "lon": 10.56244998, + "lat": 58.79523199 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 318aa6c..0a7c761 100644 --- a/data/baseline_situations_generated/traffic_situation_09.json +++ b/data/baseline_situations_generated/traffic_situation_09.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, OT-GW", "description": "A head-on and overtaking give-way situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "86c0c0b8-886d-4f0d-90ea-ab8f8367375a", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.83100382, - "lon": 10.48610925 + "lon": 10.48555628, + "lat": 58.83929892 }, "sog": 11.1, - "cog": 176.59, - "heading": 176.59, + "cog": 176.18, + "heading": 176.18, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83100382, - "lon": 10.48610925 + "lon": 10.48555628, + "lat": 58.83929892 } }, { "position": { - "lat": 58.80035566, - "lon": 10.48962903 + "lon": 10.49735423, + "lat": 58.74739511 } } - ] - }, - { + ], "static": { - "id": "15b167ea-e6b0-4327-b510-12b57861f131", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.76877259, - "lon": 10.49245116 + "lon": 10.49820554, + "lat": 58.78572189 }, "sog": 5.1, - "cog": 357.58, - "heading": 357.58, + "cog": 349.91, + "heading": 349.91, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76877259, - "lon": 10.49245116 + "lon": 10.49820554, + "lat": 58.78572189 } }, { "position": { - "lat": 58.78276485, - "lon": 10.49131429 + "lon": 10.48403063, + "lat": 58.82708565 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 fb60e5f..2c46bbe 100644 --- a/data/baseline_situations_generated/traffic_situation_10.json +++ b/data/baseline_situations_generated/traffic_situation_10.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, OT-SO", "description": "A head-on and overtaking stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,33 +16,39 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "74b2d8bc-bd2f-43e6-b9c3-b78480b593ba", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.83785356, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85725369 }, "sog": 9.9, "cog": 180.02, @@ -61,52 +58,71 @@ "waypoints": [ { "position": { - "lat": 58.83785356, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85725369 } }, { "position": { - "lat": 58.81038277, - "lon": 10.49063246 + "lon": 10.49058938, + "lat": 58.77484131 } } - ] - }, - { + ], "static": { - "id": "618785ce-4350-4752-aeaa-416caa2f26ff", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.71205347, - "lon": 10.49756616 + "lon": 10.49452481, + "lat": 58.7347483 }, - "sog": 19.1, - "cog": 357.41, - "heading": 357.41, + "sog": 16.9, + "cog": 358.39, + "heading": 358.39, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71205347, - "lon": 10.49756616 + "lon": 10.49452481, + "lat": 58.7347483 } }, { "position": { - "lat": 58.76478662, - "lon": 10.4929765 + "lon": 10.48689856, + "lat": 58.8752783 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 daf6eb3..c9c3bd1 100644 --- a/data/baseline_situations_generated/traffic_situation_11.json +++ b/data/baseline_situations_generated/traffic_situation_11.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, CR-GW", "description": "Two crossing give-way situations with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "584396d0-b857-464a-be74-3de88c809064", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.85321387, - "lon": 10.54679803 + "lon": 10.5600521, + "lat": 58.87441845 }, "sog": 13.0, - "cog": 205.18, - "heading": 205.18, + "cog": 211.71, + "heading": 211.71, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.85321387, - "lon": 10.54679803 + "lon": 10.5600521, + "lat": 58.87441845 } }, { "position": { - "lat": 58.8205531, - "lon": 10.51724645 + "lon": 10.45051847, + "lat": 58.78231131 } } - ] - }, - { + ], "static": { - "id": "f44400d1-df41-42d7-9015-de6fed6212a3", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.75394195, - "lon": 10.57672769 + "lon": 10.55272521, + "lat": 58.75659028 }, "sog": 14.0, - "cog": 309.74, - "heading": 309.74, + "cog": 326.36, + "heading": 326.36, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75394195, - "lon": 10.57672769 + "lon": 10.55272521, + "lat": 58.75659028 } }, { "position": { - "lat": 58.77873617, - "lon": 10.5193251 + "lon": 10.4286502, + "lat": 58.85344947 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 224bef7..2b7047f 100644 --- a/data/baseline_situations_generated/traffic_situation_12.json +++ b/data/baseline_situations_generated/traffic_situation_12.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, CR-SO", "description": "A crossing give-way and crossing stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "a6668e31-c0a0-4f1b-9105-b553ebfd179f", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.81997959, - "lon": 10.5994687 + "lon": 10.61125394, + "lat": 58.82610217 }, "sog": 12.1, - "cog": 242.99, - "heading": 242.99, + "cog": 260.92, + "heading": 260.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81997959, - "lon": 10.5994687 + "lon": 10.61125394, + "lat": 58.82610217 } }, { "position": { - "lat": 58.80481372, - "lon": 10.54219642 + "lon": 10.42081859, + "lat": 58.81029982 } } - ] - }, - { + ], "static": { - "id": "8025dec0-96fa-4dfe-9a9f-6faef3c89b39", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.75617732, - "lon": 10.40223017 + "lon": 10.4322808, + "lat": 58.7586461 }, "sog": 13.0, - "cog": 52.71, - "heading": 52.71, + "cog": 31.68, + "heading": 31.68, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75617732, - "lon": 10.40223017 + "lon": 10.4322808, + "lat": 58.7586461 } }, { "position": { - "lat": 58.77804081, - "lon": 10.45749841 + "lon": 10.5417422, + "lat": 58.8507764 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 7589a52..63c00e5 100644 --- a/data/baseline_situations_generated/traffic_situation_13.json +++ b/data/baseline_situations_generated/traffic_situation_13.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, OT-GW", "description": "A crossing give-way and overtaking give-way situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { + "initial": { + "position": { + "lon": 10.63373574, + "lat": 58.8063609 + }, + "sog": 15.0, + "cog": 275.36, + "heading": 275.36, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.63373574, + "lat": 58.8063609 + } + }, + { + "position": { + "lon": 10.39527798, + "lat": 58.81799159 + } + } + ], "static": { - "id": "54f7a3b1-781a-4ef9-b1e6-14ee3ea54e37", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, + "id": 10, "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.8057235, - "lon": 10.63159297 + "lon": 10.50983525, + "lat": 58.77768713 }, - "sog": 15.0, - "cog": 258.75, - "heading": 258.75, + "sog": 7.0, + "cog": 339.94, + "heading": 339.94, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8057235, - "lon": 10.63159297 + "lon": 10.50983525, + "lat": 58.77768713 } }, { "position": { - "lat": 58.79763043, - "lon": 10.55329214 + "lon": 10.47141908, + "lat": 58.83232999 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 288166a..d65bedd 100644 --- a/data/baseline_situations_generated/traffic_situation_14.json +++ b/data/baseline_situations_generated/traffic_situation_14.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, OT-SO", "description": "A crossing give-way and overtaking stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "0730c9b8-bf79-4697-98b9-b8701156e32c", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.76938305, - "lon": 10.55540367 + "lon": 10.54539832, + "lat": 58.76846736 }, "sog": 12.1, - "cog": 302.92, - "heading": 302.92, + "cog": 314.78, + "heading": 314.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76938305, - "lon": 10.55540367 + "lon": 10.54539832, + "lat": 58.76846736 } }, { "position": { - "lat": 58.78753398, - "lon": 10.50144419 + "lon": 10.40851781, + "lat": 58.83904189 } } - ] - }, - { + ], "static": { - "id": "0ce05829-8d8c-485d-b269-548613d4acb9", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.72454999, - "lon": 10.44741843 + "lon": 10.4606725, + "lat": 58.73646298 }, "sog": 16.9, - "cog": 18.62, - "heading": 18.62, + "cog": 12.78, + "heading": 12.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72454999, - "lon": 10.44741843 + "lon": 10.4606725, + "lat": 58.73646298 } }, { "position": { - "lat": 58.76895875, - "lon": 10.47622127 + "lon": 10.52051986, + "lat": 58.87356769 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 6e6669d..fbc7518 100644 --- a/data/baseline_situations_generated/traffic_situation_15.json +++ b/data/baseline_situations_generated/traffic_situation_15.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-SO, CR-SO", "description": "Two crossing stand-on situations with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "2115262c-7370-4b46-8451-d7ce8a8ad67c", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.76931123, - "lon": 10.36160394 + "lon": 10.38187386, + "lat": 58.76839554 }, "sog": 15.0, - "cog": 71.96, - "heading": 71.96, + "cog": 53.29, + "heading": 53.29, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76931123, - "lon": 10.36160394 + "lon": 10.38187386, + "lat": 58.76839554 } }, { "position": { - "lat": 58.782153, - "lon": 10.43751625 + "lon": 10.57386696, + "lat": 58.84278196 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "7168451e-d929-4f7e-a004-4655c112c734", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.75379831, - "lon": 10.38532994 + "lon": 10.4155188, + "lat": 58.75656335 }, - "sog": 15.9, - "cog": 55.69, - "heading": 55.69, + "sog": 15.0, + "cog": 38.85, + "heading": 38.85, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75379831, - "lon": 10.38532994 + "lon": 10.4155188, + "lat": 58.75656335 } }, { "position": { - "lat": 58.77869396, - "lon": 10.45555736 + "lon": 10.56574599, + "lat": 58.85347032 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 0d14999..6cc20d6 100644 --- a/data/baseline_situations_generated/traffic_situation_16.json +++ b/data/baseline_situations_generated/traffic_situation_16.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-SO, OT-SO", "description": "A crossing stand-on and overtaking stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "d58f83cd-3f39-47e6-90a8-079f11ff3a15", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.75206568, - "lon": 10.40884857 + "lon": 10.43997058, + "lat": 58.75639278 }, "sog": 13.0, - "cog": 47.38, - "heading": 47.38, + "cog": 27.16, + "heading": 27.16, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75206568, - "lon": 10.40884857 + "lon": 10.43997058, + "lat": 58.75639278 } }, { "position": { - "lat": 58.77650111, - "lon": 10.45996974 + "lon": 10.53509529, + "lat": 58.85272352 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "9617c19a-450b-44ba-90ba-bcac297fd9e8", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.72568114, - "lon": 10.47117898 + "lon": 10.47809115, + "lat": 58.73908438 }, "sog": 15.9, - "cog": 8.77, - "heading": 8.77, + "cog": 5.67, + "heading": 5.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72568114, - "lon": 10.47117898 + "lon": 10.47809115, + "lat": 58.73908438 } }, { "position": { - "lat": 58.76933391, - "lon": 10.48413629 + "lon": 10.50330074, + "lat": 58.87094176 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 a1403f4..2df09fb 100644 --- a/data/baseline_situations_generated/traffic_situation_17.json +++ b/data/baseline_situations_generated/traffic_situation_17.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-SO, OT-GW", "description": "A crossing stand-on and overtaking give-way situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,68 +16,79 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "d41038e9-3ffb-4c66-b858-cee2aa9066e5", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.75645562, - "lon": 10.44043715 + "lon": 10.4597048, + "lat": 58.75913986 }, "sog": 12.1, - "cog": 36.96, - "heading": 36.96, + "cog": 21.72, + "heading": 21.72, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75645562, - "lon": 10.44043715 + "lon": 10.4597048, + "lat": 58.75913986 } }, { "position": { - "lat": 58.78314225, - "lon": 10.47908405 + "lon": 10.53105742, + "lat": 58.85221766 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "6bcfa700-9a3a-4126-9ce3-5b4a25f6daa8", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.76933816, - "lon": 10.49720327 + "lon": 10.49720327, + "lat": 58.76933816 }, "sog": 8.0, "cog": 351.11, @@ -96,17 +98,31 @@ "waypoints": [ { "position": { - "lat": 58.76933816, - "lon": 10.49720327 + "lon": 10.49720327, + "lat": 58.76933816 } }, { "position": { - "lat": 58.79115714, - "lon": 10.49063282 + "lon": 10.47749193, + "lat": 58.83479509 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 04f65fa..557831f 100644 --- a/data/baseline_situations_generated/traffic_situation_18.json +++ b/data/baseline_situations_generated/traffic_situation_18.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-GW, OT-GW", "description": "A overtaking give-way and overtaking give-way situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,17 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, - "targetShips": [] -} + "targetShips": [ + { + "initial": { + "position": { + "lon": 10.49718599, + "lat": 58.77612507 + }, + "sog": 7.0, + "cog": 353.29, + "heading": 353.29, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.49718599, + "lat": 58.77612507 + } + }, + { + "position": { + "lon": 10.48409394, + "lat": 58.83389954 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + }, + { + "initial": { + "position": { + "lon": 10.51106216, + "lat": 58.78618871 + }, + "sog": 6.0, + "cog": 340.45, + "heading": 340.45, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.51106216, + "lat": 58.78618871 + } + }, + { + "position": { + "lon": 10.47879805, + "lat": 58.83339505 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } + } + ] +} \ 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 13551c7..4dc0071 100644 --- a/data/baseline_situations_generated/traffic_situation_19.json +++ b/data/baseline_situations_generated/traffic_situation_19.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-GW, OT-SO", "description": "A overtaking give-way and overtaking stand-on situation with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "ad6892d7-4529-47c9-95a2-486683723021", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" + "initial": { + "position": { + "lon": 10.50682846, + "lat": 58.78654781 + }, + "sog": 6.0, + "cog": 345.44, + "heading": 345.44, + "navStatus": "Under way using engine" }, + "waypoints": [ + { + "position": { + "lon": 10.50682846, + "lat": 58.78654781 + } + }, + { + "position": { + "lon": 10.48258181, + "lat": 58.83503202 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { "initial": { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49452481, + "lat": 58.74043996 }, "sog": 15.9, - "cog": 357.24, - "heading": 357.24, + "cog": 358.16, + "heading": 358.16, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49452481, + "lat": 58.74043996 } }, { "position": { - "lat": 58.77350627, - "lon": 10.49229598 + "lon": 10.48631708, + "lat": 58.87287753 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 0f035dd..a13059c 100644 --- a/data/baseline_situations_generated/traffic_situation_20.json +++ b/data/baseline_situations_generated/traffic_situation_20.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-SO, OT-SO", "description": "Two overtaking stand-on situations with two target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,113 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "539f6ee2-8f63-4451-8c8d-af739a74d363", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.71787082, - "lon": 10.52258819 + "lon": 10.51351597, + "lat": 58.73081621 }, "sog": 18.1, - "cog": 347.27, - "heading": 347.27, + "cog": 350.88, + "heading": 350.88, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71787082, - "lon": 10.52258819 + "lon": 10.51351597, + "lat": 58.73081621 } }, { "position": { - "lat": 58.76673323, - "lon": 10.50133988 + "lon": 10.46766204, + "lat": 58.87919758 } } - ] - }, - { + ], "static": { - "id": "177085c1-df1a-4457-b187-807e368383b0", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.73743254, - "lon": 10.49948429 + "lon": 10.49670214, + "lat": 58.74564685 }, "sog": 15.0, - "cog": 355.12, - "heading": 355.12, + "cog": 356.67, + "heading": 356.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.73743254, - "lon": 10.49948429 + "lon": 10.49670214, + "lat": 58.74564685 } }, { "position": { - "lat": 58.77875766, - "lon": 10.4926917 + "lon": 10.48277425, + "lat": 58.86986283 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 7c0ab21..8759444 100644 --- a/data/baseline_situations_generated/traffic_situation_21.json +++ b/data/baseline_situations_generated/traffic_situation_21.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO, HO", "description": "Three head-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,68 +16,79 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "2476955c-9f81-4c26-ab26-1b23004c940f", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.85453354, - "lon": 10.48453674 + "lon": 10.48286054, + "lat": 58.87941885 }, "sog": 12.1, - "cog": 177.1, - "heading": 177.1, + "cog": 176.36, + "heading": 176.36, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.85453354, - "lon": 10.48453674 + "lon": 10.48286054, + "lat": 58.87941885 } }, { "position": { - "lat": 58.8211804, - "lon": 10.4877876 + "lon": 10.49511607, + "lat": 58.77943375 } } - ] - }, - { + ], "static": { - "id": "71f6c9e8-3da9-42de-b811-c8bc7e2c42a6", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.83510648, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8517326 }, "sog": 9.9, "cog": 180.02, @@ -96,52 +98,71 @@ "waypoints": [ { "position": { - "lat": 58.83510648, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8517326 } }, { "position": { - "lat": 58.80763569, - "lon": 10.49063246 + "lon": 10.49058938, + "lat": 58.76932022 } } - ] - }, - { + ], "static": { - "id": "b866fd23-6db8-4d45-90ab-9a95dabe348c", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.8489137, - "lon": 10.50216275 + "lon": 10.50363158, + "lat": 58.85991099 }, "sog": 15.0, - "cog": 185.92, - "heading": 185.92, + "cog": 186.67, + "heading": 186.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8489137, - "lon": 10.50216275 + "lon": 10.50363158, + "lat": 58.85991099 } }, { "position": { - "lat": 58.80765974, - "lon": 10.49392188 + "lon": 10.4758142, + "lat": 58.73632653 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 fb225dd..89f611e 100644 --- a/data/baseline_situations_generated/traffic_situation_22.json +++ b/data/baseline_situations_generated/traffic_situation_22.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO, CR-GW", "description": "Two head-on situations and one grossing give-way situation with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "b0173d41-3df2-42f2-bf27-065526ec1de3", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.86465105, - "lon": 10.48044128 + "lon": 10.47793562, + "lat": 58.8894825 }, "sog": 14.0, - "cog": 175.9, - "heading": 175.9, + "cog": 174.87, + "heading": 174.87, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86465105, - "lon": 10.48044128 + "lon": 10.47793562, + "lat": 58.8894825 } }, { "position": { - "lat": 58.8259681, - "lon": 10.4857812 + "lon": 10.49797343, + "lat": 58.77360223 } } - ] - }, - { + ], "static": { - "id": "e1805a47-bc89-4a56-9e90-3b7a99525162", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.84602298, - "lon": 10.49620101 + "lon": 10.49806729, + "lat": 58.87367333 }, "sog": 9.9, - "cog": 183.0, - "heading": 183.0, + "cog": 184.03, + "heading": 184.03, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84602298, - "lon": 10.49620101 + "lon": 10.49806729, + "lat": 58.87367333 } }, { "position": { - "lat": 58.8185899, - "lon": 10.49343108 + "lon": 10.48690751, + "lat": 58.79146512 } } - ] - }, - { + ], "static": { - "id": "4f043257-85bc-459d-a83b-5792e66cd5f5", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.80894638, - "lon": 10.5590844 + "lon": 10.56715435, + "lat": 58.81431486 }, "sog": 8.0, - "cog": 243.39, - "heading": 243.39, + "cog": 268.55, + "heading": 268.55, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80894638, - "lon": 10.5590844 + "lon": 10.56715435, + "lat": 58.81431486 } }, { "position": { - "lat": 58.79905531, - "lon": 10.52107659 + "lon": 10.43966607, + "lat": 58.81263294 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 fd17968..1cf183d 100644 --- a/data/baseline_situations_generated/traffic_situation_23.json +++ b/data/baseline_situations_generated/traffic_situation_23.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO, CR-SO", "description": "Two head-on situations and one grossing stand-on situation with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "04d3643f-f8f5-4c59-ba7a-920dd5456ba8", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.8570113, - "lon": 10.50641373 + "lon": 10.50917859, + "lat": 58.87343991 }, "sog": 15.0, - "cog": 187.07, - "heading": 187.07, + "cog": 188.33, + "heading": 188.33, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8570113, - "lon": 10.50641373 + "lon": 10.50917859, + "lat": 58.87343991 } }, { "position": { - "lat": 58.81585121, - "lon": 10.49658643 + "lon": 10.4744752, + "lat": 58.75032644 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "45d1235f-1400-41d3-9647-4becc5eecd9d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.86120374, - "lon": 10.49722055 + "lon": 10.49766984, + "lat": 58.86774825 }, - "sog": 18.1, - "cog": 182.77, - "heading": 182.77, + "sog": 16.9, + "cog": 183.17, + "heading": 183.17, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86120374, - "lon": 10.49722055 + "lon": 10.49766984, + "lat": 58.86774825 } }, { "position": { - "lat": 58.81116861, - "lon": 10.49255471 + "lon": 10.48268367, + "lat": 58.72737815 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "255db573-6ffa-4cdd-abc4-3224113581ef", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_3", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.80382927, - "lon": 10.43207343 + "lon": 10.42758053, + "lat": 58.80692647 }, "sog": 7.0, - "cog": 112.59, - "heading": 112.59, + "cog": 83.71, + "heading": 83.71, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80382927, - "lon": 10.43207343 + "lon": 10.42758053, + "lat": 58.80692647 } }, { "position": { - "lat": 58.79638166, - "lon": 10.46653633 + "lon": 10.53888327, + "lat": 58.81330088 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 093d2a5..5231132 100644 --- a/data/baseline_situations_generated/traffic_situation_24.json +++ b/data/baseline_situations_generated/traffic_situation_24.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO, OT-GW", "description": "Two head-on situations and one overtaking give-way situation with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "0f826cad-825d-4867-974a-f567c33f120c", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.84442501, - "lon": 10.48248037 + "lon": 10.48082145, + "lat": 58.86097033 }, "sog": 12.1, - "cog": 175.44, - "heading": 175.44, + "cog": 174.52, + "heading": 174.52, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84442501, - "lon": 10.48248037 + "lon": 10.48082145, + "lat": 58.86097033 } }, { "position": { - "lat": 58.81113486, - "lon": 10.48759143 + "lon": 10.49922836, + "lat": 58.76124012 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { + "initial": { + "position": { + "lon": 10.49715143, + "lat": 58.86020725 + }, + "sog": 15.0, + "cog": 183.35, + "heading": 183.35, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.49715143, + "lat": 58.86020725 + } + }, + { + "position": { + "lon": 10.48317045, + "lat": 58.73599288 + } + } + ], "static": { - "id": "a4401792-fd27-4b8d-8243-125b7be5a811", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, + "id": 10, "name": "target_ship_2", - "shipType": "Passenger" - }, + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + }, + { "initial": { "position": { - "lat": 58.86120374, - "lon": 10.49722055 + "lon": 10.49813641, + "lat": 58.79112628 }, - "sog": 18.1, - "cog": 182.77, - "heading": 182.77, + "sog": 5.1, + "cog": 352.03, + "heading": 352.03, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86120374, - "lon": 10.49722055 + "lon": 10.49813641, + "lat": 58.79112628 } }, { "position": { - "lat": 58.81116861, - "lon": 10.49255471 + "lon": 10.48691649, + "lat": 58.83273413 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 163d021..2595f7a 100644 --- a/data/baseline_situations_generated/traffic_situation_25.json +++ b/data/baseline_situations_generated/traffic_situation_25.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, HO, OT-SO", "description": "Two head-on situations and one overtaking stand-on situation with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,68 +16,79 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "d5cb10ba-1303-42ff-b8a9-ee1009e8d858", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.8704684, - "lon": 10.47624214 + "lon": 10.47365008, + "lat": 58.88972489 }, "sog": 16.9, - "cog": 174.58, - "heading": 174.58, + "cog": 173.61, + "heading": 173.61, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8704684, - "lon": 10.47624214 + "lon": 10.47365008, + "lat": 58.88972489 } }, { "position": { - "lat": 58.82381595, - "lon": 10.48476203 + "lon": 10.50378566, + "lat": 58.75001349 } } - ] - }, - { + ], "static": { - "id": "6b037b0a-96bc-4a08-966f-42c4d2456d77", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.84528684, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85914792 }, "sog": 13.0, "cog": 180.02, @@ -96,52 +98,71 @@ "waypoints": [ { "position": { - "lat": 58.84528684, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85914792 } }, { "position": { - "lat": 58.80919775, - "lon": 10.4906257 + "lon": 10.49056911, + "lat": 58.75088067 } } - ] - }, - { + ], "static": { - "id": "1567f3cd-9ee4-43ef-9511-9f80e6e726cc", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.72882323, - "lon": 10.51230635 + "lon": 10.50473753, + "lat": 58.7409427 }, - "sog": 19.1, - "cog": 349.79, - "heading": 349.79, + "sog": 16.9, + "cog": 352.54, + "heading": 352.54, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72882323, - "lon": 10.51230635 + "lon": 10.50473753, + "lat": 58.7409427 } }, { "position": { - "lat": 58.78077447, - "lon": 10.49429681 + "lon": 10.46960737, + "lat": 58.88033888 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 2ae659b..56ce0fa 100644 --- a/data/baseline_situations_generated/traffic_situation_26.json +++ b/data/baseline_situations_generated/traffic_situation_26.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-GW, CR-GW", "description": "Head-on situation and two grossing give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "ef4fb9a9-90b4-444c-af6c-1dc2d9c79fcc", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.87390674, - "lon": 10.50179986 + "lon": 10.50458201, + "lat": 58.90150322 }, "sog": 15.0, - "cog": 183.98, - "heading": 183.98, + "cog": 185.01, + "heading": 185.01, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.87390674, - "lon": 10.50179986 + "lon": 10.50458201, + "lat": 58.90150322 } }, { "position": { - "lat": 58.83253108, - "lon": 10.49626314 + "lon": 10.48367403, + "lat": 58.77755168 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "84b31640-140b-4241-9fca-3b2305416104", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.84922791, - "lon": 10.55075524 + "lon": 10.56188382, + "lat": 58.86511788 }, "sog": 14.0, - "cog": 208.27, - "heading": 208.27, + "cog": 214.17, + "heading": 214.17, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84922791, - "lon": 10.55075524 + "lon": 10.56188382, + "lat": 58.86511788 } }, { "position": { - "lat": 58.8150714, - "lon": 10.51539816 + "lon": 10.43609474, + "lat": 58.76885724 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "802e3beb-a8ed-43d8-853d-d83a3fc2eb53", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.75759575, - "lon": 10.54367028 + "lon": 10.52431623, + "lat": 58.75973236 }, "sog": 12.1, - "cog": 320.63, - "heading": 320.63, + "cog": 336.27, + "heading": 336.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75759575, - "lon": 10.54367028 + "lon": 10.52431623, + "lat": 58.75973236 } }, { "position": { - "lat": 58.78341191, - "lon": 10.5028914 + "lon": 10.44670513, + "lat": 58.85144856 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 c30d765..1e31d62 100644 --- a/data/baseline_situations_generated/traffic_situation_27.json +++ b/data/baseline_situations_generated/traffic_situation_27.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-GW, CR-SO", "description": "Head-on, crossing give-way and crossing stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "998c5fc4-a825-44de-9986-11f0a73b317a", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.86863701, - "lon": 10.48358631 + "lon": 10.48172003, + "lat": 58.89628736 }, "sog": 14.0, - "cog": 177.27, - "heading": 177.27, + "cog": 176.59, + "heading": 176.59, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86863701, - "lon": 10.48358631 + "lon": 10.48172003, + "lat": 58.89628736 } }, { "position": { - "lat": 58.82989863, - "lon": 10.48713783 + "lon": 10.49505815, + "lat": 58.78014698 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "fc185b8f-ea19-42b9-bd97-ea94e5b5c0a0", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.81497919, - "lon": 10.58984352 + "lon": 10.59857012, + "lat": 58.81951277 }, "sog": 12.1, - "cog": 245.17, - "heading": 245.17, + "cog": 260.92, + "heading": 260.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81497919, - "lon": 10.58984352 + "lon": 10.59857012, + "lat": 58.81951277 } }, { "position": { - "lat": 58.80095463, - "lon": 10.53150353 + "lon": 10.40813477, + "lat": 58.80371042 } } - ] - }, - { + ], "static": { - "id": "d9f16645-c474-4b7d-9e75-e10114034e75", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.75609652, - "lon": 10.40129703 + "lon": 10.42464286, + "lat": 58.75801768 }, "sog": 14.0, - "cog": 52.94, - "heading": 52.94, + "cog": 36.1, + "heading": 36.1, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75609652, - "lon": 10.40129703 + "lon": 10.42464286, + "lat": 58.75801768 } }, { "position": { - "lat": 58.77946801, - "lon": 10.46087019 + "lon": 10.5565842, + "lat": 58.85202918 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 5476a8c..24ac0ec 100644 --- a/data/baseline_situations_generated/traffic_situation_28.json +++ b/data/baseline_situations_generated/traffic_situation_28.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-GW, OT-GW", "description": "Head-on, crossing give-way and overtaking give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "c0b0771c-7ee1-41c1-b3c8-4658a9da6564", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.8577654, - "lon": 10.4811325 + "lon": 10.47835035, + "lat": 58.8853529 }, "sog": 12.1, - "cog": 175.73, - "heading": 175.73, + "cog": 174.52, + "heading": 174.52, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8577654, - "lon": 10.4811325 + "lon": 10.47835035, + "lat": 58.8853529 } }, { "position": { - "lat": 58.8244624, - "lon": 10.4859231 + "lon": 10.49675727, + "lat": 58.7856227 } } - ] - }, - { + ], "static": { - "id": "cf24a238-7713-4257-90af-b225944261d2", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.8080666, - "lon": 10.61331031 + "lon": 10.61754401, + "lat": 58.80961071 }, "sog": 14.0, - "cog": 255.14, - "heading": 255.14, + "cog": 270.84, + "heading": 270.84, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8080666, - "lon": 10.61331031 + "lon": 10.61754401, + "lat": 58.80961071 } }, { "position": { - "lat": 58.79811933, - "lon": 10.54115628 + "lon": 10.39361388, + "lat": 58.8113106 } } - ] - }, - { + ], "static": { - "id": "e49e0040-72fa-482e-bda5-06aa7db0b932", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.76616017, - "lon": 10.49366079 + "lon": 10.51183978, + "lat": 58.78250799 }, "sog": 6.0, - "cog": 356.44, - "heading": 356.44, + "cog": 333.92, + "heading": 333.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76616017, - "lon": 10.49366079 + "lon": 10.51183978, + "lat": 58.78250799 } }, { "position": { - "lat": 58.78282583, - "lon": 10.49166335 + "lon": 10.46944872, + "lat": 58.82750122 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 b23b8a4..8dff346 100644 --- a/data/baseline_situations_generated/traffic_situation_29.json +++ b/data/baseline_situations_generated/traffic_situation_29.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-GW, OT-SO", "description": "Head-on, crossing give-way and overtaking stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "27e1dfe2-84c0-40ef-8eec-00c51292cf5b", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.8357349, - "lon": 10.48821746 + "lon": 10.48747441, + "lat": 58.85789108 }, "sog": 8.9, - "cog": 178.36, - "heading": 178.36, + "cog": 177.9, + "heading": 177.9, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8357349, - "lon": 10.48821746 + "lon": 10.48747441, + "lat": 58.85789108 } }, { "position": { - "lat": 58.81096745, - "lon": 10.48958097 + "lon": 10.49270898, + "lat": 58.7836081 } } - ] - }, - { + ], "static": { - "id": "11fe718f-33ff-4730-a1e6-07fdf11fbaba", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.77486823, - "lon": 10.61533211 + "lon": 10.58189453, + "lat": 58.77180694 }, "sog": 12.1, - "cog": 284.13, - "heading": 284.13, + "cog": 314.78, + "heading": 314.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.77486823, - "lon": 10.61533211 + "lon": 10.58189453, + "lat": 58.77180694 } }, { "position": { - "lat": 58.7830208, - "lon": 10.55299388 + "lon": 10.44501402, + "lat": 58.84238148 } } - ] - }, - { + ], "static": { - "id": "8e13b629-9bf1-41de-8998-260cd09d5df9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.72454999, - "lon": 10.44741843 + "lon": 10.46886341, + "lat": 58.74383342 }, - "sog": 16.9, - "cog": 18.62, - "heading": 18.62, + "sog": 15.0, + "cog": 10.49, + "heading": 10.49, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72454999, - "lon": 10.44741843 + "lon": 10.46886341, + "lat": 58.74383342 } }, { "position": { - "lat": 58.76895875, - "lon": 10.47622127 + "lon": 10.51244886, + "lat": 58.86618231 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 db2ee03..05599fd 100644 --- a/data/baseline_situations_generated/traffic_situation_30.json +++ b/data/baseline_situations_generated/traffic_situation_30.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-SO, CR-SO", "description": "Head-on and two crossing stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "8520e779-44a3-4190-9e8b-63c75f889eef", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.82867867, - "lon": 10.49284861 + "lon": 10.49350527, + "lat": 58.84806982 }, "sog": 8.0, - "cog": 181.74, - "heading": 181.74, + "cog": 182.26, + "heading": 182.26, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.82867867, - "lon": 10.49284861 + "lon": 10.49350527, + "lat": 58.84806982 } }, { "position": { - "lat": 58.80660452, - "lon": 10.4915562 + "lon": 10.48848097, + "lat": 58.78186817 } } - ] - }, - { + ], "static": { - "id": "240454f8-9218-46e1-b80f-987c3229eaf0", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.76852122, - "lon": 10.37910899 + "lon": 10.39466136, + "lat": 58.76781201 }, "sog": 15.0, - "cog": 68.64, - "heading": 68.64, + "cog": 53.29, + "heading": 53.29, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76852122, - "lon": 10.37910899 + "lon": 10.39466136, + "lat": 58.76781201 } }, { "position": { - "lat": 58.78362748, - "lon": 10.45346076 + "lon": 10.58665446, + "lat": 58.84219843 } } - ] - }, - { + ], "static": { - "id": "9a70b67e-fd41-464e-823b-fb6477bd4cf1", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.74969565, - "lon": 10.34050457 + "lon": 10.37722543, + "lat": 58.75306217 }, "sog": 15.9, - "cog": 61.99, - "heading": 61.99, + "cog": 41.83, + "heading": 41.83, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.74969565, - "lon": 10.34050457 + "lon": 10.37722543, + "lat": 58.75306217 } }, { "position": { - "lat": 58.77043567, - "lon": 10.41556825 + "lon": 10.54731637, + "lat": 58.85180239 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 64ea186..0a120a5 100644 --- a/data/baseline_situations_generated/traffic_situation_31.json +++ b/data/baseline_situations_generated/traffic_situation_31.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-SO, OT-SO", "description": "Head-on, crossing stand-on and overtaking stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,33 +16,39 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "ed95fb1e-dae4-4e28-aec8-c93add0a84d9", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.82454908, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85226226 }, "sog": 6.0, "cog": 180.02, @@ -61,87 +58,111 @@ "waypoints": [ { "position": { - "lat": 58.82454908, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.85226226 } }, { "position": { - "lat": 58.80785114, - "lon": 10.49064091 + "lon": 10.49061472, + "lat": 58.80216846 } } - ] - }, - { + ], "static": { - "id": "d88a524d-737c-47ad-9689-cc095699577d", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.75563868, - "lon": 10.40539249 + "lon": 10.44411787, + "lat": 58.75918474 }, "sog": 12.1, - "cog": 51.28, - "heading": 51.28, + "cog": 25.21, + "heading": 25.21, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75563868, - "lon": 10.40539249 + "lon": 10.44411787, + "lat": 58.75918474 } }, { "position": { - "lat": 58.77652842, - "lon": 10.45554675 + "lon": 10.52626, + "lat": 58.84982965 } } - ] - }, - { + ], "static": { - "id": "bc51aa50-f656-4849-92de-911011317e96", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.72339191, - "lon": 10.45469348 + "lon": 10.46592574, + "lat": 58.73589741 }, "sog": 16.9, - "cog": 15.41, - "heading": 15.41, + "cog": 10.54, + "heading": 10.54, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72339191, - "lon": 10.45469348 + "lon": 10.46592574, + "lat": 58.73589741 } }, { "position": { - "lat": 58.76856857, - "lon": 10.4786667 + "lon": 10.5154377, + "lat": 58.87411012 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 b88c287..b8a0ec4 100644 --- a/data/baseline_situations_generated/traffic_situation_32.json +++ b/data/baseline_situations_generated/traffic_situation_32.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, CR-SO, OT-GW", "description": "Head-on, crossing stand-on and overtaking give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "1e2e1ff0-b0f3-4d05-bdba-d57d1f368315", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.81915367, - "lon": 10.48878772 + "lon": 10.48785457, + "lat": 58.84683992 }, "sog": 5.1, - "cog": 178.02, - "heading": 178.02, + "cog": 177.04, + "heading": 177.04, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81915367, - "lon": 10.48878772 + "lon": 10.48785457, + "lat": 58.84683992 } }, { "position": { - "lat": 58.80515733, - "lon": 10.48972006 + "lon": 10.49202514, + "lat": 58.80488167 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { + "initial": { + "position": { + "lon": 10.44855894, + "lat": 58.75548606 + }, + "sog": 13.0, + "cog": 23.84, + "heading": 23.84, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.44855894, + "lat": 58.75548606 + } + }, + { + "position": { + "lon": 10.53277506, + "lat": 58.85451949 + } + } + ], "static": { - "id": "2d63203e-8e3c-45de-adb1-bdaae9a15b76", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, + "id": 10, "name": "target_ship_2", - "shipType": "Passenger" - }, + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + }, + { "initial": { "position": { - "lat": 58.75045872, - "lon": 10.42194711 + "lon": 10.50447832, + "lat": 58.77370117 }, - "sog": 13.0, - "cog": 41.25, - "heading": 41.25, + "sog": 8.0, + "cog": 348.99, + "heading": 348.99, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75045872, - "lon": 10.42194711 + "lon": 10.50447832, + "lat": 58.77370117 } }, { "position": { - "lat": 58.77759071, - "lon": 10.46775274 + "lon": 10.48011965, + "lat": 58.8387345 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 0313405..3790e4a 100644 --- a/data/baseline_situations_generated/traffic_situation_33.json +++ b/data/baseline_situations_generated/traffic_situation_33.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, OT-GW, OT-GW", "description": "Head-on and two overtaking give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { + "initial": { + "position": { + "lon": 10.50064207, + "lat": 58.8624875 + }, + "sog": 11.1, + "cog": 185.7, + "heading": 185.7, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.50064207, + "lat": 58.8624875 + } + }, + { + "position": { + "lon": 10.48304647, + "lat": 58.77083426 + } + } + ], "static": { - "id": "81ced22a-66b2-4ce9-9a8b-1789c344db58", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, + "id": 10, "name": "target_ship_1", - "shipType": "Cargo" + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { + "initial": { + "position": { + "lon": 10.51135592, + "lat": 58.79300255 + }, + "sog": 5.1, + "cog": 337.41, + "heading": 337.41, + "navStatus": "Under way using engine" }, + "waypoints": [ + { + "position": { + "lon": 10.51135592, + "lat": 58.79300255 + } + }, + { + "position": { + "lon": 10.48029643, + "lat": 58.83179463 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + }, + { "initial": { "position": { - "lat": 58.84318613, - "lon": 10.49868939 + "lon": 10.50478937, + "lat": 58.77920431 }, - "sog": 11.1, - "cog": 184.61, - "heading": 184.61, + "sog": 7.0, + "cog": 347.84, + "heading": 347.84, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84318613, - "lon": 10.49868939 + "lon": 10.50478937, + "lat": 58.77920431 } }, { "position": { - "lat": 58.81258267, - "lon": 10.49394251 + "lon": 10.48120738, + "lat": 58.83607311 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 08ff7b9..3aea438 100644 --- a/data/baseline_situations_generated/traffic_situation_34.json +++ b/data/baseline_situations_generated/traffic_situation_34.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, OT-GW, OT-SO", "description": "Head-on, overtaking give-way and overtaking stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "5ea95fa3-78dc-4564-b2b9-68faf45e3239", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.85233408, - "lon": 10.48168547 + "lon": 10.47973278, + "lat": 58.87164444 }, "sog": 13.0, - "cog": 175.67, - "heading": 175.67, + "cog": 174.69, + "heading": 174.69, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.85233408, - "lon": 10.48168547 + "lon": 10.47973278, + "lat": 58.87164444 } }, { "position": { - "lat": 58.81634806, - "lon": 10.48693168 + "lon": 10.49900169, + "lat": 58.76384096 } } - ] - }, - { + ], "static": { - "id": "fce4c5d5-6917-4bc1-80ae-6ca68899b04c", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.76444549, - "lon": 10.49134522 + "lon": 10.50359702, + "lat": 58.78192446 }, "sog": 6.0, - "cog": 359.24, - "heading": 359.24, + "cog": 345.44, + "heading": 345.44, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76444549, - "lon": 10.49134522 + "lon": 10.50359702, + "lat": 58.78192446 } }, { "position": { - "lat": 58.78114197, - "lon": 10.49092143 + "lon": 10.47935037, + "lat": 58.83040867 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "38e96e64-0cd3-411b-a88a-cfcbdce86336", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49390272, + "lat": 58.74420149 }, - "sog": 15.9, - "cog": 357.24, - "heading": 357.24, + "sog": 15.0, + "cog": 358.33, + "heading": 358.33, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49390272, + "lat": 58.74420149 } }, { "position": { - "lat": 58.77350627, - "lon": 10.49229598 + "lon": 10.48691364, + "lat": 58.86857505 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 abeb67e..2ce2465 100644 --- a/data/baseline_situations_generated/traffic_situation_35.json +++ b/data/baseline_situations_generated/traffic_situation_35.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "HO, OT-SO, OT-SO", "description": "Head-on and two overtaking stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "1077425c-1cc8-4b98-9524-56c14fe438fd", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.84160611, - "lon": 10.49590724 + "lon": 10.4966503, + "lat": 58.85266625 }, "sog": 13.0, - "cog": 183.12, - "heading": 183.12, + "cog": 183.52, + "heading": 183.52, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84160611, - "lon": 10.49590724 + "lon": 10.4966503, + "lat": 58.85266625 } }, { "position": { - "lat": 58.80557042, - "lon": 10.49212958 + "lon": 10.48386095, + "lat": 58.74460306 } } - ] - }, - { + ], "static": { - "id": "2c9124e8-7f4e-4252-b6da-75add867bf49", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.71040164, - "lon": 10.53826151 + "lon": 10.5170239, + "lat": 58.73406602 }, - "sog": 19.1, - "cog": 342.97, - "heading": 342.97, + "sog": 16.9, + "cog": 349.45, + "heading": 349.45, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71040164, - "lon": 10.53826151 + "lon": 10.5170239, + "lat": 58.73406602 } }, { "position": { - "lat": 58.76087471, - "lon": 10.50850741 + "lon": 10.46746264, + "lat": 58.87227396 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "c87e4c51-62d1-49d5-acbd-4e38288c502c", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_3", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.71695513, - "lon": 10.50643101 + "lon": 10.49901772, + "lat": 58.7387971 }, "sog": 15.0, - "cog": 353.69, - "heading": 353.69, + "cog": 356.67, + "heading": 356.67, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71695513, - "lon": 10.50643101 + "lon": 10.49901772, + "lat": 58.7387971 } }, { "position": { - "lat": 58.75817912, - "lon": 10.4976521 + "lon": 10.48508982, + "lat": 58.86301308 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 4704a04..9a8b72c 100644 --- a/data/baseline_situations_generated/traffic_situation_36.json +++ b/data/baseline_situations_generated/traffic_situation_36.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, CR-GW, CR-GW", "description": "Three crossing give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "eadae5c5-0658-44a0-bf78-6ff4ad48dd3a", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.84495467, - "lon": 10.53269722 + "lon": 10.53781222, + "lat": 58.85488366 }, "sog": 15.0, - "cog": 202.08, - "heading": 202.08, + "cog": 204.95, + "heading": 204.95, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84495467, - "lon": 10.53269722 + "lon": 10.53781222, + "lat": 58.85488366 } }, { "position": { - "lat": 58.80652158, - "lon": 10.50268415 + "lon": 10.43679327, + "lat": 58.74206632 } } - ] - }, - { + ], "static": { - "id": "0d33a880-a4ed-4542-ac7b-c1820d0354af", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.83445113, - "lon": 10.58635288 + "lon": 10.59965879, + "lat": 58.84431728 }, "sog": 14.0, - "cog": 228.95, - "heading": 228.95, + "cog": 239.21, + "heading": 239.21, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83445113, - "lon": 10.58635288 + "lon": 10.59965879, + "lat": 58.84431728 } }, { "position": { - "lat": 58.80898413, - "lon": 10.53005219 + "lon": 10.40727148, + "lat": 58.78475991 } } - ] - }, - { + ], "static": { - "id": "b3afe993-0cb1-4d15-90f5-e57f6d0b3723", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.75851144, - "lon": 10.53539297 + "lon": 10.52172417, + "lat": 58.76001964 }, "sog": 12.1, - "cog": 324.52, - "heading": 324.52, + "cog": 336.27, + "heading": 336.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75851144, - "lon": 10.53539297 + "lon": 10.52172417, + "lat": 58.76001964 } }, { "position": { - "lat": 58.78570742, - "lon": 10.49808486 + "lon": 10.44411307, + "lat": 58.85173583 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 dbffc50..a9e94cb 100644 --- a/data/baseline_situations_generated/traffic_situation_37.json +++ b/data/baseline_situations_generated/traffic_situation_37.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "920192ea-f1fe-4be2-af92-e9ccacd60797", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.76932919, - "lon": 10.62003238 + "lon": 10.59304039, + "lat": 58.76809929 }, - "sog": 15.9, - "cog": 287.97, - "heading": 287.97, + "sog": 15.0, + "cog": 306.7, + "heading": 306.7, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.76932919, - "lon": 10.62003238 + "lon": 10.59304039, + "lat": 58.76809929 } }, { "position": { - "lat": 58.78295504, - "lon": 10.53915956 + "lon": 10.40102076, + "lat": 58.84246722 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "4c8d2478-9b8c-4aa6-b67d-138b774698ce", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.81748388, - "lon": 10.59466475 + "lon": 10.60491203, + "lat": 58.82280747 }, "sog": 12.1, - "cog": 244.02, - "heading": 244.02, + "cog": 260.92, + "heading": 260.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81748388, - "lon": 10.59466475 + "lon": 10.60491203, + "lat": 58.82280747 } }, { "position": { - "lat": 58.802856, - "lon": 10.53687631 + "lon": 10.41447668, + "lat": 58.80700512 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "8e02d550-8acc-4622-acc8-ef330ee9593e", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.75193999, - "lon": 10.40794999 + "lon": 10.43238448, + "lat": 58.75533344 }, "sog": 14.0, - "cog": 47.61, - "heading": 47.61, + "cog": 31.34, + "heading": 31.34, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.75193999, - "lon": 10.40794999 + "lon": 10.43238448, + "lat": 58.75533344 } }, { "position": { - "lat": 58.7780846, - "lon": 10.46308791 + "lon": 10.54886909, + "lat": 58.85470402 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 58e2665..3fb32dd 100644 --- a/data/baseline_situations_generated/traffic_situation_38.json +++ b/data/baseline_situations_generated/traffic_situation_38.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "0f1edcd0-c5a7-40b5-ac23-18036cd001d8", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.85631106, - "lon": 10.5189593 + "lon": 10.52708109, + "lat": 58.88292003 }, "sog": 12.1, - "cog": 192.74, - "heading": 192.74, + "cog": 196.47, + "heading": 196.47, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.85631106, - "lon": 10.5189593 + "lon": 10.52708109, + "lat": 58.88292003 } }, { "position": { - "lat": 58.82373776, - "lon": 10.50477984 + "lon": 10.4724147, + "lat": 58.78684191 } } - ] - }, - { + ], "static": { - "id": "a16a6a0e-7afc-4d98-ba84-00778780a143", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.82181995, - "lon": 10.60301119 + "lon": 10.61343127, + "lat": 58.82723332 }, "sog": 14.0, - "cog": 242.3, - "heading": 242.3, + "cog": 255.37, + "heading": 255.37, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.82181995, - "lon": 10.60301119 + "lon": 10.61343127, + "lat": 58.82723332 } }, { "position": { - "lat": 58.80379462, - "lon": 10.53691303 + "lon": 10.39674116, + "lat": 58.79784155 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "cf1ee3ce-adb2-4626-8a9c-998626f22f44", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_3", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.77098103, - "lon": 10.49592452 + "lon": 10.51418991, + "lat": 58.79704237 }, "sog": 4.1, - "cog": 352.25, - "heading": 352.25, + "cog": 323.09, + "heading": 323.09, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.77098103, - "lon": 10.49592452 + "lon": 10.51418991, + "lat": 58.79704237 } }, { "position": { - "lat": 58.78218933, - "lon": 10.49299005 + "lon": 10.47496221, + "lat": 58.82417605 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 96bca6a..12d1b44 100644 --- a/data/baseline_situations_generated/traffic_situation_39.json +++ b/data/baseline_situations_generated/traffic_situation_39.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "a80e778a-6544-4676-89d6-f5aed89cd25d", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.87899691, - "lon": 10.52986324 + "lon": 10.53511648, + "lat": 58.89444699 }, - "sog": 18.1, - "cog": 193.03, - "heading": 193.03, + "sog": 16.9, + "cog": 195.89, + "heading": 195.89, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.87899691, - "lon": 10.52986324 + "lon": 10.53511648, + "lat": 58.89444699 } }, { "position": { - "lat": 58.83019281, - "lon": 10.50812407 + "lon": 10.46100609, + "lat": 58.75923593 } } - ] - }, - { + ], "static": { - "id": "1345fe0c-5885-4cb9-ae57-5c349fe9be11", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.77486823, - "lon": 10.61533211 + "lon": 10.58189453, + "lat": 58.77180694 }, "sog": 12.1, - "cog": 284.13, - "heading": 284.13, + "cog": 314.78, + "heading": 314.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.77486823, - "lon": 10.61533211 + "lon": 10.58189453, + "lat": 58.77180694 } }, { "position": { - "lat": 58.7830208, - "lon": 10.55299388 + "lon": 10.44501402, + "lat": 58.84238148 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "454cb381-b56f-40cc-aa9c-78f9b3574edf", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.71663194, - "lon": 10.47475603 + "lon": 10.48032032, + "lat": 58.73299771 }, "sog": 16.9, - "cog": 6.3, - "heading": 6.3, + "cog": 4.13, + "heading": 4.13, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71663194, - "lon": 10.47475603 + "lon": 10.48032032, + "lat": 58.73299771 } }, { "position": { - "lat": 58.76321066, - "lon": 10.48465844 + "lon": 10.49978749, + "lat": 58.87321931 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 4661e8a..3d962f5 100644 --- a/data/baseline_situations_generated/traffic_situation_40.json +++ b/data/baseline_situations_generated/traffic_situation_40.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "21f9af18-98f6-482f-870b-d99f4f144427", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.82287031, - "lon": 10.51082023 + "lon": 10.5195814, + "lat": 58.84868926 }, "sog": 6.0, - "cog": 198.3, - "heading": 198.3, + "cog": 206.72, + "heading": 206.72, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.82287031, - "lon": 10.51082023 + "lon": 10.5195814, + "lat": 58.84868926 } }, { "position": { - "lat": 58.80701693, - "lon": 10.50072766 + "lon": 10.47622113, + "lat": 58.803946 } } - ] - }, - { + ], "static": { - "id": "7ad158eb-ceab-4d30-aaa9-17084ecbbff4", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.7798417, - "lon": 10.37290533 + "lon": 10.38228859, + "lat": 58.77853101 }, "sog": 15.0, - "cog": 79.53, - "heading": 79.53, + "cog": 64.8, + "heading": 64.8, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7798417, - "lon": 10.37290533 + "lon": 10.38228859, + "lat": 58.77853101 } }, { "position": { - "lat": 58.78738112, - "lon": 10.45141067 + "lon": 10.59900317, + "lat": 58.83150625 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "df6b438d-f1c6-46aa-86ca-811ad4a42720", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.74116713, - "lon": 10.24739775 + "lon": 10.34539493, + "lat": 58.75014452 }, - "sog": 16.9, - "cog": 68.41, - "heading": 68.41, + "sog": 15.0, + "cog": 38.85, + "heading": 38.85, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.74116713, - "lon": 10.24739775 + "lon": 10.34539493, + "lat": 58.75014452 } }, { "position": { - "lat": 58.75840968, - "lon": 10.33127351 + "lon": 10.49562211, + "lat": 58.84705149 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 a5cd0bb..c1df6f1 100644 --- a/data/baseline_situations_generated/traffic_situation_41.json +++ b/data/baseline_situations_generated/traffic_situation_41.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "90ad61e9-0bde-404c-8de7-717fbebdec37", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.79163799, - "lon": 10.69314577 + "lon": 10.64237595, + "lat": 58.78456381 }, - "sog": 18.1, - "cog": 269.75, - "heading": 269.75, + "sog": 15.0, + "cog": 295.19, + "heading": 295.19, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.79163799, - "lon": 10.69314577 + "lon": 10.64237595, + "lat": 58.78456381 } }, { "position": { - "lat": 58.79141813, - "lon": 10.59672205 + "lon": 10.42564247, + "lat": 58.83751819 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "c356120c-0dd7-400a-88f8-a657e8dda6c5", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.83445113, - "lon": 10.39495512 + "lon": 10.38164921, + "lat": 58.84431728 }, "sog": 14.0, - "cog": 131.04, - "heading": 131.04, + "cog": 120.78, + "heading": 120.78, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83445113, - "lon": 10.39495512 + "lon": 10.38164921, + "lat": 58.84431728 } }, { "position": { - "lat": 58.80898955, - "lon": 10.4512649 + "lon": 10.57405776, + "lat": 58.78477843 } } - ] - }, - { + ], "static": { - "id": "e873f7d1-1ec4-47b3-b5a3-626c428b46e7", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.72339191, - "lon": 10.45469348 + "lon": 10.46592574, + "lat": 58.73589741 }, "sog": 16.9, - "cog": 15.41, - "heading": 15.41, + "cog": 10.54, + "heading": 10.54, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.72339191, - "lon": 10.45469348 + "lon": 10.46592574, + "lat": 58.73589741 } }, { "position": { - "lat": 58.76856857, - "lon": 10.4786667 + "lon": 10.5154377, + "lat": 58.87411012 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 cac3095..16548c1 100644 --- a/data/baseline_situations_generated/traffic_situation_42.json +++ b/data/baseline_situations_generated/traffic_situation_42.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,103 +16,119 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "4fe4ef8c-3048-440c-bde9-e2ae099fc8d9", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_1", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.80563373, - "lon": 10.57185462 + "lon": 10.57581183, + "lat": 58.80768955 }, "sog": 8.9, - "cog": 251.07, - "heading": 251.07, + "cog": 277.25, + "heading": 277.25, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80563373, - "lon": 10.57185462 + "lon": 10.57581183, + "lat": 58.80768955 } }, { "position": { - "lat": 58.79759561, - "lon": 10.52674017 + "lon": 10.43387538, + "lat": 58.81707577 } } - ] - }, - { + ], "static": { - "id": "3b208654-1cb8-4f44-b8ef-573049a1c296", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.818229, - "lon": 10.3649909 + "lon": 10.35724928, + "lat": 58.8216045 }, "sog": 15.9, - "cog": 112.53, - "heading": 112.53, + "cog": 101.3, + "heading": 101.3, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.818229, - "lon": 10.3649909 + "lon": 10.35724928, + "lat": 58.8216045 } }, { "position": { - "lat": 58.80130577, - "lon": 10.44352233 + "lon": 10.60736457, + "lat": 58.79564283 } } - ] - }, - { + ], "static": { - "id": "29d13c09-719c-463f-81d1-306de57352af", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.7729381, - "lon": 10.5034415 + "lon": 10.5034415, + "lat": 58.7729381 }, "sog": 7.0, "cog": 339.99, @@ -131,17 +138,31 @@ "waypoints": [ { "position": { - "lat": 58.7729381, - "lon": 10.5034415 + "lon": 10.5034415, + "lat": 58.7729381 } }, { "position": { - "lat": 58.79115902, - "lon": 10.49067118 + "lon": 10.46513053, + "lat": 58.82760088 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 8a4f3a3..16914c8 100644 --- a/data/baseline_situations_generated/traffic_situation_43.json +++ b/data/baseline_situations_generated/traffic_situation_43.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { + "initial": { + "position": { + "lon": 10.57321977, + "lat": 58.85544026 + }, + "sog": 12.1, + "cog": 225.52, + "heading": 225.52, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.57321977, + "lat": 58.85544026 + } + }, + { + "position": { + "lon": 10.43563173, + "lat": 58.78523803 + } + } + ], "static": { - "id": "e5780700-ac63-4233-a076-22872a892cfd", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, + "id": 10, "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" + } + }, + { + "initial": { + "position": { + "lon": 10.50534234, + "lat": 58.79191629 + }, + "sog": 5.1, + "cog": 344.18, + "heading": 344.18, + "navStatus": "Under way using engine" }, + "waypoints": [ + { + "position": { + "lon": 10.50534234, + "lat": 58.79191629 + } + }, + { + "position": { + "lon": 10.48328948, + "lat": 58.83233822 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { "initial": { "position": { - "lat": 58.83964904, - "lon": 10.55904984 + "lon": 10.47102346, + "lat": 58.78532689 }, - "sog": 12.1, - "cog": 216.23, - "heading": 216.23, + "sog": 7.0, + "cog": 12.15, + "heading": 12.15, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83964904, - "lon": 10.55904984 + "lon": 10.47102346, + "lat": 58.78532689 } }, { "position": { - "lat": 58.8127117, - "lon": 10.52105285 + "lon": 10.49458517, + "lat": 58.84219795 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 31ce397..5b9fe8d 100644 --- a/data/baseline_situations_generated/traffic_situation_44.json +++ b/data/baseline_situations_generated/traffic_situation_44.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "4aaa9de2-6ec0-4541-8fa9-612a4db5c754", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.81472782, - "lon": 10.70233895 + "lon": 10.69941856, + "lat": 58.81401861 }, "sog": 14.0, - "cog": 257.89, - "heading": 257.89, + "cog": 285.33, + "heading": 285.33, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81472782, - "lon": 10.70233895 + "lon": 10.69941856, + "lat": 58.81401861 } }, { "position": { - "lat": 58.80659059, - "lon": 10.62934931 + "lon": 10.48343609, + "lat": 58.84478401 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } }, { + "initial": { + "position": { + "lon": 10.51135592, + "lat": 58.79300255 + }, + "sog": 5.1, + "cog": 337.41, + "heading": 337.41, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.51135592, + "lat": 58.79300255 + } + }, + { + "position": { + "lon": 10.48029643, + "lat": 58.83179463 + } + } + ], "static": { - "id": "ea1fe2b6-9c64-4dbb-8d79-16b56ebc51b4", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49452481, + "lat": 58.74043996 }, "sog": 15.9, - "cog": 357.24, - "heading": 357.24, + "cog": 358.16, + "heading": 358.16, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7293888, - "lon": 10.49639109 + "lon": 10.49452481, + "lat": 58.74043996 } }, { "position": { - "lat": 58.77350627, - "lon": 10.49229598 + "lon": 10.48631708, + "lat": 58.87287753 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 8b077ae..04b0d07 100644 --- a/data/baseline_situations_generated/traffic_situation_45.json +++ b/data/baseline_situations_generated/traffic_situation_45.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "CR-GW, OT-SO, OT-SO", "description": "Crossing give way and two overtaking stand-on situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "25b22987-1a9c-4a75-a0d5-af47fb364d35", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.83655184, - "lon": 10.55626769 + "lon": 10.56864046, + "lat": 58.85032315 }, "sog": 12.1, - "cog": 216.92, - "heading": 216.92, + "cog": 225.52, + "heading": 225.52, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83655184, - "lon": 10.55626769 + "lon": 10.56864046, + "lat": 58.85032315 } }, { "position": { - "lat": 58.80985331, - "lon": 10.51765124 + "lon": 10.43105242, + "lat": 58.78012092 } } - ] - }, - { + ], "static": { - "id": "074bd7ee-78e6-4b82-a608-50d977d98103", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.71893913, - "lon": 10.53060629 + "lon": 10.5085565, + "lat": 58.74350125 }, - "sog": 18.1, - "cog": 343.95, - "heading": 343.95, + "sog": 15.0, + "cog": 351.4, + "heading": 351.4, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71893913, - "lon": 10.53060629 + "lon": 10.5085565, + "lat": 58.74350125 } }, { "position": { - "lat": 58.76707949, - "lon": 10.50394162 + "lon": 10.47272123, + "lat": 58.86652718 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "70961523-ef61-481d-92be-c92d838ce207", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.70876775, - "lon": 10.47209485 + "lon": 10.48135714, + "lat": 58.73605002 }, "sog": 15.0, - "cog": 6.65, - "heading": 6.65, + "cog": 3.32, + "heading": 3.32, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70876775, - "lon": 10.47209485 + "lon": 10.48135714, + "lat": 58.73605002 } }, { "position": { - "lat": 58.74996453, - "lon": 10.48133501 + "lon": 10.49524073, + "lat": 58.86026734 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 c09a910..185e305 100644 --- a/data/baseline_situations_generated/traffic_situation_46.json +++ b/data/baseline_situations_generated/traffic_situation_46.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "3bb6aa8d-dc26-4d2d-8c61-827f5ff5710e", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.82287031, - "lon": 10.47048777 + "lon": 10.4617266, + "lat": 58.84868926 }, "sog": 6.0, - "cog": 161.75, - "heading": 161.75, + "cog": 153.27, + "heading": 153.27, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.82287031, - "lon": 10.47048777 + "lon": 10.4617266, + "lat": 58.84868926 } }, { "position": { - "lat": 58.80701266, - "lon": 10.48055548 + "lon": 10.50510283, + "lat": 58.80395017 } } - ] - }, - { + ], "static": { - "id": "570237ed-04ce-4df7-b172-233c2857a272", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.7798417, - "lon": 10.37290533 + "lon": 10.38228859, + "lat": 58.77853101 }, "sog": 15.0, - "cog": 79.53, - "heading": 79.53, + "cog": 64.8, + "heading": 64.8, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7798417, - "lon": 10.37290533 + "lon": 10.38228859, + "lat": 58.77853101 } }, { "position": { - "lat": 58.78738112, - "lon": 10.45141067 + "lon": 10.59900317, + "lat": 58.83150625 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "9f1111dd-e8ca-4754-ac17-cabdddf5286f", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.86039577, - "lon": 10.38291068 + "lon": 10.3649045, + "lat": 58.87659098 }, "sog": 16.9, - "cog": 141.06, - "heading": 141.06, + "cog": 132.81, + "heading": 132.81, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.86039577, - "lon": 10.38291068 + "lon": 10.3649045, + "lat": 58.87659098 } }, { "position": { - "lat": 58.8239452, - "lon": 10.43960157 + "lon": 10.56342268, + "lat": 58.78105024 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 488cd72..3db0a44 100644 --- a/data/baseline_situations_generated/traffic_situation_47.json +++ b/data/baseline_situations_generated/traffic_situation_47.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "cdfa9a22-bd10-438e-9d67-a90abb9dda39", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.8721741, - "lon": 10.41448198 + "lon": 10.41194176, + "lat": 58.87578301 }, - "sog": 18.1, - "cog": 153.95, - "heading": 153.95, + "sog": 15.0, + "cog": 146.79, + "heading": 146.79, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.8721741, - "lon": 10.41448198 + "lon": 10.41194176, + "lat": 58.87578301 } }, { "position": { - "lat": 58.82716783, - "lon": 10.4568217 + "lon": 10.54311538, + "lat": 58.77167708 } } - ] - }, - { + ], "static": { - "id": "31e9db13-0494-4437-8fca-eff4ed5ba1a4", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.81237574, - "lon": 10.37841778 + "lon": 10.37205859, + "lat": 58.81514976 }, "sog": 14.0, - "cog": 110.01, - "heading": 110.01, + "cog": 96.83, + "heading": 96.83, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.81237574, - "lon": 10.37841778 + "lon": 10.37205859, + "lat": 58.81514976 } }, { "position": { - "lat": 58.79910639, - "lon": 10.44856358 + "lon": 10.59442337, + "lat": 58.8013136 } } - ] - }, - { + ], "static": { - "id": "ffd3df9f-82a1-444a-a784-48895f9093f6", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.67733793, - "lon": 10.44624336 + "lon": 10.4752226, + "lat": 58.73350942 }, - "sog": 19.1, - "cog": 11.46, - "heading": 11.46, + "sog": 15.0, + "cog": 5.04, + "heading": 5.04, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.67733793, - "lon": 10.44624336 + "lon": 10.4752226, + "lat": 58.73350942 } }, { "position": { - "lat": 58.72907272, - "lon": 10.46642991 + "lon": 10.49627197, + "lat": 58.8574545 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 5ed038e..a9a562a 100644 --- a/data/baseline_situations_generated/traffic_situation_48.json +++ b/data/baseline_situations_generated/traffic_situation_48.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "502a1289-c97f-443e-99cb-4c40b4513f85", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.80948503, - "lon": 10.40204009 + "lon": 10.39602651, + "lat": 58.81260916 }, "sog": 8.9, - "cog": 111.73, - "heading": 111.73, + "cog": 82.74, + "heading": 82.74, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80948503, - "lon": 10.40204009 + "lon": 10.39602651, + "lat": 58.81260916 } }, { "position": { - "lat": 58.80031284, - "lon": 10.44634581 + "lon": 10.53795961, + "lat": 58.82200904 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { + "initial": { + "position": { + "lon": 10.35479546, + "lat": 58.80419735 + }, + "sog": 15.9, + "cog": 87.09, + "heading": 87.09, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.35479546, + "lat": 58.80419735 + } + }, + { + "position": { + "lon": 10.60952524, + "lat": 58.81092528 + } + } + ], "static": { - "id": "3331dd8b-ee9c-4b22-a41e-3eee6feeb9ec", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, + "id": 10, "name": "target_ship_2", - "shipType": "Cargo" - }, + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { "initial": { "position": { - "lat": 58.80361382, - "lon": 10.35674815 + "lon": 10.5136715, + "lat": 58.78053296 }, - "sog": 15.9, - "cog": 100.15, - "heading": 100.15, + "sog": 7.0, + "cog": 339.94, + "heading": 339.94, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.80361382, - "lon": 10.35674815 + "lon": 10.5136715, + "lat": 58.78053296 } }, { "position": { - "lat": 58.79582785, - "lon": 10.44043637 + "lon": 10.47525533, + "lat": 58.83517582 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 55e2b68..e09a73d 100644 --- a/data/baseline_situations_generated/traffic_situation_49.json +++ b/data/baseline_situations_generated/traffic_situation_49.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { + "initial": { + "position": { + "lon": 10.3997418, + "lat": 58.86473185 + }, + "sog": 14.0, + "cog": 137.45, + "heading": 137.45, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.3997418, + "lat": 58.86473185 + } + }, + { + "position": { + "lon": 10.55117957, + "lat": 58.77901701 + } + } + ], "static": { - "id": "cd3fcce3-90d1-42d4-a80b-c73345fabadd", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, + "id": 10, "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, "shipType": "Passenger" + } + }, + { + "initial": { + "position": { + "lon": 10.50230099, + "lat": 58.78601814 + }, + "sog": 6.0, + "cog": 349.56, + "heading": 349.56, + "navStatus": "Under way using engine" }, + "waypoints": [ + { + "position": { + "lon": 10.50230099, + "lat": 58.78601814 + } + }, + { + "position": { + "lon": 10.48483086, + "lat": 58.8352829 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } + }, + { "initial": { "position": { - "lat": 58.84858154, - "lon": 10.41424005 + "lon": 10.47102346, + "lat": 58.78532689 }, - "sog": 14.0, - "cog": 145.36, - "heading": 145.36, + "sog": 7.0, + "cog": 12.15, + "heading": 12.15, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.84858154, - "lon": 10.41424005 + "lon": 10.47102346, + "lat": 58.78532689 } }, { "position": { - "lat": 58.81667403, - "lon": 10.45667389 + "lon": 10.49458517, + "lat": 58.84219795 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 04424de..27b2a38 100644 --- a/data/baseline_situations_generated/traffic_situation_50.json +++ b/data/baseline_situations_generated/traffic_situation_50.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "c683531e-652a-4af2-a0c7-5f6471adf0ab", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.79416063, - "lon": 10.36388496 + "lon": 10.36827418, + "lat": 58.79309232 }, "sog": 14.0, - "cog": 92.59, - "heading": 92.59, + "cog": 74.66, + "heading": 74.66, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.79416063, - "lon": 10.36388496 + "lon": 10.36827418, + "lat": 58.79309232 } }, { "position": { - "lat": 58.79240813, - "lon": 10.43846004 + "lon": 10.58424567, + "lat": 58.82387852 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { + "initial": { + "position": { + "lon": 10.51310124, + "lat": 58.8069534 + }, + "sog": 4.1, + "cog": 335.64, + "heading": 335.64, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.51310124, + "lat": 58.8069534 + } + }, + { + "position": { + "lon": 10.48615745, + "lat": 58.83786647 + } + } + ], "static": { - "id": "365e58d2-499f-4071-970c-ea5d21f3ac3b", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, "shipType": "Cargo" - }, + } + }, + { "initial": { "position": { - "lat": 58.70297734, - "lon": 10.50083216 + "lon": 10.49618373, + "lat": 58.73057382 }, "sog": 15.9, - "cog": 356.55, - "heading": 356.55, + "cog": 358.16, + "heading": 358.16, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70297734, - "lon": 10.50083216 + "lon": 10.49618373, + "lat": 58.73057382 } }, { "position": { - "lat": 58.7470661, - "lon": 10.49571832 + "lon": 10.487976, + "lat": 58.86301139 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 2277838..c02042d 100644 --- a/data/baseline_situations_generated/traffic_situation_51.json +++ b/data/baseline_situations_generated/traffic_situation_51.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "db9e7d6c-5fbf-44d9-8fa7-c84757bb3e60", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_1", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.83744958, - "lon": 10.42422813 + "lon": 10.41353156, + "lat": 58.84936257 }, "sog": 13.0, - "cog": 143.3, - "heading": 143.3, + "cog": 136.08, + "heading": 136.08, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.83744958, - "lon": 10.42422813 + "lon": 10.41353156, + "lat": 58.84936257 } }, { "position": { - "lat": 58.80851546, - "lon": 10.46574665 + "lon": 10.55809668, + "lat": 58.77138 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "586a4d94-8d3c-44cd-b073-0311b9c55fa0", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.73740561, - "lon": 10.51403439 + "lon": 10.51177065, + "lat": 58.73992825 }, "sog": 18.1, - "cog": 347.27, - "heading": 347.27, + "cog": 348.53, + "heading": 348.53, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.73740561, - "lon": 10.51403439 + "lon": 10.51177065, + "lat": 58.73992825 } }, { "position": { - "lat": 58.78626802, - "lon": 10.49278608 + "lon": 10.45424825, + "lat": 58.88720851 } } - ] - }, - { + ], "static": { - "id": "fae8ac8b-ee70-42d4-9227-930e0a061fe9", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.70538328, - "lon": 10.44997593 + "lon": 10.46813763, + "lat": 58.73130099 }, "sog": 15.9, - "cog": 13.87, - "heading": 13.87, + "cog": 7.62, + "heading": 7.62, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70538328, - "lon": 10.44997593 + "lon": 10.46813763, + "lat": 58.73130099 } }, { "position": { - "lat": 58.74826496, - "lon": 10.47035043 + "lon": 10.50196053, + "lat": 58.86263696 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 3b0b6a2..cae4fc7 100644 --- a/data/baseline_situations_generated/traffic_situation_52.json +++ b/data/baseline_situations_generated/traffic_situation_52.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-GW, OT-GW, OT-GW", "description": "Three overtaking give-way situations with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,17 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, - "targetShips": [] -} + "targetShips": [ + { + "initial": { + "position": { + "lon": 10.4828087, + "lat": 58.77865669 + }, + "sog": 7.0, + "cog": 6.7, + "heading": 6.7, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.4828087, + "lat": 58.77865669 + } + }, + { + "position": { + "lon": 10.49588014, + "lat": 58.83643243 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } + }, + { + "initial": { + "position": { + "lon": 10.50230099, + "lat": 58.78601814 + }, + "sog": 6.0, + "cog": 349.56, + "heading": 349.56, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.50230099, + "lat": 58.78601814 + } + }, + { + "position": { + "lon": 10.48483086, + "lat": 58.8352829 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { + "initial": { + "position": { + "lon": 10.45804588, + "lat": 58.79978047 + }, + "sog": 5.1, + "cog": 31.74, + "heading": 31.74, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.45804588, + "lat": 58.79978047 + } + }, + { + "position": { + "lon": 10.50059223, + "lat": 58.83551045 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + } + ] +} \ 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 d71f81d..d3c1cda 100644 --- a/data/baseline_situations_generated/traffic_situation_53.json +++ b/data/baseline_situations_generated/traffic_situation_53.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,53 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { + "initial": { + "position": { + "lon": 10.490654, + "lat": 58.77758838 + }, + "sog": 7.0, + "cog": 0.0, + "heading": 0.0, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.490654, + "lat": 58.77758838 + } + }, + { + "position": { + "lon": 10.490654, + "lat": 58.83576183 + } + } + ], "static": { - "id": "2db3c199-dc28-4f00-b1ce-7ecaed62f27e", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", - "shipType": "Passenger" + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } + }, + { + "initial": { + "position": { + "lon": 10.50774432, + "lat": 58.8138211 + }, + "sog": 4.1, + "cog": 344.81, + "heading": 344.81, + "navStatus": "Under way using engine" }, + "waypoints": [ + { + "position": { + "lon": 10.50774432, + "lat": 58.8138211 + } + }, + { + "position": { + "lon": 10.49062474, + "lat": 58.8465694 + } + } + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } + }, + { "initial": { "position": { - "lat": 58.69760886, - "lon": 10.47955998 + "lon": 10.48420841, + "lat": 58.72519637 }, "sog": 16.9, - "cog": 3.55, - "heading": 3.55, + "cog": 2.06, + "heading": 2.06, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.69760886, - "lon": 10.47955998 + "lon": 10.48420841, + "lat": 58.72519637 } }, { "position": { - "lat": 58.74438077, - "lon": 10.48514903 + "lon": 10.49394831, + "lat": 58.86569111 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ 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 7bb92d8..0e877bb 100644 --- a/data/baseline_situations_generated/traffic_situation_54.json +++ b/data/baseline_situations_generated/traffic_situation_54.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "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": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,88 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] - }, - "targetShips": [ - { - "static": { - "id": "a6261754-ef85-4613-9662-76319cc0e66c", + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { "length": 122.0, "width": 20.0, "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_2", - "shipType": "Passenger" + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 }, + "shipType": "Passenger" + } + }, + "targetShips": [ + { "initial": { "position": { - "lat": 58.71434271, - "lon": 10.53471903 + "lon": 10.47057417, + "lat": 58.7815115 }, - "sog": 18.1, - "cog": 343.43, - "heading": 343.43, + "sog": 7.0, + "cog": 15.58, + "heading": 15.58, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.71434271, - "lon": 10.53471903 + "lon": 10.47057417, + "lat": 58.7815115 } }, { "position": { - "lat": 58.76235644, - "lon": 10.50722147 + "lon": 10.50065774, + "lat": 58.83754623 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } }, { + "initial": { + "position": { + "lon": 10.52136128, + "lat": 58.72923619 + }, + "sog": 18.1, + "cog": 348.53, + "heading": 348.53, + "navStatus": "Under way using engine" + }, + "waypoints": [ + { + "position": { + "lon": 10.52136128, + "lat": 58.72923619 + } + }, + { + "position": { + "lon": 10.46383888, + "lat": 58.87651644 + } + } + ], "static": { - "id": "7c640290-36c5-4af7-9df1-0dada3165355", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, "shipType": "Passenger" - }, + } + }, + { "initial": { "position": { - "lat": 58.70365064, - "lon": 10.4487663 + "lon": 10.47366736, + "lat": 58.73919211 }, - "sog": 18.1, - "cog": 13.98, - "heading": 13.98, + "sog": 15.0, + "cog": 6.76, + "heading": 6.76, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70365064, - "lon": 10.4487663 + "lon": 10.47366736, + "lat": 58.73919211 } }, { "position": { - "lat": 58.75226064, - "lon": 10.47206115 + "lon": 10.50186358, + "lat": 58.8627534 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } } ] -} +} \ 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 8b02da8..ccf96e8 100644 --- a/data/baseline_situations_generated/traffic_situation_55.json +++ b/data/baseline_situations_generated/traffic_situation_55.json @@ -1,21 +1,12 @@ { + "version": "0.6.0", "title": "OT-SO, OT-SO, OT-SO", "description": "Three overtaking stand-on situation with three target ships.", "ownShip": { - "static": { - "id": "27b8e920-d131-49d1-be47-284c99a128d9", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "mmsi": 257847600, - "name": "BASTO VI", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 }, "sog": 10.0, "cog": 0.0, @@ -25,123 +16,153 @@ "waypoints": [ { "position": { - "lat": 58.763449, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.763449 } }, { "position": { - "lat": 58.7911568, - "lon": 10.490654 + "lon": 10.490654, + "lat": 58.8465724 } } - ] + ], + "static": { + "id": 0, + "mmsi": 257847600, + "name": "BASTO VI", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, "targetShips": [ { - "static": { - "id": "5f8224e3-e17f-4512-84d3-507031fa4827", - "length": 178.0, - "width": 30.0, - "height": 30.0, - "speedMax": 21.0, - "name": "target_ship_1", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.70727751, - "lon": 10.50971429 + "lon": 10.50098768, + "lat": 58.73299771 }, - "sog": 19.1, - "cog": 353.29, - "heading": 353.29, + "sog": 16.9, + "cog": 355.92, + "heading": 355.92, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70727751, - "lon": 10.50971429 + "lon": 10.50098768, + "lat": 58.73299771 } }, { "position": { - "lat": 58.75970249, - "lon": 10.49783446 + "lon": 10.48174041, + "lat": 58.8732275 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_1", + "dimensions": { + "length": 122.0, + "width": 20.0, + "height": 8.0, + "a": 61.0, + "b": 61.0, + "c": 10.0, + "d": 10.0 + }, + "shipType": "Passenger" + } }, { - "static": { - "id": "ea1f5e8c-7471-4d99-a22e-99507c7565ef", - "length": 50.0, - "width": 10.0, - "height": 8.0, - "speedMax": 15.0, - "name": "target_ship_2", - "shipType": "Cargo" - }, "initial": { "position": { - "lat": 58.70976424, - "lon": 10.53884905 + "lon": 10.51095847, + "lat": 58.74083497 }, - "sog": 18.1, - "cog": 342.92, - "heading": 342.92, + "sog": 15.0, + "cog": 351.4, + "heading": 351.4, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.70976424, - "lon": 10.53884905 + "lon": 10.51095847, + "lat": 58.74083497 } }, { "position": { - "lat": 58.75764747, - "lon": 10.51052083 + "lon": 10.4751232, + "lat": 58.86386089 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_2", + "dimensions": { + "length": 50.0, + "width": 10.0, + "height": 8.0, + "a": 25.0, + "b": 25.0, + "c": 5.0, + "d": 5.0 + }, + "shipType": "Cargo" + } }, { - "static": { - "id": "9f9f3674-bd0f-4213-963d-5d944f35eec2", - "length": 122.0, - "width": 20.0, - "height": 8.0, - "speedMax": 17.0, - "name": "target_ship_3", - "shipType": "Passenger" - }, "initial": { "position": { - "lat": 58.7002931, - "lon": 10.44641617 + "lon": 10.46450875, + "lat": 58.72613001 }, "sog": 16.9, - "cog": 14.21, - "heading": 14.21, + "cog": 8.31, + "heading": 8.31, "navStatus": "Under way using engine" }, "waypoints": [ { "position": { - "lat": 58.7002931, - "lon": 10.44641617 + "lon": 10.46450875, + "lat": 58.72613001 } }, { "position": { - "lat": 58.74572132, - "lon": 10.46855808 + "lon": 10.50361001, + "lat": 58.86524053 } } - ] + ], + "static": { + "id": 10, + "name": "target_ship_3", + "dimensions": { + "length": 178.0, + "width": 30.0, + "height": 30.0, + "a": 89.0, + "b": 89.0, + "c": 15.0, + "d": 15.0 + }, + "shipType": "Passenger" + } } ] -} +} \ No newline at end of file diff --git a/src/trafficgen/settings/encounter_settings.json b/src/trafficgen/settings/encounter_settings.json index 424ddbb..122d14d 100644 --- a/src/trafficgen/settings/encounter_settings.json +++ b/src/trafficgen/settings/encounter_settings.json @@ -34,9 +34,9 @@ 10.0, 30.0 ], - "situation_length": 10.0, + "situation_length": 30.0, "max_meeting_distance": 0.0, "common_vector": 5.0, "evolve_time": 120.0, - "disable_land_check": false + "disable_land_check": true } diff --git a/src/trafficgen/write_traffic_situation_to_file.py b/src/trafficgen/write_traffic_situation_to_file.py index efd61e0..5f666e0 100644 --- a/src/trafficgen/write_traffic_situation_to_file.py +++ b/src/trafficgen/write_traffic_situation_to_file.py @@ -1,7 +1,8 @@ """Functions to clean traffic situations data before writing it to a json file.""" +import json from pathlib import Path -from typing import TypeVar +from typing import Any, TypeVar from trafficgen.types import OwnShip, Ship, TargetShip, TrafficSituation from trafficgen.utils import m_2_nm, m_pr_s_2_knot, rad_2_deg @@ -25,11 +26,22 @@ def write_traffic_situations_to_json_file(situations: list[TrafficSituation], wr 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) # noqa: PLW2901 - data: str = situation.model_dump_json( - by_alias=True, indent=4, exclude_unset=True, exclude_defaults=False, exclude_none=True + data: dict[str, Any] = situation.model_dump( + by_alias=True, exclude_unset=True, exclude_defaults=False, exclude_none=True ) + + # Remove the 'sogMax' field from the 'static' dictionary in ownShip + if "static" in data.get("ownShip", {}): + data["ownShip"]["static"].pop("sogMax", None) + + # Remove the 'sogMax' field from the 'static' dictionary in each targetShip + for target_ship in data.get("targetShips", []): + if "static" in target_ship: + target_ship["static"].pop("sogMax", None) + + json_data: str = json.dumps(data, indent=4) with Path.open(output_file_path, "w", encoding="utf-8") as outfile: - _ = outfile.write(data) + _ = outfile.write(json_data) def convert_situation_data_from_si_units_to__maritime(situation: TrafficSituation) -> TrafficSituation: