diff --git a/odc/stats/plugins/l34_utils/l4_bare_gradation.py b/odc/stats/plugins/l34_utils/l4_bare_gradation.py index 3acbcf9c..da675d46 100644 --- a/odc/stats/plugins/l34_utils/l4_bare_gradation.py +++ b/odc/stats/plugins/l34_utils/l4_bare_gradation.py @@ -23,7 +23,7 @@ def bare_gradation(xx: xr.Dataset, bare_threshold, veg_cover): dtype="uint8", **{"nodata": NODATA}, ) - + # 60% <= data --> 15 bs_mask = expr_eval( "where((a>=m)&(a!=nodata), 15, a)", diff --git a/odc/stats/plugins/l34_utils/l4_veg_cover.py b/odc/stats/plugins/l34_utils/l4_veg_cover.py index 904db0f1..3fc08d02 100644 --- a/odc/stats/plugins/l34_utils/l4_veg_cover.py +++ b/odc/stats/plugins/l34_utils/l4_veg_cover.py @@ -15,7 +15,7 @@ def canopyco_veg_con(xx: xr.Dataset, veg_threshold): dtype="float32", **{"nodata": NODATA}, ) - + # Map any data > 100 ---> 100 pv_pc_50 = expr_eval( "where((a>100) & (a!=nodata), 100, a)", diff --git a/odc/stats/plugins/l34_utils/l4_water_persistence.py b/odc/stats/plugins/l34_utils/l4_water_persistence.py index 19c96f37..fdab934c 100644 --- a/odc/stats/plugins/l34_utils/l4_water_persistence.py +++ b/odc/stats/plugins/l34_utils/l4_water_persistence.py @@ -7,7 +7,7 @@ def water_persistence(xx: xr.Dataset, watper_threshold): - + # Address nan water_frequency = expr_eval( "where((a!=a), nodata, a)", diff --git a/odc/stats/plugins/l34_utils/lc_water_seasonality.py b/odc/stats/plugins/l34_utils/lc_water_seasonality.py index 1c3ed734..283eafda 100644 --- a/odc/stats/plugins/l34_utils/lc_water_seasonality.py +++ b/odc/stats/plugins/l34_utils/lc_water_seasonality.py @@ -8,7 +8,7 @@ def water_seasonality(xx: xr.Dataset, water_seasonality_threshold): # >= 3 months ----> 1 Semi-permanent or permanent # < 3 months ----> 2 Temporary or seasonal - + # Apply nodata water_frequency = expr_eval( "where((a!=a), nodata, a)", diff --git a/tests/test_lc_l4_ctv.py b/tests/test_lc_l4_ctv.py index 7375e7e4..8592c9dc 100644 --- a/tests/test_lc_l4_ctv.py +++ b/tests/test_lc_l4_ctv.py @@ -134,9 +134,7 @@ def test_ctv_classes_woody(): lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ctv.compute() == expected_cultivated_classes).all() @@ -216,9 +214,7 @@ def test_ctv_classes_herbaceous(): lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ctv.compute() == expected_cultivated_classes).all() @@ -297,9 +293,7 @@ def test_ctv_classes_woody_herbaceous(): lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ctv.compute() == expected_cultivated_classes).all() @@ -379,7 +373,5 @@ def test_ctv_classes_no_vegcover(): lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ctv.compute() == expected_cultivated_classes).all() diff --git a/tests/test_lc_l4_natural_surface.py b/tests/test_lc_l4_natural_surface.py index 29b80d7b..b11389ae 100644 --- a/tests/test_lc_l4_natural_surface.py +++ b/tests/test_lc_l4_natural_surface.py @@ -179,9 +179,7 @@ def test_ns(): veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) # Apply cultivated to match the code in Level4 processing - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover) water_seasonality = lc_water_seasonality.water_seasonality( diff --git a/tests/test_lc_l4_nav.py b/tests/test_lc_l4_nav.py index 7e6f0bc2..d76a7873 100644 --- a/tests/test_lc_l4_nav.py +++ b/tests/test_lc_l4_nav.py @@ -153,9 +153,7 @@ def test_ntv_classes_woody_herbaceous(): veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) # Apply cultivated to match the code in Level4 processing - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover) water_seasonality = lc_water_seasonality.water_seasonality( @@ -255,9 +253,7 @@ def test_ntv_herbaceous_seasonal_water_veg_cover(): veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) # Apply cultivated to match the code in Level4 processing - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover) water_seasonality = lc_water_seasonality.water_seasonality( @@ -357,9 +353,7 @@ def test_ntv_woody_seasonal_water_veg_cover(): veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) # Apply cultivated to match the code in Level4 processing - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover) water_seasonality = lc_water_seasonality.water_seasonality( @@ -454,9 +448,7 @@ def test_ntv_herbaceous_permanent_water_veg_cover(): veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) # Apply cultivated to match the code in Level4 processing - l4_ctv = l4_cultivated.lc_l4_cultivated( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover) l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover) water_seasonality = lc_water_seasonality.water_seasonality( diff --git a/tests/test_lc_l4_ntv.py b/tests/test_lc_l4_ntv.py index e63ec600..9cea5d55 100644 --- a/tests/test_lc_l4_ntv.py +++ b/tests/test_lc_l4_ntv.py @@ -136,9 +136,7 @@ def test_ntv_classes_herbaceous(): level3 = lc_level3.lc_level3(xx) lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ntv = l4_natural_veg.lc_l4_natural_veg( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all() @@ -217,9 +215,7 @@ def test_ntv_classes_woody(): lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ntv = l4_natural_veg.lc_l4_natural_veg( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all() @@ -297,9 +293,7 @@ def test_ntv_classes_no_veg(): level3 = lc_level3.lc_level3(xx) lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ntv = l4_natural_veg.lc_l4_natural_veg( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all() @@ -377,7 +371,5 @@ def test_ntv_classes_no_lifeform(): level3 = lc_level3.lc_level3(xx) lifeform = lc_lifeform.lifeform(xx) veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold) - l4_ntv = l4_natural_veg.lc_l4_natural_veg( - xx.level_3_4, level3, lifeform, veg_cover - ) + l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover) assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all()