Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
__pycache__/
.pytest_cache/
examples/large_geotiff/
examples/multi_netcdf/
mapshader.egg-info/
mapshader/.version
71 changes: 0 additions & 71 deletions example_multiband/create_multiband_netcdf.py

This file was deleted.

98 changes: 0 additions & 98 deletions example_multiband/multiband_netcdf.yaml

This file was deleted.

46 changes: 0 additions & 46 deletions example_multiband/run_multiband_netcdf.py

This file was deleted.

69 changes: 69 additions & 0 deletions examples/multi_netcdf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
---
sources:
- name: Multi Netcdf constant
key: multi-netcdf-constant
text: multi netcdf constant
description: multi netcdf constant
geometry_type: raster
shade_how: linear
cmap:
- white
- red
span:
- 0
- 1
raster_interpolate: linear
xfield: geometry
yfield: geometry
filepath: examples/multi_netcdf/multi_*.nc
band: constant
transforms:
- name: reproject_raster
args:
epsg: 3857
- name: build_raster_overviews
args:
levels:
0: 256
1: 512
2: 1024
3: 2048
4: 4096
5: 8192
6: 16384
service_types:
- tile

- name: Multi Netcdf increasing
key: multi-netcdf-increasing
text: multi netcdf increasing
description: multi netcdf increasing
geometry_type: raster
shade_how: linear
cmap:
- black
- yellow
span:
- 0
- 10
raster_interpolate: linear
xfield: geometry
yfield: geometry
filepath: examples/multi_netcdf/multi_*.nc
band: increasing
transforms:
- name: reproject_raster
args:
epsg: 3857
- name: build_raster_overviews
args:
levels:
0: 256
1: 512
2: 1024
3: 2048
4: 4096
5: 8192
6: 16384
service_types:
- tile
11 changes: 5 additions & 6 deletions mapshader/multifile.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,13 @@ def load_bounds(self, xmin, ymin, xmax, ymax, band, transforms):
da.rio.set_crs(crs, inplace=True)
arrays.append(da)

if len(arrays) == 1:
merged = arrays[0]
else:
merged = merge_arrays(arrays)
if len(arrays) == 1:
merged = arrays[0]
else:
merged = merge_arrays(arrays)

merged = merged.squeeze()
merged = merged.squeeze()

with self._lock:
merged = self._apply_transforms(merged, transforms)

return merged
Expand Down
Loading