Skip to content

Commit 3c30a10

Browse files
committed
update cloud path for v7.1 and add single-channel versions to make hybrids with ghsl
1 parent 8fdbef6 commit 3c30a10

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

src/rra_building_density/constants.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def name(self) -> str:
4141

4242
class MicrosoftVersion(BuiltVersion):
4343
provider: Literal["microsoft"] = "microsoft"
44-
version: Literal["v2", "v3", "v4", "v5", "v6", "v7", "v7_1", "v7_e101", "water_mask"]
44+
version: Literal["v2", "v3", "v4", "v5", "v6", "v7", "v7_1", "v7_1_d", "v7_1_h", "water_mask"]
4545
bands: dict[str, int]
4646

4747
def process_resources(self, resolution: str) -> tuple[str, str]:
@@ -117,21 +117,35 @@ def process_resources(self, resolution: str) -> tuple[str, str]:
117117
),
118118
"7_1": MicrosoftVersion(
119119
version="v7_1",
120-
time_points=['2020q2', '2024q2'],
121-
input_template="predictions/{time_point}/model_v7_ensemble_6-25-25/*",
120+
time_points=[
121+
f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
122+
][1:-2],
123+
input_template="predictions/{time_point}/v7_ensemble_7-3-25/*",
122124
raw_output_template="{time_point}/{tile_key}.tif",
123125
bands={
124126
"density": 1,
125127
"height": 2,
126128
},
127129
),
128-
"7_e101": MicrosoftVersion(
129-
version="v7_e101",
130-
time_points=['2023q4'],
131-
input_template="predictions/{time_point}/itu_combined_2023q4_6-29-25/*",
130+
"7_1_d": MicrosoftVersion(
131+
version="v7_1_d",
132+
time_points=[
133+
f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
134+
][1:-2],
135+
input_template="predictions/{time_point}/v7_ensemble_7-3-25/*",
132136
raw_output_template="{time_point}/{tile_key}.tif",
133137
bands={
134138
"density": 1,
139+
},
140+
),
141+
"7_1_h": MicrosoftVersion(
142+
version="v7_1_h",
143+
time_points=[
144+
f"{y}q{q}" for y, q in itertools.product(range(2020, 2025), range(1, 5))
145+
][1:-2],
146+
input_template="predictions/{time_point}/v7_ensemble_7-3-25/*",
147+
raw_output_template="{time_point}/{tile_key}.tif",
148+
bands={
135149
"height": 2,
136150
},
137151
),
@@ -146,7 +160,7 @@ def process_resources(self, resolution: str) -> tuple[str, str]:
146160
),
147161
}
148162

149-
LATEST_MICROSOFT_VERSION = MICROSOFT_VERSIONS["7"]
163+
LATEST_MICROSOFT_VERSION = MICROSOFT_VERSIONS["7_1"]
150164

151165

152166
class GHSLVersion(BuiltVersion):

0 commit comments

Comments
 (0)