From e8c3a21d38dd25f2e3f18e88d713073ad1e275f1 Mon Sep 17 00:00:00 2001 From: David Almeida Date: Tue, 4 Mar 2025 13:54:09 +0100 Subject: [PATCH 1/5] Delete fake regions --- definitions/region/middle_earth_regions.yaml | 27 -------------------- 1 file changed, 27 deletions(-) delete mode 100644 definitions/region/middle_earth_regions.yaml diff --git a/definitions/region/middle_earth_regions.yaml b/definitions/region/middle_earth_regions.yaml deleted file mode 100644 index fb54460..0000000 --- a/definitions/region/middle_earth_regions.yaml +++ /dev/null @@ -1,27 +0,0 @@ -- Middle Earth tutorial regions: - - DolAmroth - - DolAmroth>Gondor - - DolAmroth>Harad - - DolAmroth>Mordor - - DolAmroth>Rohan - - Gondor - - Gondor>DolAmroth - - Gondor>Harad - - Gondor>Mordor - - Gondor>Rohan - - Harad - - Harad>DolAmroth - - Harad>Gondor - - Harad>Mordor - - Harad>Rohan - - Mordor - - Mordor>DolAmroth - - Mordor>Gondor - - Mordor>Harad - - Mordor>Rohan - - Rohan - - Rohan>DolAmroth - - Rohan>Gondor - - Rohan>Harad - - Rohan>Mordor - - World From 2da24eb543a143a948cf0b268bc6c6db0a3f2a86 Mon Sep 17 00:00:00 2001 From: David Almeida Date: Tue, 4 Mar 2025 13:54:25 +0100 Subject: [PATCH 2/5] Allow colon characters --- nomenclature.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/nomenclature.yaml b/nomenclature.yaml index 585808d..85d8452 100644 --- a/nomenclature.yaml +++ b/nomenclature.yaml @@ -6,3 +6,4 @@ definitions: repository: openENTRANCE region: country: true +illegal_characters: [ ] \ No newline at end of file From 523b1a796928fbc8ad6baf9eb51601f825a1fe98 Mon Sep 17 00:00:00 2001 From: David Almeida Date: Tue, 4 Mar 2025 13:54:56 +0100 Subject: [PATCH 3/5] Fix spelling --- definitions/region/africa-interconnections.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/region/africa-interconnections.yaml b/definitions/region/africa-interconnections.yaml index 6151c8d..f8bd39e 100644 --- a/definitions/region/africa-interconnections.yaml +++ b/definitions/region/africa-interconnections.yaml @@ -93,7 +93,7 @@ - Guinea>Mali - Guinea>Senegal - Guinea>Sierra Leone - - Guinea-Bissao>Senegal + - Guinea-Bissau>Senegal - Guinea-Bissau>Guinea - Kenya>Ethiopia - Kenya>Somalia From cf829c7232fd79821b0d2e88a48bc5ffee1b7f70 Mon Sep 17 00:00:00 2001 From: David Almeida Date: Tue, 4 Mar 2025 13:55:09 +0100 Subject: [PATCH 4/5] Remove European countries; fix directional regions --- .../infra_fair_three_country_regions.yaml | 767 ++---------------- 1 file changed, 50 insertions(+), 717 deletions(-) diff --git a/definitions/region/infra_fair_three_country_regions.yaml b/definitions/region/infra_fair_three_country_regions.yaml index d438063..faa576a 100644 --- a/definitions/region/infra_fair_three_country_regions.yaml +++ b/definitions/region/infra_fair_three_country_regions.yaml @@ -1,721 +1,54 @@ - InfraFair 1.0.0: - - Austria:Bosnia and Herzegovina>Benelux - - Austria:Estonia>Benelux - - Austria:Germany>Greece - - Austria:Hungary>Ireland - - Austria:Hungary>Latvia - - Austria:Hungary>Lithuania - - Austria:Ireland>Italy - - Austria:Ireland>Lithuania - - Austria:Ireland>Luxembourg - - Austria:Italy>Luxembourg - - Austria:Italy>North Macedonia - - Austria:Italy>Romania - - Austria:Latvia>Norway|Norgemidt - - Austria:Lithuania>Norway|Sorland - - Austria:North Macedonia>Norway|Troms - - Austria:Norway|Norgemidt>Scandinavia - - Austria:Norway|Sorland>Norway|Troms - - Austria:Norway|Sorland>Norway|Vestmidt - - Austria:Norway|Vestmidt>Sweden - - Austria:Serbia>Slovakia - - Austria:Serbia>Switzerland - - Belgium:Ireland>Italy - - Belgium:Ireland>Lithuania - - Belgium:Italy>Luxembourg - - Belgium:Latvia>Norway|Ostland - - Belgium:Lithuania>Norway|Sorland - - Bosnia and Herzegovina:Austria>Belgium - - Bosnia and Herzegovina:Austria>Bosnia and Herzegovina - - Bosnia and Herzegovina:Belgium>Benelux - - Bosnia and Herzegovina:Belgium>Bosnia and Herzegovina - - Bosnia and Herzegovina:Belgium>Czech Republic - - Bosnia and Herzegovina:Benelux>Czech Republic - - Bosnia and Herzegovina:Bosnia and Herzegovina>Czech Republic - - Bosnia and Herzegovina:Latvia>Norway|Ostland - - Bosnia and Herzegovina:Lithuania>Luxembourg - - Bosnia and Herzegovina:Lithuania>Norway|Ostland - - Bosnia and Herzegovina:Lithuania>Norway|Sorland - - Bosnia and Herzegovina:Lithuania>Norway|Troms - - Bosnia and Herzegovina:Luxembourg>North Macedonia - - Bosnia and Herzegovina:Luxembourg>Norway|Troms - - Bosnia and Herzegovina:North Macedonia>Norway|Troms - - Bosnia and Herzegovina:Norway|Norgemidt>Norway|Ostland - - Bosnia and Herzegovina:Norway|Ostland>Poland - - Bosnia and Herzegovina:Norway|Sorland>Norway|Troms - - Bosnia and Herzegovina:Norway|Sorland>Norway|Vestmidt - - Bosnia and Herzegovina:Norway|Sorland>Poland - - Bosnia and Herzegovina:Norway|Vestmidt>Portugal - - Bosnia and Herzegovina:Norway|Vestmidt>Switzerland - - Bosnia and Herzegovina:Serbia>Finland - - Bosnia and Herzegovina:Serbia>France - - Bosnia and Herzegovina:Serbia>Slovakia - - Bosnia and Herzegovina:Serbia>Slovenia - - Bosnia and Herzegovina:Serbia>Sweden - - Bosnia and Herzegovina:Serbia>Switzerland - - Bosnia and Herzegovina:The Netherlands>Belgium - - Bosnia and Herzegovina:The Netherlands>Bosnia and Herzegovina - - Bulgaria:Austria>Belgium - - Bulgaria:Austria>Bosnia and Herzegovina - - Bulgaria:Belgium>Benelux - - Bulgaria:Belgium>Bosnia and Herzegovina - - Bulgaria:Belgium>Czech Republic - - Bulgaria:Benelux>Czech Republic - - Bulgaria:Bosnia and Herzegovina>Benelux - - Bulgaria:Bosnia and Herzegovina>Czech Republic - - Bulgaria:Croatia>United Kingdom - - Bulgaria:Denmark>Bosnia and Herzegovina - - Bulgaria:Denmark>Estonia - - Bulgaria:Estonia>Bosnia and Herzegovina - - Bulgaria:Finland>France - - Bulgaria:Germany>Greece - - Bulgaria:Hungary>Ireland - - Bulgaria:Hungary>Latvia - - Bulgaria:Hungary>Lithuania - - Bulgaria:Ireland>Italy - - Bulgaria:Ireland>Lithuania - - Bulgaria:Ireland>Luxembourg - - Bulgaria:Italy>North Macedonia - - Bulgaria:Lithuania>Norway|Ostland - - Bulgaria:Lithuania>Norway|Sorland - - Bulgaria:North Macedonia>Norway|Troms - - Bulgaria:Norway|Norgemidt>Norway|Ostland - - Bulgaria:Norway|Ostland>Poland - - Bulgaria:Norway|Sorland>Norway|Troms - - Bulgaria:Norway|Sorland>Norway|Vestmidt - - Bulgaria:Norway|Sorland>Poland - - Bulgaria:Norway|Vestmidt>Portugal - - Bulgaria:Norway|Vestmidt>Switzerland - - Bulgaria:Serbia>Slovakia - - Bulgaria:Serbia>Slovenia - - Bulgaria:Serbia>Sweden - - Bulgaria:Serbia>The Netherlands - - Bulgaria:Slovakia>Estonia - - Bulgaria:Slovakia>Finland - - Bulgaria:Slovakia>France - - Bulgaria:Slovakia>Spain - - Bulgaria:Slovenia>Sweden - - Bulgaria:Slovenia>Switzerland - - Bulgaria:Spain>Austria - - Bulgaria:Spain>Bosnia and Herzegovina - - Bulgaria:Spain>Estonia - - Bulgaria:Spain>The Netherlands - - Bulgaria:Sweden>The Netherlands - - Bulgaria:Switzerland>Austria - - Bulgaria:Switzerland>Bosnia and Herzegovina - - Bulgaria:Switzerland>The Netherlands - - Bulgaria:The Netherlands>Austria - - Bulgaria:The Netherlands>Belgium - - Bulgaria:The Netherlands>Bosnia and Herzegovina - - Bulgaria:The Netherlands>Denmark - - Croatia:Austria>Belgium - - Croatia:Austria>Bosnia and Herzegovina - - Croatia:Belgium>Benelux - - Croatia:Belgium>Bosnia and Herzegovina - - Croatia:Belgium>Czech Republic - - Croatia:Bosnia and Herzegovina>Benelux - - Croatia:Bosnia and Herzegovina>Czech Republic - - Croatia:Croatia>United Kingdom - - Croatia:Estonia>Benelux - - Croatia:Estonia>Bosnia and Herzegovina - - Croatia:Germany>Greece - - Croatia:Hungary>Ireland - - Croatia:Hungary>Latvia - - Croatia:Hungary>Lithuania - - Croatia:Ireland>Italy - - Croatia:Ireland>Lithuania - - Croatia:Ireland>Luxembourg - - Croatia:Italy>Luxembourg - - Croatia:Italy>North Macedonia - - Croatia:Italy>Romania - - Croatia:Latvia>Norway|Norgemidt - - Croatia:Lithuania>Norway|Sorland - - Croatia:Lithuania>Norway|Troms - - Croatia:Luxembourg>North Macedonia - - Croatia:Luxembourg>Norway|Troms - - Croatia:North Macedonia>Norway|Troms - - Croatia:North Macedonia>Norway|Vestmidt - - Croatia:Norway|Norgemidt>Norway|Ostland - - Croatia:Norway|Norgemidt>Scandinavia - - Croatia:Norway|Ostland>Norway|Sorland - - Croatia:Norway|Ostland>Poland - - Croatia:Norway|Sorland>Norway|Troms - - Croatia:Norway|Sorland>Norway|Vestmidt - - Croatia:Norway|Sorland>Portugal - - Croatia:Norway|Troms>Norway|Vestmidt - - Croatia:Norway|Vestmidt>Bulgaria - - Croatia:Norway|Vestmidt>Portugal - - Croatia:Norway|Vestmidt>Sweden - - Croatia:Norway|Vestmidt>Switzerland - - Croatia:Poland>Bulgaria - - Croatia:Poland>Portugal - - Croatia:Portugal>Bulgaria - - Croatia:Serbia>Finland - - Croatia:Serbia>France - - Croatia:Serbia>Slovakia - - Croatia:Serbia>Slovenia - - Croatia:Serbia>Sweden - - Croatia:Serbia>Switzerland - - Croatia:Serbia>The Netherlands - - Croatia:Slovakia>Estonia - - Croatia:Slovakia>Finland - - Croatia:Slovakia>France - - Croatia:Slovakia>Spain - - Croatia:Spain>Denmark - - Croatia:Spain>Estonia - - Croatia:Spain>Sweden - - Croatia:Sweden>The Netherlands - - Croatia:The Netherlands>Belgium - - Croatia:The Netherlands>Bosnia and Herzegovina - - Czech Republic:Austria>Belgium - - Czech Republic:Belgium>Benelux - - Czech Republic:Belgium>Bosnia and Herzegovina - - Czech Republic:Belgium>Czech Republic - - Czech Republic:Benelux>Czech Republic - - Czech Republic:Bosnia and Herzegovina>Benelux - - Czech Republic:Croatia>United Kingdom - - Czech Republic:Denmark>Estonia - - Czech Republic:Estonia>Benelux - - Czech Republic:Estonia>Bosnia and Herzegovina - - Czech Republic:Finland>France - - Czech Republic:Italy>North Macedonia - - Czech Republic:Lithuania>Norway|Ostland - - Czech Republic:Lithuania>Norway|Sorland - - Czech Republic:North Macedonia>Norway|Troms - - Czech Republic:North Macedonia>Norway|Vestmidt - - Czech Republic:Norway|Sorland>Norway|Vestmidt - - Czech Republic:Norway|Sorland>Poland - - Czech Republic:Norway|Vestmidt>Portugal - - Czech Republic:Norway|Vestmidt>Switzerland - - Czech Republic:Serbia>Slovenia - - Czech Republic:Serbia>Sweden - - Czech Republic:Serbia>Switzerland - - Czech Republic:Serbia>The Netherlands - - Czech Republic:Spain>Estonia - - Czech Republic:Sweden>The Netherlands - - Czech Republic:Switzerland>Bosnia and Herzegovina - - Czech Republic:Switzerland>The Netherlands - - Czech Republic:The Netherlands>Austria - - Czech Republic:The Netherlands>Belgium - - Czech Republic:The Netherlands>Bosnia and Herzegovina - - Czech Republic:The Netherlands>Denmark - - Denmark:Denmark>Bosnia and Herzegovina - - Denmark:Denmark>Estonia - - Denmark:Ireland>Italy - - Denmark:Ireland>Lithuania - - Denmark:Ireland>Luxembourg - - Denmark:Lithuania>Norway|Ostland - - Denmark:Lithuania>Norway|Sorland - - Denmark:Norway|Vestmidt>Portugal - - Denmark:Norway|Vestmidt>Switzerland - - Denmark:Poland>Bulgaria - - Denmark:Serbia>Slovakia - - Denmark:Serbia>Slovenia - - Denmark:Serbia>Switzerland - - Denmark:Slovenia>Sweden - - Denmark:Slovenia>Switzerland - - Denmark:Spain>Austria - - Denmark:Spain>Bosnia and Herzegovina - - Denmark:Spain>Denmark - - Denmark:Spain>The Netherlands - - Denmark:Sweden>The Netherlands - - Denmark:Switzerland>Austria - - Denmark:Switzerland>Bosnia and Herzegovina - - Denmark:Switzerland>The Netherlands - - Denmark:The Netherlands>Austria - - Denmark:The Netherlands>Belgium - - Denmark:The Netherlands>Bosnia and Herzegovina - - Denmark:The Netherlands>Denmark - - Estonia:Estonia>Benelux - - Estonia:Finland>France - - Estonia:Germany>Greece - - Estonia:Hungary>Ireland - - Estonia:Hungary>Latvia - - Estonia:Hungary>Lithuania - - Estonia:Ireland>Italy - - Estonia:Ireland>Lithuania - - Estonia:Ireland>Luxembourg - - Estonia:Italy>Luxembourg - - Estonia:Italy>North Macedonia - - Estonia:Italy>Romania - - Estonia:Latvia>Norway|Norgemidt - - Estonia:Lithuania>Norway|Sorland - - Estonia:North Macedonia>Norway|Troms - - Estonia:Norway|Norgemidt>Scandinavia - - Estonia:Norway|Ostland>Norway|Sorland - - Estonia:Norway|Sorland>Norway|Troms - - Estonia:Norway|Sorland>Norway|Vestmidt - - Estonia:Norway|Sorland>Portugal - - Estonia:Norway|Troms>Norway|Vestmidt - - Estonia:Norway|Vestmidt>Bulgaria - - Estonia:Norway|Vestmidt>Portugal - - Estonia:Norway|Vestmidt>Sweden - - Estonia:Slovakia>Finland - - Estonia:Slovakia>France - - Estonia:Spain>The Netherlands - - Estonia:Sweden>Switzerland - - Finland:Austria>Belgium - - Finland:Austria>Bosnia and Herzegovina - - Finland:Belgium>Benelux - - Finland:Belgium>Bosnia and Herzegovina - - Finland:Belgium>Czech Republic - - Finland:Bosnia and Herzegovina>Benelux - - Finland:Bosnia and Herzegovina>Czech Republic - - Finland:Croatia>United Kingdom - - Finland:Estonia>Benelux - - Finland:Estonia>Bosnia and Herzegovina - - Finland:Germany>Greece - - Finland:Hungary>Ireland - - Finland:Hungary>Latvia - - Finland:Hungary>Lithuania - - Finland:Ireland>Italy - - Finland:Ireland>Lithuania - - Finland:Ireland>Luxembourg - - Finland:Italy>Luxembourg - - Finland:Italy>North Macedonia - - Finland:Italy>Romania - - Finland:Latvia>Norway|Norgemidt - - Finland:Lithuania>Luxembourg - - Finland:Lithuania>Norway|Sorland - - Finland:Lithuania>Norway|Troms - - Finland:Luxembourg>North Macedonia - - Finland:Luxembourg>Norway|Troms - - Finland:North Macedonia>Norway|Troms - - Finland:North Macedonia>Norway|Vestmidt - - Finland:Norway|Norgemidt>Norway|Ostland - - Finland:Norway|Norgemidt>Scandinavia - - Finland:Norway|Ostland>Norway|Sorland - - Finland:Norway|Ostland>Poland - - Finland:Norway|Sorland>Norway|Troms - - Finland:Norway|Sorland>Norway|Vestmidt - - Finland:Norway|Sorland>Portugal - - Finland:Norway|Troms>Norway|Vestmidt - - Finland:Norway|Vestmidt>Bulgaria - - Finland:Norway|Vestmidt>Portugal - - Finland:Norway|Vestmidt>Sweden - - Finland:Poland>Bulgaria - - Finland:Poland>Portugal - - Finland:Portugal>Bulgaria - - Finland:Serbia>Finland - - Finland:Serbia>France - - Finland:Serbia>Slovakia - - Finland:Serbia>Slovenia - - Finland:Serbia>Sweden - - Finland:Serbia>Switzerland - - Finland:Slovakia>Finland - - Finland:Slovakia>France - - Finland:Slovakia>Spain - - Finland:Spain>Denmark - - Finland:Spain>Estonia - - Finland:Spain>Sweden - - Finland:Sweden>The Netherlands - - France:Austria>Belgium - - France:Austria>Bosnia and Herzegovina - - France:Belgium>Benelux - - France:Belgium>Bosnia and Herzegovina - - France:Belgium>Czech Republic - - France:Benelux>Czech Republic - - France:Bosnia and Herzegovina>Benelux - - France:Bosnia and Herzegovina>Czech Republic - - France:Croatia>United Kingdom - - France:Estonia>Benelux - - France:Estonia>Bosnia and Herzegovina - - France:Finland>France - - France:Germany>Greece - - France:Hungary>Ireland - - France:Hungary>Latvia - - France:Hungary>Lithuania - - France:Ireland>Italy - - France:Ireland>Lithuania - - France:Ireland>Luxembourg - - France:Italy>Luxembourg - - France:Italy>North Macedonia - - France:Italy>Romania - - France:Latvia>Lithuania - - France:Latvia>Norway|Norgemidt - - France:Latvia>Norway|Ostland - - France:Lithuania>Luxembourg - - France:Lithuania>Norway|Sorland - - France:Lithuania>Norway|Troms - - France:Luxembourg>North Macedonia - - France:Luxembourg>Norway|Troms - - France:North Macedonia>Norway|Troms - - France:North Macedonia>Norway|Vestmidt - - France:Norway|Norgemidt>Norway|Ostland - - France:Norway|Norgemidt>Scandinavia - - France:Norway|Ostland>Norway|Sorland - - France:Norway|Ostland>Poland - - France:Norway|Sorland>Norway|Troms - - France:Norway|Sorland>Norway|Vestmidt - - France:Norway|Sorland>Poland - - France:Norway|Sorland>Portugal - - France:Norway|Troms>Norway|Vestmidt - - France:Norway|Vestmidt>Bulgaria - - France:Norway|Vestmidt>Portugal - - France:Norway|Vestmidt>Sweden - - France:Norway|Vestmidt>Switzerland - - France:Poland>Bulgaria - - France:Poland>Portugal - - France:Portugal>Bulgaria - - France:Serbia>Finland - - France:Serbia>France - - France:Serbia>Slovakia - - France:Serbia>Slovenia - - France:Serbia>Sweden - - France:Serbia>Switzerland - - France:Serbia>The Netherlands - - France:Slovakia>Estonia - - France:Slovakia>Finland - - France:Slovakia>France - - France:Slovakia>Spain - - France:Slovenia>Sweden - - France:Spain>Denmark - - France:Spain>Estonia - - France:Spain>Sweden - - France:Sweden>The Netherlands - - France:The Netherlands>Belgium - - France:The Netherlands>Bosnia and Herzegovina - - France:The Netherlands>Denmark - - Germany:Austria>Belgium - - Germany:Belgium>Benelux - - Germany:Belgium>Bosnia and Herzegovina - - Germany:Belgium>Czech Republic - - Germany:Benelux>Czech Republic - - Germany:Estonia>Benelux - - Germany:Estonia>Bosnia and Herzegovina - - Germany:Finland>France - - Germany:Germany>Greece - - Germany:Ireland>Lithuania - - Germany:Ireland>Luxembourg - - Germany:Italy>North Macedonia - - Germany:Latvia>Lithuania - - Germany:Latvia>Norway|Norgemidt - - Germany:North Macedonia>Norway|Troms - - Germany:North Macedonia>Norway|Vestmidt - - Germany:Norway|Norgemidt>Scandinavia - - Germany:Norway|Ostland>Norway|Sorland - - Germany:Norway|Sorland>Norway|Vestmidt - - Germany:Norway|Sorland>Poland - - Germany:Norway|Troms>Norway|Vestmidt - - Germany:Norway|Vestmidt>Bulgaria - - Germany:Norway|Vestmidt>Portugal - - Germany:Norway|Vestmidt>Sweden - - Germany:Norway|Vestmidt>Switzerland - - Germany:Poland>Portugal - - Germany:Portugal>Bulgaria - - Germany:Serbia>Finland - - Germany:Serbia>Slovakia - - Germany:Serbia>Switzerland - - Germany:Serbia>The Netherlands - - Germany:Slovakia>France - - Germany:The Netherlands>Belgium - - Germany:The Netherlands>Bosnia and Herzegovina - - Germany:The Netherlands>Denmark - - Greece:Norway|Vestmidt>Portugal - - Greece:Norway|Vestmidt>Sweden - - Greece:Norway|Vestmidt>Switzerland - - Greece:Serbia>France - - Greece:Serbia>Slovakia - - Greece:Serbia>Slovenia - - Greece:Serbia>Sweden - - Greece:Serbia>Switzerland - - Greece:The Netherlands>Belgium - - Greece:The Netherlands>Bosnia and Herzegovina - - Hungary:Austria>Belgium - - Hungary:Belgium>Benelux - - Hungary:Belgium>Bosnia and Herzegovina - - Hungary:Belgium>Czech Republic - - Hungary:Benelux>Czech Republic - - Hungary:Estonia>Bosnia and Herzegovina - - Hungary:Finland>France - - Hungary:Hungary>Ireland - - Hungary:Hungary>Latvia - - Hungary:North Macedonia>Norway|Troms - - Hungary:Norway|Norgemidt>Scandinavia - - Hungary:Norway|Sorland>Norway|Vestmidt - - Hungary:Norway|Sorland>Poland - - Hungary:Norway|Troms>Norway|Vestmidt - - Hungary:Norway|Vestmidt>Bulgaria - - Hungary:Norway|Vestmidt>Portugal - - Hungary:Norway|Vestmidt>Switzerland - - Hungary:Poland>Portugal - - Hungary:Serbia>Finland - - Hungary:Serbia>France - - Hungary:Serbia>Slovakia - - Hungary:Serbia>Slovenia - - Hungary:Serbia>Sweden - - Hungary:Serbia>Switzerland - - Hungary:Serbia>The Netherlands - - Hungary:Slovakia>Estonia - - Hungary:Spain>Austria - - Hungary:Spain>Denmark - - Hungary:Spain>Estonia - - Hungary:Spain>Sweden - - Hungary:The Netherlands>Belgium - - Hungary:The Netherlands>Bosnia and Herzegovina - - Ireland:Poland>Portugal - - Ireland:Spain>Denmark - - Ireland:Spain>Sweden - - Italy:Austria>Belgium - - Italy:Belgium>Benelux - - Italy:Belgium>Bosnia and Herzegovina - - Italy:Belgium>Czech Republic - - Italy:Benelux>Czech Republic - - Italy:Bosnia and Herzegovina>Czech Republic - - Italy:North Macedonia>Norway|Troms - - Italy:Norway|Norgemidt>Norway|Ostland - - Italy:Norway|Sorland>Norway|Vestmidt - - Italy:Norway|Sorland>Poland - - Italy:Norway|Vestmidt>Portugal - - Italy:Norway|Vestmidt>Switzerland - - Italy:The Netherlands>Belgium - - Italy:The Netherlands>Bosnia and Herzegovina - - Latvia:Austria>Belgium - - Latvia:Austria>Bosnia and Herzegovina - - Latvia:Belgium>Benelux - - Latvia:Belgium>Bosnia and Herzegovina - - Latvia:Belgium>Czech Republic - - Latvia:Benelux>Czech Republic - - Latvia:Bosnia and Herzegovina>Czech Republic - - Latvia:Estonia>Benelux - - Latvia:Estonia>Bosnia and Herzegovina - - Latvia:Germany>Greece - - Latvia:Hungary>Ireland - - Latvia:Hungary>Latvia - - Latvia:Hungary>Lithuania - - Latvia:Ireland>Italy - - Latvia:Ireland>Lithuania - - Latvia:Ireland>Luxembourg - - Latvia:Italy>Luxembourg - - Latvia:Italy>North Macedonia - - Latvia:Italy>Romania - - Latvia:Latvia>Norway|Norgemidt - - Latvia:Lithuania>Norway|Sorland - - Latvia:Lithuania>Norway|Troms - - Latvia:North Macedonia>Norway|Troms - - Latvia:Norway|Norgemidt>Norway|Ostland - - Latvia:Norway|Norgemidt>Scandinavia - - Latvia:Norway|Ostland>Norway|Sorland - - Latvia:Norway|Ostland>Poland - - Latvia:Norway|Sorland>Norway|Troms - - Latvia:Norway|Sorland>Norway|Vestmidt - - Latvia:Norway|Sorland>Poland - - Latvia:Norway|Sorland>Portugal - - Latvia:Norway|Troms>Norway|Vestmidt - - Latvia:Norway|Vestmidt>Bulgaria - - Latvia:Norway|Vestmidt>Portugal - - Latvia:Norway|Vestmidt>Sweden - - Latvia:Norway|Vestmidt>Switzerland - - Latvia:The Netherlands>Belgium - - Latvia:The Netherlands>Bosnia and Herzegovina - - Lithuania:Austria>Belgium - - Lithuania:Belgium>Benelux - - Lithuania:Belgium>Bosnia and Herzegovina - - Lithuania:Belgium>Czech Republic - - Lithuania:Benelux>Czech Republic - - Lithuania:Bosnia and Herzegovina>Czech Republic - - Lithuania:North Macedonia>Norway|Troms - - Lithuania:Norway|Norgemidt>Norway|Ostland - - Lithuania:Norway|Sorland>Norway|Vestmidt - - Lithuania:Norway|Sorland>Poland - - Lithuania:Norway|Vestmidt>Portugal - - Lithuania:Norway|Vestmidt>Switzerland - - Lithuania:The Netherlands>Belgium - - Lithuania:The Netherlands>Bosnia and Herzegovina - - Luxembourg:Estonia>Benelux - - Luxembourg:Finland>France - - Luxembourg:Germany>Greece - - Luxembourg:Hungary>Ireland - - Luxembourg:Hungary>Latvia - - Luxembourg:Hungary>Lithuania - - Luxembourg:Ireland>Italy - - Luxembourg:Ireland>Lithuania - - Luxembourg:Ireland>Luxembourg - - Luxembourg:Italy>Luxembourg - - Luxembourg:Italy>North Macedonia - - Luxembourg:Italy>Romania - - Luxembourg:Latvia>Norway|Norgemidt - - Luxembourg:Lithuania>Norway|Sorland - - Luxembourg:North Macedonia>Norway|Troms - - Luxembourg:Norway|Norgemidt>Scandinavia - - Luxembourg:Norway|Ostland>Norway|Sorland - - Luxembourg:Norway|Sorland>Norway|Troms - - Luxembourg:Norway|Sorland>Norway|Vestmidt - - Luxembourg:Norway|Sorland>Portugal - - Luxembourg:Norway|Troms>Norway|Vestmidt - - Luxembourg:Norway|Vestmidt>Bulgaria - - Luxembourg:Norway|Vestmidt>Portugal - - Luxembourg:Norway|Vestmidt>Sweden - - North Macedonia:Austria>Belgium - - North Macedonia:Belgium>Benelux - - North Macedonia:Belgium>Bosnia and Herzegovina - - North Macedonia:Belgium>Czech Republic - - North Macedonia:Benelux>Czech Republic - - North Macedonia:Bosnia and Herzegovina>Czech Republic - - North Macedonia:Estonia>Benelux - - North Macedonia:Finland>France - - North Macedonia:Germany>Greece - - North Macedonia:Hungary>Ireland - - North Macedonia:Hungary>Latvia - - North Macedonia:Hungary>Lithuania - - North Macedonia:Ireland>Italy - - North Macedonia:Ireland>Lithuania - - North Macedonia:Ireland>Luxembourg - - North Macedonia:Italy>Luxembourg - - North Macedonia:Italy>North Macedonia - - North Macedonia:Italy>Romania - - North Macedonia:Latvia>Norway|Norgemidt - - North Macedonia:Lithuania>Norway|Sorland - - North Macedonia:North Macedonia>Norway|Troms - - North Macedonia:Norway|Norgemidt>Norway|Ostland - - North Macedonia:Norway|Norgemidt>Scandinavia - - North Macedonia:Norway|Ostland>Norway|Sorland - - North Macedonia:Norway|Sorland>Norway|Troms - - North Macedonia:Norway|Sorland>Norway|Vestmidt - - North Macedonia:Norway|Sorland>Poland - - North Macedonia:Norway|Sorland>Portugal - - North Macedonia:Norway|Troms>Norway|Vestmidt - - North Macedonia:Norway|Vestmidt>Bulgaria - - North Macedonia:Norway|Vestmidt>Portugal - - North Macedonia:Norway|Vestmidt>Sweden - - North Macedonia:Norway|Vestmidt>Switzerland - - North Macedonia:Serbia>Slovakia - - North Macedonia:Serbia>Sweden - - North Macedonia:Serbia>Switzerland - - North Macedonia:Spain>Estonia - - North Macedonia:Spain>Sweden - - North Macedonia:The Netherlands>Belgium - - North Macedonia:The Netherlands>Bosnia and Herzegovina - - Norway|Norgemidt:Bosnia and Herzegovina>Benelux - - Norway|Norgemidt:Croatia>United Kingdom - - Norway|Norgemidt:Serbia>Slovakia - - Norway|Norgemidt:Serbia>Switzerland - - Norway|Norgemidt:Slovakia>Estonia - - Norway|Norgemidt:Slovakia>France - - Norway|Norgemidt:Slovenia>Sweden - - Norway|Norgemidt:Slovenia>Switzerland - - Norway|Norgemidt:Switzerland>Bosnia and Herzegovina - - Norway|Norgemidt:Switzerland>The Netherlands - - Norway|Sorland:Austria>Belgium - - Norway|Sorland:Austria>Bosnia and Herzegovina - - Norway|Sorland:Belgium>Benelux - - Norway|Sorland:Belgium>Bosnia and Herzegovina - - Norway|Sorland:Belgium>Czech Republic - - Norway|Sorland:Benelux>Czech Republic - - Norway|Sorland:Bosnia and Herzegovina>Czech Republic - - Norway|Sorland:Lithuania>Norway|Sorland - - Norway|Sorland:Luxembourg>North Macedonia - - Norway|Sorland:North Macedonia>Norway|Troms - - Norway|Sorland:Norway|Norgemidt>Norway|Ostland - - Norway|Sorland:Norway|Ostland>Poland - - Norway|Sorland:Norway|Sorland>Norway|Troms - - Norway|Sorland:Norway|Sorland>Norway|Vestmidt - - Norway|Sorland:Norway|Sorland>Poland - - Norway|Sorland:Norway|Vestmidt>Portugal - - Norway|Sorland:Norway|Vestmidt>Switzerland - - Norway|Sorland:The Netherlands>Belgium - - Norway|Sorland:The Netherlands>Bosnia and Herzegovina - - Norway|Troms:Benelux>Czech Republic - - Norway|Troms:Norway|Sorland>Norway|Vestmidt - - Norway|Troms:Norway|Sorland>Portugal - - Norway|Troms:Norway|Vestmidt>Switzerland - - Norway|Troms:Poland>Portugal - - Norway|Troms:Serbia>France - - Norway|Troms:Serbia>Slovakia - - Norway|Troms:Serbia>Slovenia - - Norway|Troms:Serbia>Sweden - - Norway|Troms:Serbia>Switzerland - - Norway|Troms:Serbia>The Netherlands - - Norway|Troms:Slovakia>Estonia - - Norway|Troms:Spain>Austria - - Norway|Troms:Spain>Bosnia and Herzegovina - - Norway|Troms:Spain>Denmark - - Norway|Troms:Spain>Estonia - - Norway|Troms:Spain>Sweden - - Norway|Vestmidt:Benelux>Czech Republic - - Norway|Vestmidt:Norway|Sorland>Norway|Vestmidt - - Norway|Vestmidt:Norway|Sorland>Portugal - - Norway|Vestmidt:Norway|Vestmidt>Switzerland - - Norway|Vestmidt:Poland>Portugal - - Norway|Vestmidt:Serbia>France - - Norway|Vestmidt:Serbia>Slovakia - - Norway|Vestmidt:Serbia>Slovenia - - Norway|Vestmidt:Serbia>Sweden - - Norway|Vestmidt:Serbia>Switzerland - - Norway|Vestmidt:Serbia>The Netherlands - - Norway|Vestmidt:Slovakia>Estonia - - Norway|Vestmidt:Spain>Austria - - Norway|Vestmidt:Spain>Bosnia and Herzegovina - - Norway|Vestmidt:Spain>Denmark - - Norway|Vestmidt:Spain>Estonia - - Norway|Vestmidt:Spain>Sweden - - Poland:Benelux>Czech Republic - - Poland:Norway|Sorland>Norway|Vestmidt - - Poland:Norway|Sorland>Portugal - - Portugal:Norway|Vestmidt>Switzerland - - Portugal:Poland>Bulgaria - - Portugal:Poland>Portugal - - Portugal:Serbia>France - - Portugal:Serbia>Slovakia - - Portugal:Serbia>Slovenia - - Portugal:Serbia>Sweden - - Portugal:Serbia>Switzerland - - Portugal:Serbia>The Netherlands - - Portugal:Slovakia>Estonia - - Portugal:Spain>Denmark - - Portugal:Spain>Estonia - - Portugal:Spain>Sweden - - Serbia:Norway|Vestmidt>Switzerland - - Serbia:Poland>Portugal - - Serbia:Serbia>France - - Serbia:Serbia>Slovakia - - Serbia:Serbia>Slovenia - - Serbia:Serbia>Sweden - - Serbia:Serbia>Switzerland - - Serbia:Serbia>The Netherlands - - Serbia:Slovakia>Estonia - - Serbia:Spain>Austria - - Serbia:Spain>Bosnia and Herzegovina - - Serbia:Spain>Denmark - - Serbia:Spain>Estonia - - Serbia:Spain>Sweden - - Slovakia:Benelux>Czech Republic - - Slovakia:Norway|Sorland>Norway|Vestmidt - - Slovakia:Norway|Sorland>Portugal - - Spain:Benelux>Czech Republic - - Spain:Norway|Sorland>Norway|Vestmidt - - Spain:Norway|Sorland>Portugal - - The Netherlands:Benelux>Czech Republic - - The Netherlands:Norway|Sorland>Norway|Vestmidt - - The Netherlands:Norway|Sorland>Portugal - - The Netherlands:Norway|Vestmidt>Switzerland - - The Netherlands:Poland>Portugal - - The Netherlands:Serbia>France - - The Netherlands:Serbia>Slovakia - - The Netherlands:Serbia>Slovenia - - The Netherlands:Serbia>Sweden - - The Netherlands:Serbia>Switzerland - - The Netherlands:Serbia>The Netherlands - - The Netherlands:Slovakia>Estonia - - The Netherlands:Spain>Austria - - The Netherlands:Spain>Bosnia and Herzegovina - - The Netherlands:Spain>Denmark - - The Netherlands:Spain>Estonia - - The Netherlands:Spain>Sweden - - United Kingdom:Norway|Vestmidt>Switzerland - - United Kingdom:Poland>Portugal - - United Kingdom:Serbia>France - - United Kingdom:Serbia>Slovakia - - United Kingdom:Serbia>Slovenia - - United Kingdom:Serbia>Sweden - - United Kingdom:Serbia>Switzerland - - United Kingdom:Serbia>The Netherlands - - United Kingdom:Slovakia>Estonia - - United Kingdom:Spain>Austria - - United Kingdom:Spain>Bosnia and Herzegovina - - United Kingdom:Spain>Denmark - - United Kingdom:Spain>Estonia - - United Kingdom:Spain>Sweden + - Guinea:Mali + - Côte d'Ivoire:Mali + - Burkina Faso:Burkina Faso + - Guinea:Guinea + - Côte d'Ivoire:Côte d'Ivoire + - Ghana:Sierra Leone + - Ghana:Liberia + - Ghana:Ghana + - Nigeria:Nigeria + - Ghana:Benin + - Nigeria:Benin + - Senegal:Togo + - Mali:Mali + - Niger:Burkina Faso + - Sierra Leone:Guinea + - Sierra Leone:Côte d'Ivoire + - Sierra Leone:Sierra Leone + - Liberia:Liberia + - Benin:Ghana + - Togo:Ghana + - Niger:Nigeria + - Benin:Nigeria + - Togo:Nigeria + - Togo:Benin + - Togo:Togo + - Rwanda:Burundi + - Uganda:Burundi + - Tunisia:Tunisia + - Rwanda:Rwanda + - Uganda:Uganda + - Ethiopia:Kenya + - Ethiopia:Djibouti + - Ethiopia:Ethiopia + - Egypt:Egypt + - Ethiopia:Sudan + - Egypt:Sudan + - Democratic Republic of the Congo:South Sudan + - Burundi:Burundi + - Libya:Tunisia + - Kenya:Rwanda + - Kenya:Uganda + - Kenya:Kenya + - Djibouti:Djibouti + - Sudan:Ethiopia + - South Sudan:Ethiopia + - Libya:Egypt + - Sudan:Egypt + - South Sudan:Egypt + - South Sudan:Sudan + - South Sudan:South Sudan - Guinea:Mali>Guinea - Côte d'Ivoire:Mali>Côte d'Ivoire - Burkina Faso:Burkina Faso>Niger From 192f7a05a7d1d4c3018437d02bccfe0cabffca08 Mon Sep 17 00:00:00 2001 From: David Almeida Date: Tue, 4 Mar 2025 13:55:19 +0100 Subject: [PATCH 5/5] Remove fake mappings --- mappings/african_subregion_aggregation.yaml | 26 --------------------- 1 file changed, 26 deletions(-) diff --git a/mappings/african_subregion_aggregation.yaml b/mappings/african_subregion_aggregation.yaml index 4be1407..1ddb949 100644 --- a/mappings/african_subregion_aggregation.yaml +++ b/mappings/african_subregion_aggregation.yaml @@ -58,32 +58,6 @@ native_regions: - Western Sahara - Zambia - Zimbabwe - - DolAmroth - - DolAmroth>Gondor - - DolAmroth>Harad - - DolAmroth>Mordor - - DolAmroth>Rohan - - Gondor - - Gondor>DolAmroth - - Gondor>Harad - - Gondor>Mordor - - Gondor>Rohan - - Harad - - Harad>DolAmroth - - Harad>Gondor - - Harad>Mordor - - Harad>Rohan - - Mordor - - Mordor>DolAmroth - - Mordor>Gondor - - Mordor>Harad - - Mordor>Rohan - - Rohan - - Rohan>DolAmroth - - Rohan>Gondor - - Rohan>Harad - - Rohan>Mordor - - World common_regions: - Western Africa: - Benin