This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch tmp-stv in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
commit 43fee3272bab75250a22a64870d24f196e9c3832 Author: rileykk <[email protected]> AuthorDate: Tue Nov 7 07:33:56 2023 -0800 Elevation array shape + add to nexuspoint --- data-access/nexustiles/model/nexusmodel.py | 16 ++++++++++++++-- data-access/nexustiles/nexustiles.py | 6 +++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/data-access/nexustiles/model/nexusmodel.py b/data-access/nexustiles/model/nexusmodel.py index f2ab136..e679be4 100644 --- a/data-access/nexustiles/model/nexusmodel.py +++ b/data-access/nexustiles/model/nexusmodel.py @@ -138,7 +138,13 @@ class Tile(object): data_vals = [data[index] for data in self.data] else: data_vals = self.data[index] - point = NexusPoint(lat, lon, None, time, index, data_vals) + + if self.elevation is not None: + elevation = self.elevation[index] + else: + elevation = np.nan + + point = NexusPoint(lat, lon, elevation, time, index, data_vals) yield point else: for index in indices: @@ -150,7 +156,13 @@ class Tile(object): data_vals = [data[index] for data in self.data] else: data_vals = self.data[index] - point = NexusPoint(lat, lon, None, time, index, data_vals) + + if self.elevation is not None: + elevation = self.elevation[index] + else: + elevation = np.nan + + point = NexusPoint(lat, lon, elevation, time, index, data_vals) yield point def get_indices(self, include_nan=False): diff --git a/data-access/nexustiles/nexustiles.py b/data-access/nexustiles/nexustiles.py index ffa9b26..81532c2 100644 --- a/data-access/nexustiles/nexustiles.py +++ b/data-access/nexustiles/nexustiles.py @@ -504,7 +504,11 @@ class NexusTileService(object): a_tile.data = data a_tile.meta_data = meta a_tile.is_multi = is_multi_var - a_tile.elevation = tile_data_by_id[a_tile.tile_id].get_elevation_array() + + elevation = tile_data_by_id[a_tile.tile_id].get_elevation_array() + + if elevation is not None: + a_tile.elevation = np.broadcast_arrays(elevation, data)[0] del (tile_data_by_id[a_tile.tile_id])
