Merge pull request #36 from znicholls/fix-area-label-handling

Fix up area label generation

Author: znicholls

changelog/36.breaking.md

@@ -0,0 +1,2 @@
+Updated generation of area labels. The labels are now set based on keywords only, all searching for `where` or `area: mean` has been removed.
+Most notably, this means the cell methods `area: time: mean (over land and sea ice)` will now get the area label `lsi` whereas previously it was assigned `u`.

src/cmip_branded_variable_mapper/area_label.py

@@ -10,31 +10,31 @@
 
 AREA_LABEL_CELL_METHODS_MAPPER = CellMethodsSubStringMapperOrdered.from_unordered(
     {
-        "area: mean (over land and sea ice)": "lsi",
-        "where air": "air",
-        "where cloud": "cl",
-        "where convective_cloud": "ccl",
-        "where crops": "crp",
-        "where floating_ice_shelf": "fis",
-        "where grounded_ice_sheet": "gis",
-        "where ice_free_sea": "ifs",
-        "where ice_sheet": "is",
-        "where land": "lnd",
-        "where land_ice": "li",
-        "where natural_grasses": "ng",
-        "where pastures": "pst",
-        "where sea": "sea",
-        "where sea_ice": "si",
-        "where sea_ice_melt_pond": "simp",
-        "where sea_ice_ridges": "sir",
-        "where sector": "multi",
-        "where shrubs": "shb",
-        "where snow": "sn",
-        "where stratiform_cloud": "scl",
-        "where trees": "tree",
-        "where unfrozen_soil": "ufs",
-        "where vegetation": "veg",
-        "where wetland": "wl",
+        "over land and sea ice": "lsi",
+        "air": "air",
+        "cloud": "cl",
+        "convective_cloud": "ccl",
+        "crops": "crp",
+        "floating_ice_shelf": "fis",
+        "grounded_ice_sheet": "gis",
+        "ice_free_sea": "ifs",
+        "ice_sheet": "is",
+        "land": "lnd",
+        "land_ice": "li",
+        "natural_grasses": "ng",
+        "pastures": "pst",
+        "sea": "sea",
+        "sea_ice": "si",
+        "sea_ice_melt_pond": "simp",
+        "sea_ice_ridges": "sir",
+        "sector": "multi",
+        "shrubs": "shb",
+        "snow": "sn",
+        "stratiform_cloud": "scl",
+        "trees": "tree",
+        "unfrozen_soil": "ufs",
+        "vegetation": "veg",
+        "wetland": "wl",
     }
 )
 """

tests/unit/test_map_to_cmip_branded_variable.py

@@ -189,6 +189,7 @@ def test_horizontal_labels(dimensions, exp_horizontal_label):
     "cell_methods, exp_area_label",
     (
         ("area: mean (over land and sea ice) time: point", "lsi"),
+        ("area: time: mean (over land and sea ice)", "lsi"),
         ("area: mean where cloud time: point", "cl"),
     ),
 )