Skip to content

Commit a315255

Browse files
authored
Test creating overviews for multiple netcdf files with multiple bands (#119)
1 parent f69c00f commit a315255

7 files changed

Lines changed: 168 additions & 221 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
__pycache__/
22
.pytest_cache/
33
examples/large_geotiff/
4+
examples/multi_netcdf/
45
mapshader.egg-info/
56
mapshader/.version

example_multiband/create_multiband_netcdf.py

Lines changed: 0 additions & 71 deletions
This file was deleted.

example_multiband/multiband_netcdf.yaml

Lines changed: 0 additions & 98 deletions
This file was deleted.

example_multiband/run_multiband_netcdf.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

examples/multi_netcdf.yaml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
---
2+
sources:
3+
- name: Multi Netcdf constant
4+
key: multi-netcdf-constant
5+
text: multi netcdf constant
6+
description: multi netcdf constant
7+
geometry_type: raster
8+
shade_how: linear
9+
cmap:
10+
- white
11+
- red
12+
span:
13+
- 0
14+
- 1
15+
raster_interpolate: linear
16+
xfield: geometry
17+
yfield: geometry
18+
filepath: examples/multi_netcdf/multi_*.nc
19+
band: constant
20+
transforms:
21+
- name: reproject_raster
22+
args:
23+
epsg: 3857
24+
- name: build_raster_overviews
25+
args:
26+
levels:
27+
0: 256
28+
1: 512
29+
2: 1024
30+
3: 2048
31+
4: 4096
32+
5: 8192
33+
6: 16384
34+
service_types:
35+
- tile
36+
37+
- name: Multi Netcdf increasing
38+
key: multi-netcdf-increasing
39+
text: multi netcdf increasing
40+
description: multi netcdf increasing
41+
geometry_type: raster
42+
shade_how: linear
43+
cmap:
44+
- black
45+
- yellow
46+
span:
47+
- 0
48+
- 10
49+
raster_interpolate: linear
50+
xfield: geometry
51+
yfield: geometry
52+
filepath: examples/multi_netcdf/multi_*.nc
53+
band: increasing
54+
transforms:
55+
- name: reproject_raster
56+
args:
57+
epsg: 3857
58+
- name: build_raster_overviews
59+
args:
60+
levels:
61+
0: 256
62+
1: 512
63+
2: 1024
64+
3: 2048
65+
4: 4096
66+
5: 8192
67+
6: 16384
68+
service_types:
69+
- tile

mapshader/multifile.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,13 @@ def load_bounds(self, xmin, ymin, xmax, ymax, band, transforms):
280280
da.rio.set_crs(crs, inplace=True)
281281
arrays.append(da)
282282

283-
if len(arrays) == 1:
284-
merged = arrays[0]
285-
else:
286-
merged = merge_arrays(arrays)
283+
if len(arrays) == 1:
284+
merged = arrays[0]
285+
else:
286+
merged = merge_arrays(arrays)
287287

288-
merged = merged.squeeze()
288+
merged = merged.squeeze()
289289

290-
with self._lock:
291290
merged = self._apply_transforms(merged, transforms)
292291

293292
return merged

0 commit comments

Comments
 (0)