Skip to content

EC-EE: require only what the source actually fills #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivorbosloper merged 2 commits into from
Sep 14, 2026
Merged

EC-EE: require only what the source actually fills #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78bed7
EC-EE: read the release as it is shipped
ivorbosloper Sep 11, 2026
a4229d7
Merge branch 'main' into split/ec_ee
ivorbosloper Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- ES-CL: the ITACyL server is https-only, the 2025 shapefiles sit in province subfolders, and C_REFREC is the identifier
- A test refuses a fixture above 5 MB, committed or merely lying in the fixture folder, because a failing convert test downloads the real source there
- ES-MD: find RECINTO.shp wherever the archive puts it
- EC-EE: name the shapefile inside the archive, migrate the year column the release actually has, and require only what every parcel carries
- ES-CAT: the 2024 download is a shapefile package, and 34 crop names new in that edition are mapped
- DE-NDS: give the collection an id (the row index), which it was published without
- DE-BB: ref_ident holds the FLIK (field block reference), not a farmer, and the shapefile is cp1252
Expand Down
12 changes: 8 additions & 4 deletions fiboa_cli/datasets/ec_ee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
class Convert(EuroCropsConverterMixin, FiboaBaseConverter):
ec_mapping_csv = "ee_2021.csv"
ec_year = 2021
sources = "https://zenodo.org/records/14094196/files/EE_2021.zip?download=1"
sources = {
"https://zenodo.org/records/14094196/files/EE_2021.zip?download=1": [
"EE_2021/EE_2021_EC21.shp"
]
}
id = "ec_ee"
short_name = "Estonia"
title = "Field boundaries for Estonia"
Expand All @@ -36,16 +40,16 @@ class Convert(EuroCropsConverterMixin, FiboaBaseConverter):
"taotleja_n": "taotleja_nimi", # name of applicant
"taotleja_r": "taotleja_registrikood", # applicant's registration code
}
column_migrations = {"JAHR": lambda col: pd.to_datetime(col, format="%Y")}
# The shapefile truncates taotlusaasta ("application year") to ten characters;
# it holds a bare year, which has to become a datetime for the STAC extent.
column_migrations = {"taotlusaas": lambda col: pd.to_datetime(col, format="%Y")}
missing_schemas = {
"required": [
"taotletud_kultuur",
"taotletud_maakasutus",
"viimase_muutmise_aeg",
"taotleja_nimi",
],
"properties": {
"taotletud_kultuur": {"type": "string"},
"taotletud_maakasutus": {"type": "string"},
"niitmise_tuvastamise_staatus": {"type": "string"},
"niitmise_tuvast_ajavahemik": {"type": "string"},
Expand Down
Loading