From b03fe9bea0ac2841f3f23fb14a3d7c4e8bca431d Mon Sep 17 00:00:00 2001 From: Matthew Griffith Date: Mon, 13 Apr 2026 15:26:34 +0000 Subject: [PATCH 1/3] Added tile, tileattribute and tilescheme entries --- share/metkit/language.yaml | 193 +++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/share/metkit/language.yaml b/share/metkit/language.yaml index 1a95b62c..8661ee6f 100644 --- a/share/metkit/language.yaml +++ b/share/metkit/language.yaml @@ -742,6 +742,199 @@ _field: &_field - [mosd_dasd, monthly standard-deviation of daily standard-deviation] multiple: false + tile: + category: data + type: enum + values: + # 1-1000 Reserved for intercomparison tile classes/groupings + - [seoc, 1, 'Seas and oceans'] + - [inwb, 2, 'Inland water bodies'] + - [bare, 3, 'Bare areas'] + - [hiv, 4, 'High vegetation'] + - [lov, 5, 'Low vegetation'] + - [urban, 6, 'Urban'] + # 1001-1500 Reserved for tile class entries for tile models using the ECOCLIMAP-SG land cover survey + - [seao, 1001, 'Sea and oceans'] + - [lake, 1002, 'Lakes'] + - [rive, 1003, 'Rivers'] + - [no, 1004, 'Bare land'] + - [rock, 1005, 'Bare rock'] + - [snow, 1006, 'Permanent snow'] + - [bobd, 1007, 'Boreal broadleaf deciduous'] + - [tebd, 1008, 'Temperate broadleaf deciduous'] + - [trbd, 1009, 'Tropical broadleaf deciduous'] + - [tebe, 1010, 'Temperate broadleaf evergreen'] + - [trbe, 1011, 'Tropical broadleaf evergreen'] + - [bone, 1012, 'Boreal needleleaf evergreen'] + - [tene, 1013, 'Temperate needleleaf evergreen'] + - [bond, 1014, 'Boreal needleleaf deciduous'] + - [shrb, 1015, 'Shrubs'] + - [bogr, 1016, 'Boreal grassland'] + - [gras, 1017, 'Temperate grassland'] + - [trog, 1018, 'Tropical grassland'] + - [c3w, 1019, 'Winter C3 crops'] + - [c3s, 1020, 'Summer C3 crops'] + - [c4, 1021, 'C4 crops'] + - [fltr, 1022, 'Flooded trees'] + - [flgr, 1023, 'Flooded grassland'] + - [lcz1, 1024, 'Local climate zone 1: compact high-rise (buildings)'] + - [lcz2, 1025, 'Local climate zone 2: compact midrise (buildings)'] + - [lcz3, 1026, 'Local climate zone 3: compact low-rise (buildings)'] + - [lcz4, 1027, 'Local climate zone 4: open high-rise (buildings)'] + - [lcz5, 1028, 'Local climate zone 5: open midrise (buildings)'] + - [lcz6, 1029, 'Local climate zone 6: open low-rise (buildings)'] + - [lcz7, 1030, 'Local climate zone 7: lightweight low-rise (buildings)'] + - [lcz8, 1031, 'Local climate zone 8: large low-rise (buildings)'] + - [lcz9, 1032, 'Local climate zone 9: sparsely built (buildings)'] + - [lcz10, 1033, 'Local climate zone 10: heavy industry (buildings)'] + - [tebdu, 1034, 'Urban temperate broadleaf deciduous'] + - [trbdu, 1035, 'Urban tropical broadleaf deciduous'] + - [tebeu, 1036, 'Urban temperate broadleaf evergreen'] + - [trbeu, 1037, 'Urban tropical broadleaf evergreen'] + - [boneu, 1038, 'Urban boreal needleleaf evergreen'] + - [teneu, 1039, 'Urban temperate needleleaf evergreen'] + - [bondu, 1040, 'Urban boreal needleleaf deciduous'] + # 1501-2000 Reserved for tile grouping entries for tile models using the ECOCLIMAP-SG land cover survey + - [gnatu, 1501, 'Nature grouping (NO + ROCK + SNOW + BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB + BOGR + GRAS + TROG + C3W + C3S + C4 + FLTR + FLGR)'] + - [gnofo, 1502, 'Non-forest grouping (NO + ROCK + SNOW + BOGR + GRAS + TROG + C3W + C3S + C4 + FLTR + FLGR)'] + - [gfore, 1503, 'Forest grouping (BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB)'] + - [gnove, 1504, 'Non-vegetated grouping (NO + ROCK + SNOW)'] + - [gtree, 1505, 'Trees grouping (BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB + FLTR)'] + - [glveg, 1506, 'Low vegetation grouping (BOGR + GRAS + TROG + C3W + C3S + C4 + FLGR)'] + - [gnflv, 1507, 'Non-flooded low vegetation grouping (BOGR + GRAS + TROG + C3W + C3S + C4)'] + - [gcrop, 1508, 'Crops grouping (C3W + C3S + C4)'] + - [ggras, 1509, 'Grassland grouping (BOGR + GRAS + TROG)'] + - [gbaro, 1510, 'Bare and rock grouping (NO + ROCK)'] + - [gc3cr, 1511, 'C3 crops grouping (C3W + C3S)'] + - [gbfor, 1512, 'Broadleaf forest grouping (BOBD + TEBD + TRBD + TEBE + TRBE + SHRB)'] + - [gnfor, 1513, 'Needleleaf forest grouping (BONE + TENE + BOND)'] + - [gdbfo, 1514, 'Deciduous broadleaf forest grouping (BOBD + TEBD + TRBD + TEBE + SHRB)'] + - [gtgra, 1515, 'Temperate grassland grouping (BOGR + GRAS)'] + - [gnfnf, 1516, 'Non-forest (no FLTR) grouping (NO + ROCK + SNOW + BOGR + GRAS + TROG + C3W + C3S + C4 + FLGR)'] + - [gbfft, 1517, 'Broadleaf forest (with FLTR) grouping (BOBD + TEBD + TRBD + TEBE + TRBE + SHRB + FLTR)'] + - [gbtre, 1518, 'Broadleaf trees grouping (BOBD + TEBD + TRBD + TEBE + TRBE + FLTR)'] + - [gcgra, 1519, 'C3/C4 grasslands grouping (BOGR + GRAS + FLGR)'] + - [gbdtr, 1520, 'Broadleaf deciduous trees grouping (BOBD + TEBD + TRBD + FLTR)'] + - [gbetr, 1521, 'Broadleaf evergreen trees grouping (TEBE + TRBE)'] + - [gnetr, 1522, 'Needleleaf evergreen trees grouping (BONE + TENE)'] + - [glczu, 1523, 'LCZ or urban grouping (LCZ1 + LCZ2 + LCZ3 + LCZ4 + LCZ5 + LCZ6 + LCZ7 + LCZ8 + LCZ9 + LCZ10)'] + - [giwat, 1524, 'Inland water grouping (LAKE + RIVE)'] + - [gptebd, 1525, 'Urban parks and gardens TEBD grouping (NO + GRAS + TEBDU)'] + - [gptrbd, 1526, 'Urban parks and gardens TRBD grouping (NO + GRAS + TRBDU)'] + - [gptebe, 1527, 'Urban parks and gardens TEBE grouping (NO + GRAS + TEBEU)'] + - [gptrbe, 1528, 'Urban parks and gardens TRBE grouping (NO + GRAS + TRBEU)'] + - [gpbone, 1529, 'Urban parks and gardens BONE grouping (NO + GRAS + BONEU)'] + - [gptene, 1530, 'Urban parks and gardens TENE grouping (NO + GRAS + TENEU)'] + - [gpbond, 1531, 'Urban parks and gardens BOND grouping (NO + GRAS + BONDU)'] + # 2001-2500 Reserved for tile class entries for tile models using the GLCC v2.0 BATS Classification survey + - [crmf, 2001, 'Crops, mixed farming'] + - [shgr, 2002, 'Short grass'] + - [evne, 2003, 'Evergreen needleleaf trees'] + - [dene, 2004, 'Deciduous needleleaf trees'] + - [debr, 2005, 'Deciduous broadleaf trees'] + - [evbr, 2006, 'Evergreen broadleaf trees'] + - [tagr, 2007, 'Tall grass'] + - [dese, 2008, 'Desert'] + - [tund, 2009, 'Tundra'] + - [ircr, 2010, 'Irrigated crops'] + - [sede, 2011, 'Semidesert'] + - [icgl, 2012, 'Ice caps and glaciers'] + - [boma, 2013, 'Bogs and marshes'] + - [inwa, 2014, 'Inland water'] + - [ocea, 2015, 'Ocean'] + - [evsh, 2016, 'Evergreen shrubs'] + - [desh, 2017, 'Deciduous shrubs'] + - [mfwo, 2018, 'Mixed forest/woodland'] + - [info, 2019, 'Interrupted forest'] + - [wlmi, 2020, 'Water and land mixtures'] + - [baso, 2021, 'Bare soil'] + - [urba, 2022, 'Urban'] + - [lori, 2023, 'Low-rise building'] + - [hiri, 2024, 'High-rise building'] + # 2501-3000 Reserved for tile grouping entries for tile models using the GLCC v2.0 BATS Classification survey + - [glve, 2501, 'Low vegetation grouping (CRMF + SHGR + TAGR + TUND + IRCR + SEDE + BOMA + EVSH + DESH + WLMI)'] + - [ghve, 2502, 'High vegetation grouping (EVNE + DENE + DEBR + EVBR + MFWO + INFO)'] + # 3001-3500 Reserved for tile class entries for tile models using the ESA-GlobCover GCV2009 survey + - [pfic, 3001, 'Post-flooding or irrigated croplands'] + - [racr, 3002, 'Rainfed croplands'] + - [mcve, 3003, 'Mosaic cropland (50%-70%)/vegetation (grassland, 'shrubland, forest) (20-50%)'] + - [mvcr, 3004, 'Mosaic vegetation (grassland, shrubland, forest) (50%-70%)/cropland (20%-50%)'] + - [cobs, 3005, 'Closed to open (>15%) broadleaved evergreen and/or semi-deciduous forest (>5m)'] + - [clbd, 3006, 'Closed (>40%) broadleaved deciduous forest (>5m)'] + - [opbd, 3007, 'Open (15-40%) broadleaved deciduous forest (>5m)'] + - [clne, 3008, 'Closed (>40%) needleleaved evergreen forest (>5m)'] + - [onde, 3009, 'Open (15-40%) needleleaved deciduous or evergreen forest (>5m)'] + - [cobn, 3010, 'Closed to open (>15%) mixed broadleaved and needleleaved forest (>5m)'] + - [mfsg, 3011, 'Mosaic forest/shrubland (50%-70%)/grassland (20%-50%)'] + - [mgfs, 3012, 'Mosaic grassland (50%-70%)/forest/shrubland (20%-50%)'] + - [cosh, 3013, 'Closed to open (>15%) shrubland (<5m)'] + - [cohv, 3014, 'Closed to open (>15%) herbaceous vegetation'] + - [spve, 3015, 'Sparse (<15%) vegetation (woody vegetation, shrubs, grassland)'] + - [cobff, 3016, 'Closed to open (>15%) broadleaved forest regularly flooded (semi-permanently or temporarily) - fresh or brackish water'] + - [clbff, 3017, 'Closed (>40%) broadleaved forest or shrubland permanently flooded - saline or brackish water'] + - [covef, 3018, 'Closed to open (>15%) vegetation (grassland, shrubland, woody vegetation) on regularly flooded or waterlogged soil - fresh, brackish or saline water'] + - [asaa, 3019, 'Artificial surfaces and associated areas (urban areas >50%)'] + - [baar, 3020, 'Bare areas'] + - [wabo, 3021, 'Water bodies'] + - [pesi, 3022, 'Permanent snow and ice'] + # 3501-4000 Reserved for tile grouping entries for tile models using the ESA-GlobCover GCV2009 survey + - [grdt, 3501, 'Grouping using the dominant tiles approach (dominant tile varies per gridbox)'] + # 4001-4500 Reserved for tile class entries for tile models using the European Commission-Global Land Cover Project GLC2000 survey + - [tbeco, 4001, 'Tree cover, broadleaved evergreen, closed to open (>15%)'] + - [tbdc, 4002, 'Tree cover, broadleaved deciduous, closed (>40%)'] + - [tbdo, 4003, 'Tree cover, broadleaved deciduous, open (15-40%)'] + - [tneco, 4004, 'Tree cover, needleleaved evergreen, closed to open (>15%)'] + - [tndco, 4005, 'Tree cover, needleleaved deciduous, closed to open (>15%)'] + - [tmlco, 4006, 'Tree cover, mixed leaftype, closed to open (>15%)'] + - [tcoff, 4007, 'Tree cover, closed to open (>15%), regularly flooded, fresh or brackish water: swamp forests'] + - [tcofs, 4008, 'Tree cover, closed to open (>15%), regularly flooded, saline water: mangrove forests'] + - [mtvg, 4009, 'Mosaic of tree cover and other natural vegetation (crop component possible)'] + - [tburn, 4010, 'Tree cover, burnt (mainly boreal forests)'] + - [scoe, 4011, 'Shrubcover, closed to open (>15%), evergreen (broadleaved or needleleaved)'] + - [scod, 4012, 'Shrubcover, closed to open (>15%), deciduous (broadleaved)'] + - [hcco, 4013, 'Herbaceous cover, closed to open (>15%)'] + - [shsc, 4014, 'Sparse herbaceous or sparse shrub cover'] + - [fshco, 4015, 'Regularly flooded (>2 month) shrub or herbaceous cover, closed to open'] + - [crop, 4016, 'Cropland (upland crops or inundated/ flooded crops)'] + - [mctnv, 4017, 'Mosaic of cropland / tree cover/ other natural vegetation'] + - [mcsh, 4018, 'Mosaic of cropland / shrub or herbaceous cover'] + - [baare, 4019, 'Bare areas'] + - [wbna, 4020, 'Water bodies (natural or artificial)'] + - [sina, 4021, 'Snow or ice (natural or artificial)'] + - [urar, 4022, 'Urban areas'] + # 4501-5000 Reserved for tile grouping entries for tile models using the European Commission-Global Land Cover Project GLC2000 survey + default: none + multiple: true + + tileattribute: + category: data + type: enum + values: + - [undef, 0, Undefined] + - [unmod, 1, Unmodified] + - [snow, 2, Snow covered] + - [flood, 3, Flooded] + - [ice, 4, Ice covered] + - [itcw, 5, With intercepted water] + - [itcs, 6, With intercepted snow] + - [agg, 7, Aggregated] + default: none + multiple: true + + tilescheme: + category: data + type: + - context: + class: [d1] + dataset: [on-demand-extremes-dt] + type: enum + values: + - [unknown, 0, Unknown] + - [simple, 1, Simple tile scheme configuration with most-grouped tiles] + - [granular, 2, Granular tile scheme configuration with most-separated tile groupings] + default: none + multiple: true + ################################################################# # year From 673af97ac310f53f1b05d6485c9354986d11ce25 Mon Sep 17 00:00:00 2001 From: Matthew Griffith Date: Mon, 13 Apr 2026 15:41:35 +0000 Subject: [PATCH 2/3] Remove colons --- share/metkit/language.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/share/metkit/language.yaml b/share/metkit/language.yaml index 8661ee6f..d6fcd7ca 100644 --- a/share/metkit/language.yaml +++ b/share/metkit/language.yaml @@ -777,16 +777,16 @@ _field: &_field - [c4, 1021, 'C4 crops'] - [fltr, 1022, 'Flooded trees'] - [flgr, 1023, 'Flooded grassland'] - - [lcz1, 1024, 'Local climate zone 1: compact high-rise (buildings)'] - - [lcz2, 1025, 'Local climate zone 2: compact midrise (buildings)'] - - [lcz3, 1026, 'Local climate zone 3: compact low-rise (buildings)'] - - [lcz4, 1027, 'Local climate zone 4: open high-rise (buildings)'] - - [lcz5, 1028, 'Local climate zone 5: open midrise (buildings)'] - - [lcz6, 1029, 'Local climate zone 6: open low-rise (buildings)'] - - [lcz7, 1030, 'Local climate zone 7: lightweight low-rise (buildings)'] - - [lcz8, 1031, 'Local climate zone 8: large low-rise (buildings)'] - - [lcz9, 1032, 'Local climate zone 9: sparsely built (buildings)'] - - [lcz10, 1033, 'Local climate zone 10: heavy industry (buildings)'] + - [lcz1, 1024, 'Local climate zone 1 - compact high-rise (buildings)'] + - [lcz2, 1025, 'Local climate zone 2 - compact midrise (buildings)'] + - [lcz3, 1026, 'Local climate zone 3 - compact low-rise (buildings)'] + - [lcz4, 1027, 'Local climate zone 4 - open high-rise (buildings)'] + - [lcz5, 1028, 'Local climate zone 5 - open midrise (buildings)'] + - [lcz6, 1029, 'Local climate zone 6 - open low-rise (buildings)'] + - [lcz7, 1030, 'Local climate zone 7 - lightweight low-rise (buildings)'] + - [lcz8, 1031, 'Local climate zone 8 - large low-rise (buildings)'] + - [lcz9, 1032, 'Local climate zone 9 - sparsely built (buildings)'] + - [lcz10, 1033, 'Local climate zone 10 - heavy industry (buildings)'] - [tebdu, 1034, 'Urban temperate broadleaf deciduous'] - [trbdu, 1035, 'Urban tropical broadleaf deciduous'] - [tebeu, 1036, 'Urban temperate broadleaf evergreen'] @@ -886,8 +886,8 @@ _field: &_field - [tneco, 4004, 'Tree cover, needleleaved evergreen, closed to open (>15%)'] - [tndco, 4005, 'Tree cover, needleleaved deciduous, closed to open (>15%)'] - [tmlco, 4006, 'Tree cover, mixed leaftype, closed to open (>15%)'] - - [tcoff, 4007, 'Tree cover, closed to open (>15%), regularly flooded, fresh or brackish water: swamp forests'] - - [tcofs, 4008, 'Tree cover, closed to open (>15%), regularly flooded, saline water: mangrove forests'] + - [tcoff, 4007, 'Tree cover, closed to open (>15%), regularly flooded, fresh or brackish water - swamp forests'] + - [tcofs, 4008, 'Tree cover, closed to open (>15%), regularly flooded, saline water - mangrove forests'] - [mtvg, 4009, 'Mosaic of tree cover and other natural vegetation (crop component possible)'] - [tburn, 4010, 'Tree cover, burnt (mainly boreal forests)'] - [scoe, 4011, 'Shrubcover, closed to open (>15%), evergreen (broadleaved or needleleaved)'] From 1af78cf0eb75bfe65fcff95051ab7b87e2ca88a2 Mon Sep 17 00:00:00 2001 From: Matthew Griffith Date: Wed, 22 Apr 2026 16:08:35 +0100 Subject: [PATCH 3/3] METK-163: Resolve PR comments --- share/metkit/language.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/metkit/language.yaml b/share/metkit/language.yaml index 5a105af2..fea2ad06 100644 --- a/share/metkit/language.yaml +++ b/share/metkit/language.yaml @@ -757,7 +757,7 @@ _field: &_field - [bare, 3, 'Bare areas'] - [hiv, 4, 'High vegetation'] - [lov, 5, 'Low vegetation'] - - [urban, 6, 'Urban'] + - [urban, 6] # 1001-1500 Reserved for tile class entries for tile models using the ECOCLIMAP-SG land cover survey - [seao, 1001, 'Sea and oceans'] - [lake, 1002, 'Lakes'] @@ -853,7 +853,7 @@ _field: &_field - [info, 2019, 'Interrupted forest'] - [wlmi, 2020, 'Water and land mixtures'] - [baso, 2021, 'Bare soil'] - - [urba, 2022, 'Urban'] + - [urba, 2022, 'Urban (GLCC BATS)'] - [lori, 2023, 'Low-rise building'] - [hiri, 2024, 'High-rise building'] # 2501-3000 Reserved for tile grouping entries for tile models using the GLCC v2.0 BATS Classification survey @@ -862,7 +862,7 @@ _field: &_field # 3001-3500 Reserved for tile class entries for tile models using the ESA-GlobCover GCV2009 survey - [pfic, 3001, 'Post-flooding or irrigated croplands'] - [racr, 3002, 'Rainfed croplands'] - - [mcve, 3003, 'Mosaic cropland (50%-70%)/vegetation (grassland, 'shrubland, forest) (20-50%)'] + - [mcve, 3003, 'Mosaic cropland (50%-70%)/vegetation (grassland, shrubland, forest) (20-50%)'] - [mvcr, 3004, 'Mosaic vegetation (grassland, shrubland, forest) (50%-70%)/cropland (20%-50%)'] - [cobs, 3005, 'Closed to open (>15%) broadleaved evergreen and/or semi-deciduous forest (>5m)'] - [clbd, 3006, 'Closed (>40%) broadleaved deciduous forest (>5m)'] @@ -879,7 +879,7 @@ _field: &_field - [clbff, 3017, 'Closed (>40%) broadleaved forest or shrubland permanently flooded - saline or brackish water'] - [covef, 3018, 'Closed to open (>15%) vegetation (grassland, shrubland, woody vegetation) on regularly flooded or waterlogged soil - fresh, brackish or saline water'] - [asaa, 3019, 'Artificial surfaces and associated areas (urban areas >50%)'] - - [baar, 3020, 'Bare areas'] + - [baar, 3020, 'Bare areas (GCV2009)'] - [wabo, 3021, 'Water bodies'] - [pesi, 3022, 'Permanent snow and ice'] # 3501-4000 Reserved for tile grouping entries for tile models using the ESA-GlobCover GCV2009 survey @@ -903,7 +903,7 @@ _field: &_field - [crop, 4016, 'Cropland (upland crops or inundated/ flooded crops)'] - [mctnv, 4017, 'Mosaic of cropland / tree cover/ other natural vegetation'] - [mcsh, 4018, 'Mosaic of cropland / shrub or herbaceous cover'] - - [baare, 4019, 'Bare areas'] + - [baare, 4019, 'Bare areas (GLC2000)'] - [wbna, 4020, 'Water bodies (natural or artificial)'] - [sina, 4021, 'Snow or ice (natural or artificial)'] - [urar, 4022, 'Urban areas'] @@ -934,7 +934,7 @@ _field: &_field dataset: [on-demand-extremes-dt] type: enum values: - - [unknown, 0, Unknown] + - [unknown, 0] - [simple, 1, Simple tile scheme configuration with most-grouped tiles] - [granular, 2, Granular tile scheme configuration with most-separated tile groupings] default: none