Skip to content

Commit 1eab12f

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent fd6f799 commit 1eab12f

File tree

8 files changed

+17
-43
lines changed

8 files changed

+17
-43
lines changed

odc/stats/plugins/l34_utils/l4_bare_gradation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def bare_gradation(xx: xr.Dataset, bare_threshold, veg_cover):
2323
dtype="uint8",
2424
**{"nodata": NODATA},
2525
)
26-
26+
2727
# 60% <= data --> 15
2828
bs_mask = expr_eval(
2929
"where((a>=m)&(a!=nodata), 15, a)",

odc/stats/plugins/l34_utils/l4_veg_cover.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def canopyco_veg_con(xx: xr.Dataset, veg_threshold):
1515
dtype="float32",
1616
**{"nodata": NODATA},
1717
)
18-
18+
1919
# Map any data > 100 ---> 100
2020
pv_pc_50 = expr_eval(
2121
"where((a>100) & (a!=nodata), 100, a)",

odc/stats/plugins/l34_utils/l4_water_persistence.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
def water_persistence(xx: xr.Dataset, watper_threshold):
10-
10+
1111
# Address nan
1212
water_frequency = expr_eval(
1313
"where((a!=a), nodata, a)",

odc/stats/plugins/l34_utils/lc_water_seasonality.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
def water_seasonality(xx: xr.Dataset, water_seasonality_threshold):
99
# >= 3 months ----> 1 Semi-permanent or permanent
1010
# < 3 months ----> 2 Temporary or seasonal
11-
11+
1212
# Apply nodata
1313
water_frequency = expr_eval(
1414
"where((a!=a), nodata, a)",

tests/test_lc_l4_ctv.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ def test_ctv_classes_woody():
134134
lifeform = lc_lifeform.lifeform(xx)
135135
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
136136

137-
l4_ctv = l4_cultivated.lc_l4_cultivated(
138-
xx.level_3_4, level3, lifeform, veg_cover
139-
)
137+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
140138

141139
assert (l4_ctv.compute() == expected_cultivated_classes).all()
142140

@@ -216,9 +214,7 @@ def test_ctv_classes_herbaceous():
216214
lifeform = lc_lifeform.lifeform(xx)
217215
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
218216

219-
l4_ctv = l4_cultivated.lc_l4_cultivated(
220-
xx.level_3_4, level3, lifeform, veg_cover
221-
)
217+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
222218
assert (l4_ctv.compute() == expected_cultivated_classes).all()
223219

224220

@@ -297,9 +293,7 @@ def test_ctv_classes_woody_herbaceous():
297293
lifeform = lc_lifeform.lifeform(xx)
298294
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
299295

300-
l4_ctv = l4_cultivated.lc_l4_cultivated(
301-
xx.level_3_4, level3, lifeform, veg_cover
302-
)
296+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
303297

304298
assert (l4_ctv.compute() == expected_cultivated_classes).all()
305299

@@ -379,7 +373,5 @@ def test_ctv_classes_no_vegcover():
379373
lifeform = lc_lifeform.lifeform(xx)
380374
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
381375

382-
l4_ctv = l4_cultivated.lc_l4_cultivated(
383-
xx.level_3_4, level3, lifeform, veg_cover
384-
)
376+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
385377
assert (l4_ctv.compute() == expected_cultivated_classes).all()

tests/test_lc_l4_natural_surface.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@ def test_ns():
179179
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
180180

181181
# Apply cultivated to match the code in Level4 processing
182-
l4_ctv = l4_cultivated.lc_l4_cultivated(
183-
xx.level_3_4, level3, lifeform, veg_cover
184-
)
182+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
185183
l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover)
186184

187185
water_seasonality = lc_water_seasonality.water_seasonality(

tests/test_lc_l4_nav.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ def test_ntv_classes_woody_herbaceous():
153153
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
154154

155155
# Apply cultivated to match the code in Level4 processing
156-
l4_ctv = l4_cultivated.lc_l4_cultivated(
157-
xx.level_3_4, level3, lifeform, veg_cover
158-
)
156+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
159157
l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover)
160158

161159
water_seasonality = lc_water_seasonality.water_seasonality(
@@ -255,9 +253,7 @@ def test_ntv_herbaceous_seasonal_water_veg_cover():
255253
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
256254

257255
# Apply cultivated to match the code in Level4 processing
258-
l4_ctv = l4_cultivated.lc_l4_cultivated(
259-
xx.level_3_4, level3, lifeform, veg_cover
260-
)
256+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
261257
l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover)
262258

263259
water_seasonality = lc_water_seasonality.water_seasonality(
@@ -357,9 +353,7 @@ def test_ntv_woody_seasonal_water_veg_cover():
357353
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
358354

359355
# Apply cultivated to match the code in Level4 processing
360-
l4_ctv = l4_cultivated.lc_l4_cultivated(
361-
xx.level_3_4, level3, lifeform, veg_cover
362-
)
356+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
363357
l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover)
364358

365359
water_seasonality = lc_water_seasonality.water_seasonality(
@@ -454,9 +448,7 @@ def test_ntv_herbaceous_permanent_water_veg_cover():
454448
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
455449

456450
# Apply cultivated to match the code in Level4 processing
457-
l4_ctv = l4_cultivated.lc_l4_cultivated(
458-
xx.level_3_4, level3, lifeform, veg_cover
459-
)
451+
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, lifeform, veg_cover)
460452
l4_ctv_ntv = l4_natural_veg.lc_l4_natural_veg(l4_ctv, level3, lifeform, veg_cover)
461453

462454
water_seasonality = lc_water_seasonality.water_seasonality(

tests/test_lc_l4_ntv.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,7 @@ def test_ntv_classes_herbaceous():
136136
level3 = lc_level3.lc_level3(xx)
137137
lifeform = lc_lifeform.lifeform(xx)
138138
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
139-
l4_ntv = l4_natural_veg.lc_l4_natural_veg(
140-
xx.level_3_4, level3, lifeform, veg_cover
141-
)
139+
l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover)
142140
assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all()
143141

144142

@@ -217,9 +215,7 @@ def test_ntv_classes_woody():
217215
lifeform = lc_lifeform.lifeform(xx)
218216
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
219217

220-
l4_ntv = l4_natural_veg.lc_l4_natural_veg(
221-
xx.level_3_4, level3, lifeform, veg_cover
222-
)
218+
l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover)
223219
assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all()
224220

225221

@@ -297,9 +293,7 @@ def test_ntv_classes_no_veg():
297293
level3 = lc_level3.lc_level3(xx)
298294
lifeform = lc_lifeform.lifeform(xx)
299295
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
300-
l4_ntv = l4_natural_veg.lc_l4_natural_veg(
301-
xx.level_3_4, level3, lifeform, veg_cover
302-
)
296+
l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover)
303297
assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all()
304298

305299

@@ -377,7 +371,5 @@ def test_ntv_classes_no_lifeform():
377371
level3 = lc_level3.lc_level3(xx)
378372
lifeform = lc_lifeform.lifeform(xx)
379373
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
380-
l4_ntv = l4_natural_veg.lc_l4_natural_veg(
381-
xx.level_3_4, level3, lifeform, veg_cover
382-
)
374+
l4_ntv = l4_natural_veg.lc_l4_natural_veg(xx.level_3_4, level3, lifeform, veg_cover)
383375
assert (l4_ntv.compute() == expected_natural_terrestrial_veg_classes).all()

0 commit comments

Comments
 (0)