Interactive interface for browsing global, full-resolution satellite imagery
allow graticule img download in polar views #3665
Ben779f81f1b1fe
diff --git a/web/js/containers/animation-widget.js b/web/js/containers/animation-widget.jsindex 63d8ade1d..f15ff5a26 100644--- a/web/js/containers/animation-widget.js+++ b/web/js/containers/animation-widget.js@@ -405,6 +405,7 @@ class AnimationWidget extends React.Component {refreshStateAfterGif,hasNonDownloadableLayer,visibleLayersForProj,+ proj,} = this.props;const gifDisabled = numberOfFrames >= maxFrames;const elemExists = document.querySelector('#create-gif-button');@@ -428,7 +429,7 @@ class AnimationWidget extends React.Component {await this.getPromise(hasCustomPalettes, 'palette', clearCustoms, 'Notice');await this.getPromise(isRotated, 'rotate', clearRotate, 'Reset rotation');- await this.getPromise(hasGraticule, 'graticule', clearGraticule, 'Remove Graticule?');+ await this.getPromise(hasGraticule && proj.id === 'geographic', 'graticule', clearGraticule, 'Remove Graticule?');await this.getPromise(hasNonDownloadableLayer, 'layers', hideLayers, 'Remove Layers?');await onUpdateStartAndEndDate(startDate, endDate);googleTagManager.pushEvent({@@ -655,6 +656,7 @@ function mapStateToProps(state) {map,browser,ui,+ proj,} = state;const {startDate, endDate, speed, loop, isPlaying, isActive, gifActive,@@ -741,6 +743,7 @@ function mapStateToProps(state) {looping: loop,hasCustomPalettes,map,+ proj,hasNonDownloadableLayer: hasNonDownloadableVisibleLayer(visibleLayersForProj),visibleLayersForProj,promiseImageryForTime: (date, layers) => promiseImageryForTime(date, layers, state),@@ -886,6 +889,7 @@ AnimationWidget.propTypes = {onUpdateStartAndEndDate: PropTypes.func,onUpdateStartDate: PropTypes.func,promiseImageryForTime: PropTypes.func,+ proj: PropTypes.object,refreshStateAfterGif: PropTypes.func,rotation: PropTypes.number,screenWidth: PropTypes.number,diff --git a/web/js/containers/toolbar.js b/web/js/containers/toolbar.jsindex be51e71df..dc5f4a69a 100644--- a/web/js/containers/toolbar.js+++ b/web/js/containers/toolbar.js@@ -115,13 +115,14 @@ class toolbarContainer extends Component {toggleDialogVisible,hasNonDownloadableLayer,visibleLayersForProj,+ proj,} = this.props;const nonDownloadableLayers = hasNonDownloadableLayer ? getNonDownloadableLayers(visibleLayersForProj) : null;const paletteStore = lodashCloneDeep(activePalettes);toggleDialogVisible(false);await this.getPromise(hasCustomPalette, 'palette', clearCustoms, 'Notice');await this.getPromise(isRotated, 'rotate', clearRotate, 'Reset rotation');- await this.getPromise(hasGraticule, 'graticule', clearGraticule, 'Remove Graticule?');+ await this.getPromise(hasGraticule && proj.id === 'geographic', 'graticule', clearGraticule, 'Remove Graticule?');await this.getPromise(hasNonDownloadableLayer, 'layers', hideLayers, 'Remove Layers?');await openModal('TOOLBAR_SNAPSHOT',@@ -364,7 +365,7 @@ class toolbarContainer extends Component {const mapStateToProps = (state) => {const {- animation, browser, notifications, palettes, compare, map, measure, modal, ui, locationSearch, events,+ animation, browser, notifications, palettes, compare, map, measure, modal, ui, locationSearch, events, proj,} = state;const { isDistractionFreeModeActive } = ui;const { number, type } = notifications;@@ -382,6 +383,7 @@ const mapStateToProps = (state) => {const shouldBeCollapsed = snapshotModalOpen || measure.isActive || animation.gifActive;const visibleLayersForProj = lodashFilter(activeLayersForProj, 'visible');return {+ proj,faSize,notificationType: type,notificationContentNumber: number,@@ -489,6 +491,7 @@ toolbarContainer.propTypes = {hasNonDownloadableLayer: PropTypes.bool,visibleLayersForProj: PropTypes.array,config: PropTypes.object,+ proj: PropTypes.object,faSize: PropTypes.string,hasCustomPalette: PropTypes.bool,hasGraticule: PropTypes.bool,