Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 19, 2024
1 parent fd6f799 commit 1eab12f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 43 deletions.
2 changes: 1 addition & 1 deletion odc/stats/plugins/l34_utils/l4_bare_gradation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion odc/stats/plugins/l34_utils/l4_veg_cover.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion odc/stats/plugins/l34_utils/l4_water_persistence.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def water_persistence(xx: xr.Dataset, watper_threshold):

# Address nan
water_frequency = expr_eval(
"where((a!=a), nodata, a)",
Expand Down
2 changes: 1 addition & 1 deletion odc/stats/plugins/l34_utils/lc_water_seasonality.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
16 changes: 4 additions & 12 deletions tests/test_lc_l4_ctv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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()


Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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()
4 changes: 1 addition & 3 deletions tests/test_lc_l4_natural_surface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
16 changes: 4 additions & 12 deletions tests/test_lc_l4_nav.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
16 changes: 4 additions & 12 deletions tests/test_lc_l4_ntv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down Expand Up @@ -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()


Expand Down Expand Up @@ -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()


Expand Down Expand Up @@ -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()

0 comments on commit 1eab12f

Please sign in to comment.