Skip to content

Commit

Permalink
Recover extra basemap for high zoom levels
Browse files Browse the repository at this point in the history
  • Loading branch information
Bluesmile82 committed Oct 5, 2023
1 parent 226cd82 commit 760ce96
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 13 deletions.
3 changes: 2 additions & 1 deletion src/containers/scenes/aoi-scene/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
};
Expand Down
7 changes: 5 additions & 2 deletions src/pages/data-globe/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
};
Expand Down
3 changes: 1 addition & 2 deletions src/pages/landing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -21,7 +20,7 @@ function LandingContainer(props) {
setBasemap({
map,
surfaceColor: '#070710',
layersArray: [FIREFLY_BASEMAP_LAYER],
layersArray: [],
});
activateLayersOnLoad(map, activeLayers, layersConfig);
};
Expand Down
3 changes: 1 addition & 2 deletions src/pages/mobile/landing-mobile/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -23,7 +22,7 @@ function LandingMobileContainer(props) {
setBasemap({
map,
surfaceColor: '#070710',
layersArray: [FIREFLY_BASEMAP_LAYER],
layersArray: [],
});
activateLayersOnLoad(map, activeLayers, layersConfig);
};
Expand Down
7 changes: 5 additions & 2 deletions src/pages/mobile/nrc-landing-mobile/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
};
Expand Down
7 changes: 5 additions & 2 deletions src/pages/mobile/priority-mobile/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
};
Expand Down
7 changes: 5 additions & 2 deletions src/pages/nrc-landing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
};
Expand Down

0 comments on commit 760ce96

Please sign in to comment.