From 760ce96b0d0902d84ebbe060448c62f264e8854e Mon Sep 17 00:00:00 2001 From: Alvaro Leal Date: Thu, 5 Oct 2023 10:57:53 +0200 Subject: [PATCH] Recover extra basemap for high zoom levels --- src/containers/scenes/aoi-scene/index.js | 3 ++- src/pages/data-globe/index.js | 7 +++++-- src/pages/landing/index.js | 3 +-- src/pages/mobile/landing-mobile/index.js | 3 +-- src/pages/mobile/nrc-landing-mobile/index.js | 7 +++++-- src/pages/mobile/priority-mobile/index.js | 7 +++++-- src/pages/nrc-landing/index.js | 7 +++++-- 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/containers/scenes/aoi-scene/index.js b/src/containers/scenes/aoi-scene/index.js index 3c23a65e0..f4d889fa0 100644 --- a/src/containers/scenes/aoi-scene/index.js +++ b/src/containers/scenes/aoi-scene/index.js @@ -18,6 +18,7 @@ import unionBy from 'lodash/unionBy'; import { PRECALCULATED_LAYERS_SLUG } from 'constants/analyze-areas-constants'; import { FIREFLY_BASEMAP_LAYER, + SATELLITE_BASEMAP_LAYER, HALF_EARTH_FUTURE_TILE_LAYER, } from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; @@ -222,7 +223,7 @@ function AOIScene(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [FIREFLY_BASEMAP_LAYER, SATELLITE_BASEMAP_LAYER], }); activateLayersOnLoad(map, initialActiveLayers, layersConfig); }; diff --git a/src/pages/data-globe/index.js b/src/pages/data-globe/index.js index 9fd2b4404..f41fc4e7d 100644 --- a/src/pages/data-globe/index.js +++ b/src/pages/data-globe/index.js @@ -5,7 +5,10 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; +import { + FIREFLY_BASEMAP_LAYER, + SATELLITE_BASEMAP_LAYER, +} from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import DataGlobeComponent from './data-globe-component.jsx'; @@ -21,7 +24,7 @@ function DataGlobeContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [FIREFLY_BASEMAP_LAYER, SATELLITE_BASEMAP_LAYER], }); activateLayersOnLoad(map, activeLayers, layersConfig); }; diff --git a/src/pages/landing/index.js b/src/pages/landing/index.js index a42cd05b0..832f2cc5e 100644 --- a/src/pages/landing/index.js +++ b/src/pages/landing/index.js @@ -5,7 +5,6 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import LandingComponent from './landing-component.jsx'; @@ -21,7 +20,7 @@ function LandingContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [], }); activateLayersOnLoad(map, activeLayers, layersConfig); }; diff --git a/src/pages/mobile/landing-mobile/index.js b/src/pages/mobile/landing-mobile/index.js index 93aac3623..30bb37c34 100644 --- a/src/pages/mobile/landing-mobile/index.js +++ b/src/pages/mobile/landing-mobile/index.js @@ -5,7 +5,6 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import LandingComponent from './landing-mobile-component.jsx'; @@ -23,7 +22,7 @@ function LandingMobileContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [], }); activateLayersOnLoad(map, activeLayers, layersConfig); }; diff --git a/src/pages/mobile/nrc-landing-mobile/index.js b/src/pages/mobile/nrc-landing-mobile/index.js index 82d4f091c..1b5e26955 100644 --- a/src/pages/mobile/nrc-landing-mobile/index.js +++ b/src/pages/mobile/nrc-landing-mobile/index.js @@ -5,7 +5,10 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; +import { + FIREFLY_BASEMAP_LAYER, + SATELLITE_BASEMAP_LAYER, +} from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import Component from './nrc-landing-mobile-component.jsx'; @@ -21,7 +24,7 @@ function NrcLandingMobileContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [FIREFLY_BASEMAP_LAYER, SATELLITE_BASEMAP_LAYER], }); activateLayersOnLoad(map, activeLayers, layersConfig); }; diff --git a/src/pages/mobile/priority-mobile/index.js b/src/pages/mobile/priority-mobile/index.js index 1d9435e50..c7f773cab 100644 --- a/src/pages/mobile/priority-mobile/index.js +++ b/src/pages/mobile/priority-mobile/index.js @@ -5,7 +5,10 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; +import { + FIREFLY_BASEMAP_LAYER, + SATELLITE_BASEMAP_LAYER, +} from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import Component from './priority-mobile-component.jsx'; @@ -21,7 +24,7 @@ function PriorityMobileContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [FIREFLY_BASEMAP_LAYER, SATELLITE_BASEMAP_LAYER], }); activateLayersOnLoad(map, activeLayers, layersConfig); }; diff --git a/src/pages/nrc-landing/index.js b/src/pages/nrc-landing/index.js index a7d4a8745..b46c78513 100644 --- a/src/pages/nrc-landing/index.js +++ b/src/pages/nrc-landing/index.js @@ -5,7 +5,10 @@ import * as urlActions from 'actions/url-actions'; import { activateLayersOnLoad, setBasemap } from 'utils/layer-manager-utils'; -import { FIREFLY_BASEMAP_LAYER } from 'constants/layers-slugs'; +import { + FIREFLY_BASEMAP_LAYER, + SATELLITE_BASEMAP_LAYER, +} from 'constants/layers-slugs'; import { layersConfig } from 'constants/mol-layers-configs'; import Component from './component.jsx'; @@ -21,7 +24,7 @@ function NrcLandingContainer(props) { setBasemap({ map, surfaceColor: '#070710', - layersArray: [FIREFLY_BASEMAP_LAYER], + layersArray: [FIREFLY_BASEMAP_LAYER, SATELLITE_BASEMAP_LAYER], }); activateLayersOnLoad(map, activeLayers, layersConfig); };