Skip to content

Commit eb25410

Browse files
committed
Merge remote-tracking branch 'origin/yogesh-xxx-demo-todos' into yogesh-xxx-demo-todos
2 parents 9eb80b4 + 23de761 commit eb25410

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

CHANGES.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@
4545
- Updated schema for the `num_levels` parameter which now explains the parameter
4646
in more detail.
4747

48-
* Improved Extension Demo Panels.
49-
See https://github.com/xcube-dev/xcube/issues/1134
48+
* Improved the demos for the xcube Viewer server-side extensions in various ways (#1134):
49+
- enhanced user input validation
50+
- added error message label
51+
- fixed bugs in code
52+
- improved UI styles and general UX
5053

5154
## Changes in 1.9.0
5255

examples/serve/panels-demo/demo_panels/panel_histo2d.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def render_panel(
6363
)
6464

6565
if time_label:
66-
text = f"{dataset_title} " f"/ {time_label[0:-1]}"
66+
text = f"{dataset_title} / {time_label[0:-1]}"
6767
else:
6868
text = f"{dataset_title}"
6969
place_text = Typography(id="text", children=[text], align="center")
@@ -102,7 +102,7 @@ def render_panel(
102102
)
103103

104104
error_message = Typography(
105-
id="error_message", style={"color": "red"}, children=["Error: Panel Disabled"]
105+
id="error_message", style={"color": "red"}, children=["Missing variable selection"]
106106
)
107107

108108
return Box(
@@ -191,12 +191,12 @@ def update_plot(
191191
):
192192
return (
193193
None,
194-
"Error: 2-D histogram only works for geometries with a non-zero extent.",
194+
"Selected geometry must cover and area.",
195195
)
196196

197197
dataset = mask_dataset_by_geometry(dataset, place_geometry)
198198
if dataset is None:
199-
return None, "Error: dataset is None after masking, invalid geometry?"
199+
return None, "Selected geometry produces empty subset"
200200

201201
var_1_data: np.ndarray = dataset[var_1_name].values.ravel()
202202
var_2_data: np.ndarray = dataset[var_2_name].values.ravel()

examples/serve/panels-demo/demo_panels/panel_spectrum.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def render_panel(
4545
theme=theme_mode,
4646
)
4747
if time_label:
48-
text = f"{dataset_id} " f"/ {time_label[0:-1]}"
48+
text = f"{dataset_id} / {time_label[0:-1]}"
4949
else:
5050
text = f"{dataset_id}"
5151
place_text = Typography(id="text", children=[text], align="center")
@@ -129,7 +129,7 @@ def update_error_message(
129129
return ""
130130

131131

132-
def get_wavelength(
132+
def get_spectra(
133133
dataset: xr.Dataset,
134134
place_group: gpd.GeoDataFrame,
135135
places: list,

xcube/webapi/viewer/contrib/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def get_dataset(ctx: Context, dataset_id: str | None = None) -> xr.Dataset | Non
1717
return get_datasets_ctx(ctx).get_dataset(dataset_id) if dataset_id else None
1818

1919

20-
def get_place_name(place_id: str, place_group: list[dict[str, Any]]) -> str | None:
20+
def get_place_label(place_id: str, place_group: list[dict[str, Any]]) -> str | None:
2121
if not place_group or not place_id:
2222
return None
2323
for place in place_group:

0 commit comments

Comments
 (0)