Skip to content

Commit f3e776c

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

File tree

6 files changed

+12
-23
lines changed

6 files changed

+12
-23
lines changed

odc/stats/plugins/l34_utils/l4_cultivated.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
def lc_l4_cultivated(l34, level3, woody, veg_cover):
7-
7+
88
woody = expr_eval(
99
"where((a!=a), nodata, a)",
1010
{"a": woody.data},
@@ -13,7 +13,7 @@ def lc_l4_cultivated(l34, level3, woody, veg_cover):
1313
**{"nodata": NODATA},
1414
)
1515

16-
# the 4-8 classes can't happen in LC since cultivated class will not be classified if vegetation doesn't exist.
16+
# the 4-8 classes can't happen in LC since cultivated class will not be classified if vegetation doesn't exist.
1717
# skip these classes in level4
1818
l4 = expr_eval(
1919
"where((a==111), 1, d)",
@@ -42,7 +42,7 @@ def lc_l4_cultivated(l34, level3, woody, veg_cover):
4242
name="mark_cultivated",
4343
dtype="uint8",
4444
)
45-
45+
4646
l4 = expr_eval(
4747
"where((a==111)&(b==12)&(c==113), 10, d)",
4848
{"a": level3, "b": veg_cover, "c": woody, "d": l4},
@@ -101,8 +101,4 @@ def lc_l4_cultivated(l34, level3, woody, veg_cover):
101101
dtype="uint8",
102102
)
103103

104-
105-
106-
107-
108104
return l4

odc/stats/plugins/l34_utils/l4_natural_veg.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ def lc_l4_natural_veg(l4, l3, woody, veg_cover):
1212
dtype="float32",
1313
**{"nodata": NODATA},
1414
)
15-
15+
1616
l4 = expr_eval(
1717
"where((b==nodata), nodata, a)",
1818
{"a": l4, "b": l3},
1919
name="mark_cultivated",
2020
dtype="uint8",
2121
**{"nodata": NODATA},
2222
)
23-
23+
2424
l4 = expr_eval(
2525
"where((a==112), 19, d)",
2626
{"a": l3, "d": l4},
2727
name="mark_cultivated",
2828
dtype="uint8",
2929
)
30-
30+
3131
l4 = expr_eval(
3232
"where((a==112)&(b==113), 20, d)",
3333
{"a": l3, "b": woody, "d": l4},
@@ -137,6 +137,4 @@ def lc_l4_natural_veg(l4, l3, woody, veg_cover):
137137
dtype="uint8",
138138
)
139139

140-
141-
142140
return l4

odc/stats/plugins/l34_utils/l4_surface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ def lc_l4_surface(l4, level3, bare_gradation):
3333
name="mark_surface",
3434
dtype="uint8",
3535
)
36-
36+
3737
return l4

odc/stats/plugins/l34_utils/l4_water.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
def water_classification(xx, water_persistence):
77

8-
98
# Replace nan with nodata
109
l4 = expr_eval(
1110
"where((a==a), a, nodata)",
@@ -14,7 +13,7 @@ def water_classification(xx, water_persistence):
1413
dtype="uint8",
1514
**{"nodata": NODATA},
1615
)
17-
16+
1817
intertidal_mask = expr_eval(
1918
"where(a==_u, 1, 0)",
2019
{"a": l4},

tests/test_lc_l4_ctv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ def test_ctv_classes_no_vegcover():
365365

366366
stats_l4 = StatsLccsLevel4()
367367
level3 = lc_level3.lc_level3(xx)
368-
368+
369369
veg_cover = l4_veg_cover.canopyco_veg_con(xx, stats_l4.veg_threshold)
370370
l4_ctv = l4_cultivated.lc_l4_cultivated(xx.level_3_4, level3, xx.woody, veg_cover)
371-
371+
372372
assert (l4_ctv.compute() == expected_cultivated_classes).all()

tests/test_lc_l4_water.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ def test_water_classes():
168168
xx, stats_l4.watper_threshold
169169
)
170170

171-
l4_water_classes = l4_water.water_classification(
172-
xx, water_persistence
173-
)
171+
l4_water_classes = l4_water.water_classification(xx, water_persistence)
174172

175173
assert (l4_water_classes.compute() == expected_water_classes).all()
176174

@@ -276,8 +274,6 @@ def test_water_intertidal():
276274
xx, stats_l4.watper_threshold
277275
)
278276

279-
l4_water_classes = l4_water.water_classification(
280-
xx, water_persistence
281-
)
277+
l4_water_classes = l4_water.water_classification(xx, water_persistence)
282278

283279
assert (l4_water_classes.compute() == expected_water_classes).all()

0 commit comments

Comments
 (0)