diff --git a/vacs-map-app/src/MapExplorer.vue b/vacs-map-app/src/MapExplorer.vue index a4ac5bb..1ce0035 100644 --- a/vacs-map-app/src/MapExplorer.vue +++ b/vacs-map-app/src/MapExplorer.vue @@ -26,6 +26,7 @@ import MapContainerColorAfricanUnion from '@/components/MapContainerColorAfrican 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 LayoutOverview from './components/layouts/LayoutOverview.vue' import ExploreSidebar from './components/ExploreSidebar.vue' @@ -75,7 +76,12 @@ const availableMaps = [ id: 'sand', name: 'circles + sand', component: MapContainerColorSand - } + }, + { + id: 'population', + name: 'circles + population', + component: MapContainerColorPopulation + }, ] const mapExploreStore = useMapExploreStore() diff --git a/vacs-map-app/src/components/BaseMap.vue b/vacs-map-app/src/components/BaseMap.vue index c4df8dd..f4bdb8d 100644 --- a/vacs-map-app/src/components/BaseMap.vue +++ b/vacs-map-app/src/components/BaseMap.vue @@ -19,7 +19,9 @@ const initializeMap = () => { let mapOptions = { container: 'baseMapContainer', style: MAPBOX_STYLE, - bounds: INITIAL_MAP_BOUNDS + bounds: INITIAL_MAP_BOUNDS, + minZoom: 2, + maxzoom: 12 } map.value = new mapboxgl.Map(mapOptions) diff --git a/vacs-map-app/src/components/GridOverlay.vue b/vacs-map-app/src/components/GridOverlay.vue index 8b03721..6c90870 100644 --- a/vacs-map-app/src/components/GridOverlay.vue +++ b/vacs-map-app/src/components/GridOverlay.vue @@ -99,7 +99,7 @@ const addLayer = () => { 'circle-blur': 0.5 } }, - 'country-label-filter' + 'settlement-subdivision-label' ) updateLayer() @@ -140,7 +140,7 @@ const getCircleColorQuintiles = (quintiles) => { const getCircleRadius = () => { if (!radiusColumn.value || !radiusColumnExtent.value) { - return ['interpolate', ['linear'], ['zoom'], 1, 1, 3, 3, 5, 7, 9, 25] + return ['interpolate', ['linear'], ['zoom'], 1, 1, 3, 3, 5, 10, 9, 30] } else { const [min, max] = radiusColumnExtent.value const inputs = [min, min + (max - min) / 2, max] diff --git a/vacs-map-app/src/components/MapContainerColor.vue b/vacs-map-app/src/components/MapContainerColor.vue index a539e70..14de7c5 100644 --- a/vacs-map-app/src/components/MapContainerColor.vue +++ b/vacs-map-app/src/components/MapContainerColor.vue @@ -1,6 +1,13 @@