Skip to content

Commit

Permalink
fix: styling issues, separate into catalogs
Browse files Browse the repository at this point in the history
  • Loading branch information
lubojr committed Sep 17, 2024
1 parent 6c27b2f commit 91fae96
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 13 deletions.
24 changes: 14 additions & 10 deletions app/src/components/AreaStatistics.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-card>
<v-card-title class="pa-2">Custom Area Statistics</v-card-title>
<v-col>
<v-row class="pt-4 area-statistics justify-space-between align-center mx-2">
<v-row class="area-statistics align-center ma-2">
<v-btn
@click="fetchData"
color="primary"
Expand All @@ -11,19 +11,17 @@
small
>Generate</v-btn>
</v-row>
<v-row>
<div class="pa-2">
Select storm surge, years, or scenarios and additional
parameters from the drop-down menu to
generate charts representing predictions
on population, build-up areas and agriculture areas.
</div>
</v-row>
<div class="pa-0">
Select storm surge, years, or scenarios and additional
parameters from the drop-down menu to
generate charts representing predictions
on population, build-up areas and agriculture areas.
</div>
<div
class="d-flex justify-space-around"
:class="{'flex-column': $vuetify.breakpoint.mdAndUp}"
>
<v-radio-group v-model="selectedIndex">
<v-radio-group v-model="selectedIndex" hide-details>
<v-col
class="d-flex justify-space-between ml-1 mt-2"
:class="{
Expand Down Expand Up @@ -415,4 +413,10 @@ export default {
.charts canvas {
max-width: 100%;
}
.v-label {
font-size: 13px;
}
.v-input--selection-controls {
margin-top: 0;
}
</style>
2 changes: 1 addition & 1 deletion app/src/components/DataPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
v-if="indicatorSelected
&& indicatorSelected.indicator === 'IND2_1'"
>
<h1 class="ml-5">Species Info</h1>
<v-card-title class="pa-2">Species Info</v-card-title>
<v-col>
<SpeciesList v-if="selectedArea && sortedSpecies.length > 0"
:species=sortedSpecies />
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/map/CustomWmsVariables.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</v-row>
</v-row>
<p
class="compareEnable my-4"
class="compareEnable mb-2"
@click="toggleCompare"
>
<v-icon color="black">mdi-compare</v-icon>
Expand Down
4 changes: 4 additions & 0 deletions app/src/components/map/Map.vue
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,10 @@ export default {
};
},
displayTimeSelection() {
if (this.indicator?.indicator === 'IND4_1') {
// custom overload
return false;
}
if (this.indicator?.indicator === 'E13d' && this.featureData) {
// custom overload for extra hassle with replaceMapTimes from config
return true;
Expand Down
2 changes: 1 addition & 1 deletion app/src/config/esa.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,5 +436,5 @@ export const globalIndicators = [
},
},
},
...createIDEASDatasetConfigs(['IND1_1_minesweeper', 'IND1_1', 'IND2_1_minesweeper', 'IND2_1', 'IND3_1', 'IND4_1']),
...createIDEASDatasetConfigs(['IND2_1_minesweeper', 'IND2_1', 'IND1_1_minesweeper', 'IND1_1']),
];
2 changes: 2 additions & 0 deletions app/src/config/gtif.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
import { DateTime } from 'luxon';
import colormap from 'colormap';
import availableDates from '@/config/gtif_dates.json';
import { createIDEASDatasetConfigs } from '@/config/ideas_config';
import {
Fill, Stroke, Style, Circle,
} from 'ol/style';
Expand Down Expand Up @@ -2534,4 +2535,5 @@ export const globalIndicators = [
},
},
},
...createIDEASDatasetConfigs(['IND1_1']),
];
2 changes: 2 additions & 0 deletions app/src/config/trilateral.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import shTimeFunction from '@/shTimeFunction';
import {
baseLayers, overlayLayers, trucksAreaIndicator, trucksFeatures,
} from '@/config/layers';
import { createIDEASDatasetConfigs } from '@/config/ideas_config';
import {
nasaStatisticsConfig,
} from '@/helpers/customAreaObjects';
Expand Down Expand Up @@ -918,4 +919,5 @@ export const globalIndicators = [
},
},
},
...createIDEASDatasetConfigs(['IND1_1', 'IND3_1', 'IND4_1']),
];

0 comments on commit 91fae96

Please sign in to comment.