diff --git a/CHANGELOG.md b/CHANGELOG.md index 277c1cd6..73f0eed6 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] +- Multiple year support for HR +- Introduce FiboaBaseConverter.use_variant_as_determination for setting proper determination_date - Update years for DK (2025, 2026) - Support multiple years for CZ - Converter for Bavaria, Germany diff --git a/fiboa_cli/conversion/fiboa_converter.py b/fiboa_cli/conversion/fiboa_converter.py index 4fae961c..c5ac7227 100644 --- a/fiboa_cli/conversion/fiboa_converter.py +++ b/fiboa_cli/conversion/fiboa_converter.py @@ -9,6 +9,7 @@ class FiboaBaseConverter(BaseConverter): area_is_in_ha = True area_calculate_missing = False + use_variant_as_determination = False def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -35,4 +36,7 @@ def post_migrate(self, gdf): elif self.area_is_in_ha and gdf_area_key in gdf.columns: # convert area in ha to meters gdf[gdf_area_key] = gdf[gdf_area_key].astype(float) * 10_000 + + if self.use_variant_as_determination: + gdf["determination:datetime"] = f"{self.variant}-01-01T00:00:00Z" return gdf diff --git a/fiboa_cli/datasets/dk.py b/fiboa_cli/datasets/dk.py index 743834e5..2ff311cd 100644 --- a/fiboa_cli/datasets/dk.py +++ b/fiboa_cli/datasets/dk.py @@ -25,8 +25,8 @@ class DKConverter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): "Afgkode": "crop:code", "Afgroede": "crop:name", } + use_variant_as_determination = True def migrate(self, gdf) -> gpd.GeoDataFrame: gdf["Afgkode"] = gdf["Afgkode"].astype(float).fillna(value=0).astype(int).astype(str) - gdf["determination:datetime"] = f"{self.variant}-01-01T00:00:00Z" return super().migrate(gdf) diff --git a/fiboa_cli/datasets/hr.py b/fiboa_cli/datasets/hr.py index 2eac9f99..834deb5b 100644 --- a/fiboa_cli/datasets/hr.py +++ b/fiboa_cli/datasets/hr.py @@ -3,9 +3,15 @@ from ..conversion.fiboa_converter import FiboaBaseConverter from .commons.hcat import AddHCATMixin +base = "https://www.apprrr.hr/wp-content/uploads/nipp" + class Converter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): sources = "https://www.apprrr.hr/wp-content/uploads/nipp/land_parcels.gpkg" + variants = { + "2024": f"{base}/land_parcels.gpkg", + **{str(y): f"{base}/arkod_31_12_{y}.gpkg" for y in range(2023, 2010, -1)}, + } id = "hr" short_name = "Croatia" title = "Croatian Field Boundaries" @@ -99,3 +105,4 @@ class Converter(AdminConverterMixin, AddHCATMixin, FiboaBaseConverter): area_is_in_ha = False area_calculate_missing = True + use_variant_as_determination = True