ECC-1537: Beautification of ls, tile and mars

namespaces
ecmwf · Nov 24, 2023 · 775c793 · 775c793
1 parent 2b88fa1
commit 775c793
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/definitions/grib2/tables/32/4.242.table b/definitions/grib2/tables/32/4.242.table
@@ -1,10 +1,10 @@
 # Code table 4.242 - Tile classification
 0 0 Reserved
-1 1 Land use classes according to ESA-GlobCover GCV2009
-2 2 Land use classes according to European Commission-Global Land Cover Project GLC2000
-3 3 Land use classes according to ECOCLIMAP
-4 4 Land use classes according to ECOCLIMAP-SG
-5 5 Land use classes according to USGS EROS Global Land Cover Characterization (GLCC) v2.0 BATS Classification
+1 GCV2009 Land use classes according to ESA-GlobCover GCV2009
+2 GLC2000 Land use classes according to European Commission-Global Land Cover Project GLC2000
+3 ECOCLIMAP Land use classes according to ECOCLIMAP
+4 ECOCLIMAP-SG Land use classes according to ECOCLIMAP-SG
+5 GLCCv2.0 Land use classes according to USGS EROS Global Land Cover Characterization (GLCC) v2.0 BATS Classification
 # 6-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing value
diff --git a/definitions/grib2/template.4.generalised_tile.def b/definitions/grib2/template.4.generalised_tile.def
@@ -1,8 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
 # Generalised tile specifications
-codetable[1] tileClassification ('4.242.table',masterDir,localDir) : dump;
-codetable[2] typeOfTile ('4.252.table',masterDir,localDir) : dump;
+codetable[1] tileClassification ('4.242.table',masterDir,localDir) : dump, string_type;
+codetable[2] typeOfTile ('4.252.table',masterDir,localDir) : dump, string_type;
 unsigned[1]  numberOfUsedSpatialTiles=1 : dump; # Maximum number of tiles used in the entire grid
 unsigned[1]  numberOfUsedTileAttributeCombinationsForTypeOfTile=1 : dump; # Number of tile attributes for a given tile in the gridbox
 unsigned[1]  numberOfUsedTileAttributesForTileAttributeCombination=1 : dump; # Number of used attributes in a given combination
@@ -15,18 +15,35 @@ transient unknownCombinationOfAttributesOfTile = "unknown";
 concept combinationOfAttributesOfTile (unknownCombinationOfAttributesOfTile,"combinationOfAttributesOfTileConcept.def",conceptsDir2,conceptsDir1): no_copy,dump;
 byte[16] uuidOfDataGroup : dump; # UUID of data group
 
-alias NT=totalNumberOfTileAttributeCombinations;
-alias NUT=numberOfUsedSpatialTiles;
-alias ITN=tileIndex;
-alias NATC=numberOfUsedTileAttributeCombinationsForTypeOfTile;
+# Extract long name (title) + part in brackets (grouping)
+meta tileGrouping codetable_units(typeOfTile) : dump;
+meta tileName  codetable_title(typeOfTile) : dump;
+
 alias uuid=uuidOfDataGroup;
+
 alias ls.tile=typeOfTile;
 alias ls.tileAttribute=combinationOfAttributesOfTile;
+
+# Create transients to reorder keys in the namespace
+
+transient tempTileAttribute=combinationOfAttributesOfTile;
+transient tempTile=typeOfTile;
+transient tempTileName=tileName;
+
 alias tile.tileIndex=tileIndex;
-alias tile.tile=typeOfTile;
-alias tile.tileAttribute=combinationOfAttributesOfTile;
-alias tile.nTiles=numberOfUsedSpatialTiles;
-alias tile.totalTileAttCombo=totalNumberOfTileAttributeCombinations;
-alias tile.nTileAttCombo=numberOfUsedTileAttributeCombinationsForTypeOfTile;
-alias tile.nTileAtt=numberOfUsedTileAttributesForTileAttributeCombination;
-alias tile.uuid=uuidOfDataGroup;
+alias tile=tempTile;
+alias tile.tile=tile;
+alias tile.tileName=tempTileName;
+alias tileAttribute=tempTileAttribute;
+alias tile.tileAttribute=tileAttribute;
+alias nTiles=numberOfUsedSpatialTiles;
+alias tile.nTiles=nTiles;
+alias totalTileAttCombo=totalNumberOfTileAttributeCombinations;
+alias tile.totalTileAttCombo=totalTileAttCombo;
+alias nTileAttCombo=numberOfUsedTileAttributeCombinationsForTypeOfTile;
+alias tile.nTileAttCombo=nTileAttCombo;
+
+alias mars.tile=typeOfTile;
+alias mars.tileAttribute=tileAttribute;
+transient paramtype = "tile";
+alias mars.paramType=paramtype;