From 39b2016cfa1d092a705f380b764dc47cbfc29e6b Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 14:56:07 +0100 Subject: [PATCH 01/21] Add offshore nodes to YAML --- definitions/region/empire_v2.0.yaml | 20 ++ definitions/region/european-regions.yaml | 4 + mappings/empire_v2.0.yaml | 341 +++++++++++++++++++++++ 3 files changed, 365 insertions(+) create mode 100644 definitions/region/empire_v2.0.yaml create mode 100644 mappings/empire_v2.0.yaml diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/empire_v2.0.yaml new file mode 100644 index 0000000..f4c926b --- /dev/null +++ b/definitions/region/empire_v2.0.yaml @@ -0,0 +1,20 @@ +- EMPIRE v2.0: + - EMPIRE v2|Norway|Ostland + - EMPIRE v2|Norway|Sorland + - EMPIRE v2|Norway|Norgemidt + - EMPIRE v2|Norway|Troms + - EMPIRE v2|Norway|Vestmidt + - EMPIRE v2|North Sea|Moray Firth + - EMPIRE v2|North Sea|Firth of Forth + - EMPIRE v2|North Sea|Dogger Bank + - EMPIRE v2|North Sea|Hornsea + - EMPIRE v2|North Sea|Outer Dowsing + - EMPIRE v2|North Sea|Norfolk + - EMPIRE v2|North Sea|East Anglia + - EMPIRE v2|North Sea|Borssele + - EMPIRE v2|North Sea|Hollandsee Kust + - EMPIRE v2|North Sea|Helgolander Bucht + - EMPIRE v2|North Sea|Nordsoen + - EMPIRE v2|North Sea|Utsira Nord + - EMPIRE v2|North Sea|Sorlige Nordsjo I + - EMPIRE v2|North Sea|Sorlige Nordsjo II \ No newline at end of file diff --git a/definitions/region/european-regions.yaml b/definitions/region/european-regions.yaml index 786767b..7b91bfb 100644 --- a/definitions/region/european-regions.yaml +++ b/definitions/region/european-regions.yaml @@ -33,3 +33,7 @@ countries: [ Albania, Bosnia and Herzegovina, Montenegro, North Macedonia, Serbia, Kosovo ] + - North Sea: + description: Offshore nodes in the North Sea + regions: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, + Borssele, Hollandsee Kust, Helgolander Bucht, Nordsoen, Utsira Nord, Sorlige Nordsjo I, Sorlige Nordsjo II] diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml new file mode 100644 index 0000000..f280a6f --- /dev/null +++ b/mappings/empire_v2.0.yaml @@ -0,0 +1,341 @@ +model: + - EMPIRE v2.0 + +native_regions: + - Austria + - Bosnia and Herzegovina + - Belgium + - Bulgaria + - Switzerland + - Czech Republic + - Germany + - Denmark + - Estonia + - Spain + - Finland + - France + - United Kingdom + - Greece + - Croatia + - Hungary + - Ireland + - Italy + - Lithuania + - Luxembourg + - Latvia + - North Macedonia + - The Netherlands + - Norway + - Poland + - Portugal + - Romania + - Serbia + - Sweden + - Slovenia + - Slovakia + - Norway|Ostland: EMPIRE v2|Norway|Ostland + - Norway|Sorland: EMPIRE v2|Norway|Sorland + - Norway|Norgemidt: EMPIRE v2|Norway|Norgemidt + - Norway|Troms: EMPIRE v2|Norway|Troms + - Norway|Vestmidt: EMPIRE v2|Norway|Vestmidt + - North Sea|Moray Firth: EMPIRE v2|North Sea|Moray Firth + - North Sea|Firth of Forth: EMPIRE v2|North Sea|Firth of Forth + - North Sea|Dogger Bank: EMPIRE v2|North Sea|Dogger Bank + - North Sea|Hornsea: EMPIRE v2|North Sea|Hornsea + - North Sea|Outer Dowsing: EMPIRE v2|North Sea|Outer Dowsing + - North Sea|Norfolk: EMPIRE v2|North Sea|Norfolk + - North Sea|East Anglia: EMPIRE v2|North Sea|East Anglia + - North Sea|Borssele: EMPIRE v2|North Sea|Borssele + - North Sea|Hollandsee Kust: EMPIRE v2|North Sea|Hollandsee Kust + - North Sea|Helgolander Bucht: EMPIRE v2|North Sea|Helgolander Bucht + - North Sea|Nordsoen: EMPIRE v2|North Sea|Nordsoen + - North Sea|Utsira Nord: EMPIRE v2|North Sea|Utsira Nord + - North Sea|Sorlige Nordsjo I: EMPIRE v2|North Sea|Sorlige Nordsjo I + - North Sea|Sorlige Nordsjo II: EMPIRE v2|North Sea|Sorlige Nordsjo II + + +# allow directional connections explicitly +- Austria>Czech Republic +- Austria>Germany +- Austria>Hungary +- Austria>Italy +- Austria>Slovakia +- Austria>Slovenia +- Austria>Switzerland +- Belgium>Borssele +- Belgium>France +- Belgium>Germany +- Belgium>Great Britain +- Belgium>Hollandsee Kust +- Belgium>Luxembourg +- Belgium>Netherlands +- Borssele>Belgium +- Borssele>Helgolander Bucht +- Borssele>Hollandsee Kust +- Borssele>Nordsoen +- Borssele>Sørliğe Nordsjø I +- Borssele>Sørliğe Nordsjø II +- Borssele>Utsira Nord +- Bosnia and Herzegovina>Croatia +- Bosnia and Herzegovina>Italy +- Bosnia and Herzegovina>Serbia +- Bulgaria>Greece +- Bulgaria>Macedonia +- Bulgaria>Romania +- Bulgaria>Serbia +- Croatia>Hungary +- Croatia>Italy +- Croatia>Serbia +- Croatia>Slovenia +- Czech Republic>Germany +- Czech Republic>Poland +- Czech Republic>Slovakia +- Denmark>Great Britain +- Denmark>Netherlands +- Denmark>NO2 +- Denmark>Nordsoen +- Denmark>Poland +- Denmark>Sweden +- Dogger Bank>Borssele +- Dogger Bank>East Anglia +- Dogger Bank>Helgolander Bucht +- Dogger Bank>Hollandsee Kust +- Dogger Bank>Hornsea +- Dogger Bank>Nordsoen +- Dogger Bank>Norfolk +- Dogger Bank>Outer Dowsing +- Dogger Bank>Sørliğe Nordsjø I +- Dogger Bank>Sørliğe Nordsjø II +- Dogger Bank>Utsira Nord +- East Anglia>Borssele +- East Anglia>Helgolander Bucht +- East Anglia>Hollandsee Kust +- East Anglia>Nordsoen +- East Anglia>Sørliğe Nordsjø I +- East Anglia>Sørliğe Nordsjø II +- East Anglia>Utsira Nord +- Estonia>Finland +- Estonia>Latvia +- Estonia>Sweden +- Finland>NO4 +- Finland>Sweden +- Firth of Forth>Borssele +- Firth of Forth>Dogger Bank +- Firth of Forth>East Anglia +- Firth of Forth>Helgolander Bucht +- Firth of Forth>Hollandsee Kust +- Firth of Forth>Hornsea +- Firth of Forth>Nordsoen +- Firth of Forth>Norfolk +- Firth of Forth>Outer Dowsing +- Firth of Forth>Sørliğe Nordsjø I +- Firth of Forth>Sørliğe Nordsjø II +- Firth of Forth>Utsira Nord +- France>Great Britain +- France>Ireland +- France>Italy +- France>Luxembourg +- Germany>Denmark +- Germany>France +- Germany>Helgolander Bucht +- Germany>Luxembourg +- Germany>Netherlands +- Germany>NO2 +- Germany>Poland +- Germany>Sweden +- Great Britain>Dogger Bank +- Great Britain>East Anglia +- Great Britain>Firth of Forth +- Great Britain>Hornsea +- Great Britain>Ireland +- Great Britain>Moray Firth +- Great Britain>Netherlands +- Great Britain>NO2 +- Great Britain>NO5 +- Great Britain>Norfolk +- Great Britain>Outer Dowsing +- Greece>Italy +- Greece>Macedonia +- Helgolander Bucht>Nordsoen +- Helgolander Bucht>Sørliğe Nordsjø I +- Helgolander Bucht>Sørliğe Nordsjø II +- Helgolander Bucht>Utsira Nord +- Hollandsee Kust>Helgolander Bucht +- Hollandsee Kust>Nordsoen +- Hollandsee Kust>Sørliğe Nordsjø I +- Hollandsee Kust>Sørliğe Nordsjø II +- Hollandsee Kust>Utsira Nord +- Hornsea>Borssele +- Hornsea>East Anglia +- Hornsea>Helgolander Bucht +- Hornsea>Hollandsee Kust +- Hornsea>Nordsoen +- Hornsea>Norfolk +- Hornsea>Outer Dowsing +- Hornsea>Sørliğe Nordsjø I +- Hornsea>Sørliğe Nordsjø II +- Hornsea>Utsira Nord +- Hungary>Romania +- Hungary>Serbia +- Hungary>Slovakia +- Hungary>Slovenia +- Italy>Slovenia +- Latvia>Sweden +- Lithuania>Latvia +- Lithuania>Poland +- Lithuania>Sweden +- Macedonia>Serbia +- Moray Firth>Borssele +- Moray Firth>Dogger Bank +- Moray Firth>East Anglia +- Moray Firth>Firth of Forth +- Moray Firth>Helgolander Bucht +- Moray Firth>Hollandsee Kust +- Moray Firth>Hornsea +- Moray Firth>Nordsoen +- Moray Firth>Norfolk +- Moray Firth>Outer Dowsing +- Moray Firth>Sørliğe Nordsjø I +- Moray Firth>Sørliğe Nordsjø II +- Moray Firth>Utsira Nord +- Netherlands>Borssele +- Netherlands>Helgolander Bucht +- Netherlands>Hollandsee Kust +- Netherlands>NO2 +- NO1>NO2 +- NO1>NO3 +- NO1>NO5 +- NO1>Sweden +- NO2>NO5 +- NO2>Sørliğe Nordsjø I +- NO2>Sørliğe Nordsjø II +- NO2>Utsira Nord +- NO3>NO4 +- NO3>NO5 +- NO3>Sweden +- NO4>Sweden +- Nordsoen>Sørliğe Nordsjø I +- Nordsoen>Sørliğe Nordsjø II +- Nordsoen>Utsira Nord +- Norfolk>Borssele +- Norfolk>East Anglia +- Norfolk>Helgolander Bucht +- Norfolk>Hollandsee Kust +- Norfolk>Nordsoen +- Norfolk>Sørliğe Nordsjø I +- Norfolk>Sørliğe Nordsjø II +- Norfolk>Utsira Nord +- Outer Dowsing>Borssele +- Outer Dowsing>East Anglia +- Outer Dowsing>Helgolander Bucht +- Outer Dowsing>Hollandsee Kust +- Outer Dowsing>Nordsoen +- Outer Dowsing>Norfolk +- Outer Dowsing>Sørliğe Nordsjø I +- Outer Dowsing>Sørliğe Nordsjø II +- Outer Dowsing>Utsira Nord +- Poland>Slovakia +- Poland>Sweden +- Romania>Serbia +- Sørliğe Nordsjø I>Sørliğe Nordsjø II +- Spain>France +- Spain>Ireland +- Spain>Portugal +- Switzerland>France +- Switzerland>Germany +- Switzerland>Italy +- Utsira Nord>Sørliğe Nordsjø I +- Utsira Nord>Sørliğe Nordsjø II + + +common_regions: + # includes all native regions + - Europe: + - Austria + - Bosnia and Herzegovina + - Belgium + - Bulgaria + - Switzerland + - Czech Republic + - Germany + - Denmark + - Estonia + - Spain + - Finland + - France + - United Kingdom + - Greece + - Croatia + - Hungary + - Ireland + - Italy + - Lithuania + - Luxembourg + - Latvia + - North Macedonia + - The Netherlands + - Norway + - Poland + - Portugal + - Romania + - Serbia + - Sweden + - Slovenia + - Slovakia + - EU27 & UK: + - Austria + - Belgium + - Bulgaria + - Croatia +# - Cyprus - missing in the model + - CzechR + - Denmark + - Estonia + - Finland + - France + - Germany + - Greece + - Hungary + - Ireland + - Italy + - Latvia + - Lithuania + - Luxemb. +# - Malta - missing in the model + - Netherlands + - Poland + - Portugal + - Romania + - Slovakia + - Slovenia + - Spain + - Sweden + - GreatBrit. + - EU27: + - Austria + - Belgium + - Bulgaria + - Croatia +# - Cyprus - missing in the model + - CzechR + - Denmark + - Estonia + - Finland + - France + - Germany + - Greece + - Hungary + - Ireland + - Italy + - Latvia + - Lithuania + - Luxemb. +# - Malta - missing in the model + - Netherlands + - Poland + - Portugal + - Romania + - Slovakia + - Slovenia + - Spain + - Sweden From 6cd0faa418199205f93396e2ed0fba637518b9ea Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:00:20 +0100 Subject: [PATCH 02/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index f280a6f..2a76219 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -288,7 +288,7 @@ common_regions: - Bulgaria - Croatia # - Cyprus - missing in the model - - CzechR + - Czechia - Denmark - Estonia - Finland From e7d65a59302f09c238185f652951b59cd562b7c8 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:03:49 +0100 Subject: [PATCH 03/21] Update european-regions.yaml --- definitions/region/european-regions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/region/european-regions.yaml b/definitions/region/european-regions.yaml index 7b91bfb..6e4dbaa 100644 --- a/definitions/region/european-regions.yaml +++ b/definitions/region/european-regions.yaml @@ -35,5 +35,5 @@ ] - North Sea: description: Offshore nodes in the North Sea - regions: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, + territories: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, Borssele, Hollandsee Kust, Helgolander Bucht, Nordsoen, Utsira Nord, Sorlige Nordsjo I, Sorlige Nordsjo II] From 00b561107fe60c56eced1c3dc7f071c715137f1f Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:04:24 +0100 Subject: [PATCH 04/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index 2a76219..8af0389 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -310,7 +310,7 @@ common_regions: - Slovenia - Spain - Sweden - - GreatBrit. + - United Kingdom - EU27: - Austria - Belgium From 62d6f21fcf8d59fede529bd2a5a32abce6ff6e7a Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:06:06 +0100 Subject: [PATCH 05/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index 8af0389..293d9f8 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -311,7 +311,7 @@ common_regions: - Spain - Sweden - United Kingdom - - EU27: + - EU27 (excl. Malta & Cyprus): - Austria - Belgium - Bulgaria From 2fd7767cfc5c93a089ebdd09099db1166bb7bac5 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:07:04 +0100 Subject: [PATCH 06/21] Update european-regions.yaml --- definitions/region/european-regions.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/definitions/region/european-regions.yaml b/definitions/region/european-regions.yaml index 6e4dbaa..18cae4b 100644 --- a/definitions/region/european-regions.yaml +++ b/definitions/region/european-regions.yaml @@ -34,6 +34,6 @@ Albania, Bosnia and Herzegovina, Montenegro, North Macedonia, Serbia, Kosovo ] - North Sea: - description: Offshore nodes in the North Sea - territories: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, - Borssele, Hollandsee Kust, Helgolander Bucht, Nordsoen, Utsira Nord, Sorlige Nordsjo I, Sorlige Nordsjo II] + description: Offshore nodes in the North Sea + territories: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, + Borssele, Hollandsee Kust, Helgolander Bucht, Nordsoen, Utsira Nord, Sorlige Nordsjo I, Sorlige Nordsjo II] From 59550c634d453bff4af4e9ba334054590d16a0a9 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:07:44 +0100 Subject: [PATCH 07/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index 293d9f8..8ef180a 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -65,7 +65,7 @@ native_regions: - Belgium>Borssele - Belgium>France - Belgium>Germany -- Belgium>Great Britain +- Belgium>United Kingdom - Belgium>Hollandsee Kust - Belgium>Luxembourg - Belgium>Netherlands From ec6290d3489ebbaf778cc740376e020e25b3fcf8 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:07:54 +0100 Subject: [PATCH 08/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index 8ef180a..489c87e 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -24,7 +24,7 @@ native_regions: - Luxembourg - Latvia - North Macedonia - - The Netherlands + - Netherlands - Norway - Poland - Portugal From 1f8bd64912d6cb47024ffa4093af20b24aafc2fd Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Fri, 13 Dec 2024 16:08:27 +0100 Subject: [PATCH 09/21] Update mappings/empire_v2.0.yaml Co-authored-by: Daniel Huppmann --- mappings/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml index 489c87e..77dfb60 100644 --- a/mappings/empire_v2.0.yaml +++ b/mappings/empire_v2.0.yaml @@ -7,7 +7,7 @@ native_regions: - Belgium - Bulgaria - Switzerland - - Czech Republic + - Czechia - Germany - Denmark - Estonia From 767c021eb5cf26a14b3cb4f97c240bc1968c0823 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Mon, 16 Dec 2024 13:49:58 +0100 Subject: [PATCH 10/21] commit changes --- definitions/region/connections.yaml | 192 ++++++++++++++++ mappings/empire_v2.0.yaml | 341 ---------------------------- 2 files changed, 192 insertions(+), 341 deletions(-) create mode 100644 definitions/region/connections.yaml delete mode 100644 mappings/empire_v2.0.yaml diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml new file mode 100644 index 0000000..e2cb6fd --- /dev/null +++ b/definitions/region/connections.yaml @@ -0,0 +1,192 @@ +# allow directional connections explicitly +- Austria>Czechia +- Austria>Germany +- Austria>Hungary +- Austria>Italy +- Austria>Slovakia +- Austria>Slovenia +- Austria>Switzerland +- Belgium>North Sea|Borssele +- Belgium>France +- Belgium>Germany +- Belgium>United Kingdom +- Belgium>North Sea|Hollandsee Kust +- Belgium>Luxembourg +- Belgium>Netherlands +- North Sea|Borssele>Belgium +- North Sea|Borssele>North Sea|Helgolander Bucht +- North Sea|Borssele>North Sea|Hollandsee Kust +- North Sea|Borssele>North Sea|Nordsoen +- North Sea|Borssele>North Sea|Sorlige Nordsjo I +- North Sea|Borssele>North Sea|Sorlige Nordsjo II +- North Sea|Borssele>North Sea|Utsira Nord +- Bosnia and Herzegovina>Croatia +- Bosnia and Herzegovina>Italy +- Bosnia and Herzegovina>Serbia +- Bulgaria>Greece +- Bulgaria>Macedonia +- Bulgaria>Romania +- Bulgaria>Serbia +- Croatia>Hungary +- Croatia>Italy +- Croatia>Serbia +- Croatia>Slovenia +- Czechia>Germany +- Czechia>Poland +- Czechia>Slovakia +- Denmark>United Kingdom +- Denmark>Netherlands +- Denmark>NO2 +- Denmark>North Sea|Nordsoen +- Denmark>Poland +- Denmark>Sweden +- North Sea|Dogger Bank>North Sea|Borssele +- North Sea|Dogger Bank>North Sea|East Anglia +- North Sea|Dogger Bank>North Sea|Helgolander Bucht +- North Sea|Dogger Bank>North Sea|Hollandsee Kust +- North Sea|Dogger Bank>North Sea|Hornsea +- North Sea|Dogger Bank>North Sea|Nordsoen +- North Sea|Dogger Bank>North Sea|Norfolk +- North Sea|Dogger Bank>North Sea|Outer Dowsing +- North Sea|Dogger Bank>North Sea|Sorlige Nordsjo I +- North Sea|Dogger Bank>North Sea|Sorlige Nordsjo II +- North Sea|Dogger Bank>North Sea|Utsira Nord +- North Sea|East Anglia>North Sea|Borssele +- North Sea|East Anglia>North Sea|Helgolander Bucht +- North Sea|East Anglia>North Sea|Hollandsee Kust +- North Sea|East Anglia>North Sea|Nordsoen +- North Sea|East Anglia>North Sea|Sorlige Nordsjo I +- North Sea|East Anglia>North Sea|Sorlige Nordsjo II +- North Sea|East Anglia>North Sea|Utsira Nord +- Estonia>Finland +- Estonia>Latvia +- Estonia>Sweden +- Finland>NO4 +- Finland>Sweden +- North Sea|Firth of Forth>North Sea|Borssele +- North Sea|Firth of Forth>North Sea|Dogger Bank +- North Sea|Firth of Forth>North Sea|East Anglia +- North Sea|Firth of Forth>North Sea|Helgolander Bucht +- North Sea|Firth of Forth>North Sea|Hollandsee Kust +- North Sea|Firth of Forth>North Sea|Hornsea +- North Sea|Firth of Forth>North Sea|Nordsoen +- North Sea|Firth of Forth>North Sea|Norfolk +- North Sea|Firth of Forth>North Sea|Outer Dowsing +- North Sea|Firth of Forth>North Sea|Sorlige Nordsjo I +- North Sea|Firth of Forth>North Sea|Sorlige Nordsjo II +- North Sea|Firth of Forth>North Sea|Utsira Nord +- France>United Kingdom +- France>Ireland +- France>Italy +- France>Luxembourg +- Germany>Denmark +- Germany>France +- Germany>North Sea|Helgolander Bucht +- Germany>Luxembourg +- Germany>Netherlands +- Germany>NO2 +- Germany>Poland +- Germany>Sweden +- United Kingdom>North Sea|Dogger Bank +- United Kingdom>North Sea|East Anglia +- United Kingdom>North Sea|Firth of Forth +- United Kingdom>North Sea|Hornsea +- United Kingdom>Ireland +- United Kingdom>North Sea|Moray Firth +- United Kingdom>Netherlands +- United Kingdom>NO2 +- United Kingdom>NO5 +- United Kingdom>North Sea|Norfolk +- United Kingdom>North Sea|Outer Dowsing +- Greece>Italy +- Greece>Macedonia +- North Sea|Helgolander Bucht>North Sea|Nordsoen +- North Sea|Helgolander Bucht>North Sea|Sorlige Nordsjo I +- North Sea|Helgolander Bucht>North Sea|Sorlige Nordsjo II +- North Sea|Helgolander Bucht>North Sea|Utsira Nord +- North Sea|Hollandsee Kust>North Sea|Helgolander Bucht +- North Sea|Hollandsee Kust>North Sea|Nordsoen +- North Sea|Hollandsee Kust>North Sea|Sorlige Nordsjo I +- North Sea|Hollandsee Kust>North Sea|Sorlige Nordsjo II +- North Sea|Hollandsee Kust>North Sea|Utsira Nord +- North Sea|Hornsea>North Sea|Borssele +- North Sea|Hornsea>North Sea|East Anglia +- North Sea|Hornsea>North Sea|Helgolander Bucht +- North Sea|Hornsea>North Sea|Hollandsee Kust +- North Sea|Hornsea>North Sea|Nordsoen +- North Sea|Hornsea>North Sea|Norfolk +- North Sea|Hornsea>North Sea|Outer Dowsing +- North Sea|Hornsea>North Sea|Sorlige Nordsjo I +- North Sea|Hornsea>North Sea|Sorlige Nordsjo II +- North Sea|Hornsea>North Sea|Utsira Nord +- Hungary>Romania +- Hungary>Serbia +- Hungary>Slovakia +- Hungary>Slovenia +- Italy>Slovenia +- Latvia>Sweden +- Lithuania>Latvia +- Lithuania>Poland +- Lithuania>Sweden +- Macedonia>Serbia +- North Sea|Moray Firth>North Sea|Borssele +- North Sea|Moray Firth>North Sea|Dogger Bank +- North Sea|Moray Firth>North Sea|East Anglia +- North Sea|Moray Firth>North Sea|Firth of Forth +- North Sea|Moray Firth>North Sea|Helgolander Bucht +- North Sea|Moray Firth>North Sea|Hollandsee Kust +- North Sea|Moray Firth>North Sea|Hornsea +- North Sea|Moray Firth>North Sea|Nordsoen +- North Sea|Moray Firth>North Sea|Norfolk +- North Sea|Moray Firth>North Sea|Outer Dowsing +- North Sea|Moray Firth>North Sea|Sorlige Nordsjo I +- North Sea|Moray Firth>North Sea|Sorlige Nordsjo II +- North Sea|Moray Firth>North Sea|Utsira Nord +- Netherlands>North Sea|Borssele +- Netherlands>North Sea|Helgolander Bucht +- Netherlands>North Sea|Hollandsee Kust +- Netherlands>NO2 +- NO1>NO2 +- NO1>NO3 +- NO1>NO5 +- NO1>Sweden +- NO2>NO5 +- NO2>North Sea|Sorlige Nordsjo I +- NO2>North Sea|Sorlige Nordsjo II +- NO2>North Sea|Utsira Nord +- NO3>NO4 +- NO3>NO5 +- NO3>Sweden +- NO4>Sweden +- North Sea|Nordsoen>North Sea|Sorlige Nordsjo I +- North Sea|Nordsoen>North Sea|Sorlige Nordsjo II +- North Sea|Nordsoen>North Sea|Utsira Nord +- North Sea|Norfolk>North Sea|Borssele +- North Sea|Norfolk>North Sea|East Anglia +- North Sea|Norfolk>North Sea|Helgolander Bucht +- North Sea|Norfolk>North Sea|Hollandsee Kust +- North Sea|Norfolk>North Sea|Nordsoen +- North Sea|Norfolk>North Sea|Sorlige Nordsjo I +- North Sea|Norfolk>North Sea|Sorlige Nordsjo II +- North Sea|Norfolk>North Sea|Utsira Nord +- North Sea|Outer Dowsing>North Sea|Borssele +- North Sea|Outer Dowsing>North Sea|East Anglia +- North Sea|Outer Dowsing>North Sea|Helgolander Bucht +- North Sea|Outer Dowsing>North Sea|Hollandsee Kust +- North Sea|Outer Dowsing>North Sea|Nordsoen +- North Sea|Outer Dowsing>North Sea|Norfolk +- North Sea|Outer Dowsing>North Sea|Sorlige Nordsjo I +- North Sea|Outer Dowsing>North Sea|Sorlige Nordsjo II +- North Sea|Outer Dowsing>North Sea|Utsira Nord +- Poland>Slovakia +- Poland>Sweden +- Romania>Serbia +- North Sea|Sorlige Nordsjo I>North Sea|Sorlige Nordsjo II +- Spain>France +- Spain>Ireland +- Spain>Portugal +- Switzerland>France +- Switzerland>Germany +- Switzerland>Italy +- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo I +- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo II \ No newline at end of file diff --git a/mappings/empire_v2.0.yaml b/mappings/empire_v2.0.yaml deleted file mode 100644 index 77dfb60..0000000 --- a/mappings/empire_v2.0.yaml +++ /dev/null @@ -1,341 +0,0 @@ -model: - - EMPIRE v2.0 - -native_regions: - - Austria - - Bosnia and Herzegovina - - Belgium - - Bulgaria - - Switzerland - - Czechia - - Germany - - Denmark - - Estonia - - Spain - - Finland - - France - - United Kingdom - - Greece - - Croatia - - Hungary - - Ireland - - Italy - - Lithuania - - Luxembourg - - Latvia - - North Macedonia - - Netherlands - - Norway - - Poland - - Portugal - - Romania - - Serbia - - Sweden - - Slovenia - - Slovakia - - Norway|Ostland: EMPIRE v2|Norway|Ostland - - Norway|Sorland: EMPIRE v2|Norway|Sorland - - Norway|Norgemidt: EMPIRE v2|Norway|Norgemidt - - Norway|Troms: EMPIRE v2|Norway|Troms - - Norway|Vestmidt: EMPIRE v2|Norway|Vestmidt - - North Sea|Moray Firth: EMPIRE v2|North Sea|Moray Firth - - North Sea|Firth of Forth: EMPIRE v2|North Sea|Firth of Forth - - North Sea|Dogger Bank: EMPIRE v2|North Sea|Dogger Bank - - North Sea|Hornsea: EMPIRE v2|North Sea|Hornsea - - North Sea|Outer Dowsing: EMPIRE v2|North Sea|Outer Dowsing - - North Sea|Norfolk: EMPIRE v2|North Sea|Norfolk - - North Sea|East Anglia: EMPIRE v2|North Sea|East Anglia - - North Sea|Borssele: EMPIRE v2|North Sea|Borssele - - North Sea|Hollandsee Kust: EMPIRE v2|North Sea|Hollandsee Kust - - North Sea|Helgolander Bucht: EMPIRE v2|North Sea|Helgolander Bucht - - North Sea|Nordsoen: EMPIRE v2|North Sea|Nordsoen - - North Sea|Utsira Nord: EMPIRE v2|North Sea|Utsira Nord - - North Sea|Sorlige Nordsjo I: EMPIRE v2|North Sea|Sorlige Nordsjo I - - North Sea|Sorlige Nordsjo II: EMPIRE v2|North Sea|Sorlige Nordsjo II - - -# allow directional connections explicitly -- Austria>Czech Republic -- Austria>Germany -- Austria>Hungary -- Austria>Italy -- Austria>Slovakia -- Austria>Slovenia -- Austria>Switzerland -- Belgium>Borssele -- Belgium>France -- Belgium>Germany -- Belgium>United Kingdom -- Belgium>Hollandsee Kust -- Belgium>Luxembourg -- Belgium>Netherlands -- Borssele>Belgium -- Borssele>Helgolander Bucht -- Borssele>Hollandsee Kust -- Borssele>Nordsoen -- Borssele>Sørliğe Nordsjø I -- Borssele>Sørliğe Nordsjø II -- Borssele>Utsira Nord -- Bosnia and Herzegovina>Croatia -- Bosnia and Herzegovina>Italy -- Bosnia and Herzegovina>Serbia -- Bulgaria>Greece -- Bulgaria>Macedonia -- Bulgaria>Romania -- Bulgaria>Serbia -- Croatia>Hungary -- Croatia>Italy -- Croatia>Serbia -- Croatia>Slovenia -- Czech Republic>Germany -- Czech Republic>Poland -- Czech Republic>Slovakia -- Denmark>Great Britain -- Denmark>Netherlands -- Denmark>NO2 -- Denmark>Nordsoen -- Denmark>Poland -- Denmark>Sweden -- Dogger Bank>Borssele -- Dogger Bank>East Anglia -- Dogger Bank>Helgolander Bucht -- Dogger Bank>Hollandsee Kust -- Dogger Bank>Hornsea -- Dogger Bank>Nordsoen -- Dogger Bank>Norfolk -- Dogger Bank>Outer Dowsing -- Dogger Bank>Sørliğe Nordsjø I -- Dogger Bank>Sørliğe Nordsjø II -- Dogger Bank>Utsira Nord -- East Anglia>Borssele -- East Anglia>Helgolander Bucht -- East Anglia>Hollandsee Kust -- East Anglia>Nordsoen -- East Anglia>Sørliğe Nordsjø I -- East Anglia>Sørliğe Nordsjø II -- East Anglia>Utsira Nord -- Estonia>Finland -- Estonia>Latvia -- Estonia>Sweden -- Finland>NO4 -- Finland>Sweden -- Firth of Forth>Borssele -- Firth of Forth>Dogger Bank -- Firth of Forth>East Anglia -- Firth of Forth>Helgolander Bucht -- Firth of Forth>Hollandsee Kust -- Firth of Forth>Hornsea -- Firth of Forth>Nordsoen -- Firth of Forth>Norfolk -- Firth of Forth>Outer Dowsing -- Firth of Forth>Sørliğe Nordsjø I -- Firth of Forth>Sørliğe Nordsjø II -- Firth of Forth>Utsira Nord -- France>Great Britain -- France>Ireland -- France>Italy -- France>Luxembourg -- Germany>Denmark -- Germany>France -- Germany>Helgolander Bucht -- Germany>Luxembourg -- Germany>Netherlands -- Germany>NO2 -- Germany>Poland -- Germany>Sweden -- Great Britain>Dogger Bank -- Great Britain>East Anglia -- Great Britain>Firth of Forth -- Great Britain>Hornsea -- Great Britain>Ireland -- Great Britain>Moray Firth -- Great Britain>Netherlands -- Great Britain>NO2 -- Great Britain>NO5 -- Great Britain>Norfolk -- Great Britain>Outer Dowsing -- Greece>Italy -- Greece>Macedonia -- Helgolander Bucht>Nordsoen -- Helgolander Bucht>Sørliğe Nordsjø I -- Helgolander Bucht>Sørliğe Nordsjø II -- Helgolander Bucht>Utsira Nord -- Hollandsee Kust>Helgolander Bucht -- Hollandsee Kust>Nordsoen -- Hollandsee Kust>Sørliğe Nordsjø I -- Hollandsee Kust>Sørliğe Nordsjø II -- Hollandsee Kust>Utsira Nord -- Hornsea>Borssele -- Hornsea>East Anglia -- Hornsea>Helgolander Bucht -- Hornsea>Hollandsee Kust -- Hornsea>Nordsoen -- Hornsea>Norfolk -- Hornsea>Outer Dowsing -- Hornsea>Sørliğe Nordsjø I -- Hornsea>Sørliğe Nordsjø II -- Hornsea>Utsira Nord -- Hungary>Romania -- Hungary>Serbia -- Hungary>Slovakia -- Hungary>Slovenia -- Italy>Slovenia -- Latvia>Sweden -- Lithuania>Latvia -- Lithuania>Poland -- Lithuania>Sweden -- Macedonia>Serbia -- Moray Firth>Borssele -- Moray Firth>Dogger Bank -- Moray Firth>East Anglia -- Moray Firth>Firth of Forth -- Moray Firth>Helgolander Bucht -- Moray Firth>Hollandsee Kust -- Moray Firth>Hornsea -- Moray Firth>Nordsoen -- Moray Firth>Norfolk -- Moray Firth>Outer Dowsing -- Moray Firth>Sørliğe Nordsjø I -- Moray Firth>Sørliğe Nordsjø II -- Moray Firth>Utsira Nord -- Netherlands>Borssele -- Netherlands>Helgolander Bucht -- Netherlands>Hollandsee Kust -- Netherlands>NO2 -- NO1>NO2 -- NO1>NO3 -- NO1>NO5 -- NO1>Sweden -- NO2>NO5 -- NO2>Sørliğe Nordsjø I -- NO2>Sørliğe Nordsjø II -- NO2>Utsira Nord -- NO3>NO4 -- NO3>NO5 -- NO3>Sweden -- NO4>Sweden -- Nordsoen>Sørliğe Nordsjø I -- Nordsoen>Sørliğe Nordsjø II -- Nordsoen>Utsira Nord -- Norfolk>Borssele -- Norfolk>East Anglia -- Norfolk>Helgolander Bucht -- Norfolk>Hollandsee Kust -- Norfolk>Nordsoen -- Norfolk>Sørliğe Nordsjø I -- Norfolk>Sørliğe Nordsjø II -- Norfolk>Utsira Nord -- Outer Dowsing>Borssele -- Outer Dowsing>East Anglia -- Outer Dowsing>Helgolander Bucht -- Outer Dowsing>Hollandsee Kust -- Outer Dowsing>Nordsoen -- Outer Dowsing>Norfolk -- Outer Dowsing>Sørliğe Nordsjø I -- Outer Dowsing>Sørliğe Nordsjø II -- Outer Dowsing>Utsira Nord -- Poland>Slovakia -- Poland>Sweden -- Romania>Serbia -- Sørliğe Nordsjø I>Sørliğe Nordsjø II -- Spain>France -- Spain>Ireland -- Spain>Portugal -- Switzerland>France -- Switzerland>Germany -- Switzerland>Italy -- Utsira Nord>Sørliğe Nordsjø I -- Utsira Nord>Sørliğe Nordsjø II - - -common_regions: - # includes all native regions - - Europe: - - Austria - - Bosnia and Herzegovina - - Belgium - - Bulgaria - - Switzerland - - Czech Republic - - Germany - - Denmark - - Estonia - - Spain - - Finland - - France - - United Kingdom - - Greece - - Croatia - - Hungary - - Ireland - - Italy - - Lithuania - - Luxembourg - - Latvia - - North Macedonia - - The Netherlands - - Norway - - Poland - - Portugal - - Romania - - Serbia - - Sweden - - Slovenia - - Slovakia - - EU27 & UK: - - Austria - - Belgium - - Bulgaria - - Croatia -# - Cyprus - missing in the model - - Czechia - - Denmark - - Estonia - - Finland - - France - - Germany - - Greece - - Hungary - - Ireland - - Italy - - Latvia - - Lithuania - - Luxemb. -# - Malta - missing in the model - - Netherlands - - Poland - - Portugal - - Romania - - Slovakia - - Slovenia - - Spain - - Sweden - - United Kingdom - - EU27 (excl. Malta & Cyprus): - - Austria - - Belgium - - Bulgaria - - Croatia -# - Cyprus - missing in the model - - CzechR - - Denmark - - Estonia - - Finland - - France - - Germany - - Greece - - Hungary - - Ireland - - Italy - - Latvia - - Lithuania - - Luxemb. -# - Malta - missing in the model - - Netherlands - - Poland - - Portugal - - Romania - - Slovakia - - Slovenia - - Spain - - Sweden From 894a1bc7707ffdc09e81752a6293c3bb9fccb3f0 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 12:32:33 +0100 Subject: [PATCH 11/21] Update empire_v2.0.yaml --- definitions/region/empire_v2.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/empire_v2.0.yaml index f4c926b..b0b8deb 100644 --- a/definitions/region/empire_v2.0.yaml +++ b/definitions/region/empire_v2.0.yaml @@ -17,4 +17,4 @@ - EMPIRE v2|North Sea|Nordsoen - EMPIRE v2|North Sea|Utsira Nord - EMPIRE v2|North Sea|Sorlige Nordsjo I - - EMPIRE v2|North Sea|Sorlige Nordsjo II \ No newline at end of file + - EMPIRE v2|North Sea|Sorlige Nordsjo II From 189a07a4f3124362c138eca4e5e92268be33b87e Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 12:32:47 +0100 Subject: [PATCH 12/21] Update empire_v2.0.yaml --- definitions/region/empire_v2.0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/empire_v2.0.yaml index b0b8deb..1c4f717 100644 --- a/definitions/region/empire_v2.0.yaml +++ b/definitions/region/empire_v2.0.yaml @@ -18,3 +18,4 @@ - EMPIRE v2|North Sea|Utsira Nord - EMPIRE v2|North Sea|Sorlige Nordsjo I - EMPIRE v2|North Sea|Sorlige Nordsjo II + From b590ba69f0fa64a73aaa062e061dfe38ad8397b3 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 12:32:56 +0100 Subject: [PATCH 13/21] Update empire_v2.0.yaml --- definitions/region/empire_v2.0.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/empire_v2.0.yaml index 1c4f717..b0b8deb 100644 --- a/definitions/region/empire_v2.0.yaml +++ b/definitions/region/empire_v2.0.yaml @@ -18,4 +18,3 @@ - EMPIRE v2|North Sea|Utsira Nord - EMPIRE v2|North Sea|Sorlige Nordsjo I - EMPIRE v2|North Sea|Sorlige Nordsjo II - From 52bc265926df24ca0b0c643880fb12b361e6e6ff Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 12:34:24 +0100 Subject: [PATCH 14/21] Update connections.yaml --- definitions/region/connections.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index e2cb6fd..cf5081b 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -189,4 +189,4 @@ - Switzerland>Germany - Switzerland>Italy - North Sea|Utsira Nord>North Sea|Sorlige Nordsjo I -- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo II \ No newline at end of file +- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo II From 9ad860f05115d82c1615d623c66f91f4682b7ac2 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 15:59:28 +0100 Subject: [PATCH 15/21] Update european-regions.yaml --- definitions/region/european-regions.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/definitions/region/european-regions.yaml b/definitions/region/european-regions.yaml index 18cae4b..786767b 100644 --- a/definitions/region/european-regions.yaml +++ b/definitions/region/european-regions.yaml @@ -33,7 +33,3 @@ countries: [ Albania, Bosnia and Herzegovina, Montenegro, North Macedonia, Serbia, Kosovo ] - - North Sea: - description: Offshore nodes in the North Sea - territories: [Moray Firth, Firth of Forth, Dogger Bank, Hornsea, Outer Dowsing, Norfolk, East Anglia, - Borssele, Hollandsee Kust, Helgolander Bucht, Nordsoen, Utsira Nord, Sorlige Nordsjo I, Sorlige Nordsjo II] From ab4d9d2b3996632b6fc9465b3838160833e41816 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Tue, 17 Dec 2024 16:14:00 +0100 Subject: [PATCH 16/21] Changes to NO-zones --- definitions/region/connections.yaml | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index cf5081b..461aab4 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -36,7 +36,7 @@ - Czechia>Slovakia - Denmark>United Kingdom - Denmark>Netherlands -- Denmark>NO2 +- Denmark>Norway|Sorland - Denmark>North Sea|Nordsoen - Denmark>Poland - Denmark>Sweden @@ -61,7 +61,7 @@ - Estonia>Finland - Estonia>Latvia - Estonia>Sweden -- Finland>NO4 +- Finland>Norway|Troms - Finland>Sweden - North Sea|Firth of Forth>North Sea|Borssele - North Sea|Firth of Forth>North Sea|Dogger Bank @@ -84,7 +84,7 @@ - Germany>North Sea|Helgolander Bucht - Germany>Luxembourg - Germany>Netherlands -- Germany>NO2 +- Germany>Norway|Sorland - Germany>Poland - Germany>Sweden - United Kingdom>North Sea|Dogger Bank @@ -94,8 +94,8 @@ - United Kingdom>Ireland - United Kingdom>North Sea|Moray Firth - United Kingdom>Netherlands -- United Kingdom>NO2 -- United Kingdom>NO5 +- United Kingdom>Norway|Sorland +- United Kingdom>Norway|Vestmidt - United Kingdom>North Sea|Norfolk - United Kingdom>North Sea|Outer Dowsing - Greece>Italy @@ -145,19 +145,19 @@ - Netherlands>North Sea|Borssele - Netherlands>North Sea|Helgolander Bucht - Netherlands>North Sea|Hollandsee Kust -- Netherlands>NO2 -- NO1>NO2 -- NO1>NO3 -- NO1>NO5 -- NO1>Sweden -- NO2>NO5 -- NO2>North Sea|Sorlige Nordsjo I -- NO2>North Sea|Sorlige Nordsjo II -- NO2>North Sea|Utsira Nord -- NO3>NO4 -- NO3>NO5 -- NO3>Sweden -- NO4>Sweden +- Netherlands>Norway|Sorland +- Norway|Ostland>Norway|Sorland +- Norway|Ostland>Norway|Norgemidt +- Norway|Ostland>Norway|Vestmidt +- Norway|Ostland>Sweden +- Norway|Sorland>Norway|Vestmidt +- Norway|Sorland>North Sea|Sorlige Nordsjo I +- Norway|Sorland>North Sea|Sorlige Nordsjo II +- Norway|Sorland>North Sea|Utsira Nord +- Norway|Norgemidt>Norway|Troms +- Norway|Norgemidt>Norway|Vestmidt +- Norway|Norgemidt>Sweden +- Norway|Troms>Sweden - North Sea|Nordsoen>North Sea|Sorlige Nordsjo I - North Sea|Nordsoen>North Sea|Sorlige Nordsjo II - North Sea|Nordsoen>North Sea|Utsira Nord From 80fb9ce94c9d5c30f2a70e009adf07968dd50c9c Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 18 Dec 2024 11:13:48 +0100 Subject: [PATCH 17/21] Change model version name --- definitions/region/connections.yaml | 248 ++++++++++++++-------------- definitions/region/empire_v2.0.yaml | 40 ++--- 2 files changed, 144 insertions(+), 144 deletions(-) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index 461aab4..c67c88b 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -6,20 +6,20 @@ - Austria>Slovakia - Austria>Slovenia - Austria>Switzerland -- Belgium>North Sea|Borssele +- Belgium>EMPIRE V1.0.0/v51|North Sea|Borssele - Belgium>France - Belgium>Germany - Belgium>United Kingdom -- Belgium>North Sea|Hollandsee Kust +- Belgium>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust - Belgium>Luxembourg - Belgium>Netherlands -- North Sea|Borssele>Belgium -- North Sea|Borssele>North Sea|Helgolander Bucht -- North Sea|Borssele>North Sea|Hollandsee Kust -- North Sea|Borssele>North Sea|Nordsoen -- North Sea|Borssele>North Sea|Sorlige Nordsjo I -- North Sea|Borssele>North Sea|Sorlige Nordsjo II -- North Sea|Borssele>North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Borssele>Belgium +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Utsira Nord - Bosnia and Herzegovina>Croatia - Bosnia and Herzegovina>Italy - Bosnia and Herzegovina>Serbia @@ -36,89 +36,89 @@ - Czechia>Slovakia - Denmark>United Kingdom - Denmark>Netherlands -- Denmark>Norway|Sorland -- Denmark>North Sea|Nordsoen +- Denmark>EMPIRE V1.0.0/v51|Norway|Sorland +- Denmark>EMPIRE V1.0.0/v51|North Sea|Nordsoen - Denmark>Poland - Denmark>Sweden -- North Sea|Dogger Bank>North Sea|Borssele -- North Sea|Dogger Bank>North Sea|East Anglia -- North Sea|Dogger Bank>North Sea|Helgolander Bucht -- North Sea|Dogger Bank>North Sea|Hollandsee Kust -- North Sea|Dogger Bank>North Sea|Hornsea -- North Sea|Dogger Bank>North Sea|Nordsoen -- North Sea|Dogger Bank>North Sea|Norfolk -- North Sea|Dogger Bank>North Sea|Outer Dowsing -- North Sea|Dogger Bank>North Sea|Sorlige Nordsjo I -- North Sea|Dogger Bank>North Sea|Sorlige Nordsjo II -- North Sea|Dogger Bank>North Sea|Utsira Nord -- North Sea|East Anglia>North Sea|Borssele -- North Sea|East Anglia>North Sea|Helgolander Bucht -- North Sea|East Anglia>North Sea|Hollandsee Kust -- North Sea|East Anglia>North Sea|Nordsoen -- North Sea|East Anglia>North Sea|Sorlige Nordsjo I -- North Sea|East Anglia>North Sea|Sorlige Nordsjo II -- North Sea|East Anglia>North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hornsea +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Norfolk +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Utsira Nord - Estonia>Finland - Estonia>Latvia - Estonia>Sweden -- Finland>Norway|Troms +- Finland>EMPIRE V1.0.0/v51|Norway|Troms - Finland>Sweden -- North Sea|Firth of Forth>North Sea|Borssele -- North Sea|Firth of Forth>North Sea|Dogger Bank -- North Sea|Firth of Forth>North Sea|East Anglia -- North Sea|Firth of Forth>North Sea|Helgolander Bucht -- North Sea|Firth of Forth>North Sea|Hollandsee Kust -- North Sea|Firth of Forth>North Sea|Hornsea -- North Sea|Firth of Forth>North Sea|Nordsoen -- North Sea|Firth of Forth>North Sea|Norfolk -- North Sea|Firth of Forth>North Sea|Outer Dowsing -- North Sea|Firth of Forth>North Sea|Sorlige Nordsjo I -- North Sea|Firth of Forth>North Sea|Sorlige Nordsjo II -- North Sea|Firth of Forth>North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hornsea +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Norfolk +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord - France>United Kingdom - France>Ireland - France>Italy - France>Luxembourg - Germany>Denmark - Germany>France -- Germany>North Sea|Helgolander Bucht +- Germany>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht - Germany>Luxembourg - Germany>Netherlands -- Germany>Norway|Sorland +- Germany>EMPIRE V1.0.0/v51|Norway|Sorland - Germany>Poland - Germany>Sweden -- United Kingdom>North Sea|Dogger Bank -- United Kingdom>North Sea|East Anglia -- United Kingdom>North Sea|Firth of Forth -- United Kingdom>North Sea|Hornsea +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Dogger Bank +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|East Anglia +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Firth of Forth +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Hornsea - United Kingdom>Ireland -- United Kingdom>North Sea|Moray Firth +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Moray Firth - United Kingdom>Netherlands -- United Kingdom>Norway|Sorland -- United Kingdom>Norway|Vestmidt -- United Kingdom>North Sea|Norfolk -- United Kingdom>North Sea|Outer Dowsing +- United Kingdom>EMPIRE V1.0.0/v51|Norway|Sorland +- United Kingdom>EMPIRE V1.0.0/v51|Norway|Vestmidt +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Norfolk +- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing - Greece>Italy - Greece>Macedonia -- North Sea|Helgolander Bucht>North Sea|Nordsoen -- North Sea|Helgolander Bucht>North Sea|Sorlige Nordsjo I -- North Sea|Helgolander Bucht>North Sea|Sorlige Nordsjo II -- North Sea|Helgolander Bucht>North Sea|Utsira Nord -- North Sea|Hollandsee Kust>North Sea|Helgolander Bucht -- North Sea|Hollandsee Kust>North Sea|Nordsoen -- North Sea|Hollandsee Kust>North Sea|Sorlige Nordsjo I -- North Sea|Hollandsee Kust>North Sea|Sorlige Nordsjo II -- North Sea|Hollandsee Kust>North Sea|Utsira Nord -- North Sea|Hornsea>North Sea|Borssele -- North Sea|Hornsea>North Sea|East Anglia -- North Sea|Hornsea>North Sea|Helgolander Bucht -- North Sea|Hornsea>North Sea|Hollandsee Kust -- North Sea|Hornsea>North Sea|Nordsoen -- North Sea|Hornsea>North Sea|Norfolk -- North Sea|Hornsea>North Sea|Outer Dowsing -- North Sea|Hornsea>North Sea|Sorlige Nordsjo I -- North Sea|Hornsea>North Sea|Sorlige Nordsjo II -- North Sea|Hornsea>North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Norfolk +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Utsira Nord - Hungary>Romania - Hungary>Serbia - Hungary>Slovakia @@ -129,64 +129,64 @@ - Lithuania>Poland - Lithuania>Sweden - Macedonia>Serbia -- North Sea|Moray Firth>North Sea|Borssele -- North Sea|Moray Firth>North Sea|Dogger Bank -- North Sea|Moray Firth>North Sea|East Anglia -- North Sea|Moray Firth>North Sea|Firth of Forth -- North Sea|Moray Firth>North Sea|Helgolander Bucht -- North Sea|Moray Firth>North Sea|Hollandsee Kust -- North Sea|Moray Firth>North Sea|Hornsea -- North Sea|Moray Firth>North Sea|Nordsoen -- North Sea|Moray Firth>North Sea|Norfolk -- North Sea|Moray Firth>North Sea|Outer Dowsing -- North Sea|Moray Firth>North Sea|Sorlige Nordsjo I -- North Sea|Moray Firth>North Sea|Sorlige Nordsjo II -- North Sea|Moray Firth>North Sea|Utsira Nord -- Netherlands>North Sea|Borssele -- Netherlands>North Sea|Helgolander Bucht -- Netherlands>North Sea|Hollandsee Kust -- Netherlands>Norway|Sorland -- Norway|Ostland>Norway|Sorland -- Norway|Ostland>Norway|Norgemidt -- Norway|Ostland>Norway|Vestmidt -- Norway|Ostland>Sweden -- Norway|Sorland>Norway|Vestmidt -- Norway|Sorland>North Sea|Sorlige Nordsjo I -- Norway|Sorland>North Sea|Sorlige Nordsjo II -- Norway|Sorland>North Sea|Utsira Nord -- Norway|Norgemidt>Norway|Troms -- Norway|Norgemidt>Norway|Vestmidt -- Norway|Norgemidt>Sweden -- Norway|Troms>Sweden -- North Sea|Nordsoen>North Sea|Sorlige Nordsjo I -- North Sea|Nordsoen>North Sea|Sorlige Nordsjo II -- North Sea|Nordsoen>North Sea|Utsira Nord -- North Sea|Norfolk>North Sea|Borssele -- North Sea|Norfolk>North Sea|East Anglia -- North Sea|Norfolk>North Sea|Helgolander Bucht -- North Sea|Norfolk>North Sea|Hollandsee Kust -- North Sea|Norfolk>North Sea|Nordsoen -- North Sea|Norfolk>North Sea|Sorlige Nordsjo I -- North Sea|Norfolk>North Sea|Sorlige Nordsjo II -- North Sea|Norfolk>North Sea|Utsira Nord -- North Sea|Outer Dowsing>North Sea|Borssele -- North Sea|Outer Dowsing>North Sea|East Anglia -- North Sea|Outer Dowsing>North Sea|Helgolander Bucht -- North Sea|Outer Dowsing>North Sea|Hollandsee Kust -- North Sea|Outer Dowsing>North Sea|Nordsoen -- North Sea|Outer Dowsing>North Sea|Norfolk -- North Sea|Outer Dowsing>North Sea|Sorlige Nordsjo I -- North Sea|Outer Dowsing>North Sea|Sorlige Nordsjo II -- North Sea|Outer Dowsing>North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Firth of Forth +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hornsea +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Norfolk +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- Netherlands>EMPIRE V1.0.0/v51|North Sea|Borssele +- Netherlands>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- Netherlands>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- Netherlands>EMPIRE V1.0.0/v51|Norway|Sorland +- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Sorland +- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Norgemidt +- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Vestmidt +- EMPIRE V1.0.0/v51|Norway|Ostland>Sweden +- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|Norway|Vestmidt +- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Troms +- EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Vestmidt +- EMPIRE V1.0.0/v51|Norway|Norgemidt>Sweden +- EMPIRE V1.0.0/v51|Norway|Troms>Sweden +- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Utsira Nord +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Borssele +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|East Anglia +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Nordsoen +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Norfolk +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Utsira Nord - Poland>Slovakia - Poland>Sweden - Romania>Serbia -- North Sea|Sorlige Nordsjo I>North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II - Spain>France - Spain>Ireland - Spain>Portugal - Switzerland>France - Switzerland>Germany - Switzerland>Italy -- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo I -- North Sea|Utsira Nord>North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I +- EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/empire_v2.0.yaml index b0b8deb..baf9535 100644 --- a/definitions/region/empire_v2.0.yaml +++ b/definitions/region/empire_v2.0.yaml @@ -1,20 +1,20 @@ -- EMPIRE v2.0: - - EMPIRE v2|Norway|Ostland - - EMPIRE v2|Norway|Sorland - - EMPIRE v2|Norway|Norgemidt - - EMPIRE v2|Norway|Troms - - EMPIRE v2|Norway|Vestmidt - - EMPIRE v2|North Sea|Moray Firth - - EMPIRE v2|North Sea|Firth of Forth - - EMPIRE v2|North Sea|Dogger Bank - - EMPIRE v2|North Sea|Hornsea - - EMPIRE v2|North Sea|Outer Dowsing - - EMPIRE v2|North Sea|Norfolk - - EMPIRE v2|North Sea|East Anglia - - EMPIRE v2|North Sea|Borssele - - EMPIRE v2|North Sea|Hollandsee Kust - - EMPIRE v2|North Sea|Helgolander Bucht - - EMPIRE v2|North Sea|Nordsoen - - EMPIRE v2|North Sea|Utsira Nord - - EMPIRE v2|North Sea|Sorlige Nordsjo I - - EMPIRE v2|North Sea|Sorlige Nordsjo II +- EMPIRE V1.0.0/v51.0: + - EMPIRE V1.0.0/v51|Norway|Ostland + - EMPIRE V1.0.0/v51|Norway|Sorland + - EMPIRE V1.0.0/v51|Norway|Norgemidt + - EMPIRE V1.0.0/v51|Norway|Troms + - EMPIRE V1.0.0/v51|Norway|Vestmidt + - EMPIRE V1.0.0/v51|North Sea|Moray Firth + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank + - EMPIRE V1.0.0/v51|North Sea|Hornsea + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II From bc9cd655d1cd50904caa8f5b2b4cdf5d05ce4d3c Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 18 Dec 2024 11:18:35 +0100 Subject: [PATCH 18/21] Change model version name --- .../region/{empire_v2.0.yaml => EMPIRE_V1.0.0:v51.yaml} | 0 definitions/region/connections.yaml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename definitions/region/{empire_v2.0.yaml => EMPIRE_V1.0.0:v51.yaml} (100%) diff --git a/definitions/region/empire_v2.0.yaml b/definitions/region/EMPIRE_V1.0.0:v51.yaml similarity index 100% rename from definitions/region/empire_v2.0.yaml rename to definitions/region/EMPIRE_V1.0.0:v51.yaml diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index c67c88b..3b181b9 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -24,7 +24,7 @@ - Bosnia and Herzegovina>Italy - Bosnia and Herzegovina>Serbia - Bulgaria>Greece -- Bulgaria>Macedonia +- Bulgaria>North Macedonia - Bulgaria>Romania - Bulgaria>Serbia - Croatia>Hungary @@ -99,7 +99,7 @@ - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Norfolk - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing - Greece>Italy -- Greece>Macedonia +- Greece>North Macedonia - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Nordsoen - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II @@ -128,7 +128,7 @@ - Lithuania>Latvia - Lithuania>Poland - Lithuania>Sweden -- Macedonia>Serbia +- North Macedonia>Serbia - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Borssele - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|East Anglia From ed66fcb6ef8d9814967f5f6af90017968fa9dd7e Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 18 Dec 2024 11:53:57 +0100 Subject: [PATCH 19/21] Change connections --- definitions/region/connections.yaml | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index 3b181b9..64e28fe 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -1,3 +1,54 @@ +- Connections: + - Austria + - Belgium + - Bosnia and Herzegovina + - Bulgaria + - Croatia + - Czechia + - Denmark + - EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank + - EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Hornsea + - EMPIRE V1.0.0/v51|North Sea|Moray Firth + - EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|Norway|Norgemidt + - EMPIRE V1.0.0/v51|Norway|Ostland + - EMPIRE V1.0.0/v51|Norway|Sorland + - EMPIRE V1.0.0/v51|Norway|Troms + - EMPIRE V1.0.0/v51|Norway|Vestmidt + - Estonia + - Finland + - France + - Germany + - Greece + - Hungary + - Ireland + - Italy + - Latvia + - Lithuania + - Luxembourg + - Netherlands + - North Macedonia + - Poland + - Portugal + - Romania + - Serbia + - Slovakia + - Slovenia + - Spain + - Sweden + - Switzerland + - United Kingdom + # allow directional connections explicitly - Austria>Czechia - Austria>Germany From ac36b66738171ed15958d01b229380cfe732195a Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 18 Dec 2024 13:04:30 +0100 Subject: [PATCH 20/21] Update definitions/region/connections.yaml Co-authored-by: Daniel Huppmann --- definitions/region/connections.yaml | 50 ----------------------------- 1 file changed, 50 deletions(-) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index 64e28fe..823416d 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -1,54 +1,4 @@ - Connections: - - Austria - - Belgium - - Bosnia and Herzegovina - - Bulgaria - - Croatia - - Czechia - - Denmark - - EMPIRE V1.0.0/v51|North Sea|Borssele - - EMPIRE V1.0.0/v51|North Sea|Dogger Bank - - EMPIRE V1.0.0/v51|North Sea|East Anglia - - EMPIRE V1.0.0/v51|North Sea|Firth of Forth - - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht - - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust - - EMPIRE V1.0.0/v51|North Sea|Hornsea - - EMPIRE V1.0.0/v51|North Sea|Moray Firth - - EMPIRE V1.0.0/v51|North Sea|Nordsoen - - EMPIRE V1.0.0/v51|North Sea|Norfolk - - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing - - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I - - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II - - EMPIRE V1.0.0/v51|North Sea|Utsira Nord - - EMPIRE V1.0.0/v51|Norway|Norgemidt - - EMPIRE V1.0.0/v51|Norway|Ostland - - EMPIRE V1.0.0/v51|Norway|Sorland - - EMPIRE V1.0.0/v51|Norway|Troms - - EMPIRE V1.0.0/v51|Norway|Vestmidt - - Estonia - - Finland - - France - - Germany - - Greece - - Hungary - - Ireland - - Italy - - Latvia - - Lithuania - - Luxembourg - - Netherlands - - North Macedonia - - Poland - - Portugal - - Romania - - Serbia - - Slovakia - - Slovenia - - Spain - - Sweden - - Switzerland - - United Kingdom - # allow directional connections explicitly - Austria>Czechia - Austria>Germany From a9b7b648f85b8d422eb6e6be8773b6854d0cdb51 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 18 Dec 2024 13:15:42 +0100 Subject: [PATCH 21/21] Update connections.yaml --- definitions/region/connections.yaml | 382 ++++++++++++++-------------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/definitions/region/connections.yaml b/definitions/region/connections.yaml index 823416d..3aa239e 100644 --- a/definitions/region/connections.yaml +++ b/definitions/region/connections.yaml @@ -1,193 +1,193 @@ - Connections: # allow directional connections explicitly -- Austria>Czechia -- Austria>Germany -- Austria>Hungary -- Austria>Italy -- Austria>Slovakia -- Austria>Slovenia -- Austria>Switzerland -- Belgium>EMPIRE V1.0.0/v51|North Sea|Borssele -- Belgium>France -- Belgium>Germany -- Belgium>United Kingdom -- Belgium>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- Belgium>Luxembourg -- Belgium>Netherlands -- EMPIRE V1.0.0/v51|North Sea|Borssele>Belgium -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- Bosnia and Herzegovina>Croatia -- Bosnia and Herzegovina>Italy -- Bosnia and Herzegovina>Serbia -- Bulgaria>Greece -- Bulgaria>North Macedonia -- Bulgaria>Romania -- Bulgaria>Serbia -- Croatia>Hungary -- Croatia>Italy -- Croatia>Serbia -- Croatia>Slovenia -- Czechia>Germany -- Czechia>Poland -- Czechia>Slovakia -- Denmark>United Kingdom -- Denmark>Netherlands -- Denmark>EMPIRE V1.0.0/v51|Norway|Sorland -- Denmark>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- Denmark>Poland -- Denmark>Sweden -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hornsea -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Norfolk -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- Estonia>Finland -- Estonia>Latvia -- Estonia>Sweden -- Finland>EMPIRE V1.0.0/v51|Norway|Troms -- Finland>Sweden -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hornsea -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Norfolk -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- France>United Kingdom -- France>Ireland -- France>Italy -- France>Luxembourg -- Germany>Denmark -- Germany>France -- Germany>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- Germany>Luxembourg -- Germany>Netherlands -- Germany>EMPIRE V1.0.0/v51|Norway|Sorland -- Germany>Poland -- Germany>Sweden -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Dogger Bank -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|East Anglia -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Firth of Forth -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Hornsea -- United Kingdom>Ireland -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Moray Firth -- United Kingdom>Netherlands -- United Kingdom>EMPIRE V1.0.0/v51|Norway|Sorland -- United Kingdom>EMPIRE V1.0.0/v51|Norway|Vestmidt -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Norfolk -- United Kingdom>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing -- Greece>Italy -- Greece>North Macedonia -- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Norfolk -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- Hungary>Romania -- Hungary>Serbia -- Hungary>Slovakia -- Hungary>Slovenia -- Italy>Slovenia -- Latvia>Sweden -- Lithuania>Latvia -- Lithuania>Poland -- Lithuania>Sweden -- North Macedonia>Serbia -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Firth of Forth -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hornsea -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Norfolk -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- Netherlands>EMPIRE V1.0.0/v51|North Sea|Borssele -- Netherlands>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- Netherlands>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- Netherlands>EMPIRE V1.0.0/v51|Norway|Sorland -- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Sorland -- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Norgemidt -- EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Vestmidt -- EMPIRE V1.0.0/v51|Norway|Ostland>Sweden -- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|Norway|Vestmidt -- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Troms -- EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Vestmidt -- EMPIRE V1.0.0/v51|Norway|Norgemidt>Sweden -- EMPIRE V1.0.0/v51|Norway|Troms>Sweden -- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Borssele -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|East Anglia -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Nordsoen -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Norfolk -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Utsira Nord -- Poland>Slovakia -- Poland>Sweden -- Romania>Serbia -- EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II -- Spain>France -- Spain>Ireland -- Spain>Portugal -- Switzerland>France -- Switzerland>Germany -- Switzerland>Italy -- EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I -- EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - Austria>Czechia + - Austria>Germany + - Austria>Hungary + - Austria>Italy + - Austria>Slovakia + - Austria>Slovenia + - Austria>Switzerland + - Belgium>EMPIRE V1.0.0/v51|North Sea|Borssele + - Belgium>France + - Belgium>Germany + - Belgium>United Kingdom + - Belgium>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - Belgium>Luxembourg + - Belgium>Netherlands + - EMPIRE V1.0.0/v51|North Sea|Borssele>Belgium + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Borssele>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - Bosnia and Herzegovina>Croatia + - Bosnia and Herzegovina>Italy + - Bosnia and Herzegovina>Serbia + - Bulgaria>Greece + - Bulgaria>North Macedonia + - Bulgaria>Romania + - Bulgaria>Serbia + - Croatia>Hungary + - Croatia>Italy + - Croatia>Serbia + - Croatia>Slovenia + - Czechia>Germany + - Czechia>Poland + - Czechia>Slovakia + - Denmark>United Kingdom + - Denmark>Netherlands + - Denmark>EMPIRE V1.0.0/v51|Norway|Sorland + - Denmark>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - Denmark>Poland + - Denmark>Sweden + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Hornsea + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Dogger Bank>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|East Anglia>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - Estonia>Finland + - Estonia>Latvia + - Estonia>Sweden + - Finland>EMPIRE V1.0.0/v51|Norway|Troms + - Finland>Sweden + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Hornsea + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Firth of Forth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - France>United Kingdom + - France>Ireland + - France>Italy + - France>Luxembourg + - Germany>Denmark + - Germany>France + - Germany>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - Germany>Luxembourg + - Germany>Netherlands + - Germany>EMPIRE V1.0.0/v51|Norway|Sorland + - Germany>Poland + - Germany>Sweden + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Dogger Bank + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|East Anglia + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Firth of Forth + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Hornsea + - United Kingdom>Ireland + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Moray Firth + - United Kingdom>Netherlands + - United Kingdom>EMPIRE V1.0.0/v51|Norway|Sorland + - United Kingdom>EMPIRE V1.0.0/v51|Norway|Vestmidt + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Norfolk + - United Kingdom>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - Greece>Italy + - Greece>North Macedonia + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Hornsea>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - Hungary>Romania + - Hungary>Serbia + - Hungary>Slovakia + - Hungary>Slovenia + - Italy>Slovenia + - Latvia>Sweden + - Lithuania>Latvia + - Lithuania>Poland + - Lithuania>Sweden + - North Macedonia>Serbia + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Dogger Bank + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Firth of Forth + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Hornsea + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Outer Dowsing + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Moray Firth>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - Netherlands>EMPIRE V1.0.0/v51|North Sea|Borssele + - Netherlands>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - Netherlands>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - Netherlands>EMPIRE V1.0.0/v51|Norway|Sorland + - EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Sorland + - EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Norgemidt + - EMPIRE V1.0.0/v51|Norway|Ostland>EMPIRE V1.0.0/v51|Norway|Vestmidt + - EMPIRE V1.0.0/v51|Norway|Ostland>Sweden + - EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|Norway|Vestmidt + - EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|Norway|Sorland>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Troms + - EMPIRE V1.0.0/v51|Norway|Norgemidt>EMPIRE V1.0.0/v51|Norway|Vestmidt + - EMPIRE V1.0.0/v51|Norway|Norgemidt>Sweden + - EMPIRE V1.0.0/v51|Norway|Troms>Sweden + - EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Nordsoen>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Norfolk>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Borssele + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|East Anglia + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Helgolander Bucht + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Hollandsee Kust + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Nordsoen + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Norfolk + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - EMPIRE V1.0.0/v51|North Sea|Outer Dowsing>EMPIRE V1.0.0/v51|North Sea|Utsira Nord + - Poland>Slovakia + - Poland>Sweden + - Romania>Serbia + - EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II + - Spain>France + - Spain>Ireland + - Spain>Portugal + - Switzerland>France + - Switzerland>Germany + - Switzerland>Italy + - EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo I + - EMPIRE V1.0.0/v51|North Sea|Utsira Nord>EMPIRE V1.0.0/v51|North Sea|Sorlige Nordsjo II