From 667c02d96f512c70ce15150c0f6cfae313e72205 Mon Sep 17 00:00:00 2001 From: Ivor Bosloper Date: Mon, 16 Feb 2026 14:10:59 +0100 Subject: [PATCH 1/3] Update FR --- fiboa_cli/datasets/fr.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fiboa_cli/datasets/fr.py b/fiboa_cli/datasets/fr.py index 823cbdc6..b8feb178 100644 --- a/fiboa_cli/datasets/fr.py +++ b/fiboa_cli/datasets/fr.py @@ -1,3 +1,4 @@ +from geopandas import GeoDataFrame from vecorel_cli.conversion.admin import AdminConverterMixin from ..conversion.fiboa_converter import FiboaBaseConverter @@ -9,17 +10,17 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): variants = { "2022": { "https://data.geopf.fr/telechargement/download/RPG/RPG_2-0__GPKG_LAMB93_FXX_2022-01-01/RPG_2-0__GPKG_LAMB93_FXX_2022-01-01.7z.001": [ - "RPG_2-0__GPKG_LAMB93_FXX_2022-01-01/RPG/1_DONNEES_LIVRAISON_2023-08-01/RPG_2-0_GPKG_LAMB93_FXX-2022/PARCELLES_GRAPHIQUES.gpkg" + "**/*.gpkg" ] }, "2023": { "https://data.geopf.fr/telechargement/download/RPG/RPG_2-2__GPKG_LAMB93_FXX_2023-01-01/RPG_2-2__GPKG_LAMB93_FXX_2023-01-01.7z": [ - "RPG_2-2__GPKG_LAMB93_FXX_2023-01-01/RPG_2-2__GPKG_LAMB93_FXX_2023-01-01.gpkg" + "**/*.gpkg" ] }, "2021": { "https://data.geopf.fr/telechargement/download/RPG/RPG_2-0__GPKG_LAMB93_FXX_2021-01-01/RPG_2-0__GPKG_LAMB93_FXX_2021-01-01.7z": [ - "RPG_2-0__GPKG_LAMB93_FXX_2022-01-01/RPG/1_DONNEES_LIVRAISON_2021-08-01/RPG_2-0_GPKG_LAMB93_FXX-2021/PARCELLES_GRAPHIQUES.gpkg" + "**/*.gpkg" ] }, "2020": { @@ -44,7 +45,7 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): provider = "Anstitut National de l'Information Géographique et Forestière " # Attribution example as described in the open license - attribution = "IGN — Original data from https://geoservices.ign.fr/rpg" + attribution = "IGN - Original data from https://geoservices.ign.fr/rpg" license = "Licence Ouverte / Open Licence " ec_mapping_csv = "fr_2018.csv" @@ -56,6 +57,12 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): "code_group": "group_code", } + def migrate(self, gdf) -> GeoDataFrame: + if "ID_PARCEL" in gdf.columns: + # Make column names lowercase, harmonize for different years + gdf.rename(columns={k: k.lower() for k in gdf.columns}, inplace=True) + return super().migrate(gdf) + column_filters = { "surf_parc": lambda col: col > 0.0 # fiboa validator requires area > 0.0 } From e2a06478eb88765a72ac3651d463075f8755357e Mon Sep 17 00:00:00 2001 From: Ivor Bosloper Date: Tue, 12 May 2026 23:16:00 +0200 Subject: [PATCH 2/3] Compatibility for small differences within multiple years in France --- fiboa_cli/datasets/fr.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fiboa_cli/datasets/fr.py b/fiboa_cli/datasets/fr.py index b8feb178..1425a51b 100644 --- a/fiboa_cli/datasets/fr.py +++ b/fiboa_cli/datasets/fr.py @@ -13,6 +13,13 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): "**/*.gpkg" ] }, + "2024": { + "https://data.geopf.fr/telechargement/download/RPG/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01.7z.001": [], + "https://data.geopf.fr/telechargement/download/RPG/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01.7z.002": [], + "https://data.geopf.fr/telechargement/download/RPG/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01.7z.003": [], + "https://data.geopf.fr/telechargement/download/RPG/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01.7z.004": [], + "https://data.geopf.fr/telechargement/download/RPG/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01/RPG_3-0__GPKG_LAMB93_FXX_2024-01-01.7z.005": [], + }, "2023": { "https://data.geopf.fr/telechargement/download/RPG/RPG_2-2__GPKG_LAMB93_FXX_2023-01-01/RPG_2-2__GPKG_LAMB93_FXX_2023-01-01.7z": [ "**/*.gpkg" @@ -20,7 +27,7 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): }, "2021": { "https://data.geopf.fr/telechargement/download/RPG/RPG_2-0__GPKG_LAMB93_FXX_2021-01-01/RPG_2-0__GPKG_LAMB93_FXX_2021-01-01.7z": [ - "**/*.gpkg" + "**/PARCELLES_GRAPHIQUES.gpkg" ] }, "2020": { @@ -60,7 +67,7 @@ class FRConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): def migrate(self, gdf) -> GeoDataFrame: if "ID_PARCEL" in gdf.columns: # Make column names lowercase, harmonize for different years - gdf.rename(columns={k: k.lower() for k in gdf.columns}, inplace=True) + gdf = gdf.rename(columns={k: k.lower() for k in gdf.columns}, inplace=True) return super().migrate(gdf) column_filters = { From 8c52ff2806b7875136da90e6dbf66a9f452d0e59 Mon Sep 17 00:00:00 2001 From: Ivor Date: Fri, 15 May 2026 11:52:49 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98daeccf..ec2b7d53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- Update fr-converter to support 2021/2022 files + ## [v0.21.0] - 2026-02-16 - Update vecorel-cli