From 49bb1191f819b5e4e04cfb9d280a9cd63c31a25a Mon Sep 17 00:00:00 2001 From: Mat Lbnt Date: Sat, 4 Nov 2023 16:06:25 +0100 Subject: [PATCH] Update according to 2016 law --- pygal_maps_fr/fr.departments.svg | 3 - pygal_maps_fr/fr.regions.svg | 73 ++++---------- pygal_maps_fr/maps.py | 162 ++++++++++++++----------------- 3 files changed, 95 insertions(+), 143 deletions(-) diff --git a/pygal_maps_fr/fr.departments.svg b/pygal_maps_fr/fr.departments.svg index 0d02fbd..9f8e817 100644 --- a/pygal_maps_fr/fr.departments.svg +++ b/pygal_maps_fr/fr.departments.svg @@ -309,9 +309,6 @@ - - - diff --git a/pygal_maps_fr/fr.regions.svg b/pygal_maps_fr/fr.regions.svg index 046c62d..6742b6c 100644 --- a/pygal_maps_fr/fr.regions.svg +++ b/pygal_maps_fr/fr.regions.svg @@ -6,86 +6,55 @@ - - + + - - + + - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - - - - + - + - + - + - + diff --git a/pygal_maps_fr/maps.py b/pygal_maps_fr/maps.py index 1a89e15..d19d939 100644 --- a/pygal_maps_fr/maps.py +++ b/pygal_maps_fr/maps.py @@ -130,41 +130,28 @@ '972': u("Martinique"), '973': u("Guyane"), '974': u("Réunion"), - # Not a area anymore but in case of... - '975': u("Saint Pierre et Miquelon"), '976': u("Mayotte") } REGIONS = { '11': u("Île-de-France"), - '21': u("Champagne-Ardenne"), - '22': u("Picardie"), - '23': u("Haute-Normandie"), - '24': u("Centre"), - '25': u("Basse-Normandie"), - '26': u("Bourgogne"), - '31': u("Nord-Pas-de-Calais"), - '41': u("Lorraine"), - '42': u("Alsace"), - '43': u("Franche-Comté"), - '52': u("Pays-de-la-Loire"), + '24': u("Centre-Val de Loire"), + '27': u("Bourgogne-Franche-Comté"), + '28': u("Normandie"), + '32': u("Hauts-de-France"), + '44': u("Grand Est"), + '52': u("Pays de la Loire"), '53': u("Bretagne"), - '54': u("Poitou-Charentes"), - '72': u("Aquitaine"), - '73': u("Midi-Pyrénées"), - '74': u("Limousin"), - '82': u("Rhône-Alpes"), - '83': u("Auvergne"), - '91': u("Languedoc-Roussillon"), + '75': u("Nouvelle-Aquitaine"), + '76': u("Occitanie"), + '84': u("Auvergne-Rhône-Alpes"), '93': u("Provence-Alpes-Côte d'Azur"), '94': u("Corse"), '01': u("Guadeloupe"), '02': u("Martinique"), '03': u("Guyane"), '04': u("Réunion"), - # Not a region anymore but in case of... - '05': u("Saint Pierre et Miquelon"), '06': u("Mayotte") } @@ -207,97 +194,97 @@ class Regions(IntCodeMixin, BaseMap): DEPARTMENTS_REGIONS = { - "01": "82", - "02": "22", - "03": "83", + "01": "84", + "02": "32", + "03": "84", "04": "93", "05": "93", "06": "93", - "07": "82", - "08": "21", - "09": "73", - "10": "21", - "11": "91", - "12": "73", + "07": "84", + "08": "44", + "09": "76", + "10": "44", + "11": "76", + "12": "76", "13": "93", - "14": "25", - "15": "83", - "16": "54", - "17": "54", + "14": "28", + "15": "84", + "16": "75", + "17": "75", "18": "24", - "19": "74", - "21": "26", + "19": "75", + "21": "27", "22": "53", - "23": "74", - "24": "72", - "25": "43", - "26": "82", - "27": "23", + "23": "75", + "24": "75", + "25": "27", + "26": "84", + "27": "28", "28": "24", "29": "53", "2A": "94", "2B": "94", - "30": "91", - "31": "73", - "32": "73", - "33": "72", - "34": "91", + "30": "76", + "31": "76", + "32": "76", + "33": "75", + "34": "76", "35": "53", "36": "24", "37": "24", - "38": "82", - "39": "43", - "40": "72", + "38": "84", + "39": "27", + "40": "75", "41": "24", - "42": "82", - "43": "83", + "42": "84", + "43": "84", "44": "52", "45": "24", - "46": "73", - "47": "72", - "48": "91", + "46": "76", + "47": "75", + "48": "76", "49": "52", - "50": "25", - "51": "21", - "52": "21", + "50": "28", + "51": "44", + "52": "44", "53": "52", - "54": "41", - "55": "41", + "54": "44", + "55": "44", "56": "53", - "57": "41", - "58": "26", - "59": "31", - "60": "22", - "61": "25", - "62": "31", - "63": "83", - "64": "72", - "65": "73", - "66": "91", - "67": "42", - "68": "42", - "69": "82", - "70": "43", - "71": "26", + "57": "44", + "58": "27", + "59": "32", + "60": "32", + "61": "28", + "62": "32", + "63": "84", + "64": "75", + "65": "76", + "66": "76", + "67": "44", + "68": "44", + "69": "84", + "70": "27", + "71": "27", "72": "52", - "73": "82", - "74": "82", + "73": "84", + "74": "84", "75": "11", - "76": "23", + "76": "28", "77": "11", "78": "11", - "79": "54", - "80": "22", - "81": "73", - "82": "73", + "79": "75", + "80": "32", + "81": "76", + "82": "76", "83": "93", "84": "93", "85": "52", - "86": "54", - "87": "74", - "88": "41", - "89": "26", - "90": "43", + "86": "75", + "87": "75", + "88": "44", + "89": "27", + "90": "27", "91": "11", "92": "11", "93": "11", @@ -307,7 +294,6 @@ class Regions(IntCodeMixin, BaseMap): "972": "02", "973": "03", "974": "04", - "975": "05", "976": "06" }