Skip to content

Commit

Permalink
Working #17. Removed lat_lon0 as a setting, instead always using ship…
Browse files Browse the repository at this point in the history 
… initial position in lat lon as the reference point lat_lon0. Renamed test_08 file.
  • Loading branch information
@tomarnepedersen
tomarnepedersen committed Jan 24, 2024
1 parent b44941a commit c56fc65
Show file tree
Hide file tree
Showing 144 changed files with 1,130 additions and 1,368 deletions.
20 changes: 8 additions & 12 deletions data/baseline_situations_generated/traffic_situation_01.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "HO",
"inputFileName": "baseline_situation_01_1_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,14 +45,14 @@
"targetShips": [
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"length": 50.0,
"width": 10.0,
"id": "29376342-9c27-4875-8377-0a9a569e1505",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
Expand Down
30 changes: 13 additions & 17 deletions data/baseline_situations_generated/traffic_situation_02.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "CR-GW",
"inputFileName": "baseline_situation_02_1_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,21 +45,21 @@
"targetShips": [
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
"north": 8348.609313788964,
"east": 3038.6452877367683,
"latitude": 58.838398,
"longitude": 10.543163
"north": 13805.59842063799,
"east": 5024.826891344722,
"latitude": 58.887387,
"longitude": 10.577485
},
"sog": 8.0,
"cog": 225.3
Expand Down
8 changes: 2 additions & 6 deletions data/baseline_situations_generated/traffic_situation_03.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "CR-SO",
"inputFileName": "baseline_situation_03_1_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,7 +45,7 @@
"targetShips": [
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d",
"length": 50.0,
"width": 10.0,
"height": 8.0,
Expand Down
8 changes: 2 additions & 6 deletions data/baseline_situations_generated/traffic_situation_04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "OT-GW",
"inputFileName": "baseline_situation_04_1_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,7 +45,7 @@
"targetShips": [
{
"static": {
"id": "500c1686-6076-43e4-baec-2d01db90422c",
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
Expand Down
32 changes: 14 additions & 18 deletions data/baseline_situations_generated/traffic_situation_05.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "OT-SO",
"inputFileName": "baseline_situation_05_1_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,24 +45,24 @@
"targetShips": [
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"length": 50.0,
"width": 10.0,
"id": "29376342-9c27-4875-8377-0a9a569e1505",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
"north": -2897.7442608687784,
"east": -776.4482345717098,
"latitude": 58.737435,
"longitude": 10.477237
"north": -3472.2532721437688,
"east": -930.3874601872462,
"latitude": 58.732277,
"longitude": 10.474577
},
"sog": 15.0,
"cog": 5.1
"sog": 16.0,
"cog": 5.7
}
}
]
Expand Down
36 changes: 16 additions & 20 deletions data/baseline_situations_generated/traffic_situation_06.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "HO, HO",
"inputFileName": "baseline_situation_06_2_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,14 +45,14 @@
"targetShips": [
{
"static": {
"id": "a85975ef-54bc-4e92-a95e-f7925e347f63",
"length": 122.0,
"width": 20.0,
"id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d",
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"shipType": "Passenger/Ro-Ro Cargo Ship"
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
},
"initial": {
"position": {
Expand All @@ -71,14 +67,14 @@
},
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"length": 50.0,
"width": 10.0,
"height": 8.0,
"speedMax": 15.0,
"mmsi": 257083180,
"name": "CANOLE",
"shipType": "Cargo"
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
"position": {
Expand Down
22 changes: 9 additions & 13 deletions data/baseline_situations_generated/traffic_situation_07.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "HO, CR-GW",
"inputFileName": "baseline_situation_07_2_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,13 +45,13 @@
"targetShips": [
{
"static": {
"id": "500c1686-6076-43e4-baec-2d01db90422c",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"id": "29376342-9c27-4875-8377-0a9a569e1505",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
Expand All @@ -71,7 +67,7 @@
},
{
"static": {
"id": "500c1686-6076-43e4-baec-2d01db90422c",
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
Expand Down
22 changes: 9 additions & 13 deletions data/baseline_situations_generated/traffic_situation_08.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "HO, CR-SO",
"inputFileName": "baseline_situation_08_2_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,7 +45,7 @@
"targetShips": [
{
"static": {
"id": "a85975ef-54bc-4e92-a95e-f7925e347f63",
"id": "29376342-9c27-4875-8377-0a9a569e1505",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand All @@ -71,13 +67,13 @@
},
{
"static": {
"id": "a85975ef-54bc-4e92-a95e-f7925e347f63",
"length": 122.0,
"width": 20.0,
"height": 8.0,
"speedMax": 17.0,
"mmsi": 257845600,
"name": "BASTO IV",
"id": "dbefc9b2-a975-46aa-8672-a54a4c8125e2",
"length": 178.0,
"width": 30.0,
"height": 30.0,
"speedMax": 21.0,
"mmsi": 219945000,
"name": "BASTO VI",
"shipType": "Passenger/Ro-Ro Cargo Ship"
},
"initial": {
Expand Down
10 changes: 3 additions & 7 deletions data/baseline_situations_generated/traffic_situation_09.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"title": "HO, OT-GW",
"inputFileName": "baseline_situation_09_2_ts.json",
"commonVector": 10.0,
"latLon0": [
58.763449,
10.490654
],
"ownShip": {
"static": {
"id": "d700e603-10c8-4ce3-bb2f-9ae4fd80b37f",
"id": "cb8d9e7b-49eb-407b-bed3-2b5f1e1369b5",
"length": 122.0,
"width": 20.0,
"height": 8.0,
Expand Down Expand Up @@ -49,7 +45,7 @@
"targetShips": [
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d",
"length": 50.0,
"width": 10.0,
"height": 8.0,
Expand All @@ -71,7 +67,7 @@
},
{
"static": {
"id": "76a84885-8e48-463c-8ba2-6669c70f02cd",
"id": "dd29bab9-1eb0-48cd-9add-ce637bb86f8d",
"length": 50.0,
"width": 10.0,
"height": 8.0,
Expand Down
Loading

0 comments on commit c56fc65

Please sign in to comment.