Skip to content

Commit 91fae96

Browse files
committed
fix: styling issues, separate into catalogs
1 parent 6c27b2f commit 91fae96

File tree

7 files changed

+25
-13
lines changed

7 files changed

+25
-13
lines changed

app/src/components/AreaStatistics.vue

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<v-card>
33
<v-card-title class="pa-2">Custom Area Statistics</v-card-title>
44
<v-col>
5-
<v-row class="pt-4 area-statistics justify-space-between align-center mx-2">
5+
<v-row class="area-statistics align-center ma-2">
66
<v-btn
77
@click="fetchData"
88
color="primary"
@@ -11,19 +11,17 @@
1111
small
1212
>Generate</v-btn>
1313
</v-row>
14-
<v-row>
15-
<div class="pa-2">
16-
Select storm surge, years, or scenarios and additional
17-
parameters from the drop-down menu to
18-
generate charts representing predictions
19-
on population, build-up areas and agriculture areas.
20-
</div>
21-
</v-row>
14+
<div class="pa-0">
15+
Select storm surge, years, or scenarios and additional
16+
parameters from the drop-down menu to
17+
generate charts representing predictions
18+
on population, build-up areas and agriculture areas.
19+
</div>
2220
<div
2321
class="d-flex justify-space-around"
2422
:class="{'flex-column': $vuetify.breakpoint.mdAndUp}"
2523
>
26-
<v-radio-group v-model="selectedIndex">
24+
<v-radio-group v-model="selectedIndex" hide-details>
2725
<v-col
2826
class="d-flex justify-space-between ml-1 mt-2"
2927
:class="{
@@ -415,4 +413,10 @@ export default {
415413
.charts canvas {
416414
max-width: 100%;
417415
}
416+
.v-label {
417+
font-size: 13px;
418+
}
419+
.v-input--selection-controls {
420+
margin-top: 0;
421+
}
418422
</style>

app/src/components/DataPanel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
v-if="indicatorSelected
214214
&& indicatorSelected.indicator === 'IND2_1'"
215215
>
216-
<h1 class="ml-5">Species Info</h1>
216+
<v-card-title class="pa-2">Species Info</v-card-title>
217217
<v-col>
218218
<SpeciesList v-if="selectedArea && sortedSpecies.length > 0"
219219
:species=sortedSpecies />

app/src/components/map/CustomWmsVariables.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</v-row>
2929
</v-row>
3030
<p
31-
class="compareEnable my-4"
31+
class="compareEnable mb-2"
3232
@click="toggleCompare"
3333
>
3434
<v-icon color="black">mdi-compare</v-icon>

app/src/components/map/Map.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,10 @@ export default {
454454
};
455455
},
456456
displayTimeSelection() {
457+
if (this.indicator?.indicator === 'IND4_1') {
458+
// custom overload
459+
return false;
460+
}
457461
if (this.indicator?.indicator === 'E13d' && this.featureData) {
458462
// custom overload for extra hassle with replaceMapTimes from config
459463
return true;

app/src/config/esa.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,5 +436,5 @@ export const globalIndicators = [
436436
},
437437
},
438438
},
439-
...createIDEASDatasetConfigs(['IND1_1_minesweeper', 'IND1_1', 'IND2_1_minesweeper', 'IND2_1', 'IND3_1', 'IND4_1']),
439+
...createIDEASDatasetConfigs(['IND2_1_minesweeper', 'IND2_1', 'IND1_1_minesweeper', 'IND1_1']),
440440
];

app/src/config/gtif.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { DateTime } from 'luxon';
77
import colormap from 'colormap';
88
import availableDates from '@/config/gtif_dates.json';
9+
import { createIDEASDatasetConfigs } from '@/config/ideas_config';
910
import {
1011
Fill, Stroke, Style, Circle,
1112
} from 'ol/style';
@@ -2534,4 +2535,5 @@ export const globalIndicators = [
25342535
},
25352536
},
25362537
},
2538+
...createIDEASDatasetConfigs(['IND1_1']),
25372539
];

app/src/config/trilateral.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import shTimeFunction from '@/shTimeFunction';
1010
import {
1111
baseLayers, overlayLayers, trucksAreaIndicator, trucksFeatures,
1212
} from '@/config/layers';
13+
import { createIDEASDatasetConfigs } from '@/config/ideas_config';
1314
import {
1415
nasaStatisticsConfig,
1516
} from '@/helpers/customAreaObjects';
@@ -918,4 +919,5 @@ export const globalIndicators = [
918919
},
919920
},
920921
},
922+
...createIDEASDatasetConfigs(['IND1_1', 'IND3_1', 'IND4_1']),
921923
];

0 commit comments

Comments
 (0)