Skip to content

Commit 2794820

Browse files
BryonLewisBryonLewis
committed
phase 2 screenshots
1 parent 3e5d779 commit 2794820

9 files changed

Lines changed: 381 additions & 26 deletions

File tree

‎client/src/api/UVDATApi.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ export default class UVdatApi {
215215
return (await UVdatApi.apiClient.delete(`/files/${fileItemId}/`)).data;
216216
}
217217

218-
219218
public static async getGlobalDatasets(filter?: { unconnected: boolean }): Promise<(Dataset & { contextCount: number })[]> {
220219
return (await UVdatApi.apiClient.get('datasets', { params: { ...filter } })).data.results;
221220
}

‎client/src/components/TabularData/MapLayerTableGraph.vue‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ export default defineComponent({
3535
3636
const maxMovingAverage = computed(() => {
3737
if (graphData.value) {
38-
if (graphData.value?.graphs && graphData.value.graphs.all) {
39-
const dataLength = graphData.value.graphs.all.data.length;
40-
return Math.floor(dataLength / 4);
38+
if (graphData.value?.graphs) {
39+
const values = Object.values(graphData.value.graphs);
40+
let max = -Infinity;
41+
for (let i = 0; i < values.length; i += 1) {
42+
max = Math.max(max, Math.floor(values[i].data.length / 4));
43+
}
44+
return max;
4145
}
4246
}
4347
return 50;

‎client/src/components/VectorFeatureSearch/Editor/VectorFeatureSearchEditor.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default defineComponent({
7575
value: key,
7676
})));
7777
78-
const availableTitleKeys = computed(() => Object.keys(availableProperties.value || {}).map((key) => (getDisplayName(key))));
78+
const availableTitleKeys = computed(() => Object.keys(availableProperties.value || {}).map((key) => ({ title: getDisplayName(key), value: key })));
7979
8080
const availableSubtitleKeys = computed(() => Object.keys(availableProperties.value || {}).map((key) => ({
8181
title: availableProperties.value?.[key]?.displayName || key,
@@ -269,7 +269,13 @@ export default defineComponent({
269269
<strong>Title</strong>
270270
</v-expansion-panel-title>
271271
<v-expansion-panel-text>
272-
<v-select v-model="localData.display.titleKey" :items="availableTitleKeys" label="Title Key" />
272+
<v-select
273+
v-model="localData.display.titleKey"
274+
:items="availableTitleKeys"
275+
item-title="title"
276+
item-value="value"
277+
label="Title Key"
278+
/>
273279
</v-expansion-panel-text>
274280
</v-expansion-panel>
275281
<v-expansion-panel>

‎client/src/views/SourceSelection.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ export default defineComponent({
2626
if (MapStore.displayConfiguration.value.default_tab) {
2727
tab.value = MapStore.displayConfiguration.value.default_tab;
2828
}
29-
})
29+
});
3030
return {
3131
tab,
3232
selectedLayersCount,
3333
collectionList: MapStore.availableCollections,
34-
displayConfig: MapStore.displayConfiguration
34+
displayConfig: MapStore.displayConfiguration,
3535
};
3636
},
3737
});

‎sample_data/phase2_screenshots.json‎

Lines changed: 305 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,305 @@
1+
[
2+
{
3+
"type": "Context",
4+
"name": "DIVERS-H",
5+
"default_map_center": [34.8019, -86.1794],
6+
"default_map_zoom": 6,
7+
"datasets": [
8+
{
9+
"name": "DIVERS-H",
10+
"description": "DIVERS-H PowerPlant data",
11+
"category": "merged",
12+
"metadata": {},
13+
"files": [
14+
{
15+
"name": "PowerPlant_CNRM-CM6-1_ssp585_r4i1p1f2_tabular",
16+
"path": "./data/DIVERS-H/PowerPlants/TVAPowerPlants.geojson",
17+
"url": "https://data.kitware.com/api/v1/file/67c0deb5de1cd5c0d8ba66ce/download",
18+
"type": "geojson",
19+
"metadata": {
20+
"tabular": {
21+
"path": "./data/DIVERS-H/PowerPlants/PowerPlant_CNRM-CM6-1_ssp585_r4i1p1f2_tabular.json",
22+
"name": "PowerPlant_CNRM-CM6-1_ssp585_r4i1p1f2_tabular_data",
23+
"url": "https://data.kitware.com/api/v1/file/67c0deb5de1cd5c0d8ba66d1/download",
24+
"featurePropertyMatcher": "Plant_Code"
25+
},
26+
"tags": {
27+
"filters": {
28+
"Model": "CNRM-CM6-1",
29+
"Scenario": "ssp585",
30+
"Ensemble": "r4i1p1f2",
31+
"Input/Output": "Ouput"
32+
}
33+
},
34+
"default_style": {
35+
"layers": {
36+
"fill": {
37+
"color": "#888888",
38+
"enabled": false
39+
},
40+
"line": {
41+
"size": 1,
42+
"color": "#000000",
43+
"enabled": false
44+
},
45+
"text": {
46+
"size": {
47+
"type": "SizeZoom",
48+
"zoomLevels": [
49+
[10, 12],
50+
[12, 9],
51+
[16, 10]
52+
]
53+
},
54+
"text": {
55+
"key": "Plant_Name"
56+
},
57+
"zoom": {
58+
"max": 24,
59+
"min": 7
60+
},
61+
"color": "#000000",
62+
"enabled": true
63+
},
64+
"circle": {
65+
"color": "#888888",
66+
"enabled": true,
67+
"selectable": "singleSelect",
68+
"selectColor": "#00FFFF"
69+
},
70+
"fill-extrusion": {
71+
"color": "#888888",
72+
"enabled": false
73+
}
74+
},
75+
"properties": {
76+
"selectionDisplay": true,
77+
"availableProperties": {
78+
"Total_MW": {
79+
"key": "Total_MW",
80+
"max": 3661.7,
81+
"min": 0.9,
82+
"type": "number",
83+
"display": true,
84+
"tooltip": false,
85+
"description": "",
86+
"displayName": "Total_MW"
87+
},
88+
"tech_desc": {
89+
"key": "tech_desc",
90+
"type": "string",
91+
"values": [
92+
"Batteries; Solar Photovoltaic;",
93+
"Conventional Hydroelectric",
94+
"Conventional Steam Coal",
95+
"Conventional Steam Coal; Natural Gas Fired Combustion Turbine;",
96+
"Hydroelectric Pumped Storage",
97+
"Hydroelectric Pumped Storage; Conventional Hydroelectric;",
98+
"Landfill Gas",
99+
"Natural Gas Fired Combined Cycle",
100+
"Natural Gas Fired Combined Cycle; Natural Gas Fired Combustion Turbine;",
101+
"Natural Gas Fired Combined Cycle; Petroleum Liquids;",
102+
"Natural Gas Fired Combustion Turbine",
103+
"Natural Gas Internal Combustion Engine; Petroleum Liquids;",
104+
"Nuclear",
105+
"Onshore Wind Turbine",
106+
"Other Gases",
107+
"Other Waste Biomass; Petroleum Liquids;",
108+
"Petroleum Liquids",
109+
"Solar Photovoltaic",
110+
"Wood/Wood Waste Biomass"
111+
],
112+
"display": true,
113+
"tooltip": false,
114+
"description": "",
115+
"displayName": "tech_desc"
116+
},
117+
"Plant_Code": {
118+
"key": "Plant_Code",
119+
"max": 65642,
120+
"min": 20,
121+
"type": "number",
122+
"display": true,
123+
"tooltip": false,
124+
"description": "",
125+
"displayName": "Plant_Code"
126+
},
127+
"Plant_Name": {
128+
"key": "Plant_Name",
129+
"type": "string",
130+
"unique": 121,
131+
"display": true,
132+
"tooltip": false,
133+
"searchable": true,
134+
"description": "",
135+
"displayName": "Plant_Name"
136+
}
137+
}
138+
},
139+
"vectorFeatureTableGraphs": [
140+
{
141+
"name": "tas",
142+
"type": "tas_pr_evspsbl_P_minus_E",
143+
"xAxis": "unix_time",
144+
"yAxis": "tas",
145+
"xAxisLabel": "Date",
146+
"yAxisLabel": "tas"
147+
},
148+
{
149+
"name": "pr",
150+
"type": "tas_pr_evspsbl_P_minus_E",
151+
"xAxis": "unix_time",
152+
"yAxis": "pr",
153+
"xAxisLabel": "Date",
154+
"yAxisLabel": "pr"
155+
},
156+
{
157+
"name": "evspsbl",
158+
"type": "tas_pr_evspsbl_P_minus_E",
159+
"xAxis": "unix_time",
160+
"yAxis": "evspsbl",
161+
"xAxisLabel": "Date",
162+
"yAxisLabel": "evspsbl"
163+
},
164+
{
165+
"name": "P_minus_E",
166+
"type": "tas_pr_evspsbl_P_minus_E",
167+
"xAxis": "unix_time",
168+
"yAxis": "P_minus_E",
169+
"xAxisLabel": "Date",
170+
"yAxisLabel": "P_minus_E"
171+
}
172+
],
173+
"mapLayerFeatureTableGraphs": [
174+
{
175+
"name": "tas",
176+
"type": "tas_pr_evspsbl_P_minus_E",
177+
"xAxis": "unix_time",
178+
"yAxis": "tas",
179+
"indexer": "Plant_Name",
180+
"xAxisLabel": "Date",
181+
"yAxisLabel": "tas"
182+
},
183+
{
184+
"name": "pr",
185+
"type": "tas_pr_evspsbl_P_minus_E",
186+
"xAxis": "unix_time",
187+
"yAxis": "pr",
188+
"indexer": "Plant_Name",
189+
"xAxisLabel": "Date",
190+
"yAxisLabel": "pr"
191+
},
192+
{
193+
"name": "evspsbl",
194+
"type": "tas_pr_evspsbl_P_minus_E",
195+
"xAxis": "unix_time",
196+
"yAxis": "evspsbl",
197+
"indexer": "Plant_Name",
198+
"xAxisLabel": "Date",
199+
"yAxisLabel": "evspsbl"
200+
},
201+
{
202+
"name": "P_minus_E",
203+
"type": "tas_pr_evspsbl_P_minus_E",
204+
"xAxis": "unix_time",
205+
"yAxis": "P_minus_E",
206+
"indexer": "Plant_Name",
207+
"xAxisLabel": "Date",
208+
"yAxisLabel": "P_minus_E"
209+
}
210+
]
211+
}
212+
}
213+
},
214+
{
215+
"name": "PminusE_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_2015-2055",
216+
"path": "./data/DIVERS-H/Output/PminusE_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_2015-2055.nc",
217+
"url": "https://data.kitware.com/api/v1/file/67c0dea9de1cd5c0d8ba66a4/download",
218+
"type": "netcdf",
219+
"metadata": {
220+
"generate": [
221+
{
222+
"name": "PminusE_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_2015-2055",
223+
"x_variable": "lon",
224+
"y_variable": "lat",
225+
"variable": "P_minus_E",
226+
"sliding_variable": "time",
227+
"color_map": "turbo"
228+
}
229+
],
230+
"tags": {
231+
"filters": {
232+
"Variable": "PminusE",
233+
"Model": "CNRM-CM6-1",
234+
"Scenario": "ssp585",
235+
"Ensemble": "r4i1p1f2",
236+
"Grid": null,
237+
"Time Range": "2015-2055",
238+
"Input/Output": "Output"
239+
}
240+
}
241+
}
242+
},
243+
{
244+
"name": "tas_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012",
245+
"path": "./data/DIVERS-H/Input/tas_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012.nc",
246+
"url": "https://data.kitware.com/api/v1/file/67c0dea0de1cd5c0d8ba667a/download",
247+
"type": "netcdf",
248+
"metadata": {
249+
"generate": [
250+
{
251+
"name": "tas_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012",
252+
"x_variable": "lon",
253+
"y_variable": "lat",
254+
"variable": "tas",
255+
"sliding_variable": "time",
256+
"color_map": "Reds"
257+
}
258+
],
259+
"tags": {
260+
"filters": {
261+
"Variable": "tas",
262+
"Model": "CNRM-CM6-1",
263+
"Scenario": "ssp585",
264+
"Ensemble": "r4i1p1f2",
265+
"Grid": "gr",
266+
"Time Range": "201501-210012",
267+
"Input/Output": "Input"
268+
}
269+
}
270+
}
271+
},
272+
{
273+
"name": "evspsbl_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012",
274+
"path": "./data/DIVERS-H/Input/evspsbl_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012.nc",
275+
"url": "https://data.kitware.com/api/v1/file/67c0de9ede1cd5c0d8ba666e/download",
276+
"type": "netcdf",
277+
"metadata": {
278+
"generate": [
279+
{
280+
"name": "evspsbl_Amon_CNRM-CM6-1_ssp585_r4i1p1f2_gr_201501-210012",
281+
"x_variable": "lon",
282+
"y_variable": "lat",
283+
"variable": "evspsbl",
284+
"sliding_variable": "time",
285+
"color_map": "Blues"
286+
}
287+
],
288+
"tags": {
289+
"filters": {
290+
"Variable": "evspsbl",
291+
"Model": "CNRM-CM6-1",
292+
"Scenario": "ssp585",
293+
"Ensemble": "r4i1p1f2",
294+
"Grid": "gr",
295+
"Time Range": "201501-210012",
296+
"Input/Output": "Input"
297+
}
298+
}
299+
}
300+
}
301+
]
302+
}
303+
]
304+
}
305+
]

0 commit comments

Comments
 (0)
⚡