From d30b0eb802a2ec365bfdac202d60f385025acdce Mon Sep 17 00:00:00 2001 From: mwbernard Date: Thu, 30 Nov 2023 09:35:25 -0800 Subject: [PATCH 1/2] Remove population option --- vacs-map-app/src/MapExplorer.vue | 49 +------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/vacs-map-app/src/MapExplorer.vue b/vacs-map-app/src/MapExplorer.vue index 3383486..a842109 100644 --- a/vacs-map-app/src/MapExplorer.vue +++ b/vacs-map-app/src/MapExplorer.vue @@ -34,16 +34,8 @@ import { computed, onMounted, onUnmounted, ref } from 'vue' import { storeToRefs } from 'pinia' import { useResizeObserver } from '@vueuse/core' -import MapContainerColor from '@/components/MapContainerColor.vue' import MapContainerColorAcrossScenarios from './components/MapContainerColorAcrossScenarios.vue' -import MapContainerColorRadius from '@/components/MapContainerColorRadius.vue' -import MapContainerNotFilled from '@/components/MapContainerNotFilled.vue' -import MapContainerNotFilledTwoLayers from '@/components/MapContainerNotFilledTwoLayers.vue' -import MapContainerColorAfricanUnion from '@/components/MapContainerColorAfricanUnion.vue' import MapContainerColorSandSoil from '@/components/MapContainerColorSandSoil.vue' -import MapContainerColorSoil from '@/components/MapContainerColorSoil.vue' -import MapContainerColorSand from '@/components/MapContainerColorSand.vue' -import MapContainerColorPopulation from '@/components/MapContainerColorPopulation.vue' import { useMapExploreStore } from '@/stores/mapExplore' import LayoutOpen from './components/layouts/LayoutOpen.vue' import ExploreSidebar from './components/ExploreSidebar.vue' @@ -54,56 +46,17 @@ import MapLegend from '@/components/MapLegend.vue' import OverviewTop from '@/components/OverviewTop.vue' const availableMaps = [ - // { - // id: 'just-color', - // name: 'dynamic color', - // component: MapContainerColor - // }, + { id: 'color-across-scenarios', name: 'Default', component: MapContainerColorAcrossScenarios }, - // { - // id: 'color-and-radius-1', - // name: 'dynamic color and radius (cropyield)', - // component: MapContainerColorRadius - // }, - // { - // id: 'not-filled', - // name: 'circles not filled', - // component: MapContainerNotFilled - // }, - // { - // id: 'not-filled-2', - // name: 'circles not filled, two layers', - // component: MapContainerNotFilledTwoLayers - // }, - // { - // id: 'african-union', - // name: 'circles + african union regions', - // component: MapContainerColorAfricanUnion - // }, { id: 'sand-soil', name: 'Sand + Soil', component: MapContainerColorSandSoil }, - // { - // id: 'soil', - // name: 'circles + soil carbon', - // component: MapContainerColorSoil - // }, - // { - // id: 'sand', - // name: 'circles + sand', - // component: MapContainerColorSand - // }, - { - id: 'population', - name: 'Population', - component: MapContainerColorPopulation - } ] const basePadding = 50 From 41e82d05fb5dec5e2f97aabd6797c8fe9ad98e4e Mon Sep 17 00:00:00 2001 From: mwbernard Date: Thu, 30 Nov 2023 09:38:11 -0800 Subject: [PATCH 2/2] Prettier --- vacs-map-app/src/MapExplorer.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vacs-map-app/src/MapExplorer.vue b/vacs-map-app/src/MapExplorer.vue index a842109..700546b 100644 --- a/vacs-map-app/src/MapExplorer.vue +++ b/vacs-map-app/src/MapExplorer.vue @@ -46,7 +46,6 @@ import MapLegend from '@/components/MapLegend.vue' import OverviewTop from '@/components/OverviewTop.vue' const availableMaps = [ - { id: 'color-across-scenarios', name: 'Default', @@ -56,7 +55,7 @@ const availableMaps = [ id: 'sand-soil', name: 'Sand + Soil', component: MapContainerColorSandSoil - }, + } ] const basePadding = 50