Skip to content

Commit 5c9bedd

Browse files
authored
Merge pull request #59 from ESA-eodashboards/rasterform-eodash
feat: add support for xyz link updates via jsonform
2 parents ba3fdf9 + b20373e commit 5c9bedd

6 files changed

Lines changed: 17 additions & 71 deletions

.github/workflows/build_main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
SH_CLIENT_ID: ${{ secrets.SH_CLIENT_ID }}
5252
SH_CLIENT_SECRET: ${{ secrets.SH_CLIENT_SECRET }}
5353
run: |
54-
docker run -v "$PWD:/workspace" -w "/workspace" -e SH_INSTANCE_ID="$SH_INSTANCE_ID" -e SH_CLIENT_ID="$SH_CLIENT_ID" -e SH_CLIENT_SECRET="$SH_CLIENT_SECRET" ghcr.io/eodash/eodash_catalog:0.4.7 eodash_catalog -gp
54+
docker run -v "$PWD:/workspace" -w "/workspace" -e SH_INSTANCE_ID="$SH_INSTANCE_ID" -e SH_CLIENT_ID="$SH_CLIENT_ID" -e SH_CLIENT_SECRET="$SH_CLIENT_SECRET" ghcr.io/eodash/eodash_catalog:0.5.0 eodash_catalog -gp
5555
- name: copy static to build
5656
run: cp -r static/* build/
5757
- name: Deploy

collections/ESDL_Hydrology_Precipitation.json

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,14 @@
9393
"Query": {
9494
"Start": "2017-01-01T00:00:00Z",
9595
"End": "2021-12-31T00:00:00Z"
96-
}
96+
},
97+
"Unit": "[mm/day]"
9798
}
9899
],
99100
"Process": {
100-
"JsonForm": "https://raw.githubusercontent.com/eurodatacube/eodash-assets/refs/heads/main/defaults/xcube_form.json",
101-
"VegaDefinition": "ESDL_Hydrology_Precipitation/chart.json",
102-
"EndPoints": [
101+
"JsonForm": "https://raw.githubusercontent.com/eurodatacube/eodash-assets/refs/heads/main/defaults/xcube_form.json",
102+
"VegaDefinition": "ESDL_Hydrology_Precipitation/chart.json",
103+
"EndPoints": [
103104
{
104105
"Url": "https://api.earthsystemdatalab.net/api/timeseries/hydrology/precip?aggMethods=median",
105106
"Identifier": "xcube_statistics",
@@ -109,32 +110,5 @@
109110
}
110111
]
111112
},
112-
"Legend": "ESDL_Hydrology_Precipitation/cm_legend.png",
113-
"Image": "ESDL_Hydrology_Precipitation/ESDL_Hydrology_Precipitation.jpg",
114-
"yAxis": "mm/day",
115-
"Colorlegend": {
116-
"domain": [
117-
0,
118-
50
119-
],
120-
"range": [
121-
"#440154",
122-
"#481c6e",
123-
"#453581",
124-
"#3d4d8a",
125-
"#34618d",
126-
"#2b748e",
127-
"#24878e",
128-
"#1f998a",
129-
"#25ac82",
130-
"#40bd72",
131-
"#67cc5c",
132-
"#98d83e",
133-
"#cde11d",
134-
"#fde725"
135-
],
136-
"scaleType": "continuous",
137-
"tickFormat": ".0f",
138-
"title": "[mm/day]"
139-
}
113+
"Image": "ESDL_Hydrology_Precipitation/ESDL_Hydrology_Precipitation.jpg"
140114
}

collections/ESDL_Hydrology_SM.json

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@
6969
"Query": {
7070
"Start": "2017-01-01T00:00:00Z",
7171
"End": "2022-06-30T00:00:00Z"
72-
}
72+
},
73+
"Unit": "[% relative saturation]"
7374
}
7475
],
7576
"Process": {
76-
"JsonForm": "https://raw.githubusercontent.com/eurodatacube/eodash-assets/refs/heads/main/defaults/xcube_form.json",
77-
"VegaDefinition": "ESDL_Hydrology_SM/chart.json",
78-
"EndPoints": [
77+
"JsonForm": "https://raw.githubusercontent.com/eurodatacube/eodash-assets/refs/heads/main/defaults/xcube_form.json",
78+
"VegaDefinition": "ESDL_Hydrology_SM/chart.json",
79+
"EndPoints": [
7980
{
8081
"Url": "https://api.earthsystemdatalab.net/api/timeseries/hydrology/SM?aggMethods=median",
8182
"Identifier": "xcube_statistics",
@@ -85,31 +86,5 @@
8586
}
8687
]
8788
},
88-
"Legend": "ESDL_Hydrology_SM/cm_legend.png",
89-
"Image": "ESDL_Hydrology_SM/image.jpg",
90-
"Colorlegend": {
91-
"domain": [
92-
0,
93-
1
94-
],
95-
"range": [
96-
"#f0f921",
97-
"#fad824",
98-
"#feb82c",
99-
"#fa9b3d",
100-
"#f1814d",
101-
"#e4695e",
102-
"#d45270",
103-
"#c23c81",
104-
"#ac2694",
105-
"#920fa3",
106-
"#7701a8",
107-
"#5801a4",
108-
"#370499",
109-
"#0d0887"
110-
],
111-
"scaleType": "continuous",
112-
"tickFormat": ".1f",
113-
"title": "[% relative saturation]"
114-
}
115-
}
89+
"Image": "ESDL_Hydrology_SM/image.jpg"
90+
}

collections/N3c_ocean_colour_plankton_atlantic.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"European Commission",
3737
"ECMWF"
3838
],
39-
"Legend": "N3c_ocean_colour_plankton_atlantic/N3c_atlantic_legend.png",
4039
"Image": "N3c_ocean_colour_plankton_atlantic/N3c_ocean_colour_plankton_atlantic.png",
4140
"References": [
4241
{
@@ -61,4 +60,4 @@
6160
"Url": "https://marine.copernicus.eu/access-data"
6261
}
6362
]
64-
}
63+
}

collections/N3c_ocean_colour_plankton_black_sea.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"European Commission",
3737
"ECMWF"
3838
],
39-
"Legend": "N3c_ocean_colour_plankton_black_sea/N3c_bs_legend.png",
4039
"Image": "N3c_ocean_colour_plankton_black_sea/N3c_ocean_colour_plankton_black_sea.png",
4140
"References": [
4241
{
@@ -65,4 +64,4 @@
6564
"Url": "https://marine.copernicus.eu/access-data"
6665
}
6766
]
68-
}
67+
}

collections/N3c_ocean_colour_plankton_mediterranean.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"European Commission",
3737
"ECMWF"
3838
],
39-
"Legend": "N3c_ocean_colour_plankton_mediterranean/N3c_med_legend.png",
4039
"Image": "N3c_ocean_colour_plankton_mediterranean/N3c_ocean_colour_plankton_mediterranean.png",
4140
"References": [
4241
{
@@ -65,4 +64,4 @@
6564
"Url": "https://marine.copernicus.eu/access-data"
6665
}
6766
]
68-
}
67+
}

0 commit comments

Comments
 (0)