Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-3585 Charting UI Updates (#5886)

christof-wittreichdd0b63199679
diff --git a/tasks/build-options/processColormap.js b/tasks/build-options/processColormap.js
index 54efae9dc..1009d2f51 100755
--- a/tasks/build-options/processColormap.js
+++ b/tasks/build-options/processColormap.js
@@ -10,7 +10,7 @@ const writeFile = promisify(fs.writeFile)
const prog = path.basename(__filename)
const options = yargs
- .usage('Usage: $0 [config] [inputDir] [outputDir]')
+ .usage('Usage: $0 [config] [inputDir] [outputDir] [layersDir]')
.option('config', {
demandOption: true,
alias: 'c',
@@ -29,21 +29,30 @@ const options = yargs
type: 'string',
description: 'wmts output directory'
})
+ .option('layersDir', {
+ demandOption: true,
+ alias: 'l',
+ type: 'string',
+ description: 'wmts layers directory'
+ })
.epilog('Converts colormaps to JSON files')
const { argv } = options
-if (!argv.config && !argv.inputDir && !argv.outputDir) {
+if (!argv.config && !argv.inputDir && !argv.outputDir && !argv.layersDir) {
throw new Error('Invalid number of arguments')
}
const config = argv.config
const inputDir = argv.inputDir
const outputDir = argv.outputDir
+const layersDir = argv.layersDir
const skips = config.skipPalettes || []
let errorCount = 0
let fileCount = 0
+const colormapTypes = {}
+
const walk = (dir) => {
let results = []
const list = fs.readdirSync(dir)
@@ -77,6 +86,24 @@ async function main () {
}
}
+ try {
+ const wmtsFiles = fs.readdirSync(layersDir)
+ for (const file of wmtsFiles) {
+ if (!file.endsWith('.json')) continue
+ const data = await fs.promises.readFile(path.join(layersDir, file), 'utf8')
+ const jsonData = JSON.parse(data)
+ Object.keys(jsonData.layers).forEach((id) => {
+ const hasPaletteId = Object.prototype.hasOwnProperty.call(jsonData.layers[id], 'palette') &&
+ Object.prototype.hasOwnProperty.call(jsonData.layers[id].palette, 'id')
+ const colormapId = hasPaletteId ? jsonData.layers[id].palette.id : id
+ if (Object.prototype.hasOwnProperty.call(colormapTypes, colormapId)) jsonData.layers[id].colormapType = colormapTypes[colormapId]
+ })
+ await writeFile(path.join(layersDir, file), JSON.stringify(jsonData, null, 2), { encoding: 'utf-8' })
+ }
+ } catch (error) {
+ console.error(`${prog}: ERROR: ${error}`)
+ }
+
console.warn(`${prog}: ${errorCount} error(s), ${fileCount} file(s)`)
if (errorCount > 0) {
@@ -352,6 +379,8 @@ async function processFile (id, xml) {
maps
}
+ colormapTypes[id] = maps[0].legend.type
+
const outputFile = path.join(outputDir, `${id}.json`)
await writeFile(outputFile, JSON.stringify(data, null, 2), { encoding: 'utf-8' })
} catch (error) {
diff --git a/tasks/buildOptions.sh b/tasks/buildOptions.sh
index 6f0124983..1a97ff4b0 100755
--- a/tasks/buildOptions.sh
+++ b/tasks/buildOptions.sh
@@ -142,6 +142,7 @@ else
--config "$OPT_DIR/$OPT_SUBDIR/config.json" \
--inputDir "$BUILD_DIR/colormaps" \
--outputDir "$BUILD_DIR/config/palettes" \
+ --layersDir "$BUILD_DIR/_wmts" \
--mode "$MODE"`
fi
diff --git a/web/images/layers/charting/charting_icon_filled.svg b/web/images/layers/charting/charting_icon_filled.svg
new file mode 100644
index 000000000..22ae4ad2d
--- /dev/null
+++ b/web/images/layers/charting/charting_icon_filled.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.59 174.59">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: #333;
+ }
+ </style>
+ </defs>
+ <g id="Layer_1-2" data-name="Layer 1">
+ <path class="cls-1" d="M162.59,0H12C5.4,0,0,5.4,0,12v150.59c0,6.6,5.4,12,12,12h150.59c6.6,0,12-5.4,12-12V12c0-6.6-5.4-12-12-12ZM161.72,74.09c-11.63,12.09-27.37,28.98-35.69,36.97-3.43,3.29-10.04,3.33-13.52.08l-28.37-27.49c-2.2-2.05-5.62-2.04-7.8.03-11.89,11.3-43.89,42.71-45.01,43.55-11.51,10.67-26.62-5.69-18.87-13.45l60.57-60.1c3.85-3.8,10.01-3.88,13.96-.19l27.67,27.37c2.24,2.1,5.73,2.08,7.95-.03,0,0,13.91-14.85,22.9-23.51,8.99-8.66,27.62,3.41,16.22,16.77Z"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/web/images/layers/charting/charting_icon_stroked.svg b/web/images/layers/charting/charting_icon_stroked.svg
new file mode 100644
index 000000000..463d81fbc
--- /dev/null
+++ b/web/images/layers/charting/charting_icon_stroked.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 206.59 206.59">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: #eee;
+ }
+ </style>
+ </defs>
+ <g id="Layer_1-2" data-name="Layer 1">
+ <path class="cls-1" d="M178.59,16c6.6,0,12,5.4,12,12v150.59c0,6.6-5.4,12-12,12H28c-6.6,0-12-5.4-12-12V28c0-6.6,5.4-12,12-12h150.59M178.59,0H28C12.56,0,0,12.56,0,28v150.59c0,15.44,12.56,28,28,28h150.59c15.44,0,28-12.56,28-28V28c0-15.44-12.56-28-28-28h0ZM177.72,90.09c-11.63,12.09-27.37,28.98-35.69,36.97-3.43,3.29-10.04,3.33-13.52.08l-28.37-27.49c-2.2-2.05-5.62-2.04-7.8.03-11.89,11.3-43.89,42.71-45.01,43.55-11.51,10.67-26.62-5.69-18.87-13.45l60.57-60.1c3.85-3.8,10.01-3.88,13.96-.19l27.67,27.37c2.24,2.1,5.73,2.08,7.95-.03,0,0,13.91-14.85,22.9-23.51,8.99-8.66,27.62,3.41,16.22,16.77Z"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/web/js/components/layer/product-picker/search/search-layer-row.js b/web/js/components/layer/product-picker/search/search-layer-row.js
index e3cf77e96..35f9fa135 100644
--- a/web/js/components/layer/product-picker/search/search-layer-row.js
+++ b/web/js/components/layer/product-picker/search/search-layer-row.js
@@ -110,15 +110,16 @@ class SearchLayerRow extends React.Component {
layerNotices,
} = this.props;
const { showDeleteIcon } = this.state;
- const { id } = layer;
+ const { id, analysis } = layer;
const encodedId = util.encodeId(id);
const isMetadataShowing = selectedLayer && id === selectedLayer.id;
+ const chartableLayer = analysis?.includes('Chartable (Raster-based)');
const rowClass = isMetadataShowing
? 'search-row layers-all-layer selected'
: 'search-row layers-all-layer';
const checkboxClass = isEnabled ? 'wv-checkbox checked' : 'wv-checkbox';
const recentLayerMode = categoryType === 'recent';
- const headerClassName = layerNotices
+ const headerClassName = layerNotices || chartableLayer
? 'layers-all-header notice'
: 'layers-all-header';
@@ -142,24 +143,47 @@ class SearchLayerRow extends React.Component {
<Check class="check" size="15px" />
)}
</div>
- {layerNotices && (
- <div className="layer-notice-wrapper">
- <FontAwesomeIcon
- id={`${encodedId}-notice-info`}
- className="layer-notice-icon"
- icon="exclamation-triangle"
- />
- <UncontrolledTooltip
- id="center-align-tooltip"
- className="zot-tooltip"
- placement="top"
- target={`${encodedId}-notice-info`}
- trigger="hover"
- autohide={isMobile}
- delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}
- >
- <div dangerouslySetInnerHTML={{ __html: layerNotices }} />
- </UncontrolledTooltip>
+ {(chartableLayer || layerNotices) && (
+ <div className="layer-notices">
+ {chartableLayer && (
+ <div className="layer-notice-wrapper">
+ <i
+ id={`${encodedId}-chartable-info`}
+ className="layer-notice-icon chartable-icon"
+ />
+ <UncontrolledTooltip
+ id="center-align-tooltip"
+ className="zot-tooltip"
+ placement="top"
+ target={`${encodedId}-chartable-info`}
+ trigger="hover"
+ autohide={isMobile}
+ delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}
+ >
+ <div dangerouslySetInnerHTML={{ __html: 'Create time series charts or get statistics for this layer' }} />
+ </UncontrolledTooltip>
+ </div>
+ )}
+ {layerNotices && (
+ <div className="layer-notice-wrapper">
+ <FontAwesomeIcon
+ id={`${encodedId}-notice-info`}
+ className="layer-notice-icon"
+ icon="exclamation-triangle"
+ />
+ <UncontrolledTooltip
+ id="center-align-tooltip"
+ className="zot-tooltip"
+ placement="top"
+ target={`${encodedId}-notice-info`}
+ trigger="hover"
+ autohide={isMobile}
+ delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}
+ >
+ <div dangerouslySetInnerHTML={{ __html: layerNotices }} />
+ </UncontrolledTooltip>
+ </div>
+ )}
</div>
)}
<div className={headerClassName} onClick={this.onRowClick}>
diff --git a/web/js/components/sidebar/paletteLegend.js b/web/js/components/sidebar/paletteLegend.js
index c8874af14..d3ebbf217 100644
--- a/web/js/components/sidebar/paletteLegend.js
+++ b/web/js/components/sidebar/paletteLegend.js
@@ -449,10 +449,10 @@ class PaletteLegend extends React.Component {
render() {
const {
- paletteId, layer, isCustomPalette, showingVectorHand,
+ paletteId, layer, isCustomPalette, showingVectorHand, showingChartingIcon,
} = this.props;
const { isHoveringLegend } = this.state;
- const customClass = showingVectorHand && layer.id.includes('AERONET') ? ' vector-palette' : isCustomPalette ? ' is_custom' : '';
+ const customClass = (showingVectorHand && layer.id.includes('AERONET')) || showingChartingIcon ? ' bottomspace-palette' : isCustomPalette ? ' is_custom' : '';
if (!layer.palette) return;
return (
<div
diff --git a/web/js/containers/sidebar/layer-list.js b/web/js/containers/sidebar/layer-list.js
index 454393a1f..f8f34637e 100644
--- a/web/js/containers/sidebar/layer-list.js
+++ b/web/js/containers/sidebar/layer-list.js
@@ -186,7 +186,7 @@ function LayerList(props) {
ref={provided.innerRef}
{...provided.droppableProps}
>
- {layers.map(renderLayer)}
+ {layers.sort((layerA, layerB) => (isChartingActive ? layerB.shouldHide === layerA.shouldHide ? 0 : layerB.shouldHide ? -1 : 1 : 0)).map(renderLayer)}
{provided.placeholder}
</ul>
)}
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index 8852189ea..5b0a219af 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -90,6 +90,7 @@ function LayerRow (props) {
isInProjection,
tracksForLayer,
isVectorLayer,
+ isChartableLayer,
measurementDescriptionPath,
isAnimating,
palettes,
@@ -253,6 +254,7 @@ function LayerRow (props) {
isMobile={isMobile}
palettes={palettes}
showingVectorHand={isVectorLayer && isVisible}
+ showingChartingIcon={isChartableLayer && isVisible}
/>
);
}
@@ -415,6 +417,24 @@ function LayerRow (props) {
);
};
+ const renderChartingIcon = () => {
+ const title = 'Select Start Charting to create time series charts or get statistics for this layer';
+ const layerChartableBtnId = `layer-chartable-btn-${encodedLayerId}`;
+ return (
+ <div
+ id={layerChartableBtnId}
+ aria-label={title}
+ className="layer-chartable-icon"
+ onMouseDown={stopPropagation}
+ >
+ <UncontrolledTooltip id="center-align-tooltip" placement="top" target={layerChartableBtnId}>
+ {title}
+ </UncontrolledTooltip>
+ <i />
+ </div>
+ );
+ };
+
const mouseOver = () => {
if (isMobile) return;
events.trigger(SIDEBAR_LAYER_HOVER, layer.id, true);
@@ -430,23 +450,24 @@ function LayerRow (props) {
const getLayerItemClasses = () => {
let baseClasses = 'item productsitem layer-enabled';
if (isAnimating) baseClasses += ' disabled';
- if (!isVisible || disabled) {
+ if (!isVisible || disabled || layer.shouldHide) {
baseClasses += ' layer-hidden';
} else {
baseClasses += ' layer-visible';
}
if (activeZot || zot) baseClasses += ' zotted';
+ if (layer.shouldHide) baseClasses += ' mini';
return baseClasses;
};
const getVisibilityToggleClass = () => {
let baseClasses = 'visibility';
- if (disabled || isAnimating) {
+ if (disabled || isAnimating || layer.shouldHide) {
baseClasses += ' disabled';
} else {
baseClasses += ' layer-enabled';
}
- if (isVisible && !disabled) {
+ if (isVisible && !disabled && !layer.shouldHide) {
baseClasses += ' layer-visible';
} else {
baseClasses += ' layer-hidden';
@@ -496,61 +517,72 @@ function LayerRow (props) {
</a>
)}
{isChartingActive && (
- <>
- <div />
- <a
- id={`activate-${encodedLayerId}`}
- className={layer.id === activeChartingLayer ? 'layer-visible visibility active-chart' : 'layer-visible visibility'}
- onClick={() => makeActiveForCharting(layer.id)}
- >
- <UncontrolledTooltip
- id="center-align-tooltip"
- placement="right"
- target={`activate-${encodedLayerId}`}
+ !layer.shouldHide ? (
+ <>
+ <div />
+ <a
+ id={`activate-${encodedLayerId}`}
+ className={layer.id === activeChartingLayer ? 'layer-visible visibility active-chart' : 'layer-visible visibility'}
+ onClick={() => makeActiveForCharting(layer.id)}
>
- Select layer for processing
- </UncontrolledTooltip>
- {layer.id === activeChartingLayer ? (
- <FontAwesomeIcon
- icon={faCircleDot}
- className="charting-indicator"
- />
- ) : (
- <FontAwesomeIcon
- icon={faCircle}
- className="charting-indicator"
- />
- )}
- </a>
- </>
+ <UncontrolledTooltip
+ id="center-align-tooltip"
+ placement="right"
+ target={`activate-${encodedLayerId}`}
+ >
+ Select layer for processing
+ </UncontrolledTooltip>
+ {layer.id === activeChartingLayer ? (
+ <FontAwesomeIcon
+ icon={faCircleDot}
+ className="charting-indicator"
+ />
+ ) : (
+ <FontAwesomeIcon
+ icon={faCircle}
+ className="charting-indicator"
+ />
+ )}
+ </a>
+ </>
+ ) : (
+ <a className={getVisibilityToggleClass()} />
+ )
)}
<Zot zot={activeZot || zot} layer={layer.id} isMobile={isMobile} />
<div className={isVectorLayer ? 'layer-main wv-vector-layer' : 'layer-main'}>
- <div className="layer-info" style={{ minHeight: isVectorLayer ? '60px' : '40px' }}>
+ <div className="layer-info" style={{ minHeight: layer.shouldHide ? '22px' : isVectorLayer ? '60px' : '40px' }}>
<div className="layer-buttons">
{showButtons && renderControls()}
</div>
<h4 title={names.title}>{names.title}</h4>
- <div className="instrument-collection">
- <p dangerouslySetInnerHTML={{ __html: names.subtitle }} />
-
- {collections && isVisible ? (
- <h6>
- <span id="collection-identifier" className={collectionClass}>
- {collections.version} {collections.type}
- <UncontrolledTooltip id="center-align-tooltip" placement="right" target="collection-identifier" boundariesElement="wv-content" delay={{ show: 250, hide: 0 }}>
- {collectionIdentifierDescription}
- </UncontrolledTooltip>
- </span>
- </h6>
- ) : ''}
- </div>
+ {!layer.shouldHide && (
+ <div className="instrument-collection">
+ <p dangerouslySetInnerHTML={{ __html: names.subtitle }} />
+
+ {collections && isVisible ? (
+ <h6>
+ <span id="collection-identifier" className={collectionClass}>
+ {collections.version} {collections.type}
+ <UncontrolledTooltip id="center-align-tooltip" placement="right" target="collection-identifier" boundariesElement="wv-content" delay={{ show: 250, hide: 0 }}>
+ {collectionIdentifierDescription}
+ </UncontrolledTooltip>
+ </span>
+ </h6>
+ ) : ''}
+ </div>
+ )}
- {hasPalette ? getPaletteLegend() : ''}
+ {hasPalette && !layer.shouldHide ? getPaletteLegend() : ''}
</div>
- {isVectorLayer && isVisible ? renderVectorIcon() : null}
- {tracksForLayer.length > 0 && (
+ {isVisible && !layer.shouldHide && (isChartableLayer || isVectorLayer) && (
+ <div className="layer-buttons-container">
+ {isVectorLayer ? renderVectorIcon() : null}
+ {isChartableLayer && !isChartingActive ? renderChartingIcon() : null}
+ </div>
+ )}
+ {tracksForLayer.length > 0 && !layer.shouldHide && (
<div className="layer-tracks">
{tracksForLayer.map((track) => (
<OrbitTrack
@@ -561,7 +593,7 @@ function LayerRow (props) {
))}
</div>
)}
- {showZoomAlert && !hideZoomAlert && !isLayerNotificationDismissable && (
+ {showZoomAlert && !hideZoomAlert && !isLayerNotificationDismissable && !layer.shouldHide && (
<AlertUtil
id="zoom-alert"
isOpen
@@ -572,7 +604,7 @@ function LayerRow (props) {
onClick={openZoomAlertModal}
/>
)}
- {showGranuleAlert && !hideGranuleAlert && !isLayerNotificationDismissable && (
+ {showGranuleAlert && !hideGranuleAlert && !isLayerNotificationDismissable && !layer.shouldHide && (
<AlertUtil
id="granule-alert"
isOpen
@@ -587,38 +619,36 @@ function LayerRow (props) {
</>
);
- if (!layer.shouldHide) {
- return (
- <Draggable
- isDragDisabled={isEmbedModeActive || isAnimating}
- draggableId={`${encodedLayerId}-${compareState}`}
- index={index}
- direction="vertical"
- >
- {(provided, snapshot) => (isInProjection ? (
- <li
- id={`${compareState}-${encodedLayerId}`}
- className={getLayerItemClasses()}
- style={getItemStyle(snapshot.isDragging, provided.draggableProps.style)}
- ref={provided.innerRef}
- onMouseOver={mouseOver}
- onMouseLeave={mouseLeave}
- {...provided.draggableProps}
- {...provided.dragHandleProps}
- >
- {renderLayerRow()}
- </li>
- ) : (
- <li
- className="layer-list-placeholder"
- ref={provided.innerRef}
- {...provided.draggableProps}
- {...provided.dragHandleProps}
- />
- ))}
- </Draggable>
- );
- }
+ return (
+ <Draggable
+ isDragDisabled={isEmbedModeActive || isAnimating}
+ draggableId={`${encodedLayerId}-${compareState}`}
+ index={index}
+ direction="vertical"
+ >
+ {(provided, snapshot) => (isInProjection ? (
+ <li
+ id={`${compareState}-${encodedLayerId}`}
+ className={getLayerItemClasses()}
+ style={getItemStyle(snapshot.isDragging, provided.draggableProps.style)}
+ ref={provided.innerRef}
+ onMouseOver={mouseOver}
+ onMouseLeave={mouseLeave}
+ {...provided.draggableProps}
+ {...provided.dragHandleProps}
+ >
+ {renderLayerRow()}
+ </li>
+ ) : (
+ <li
+ className="layer-list-placeholder"
+ ref={provided.innerRef}
+ {...provided.draggableProps}
+ {...provided.dragHandleProps}
+ />
+ ))}
+ </Draggable>
+ );
}
const makeMapStateToProps = () => {
@@ -645,6 +675,7 @@ const makeMapStateToProps = () => {
const { isEmbedModeActive } = embed;
const selectedMap = lodashGet(map, 'ui.selected');
const isVector = layer.type === 'vector';
+ const isChartable = Object.prototype.hasOwnProperty.call(layer, 'palette') && state.palettes.rendered[layer.palette.id] && state.palettes.rendered[layer.palette.id].maps[0].type === 'continuous' && layer.layerPeriod === 'Daily' && !layer.disableCharting;
const mapRes = selectedMap ? selectedMap.getView().getResolution() : null;
const tracksForLayer = getActiveLayers(state).filter(
(activeLayer) => (layer.orbitTracks || []).some((track) => activeLayer.id === track),
@@ -672,6 +703,7 @@ const makeMapStateToProps = () => {
isMobile,
isVisible,
isVectorLayer: isVector,
+ isChartableLayer: isChartable,
isAnimating: animation.isPlaying,
hasClickableFeature: isVector && isVisible && isVectorLayerClickable(layer, mapRes, proj.id, isMobile),
hasPalette,
@@ -814,6 +846,7 @@ LayerRow.propTypes = {
openGranuleAlertModal: PropTypes.func,
zot: PropTypes.object,
isVectorLayer: PropTypes.bool,
+ isChartableLayer: PropTypes.bool,
isAnimating: PropTypes.bool,
isChartingActive: PropTypes.bool,
activeChartingLayer: PropTypes.string,
diff --git a/web/js/modules/product-picker/facet-config.js b/web/js/modules/product-picker/facet-config.js
index 3373b1640..2fbc55386 100644
--- a/web/js/modules/product-picker/facet-config.js
+++ b/web/js/modules/product-picker/facet-config.js
@@ -69,4 +69,11 @@ export default [
tooltip: 'Granule-based rasters cover the spatial footprint of individual data files; mosaics assemble granules into spatially continuous maps. Vectors provide additional attribute information or flow visualizations.',
hideZeroCount: true,
},
+ {
+ field: 'analysis',
+ label: 'Analysis',
+ filterType: 'any',
+ tooltip: 'Create time series charts or get statistics of a single variable',
+ hideZeroCount: true,
+ },
];
diff --git a/web/js/modules/product-picker/format-config.js b/web/js/modules/product-picker/format-config.js
index 25b794a30..ce2cd0610 100644
--- a/web/js/modules/product-picker/format-config.js
+++ b/web/js/modules/product-picker/format-config.js
@@ -99,6 +99,13 @@ function setTypeProp(layer) {
return layer;
}
+function setChartableProp(layer) {
+ if (!(Object.prototype.hasOwnProperty.call(layer, 'palette') && Object.prototype.hasOwnProperty.call(layer, 'colormapType') && layer.colormapType === 'continuous' && layer.layerPeriod === 'Daily') || layer.disableCharting) {
+ return;
+ }
+ layer.analysis = ['Chartable (Raster-based)'];
+}
+
/**
* Derive and format facet props from config
* @param {*} config
@@ -111,6 +118,7 @@ export default function buildLayerFacetProps(config, selectedDate) {
setCoverageFacetProp(layer, selectedDate);
setLayerProp(layer, 'sources', layer.subtitle);
setTypeProp(layer);
+ setChartableProp(layer);
if (layer.daynight && layer.daynight.length) {
if (typeof layer.daynight === 'string') {
layer.daynight = [layer.daynight];
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index a55112e1e..8c4ac42fd 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -81,6 +81,10 @@
color: #666;
}
+ & .chartable-icon {
+ background-color: #666;
+ }
+
& .layers-all-header > h3 {
transition: background-color 200ms ease;
color: #000;
@@ -268,20 +272,31 @@
.layers-all-layer.search-row {
padding: 8px 5px;
+ .layer-notices {
+ position: absolute;
+ display: flex;
+ right: 5px;
+ bottom: 5px;
+ }
+
.layer-notice-icon {
color: #eee;
- height: 24px;
- width: 24px;
- display: inline;
- position: absolute;
- left: 40px;
+ height: 20px;
+ width: 20px;
+ margin: 0 5px;
+
+ &.chartable-icon {
+ display: block;
+ background-color: #eee;
+ mask-image: url("../images/layers/charting/charting_icon_stroked.svg");
+ }
}
.layers-all-header {
- padding: 0 0 0 40px;
+ padding: 0 0 0 25px;
&.notice {
- padding: 0 0 0 70px;
+ padding: 0 70px 0 25px;
}
}
diff --git a/web/scss/features/palettes.scss b/web/scss/features/palettes.scss
index 9d64a8781..321cb4ffe 100644
--- a/web/scss/features/palettes.scss
+++ b/web/scss/features/palettes.scss
@@ -283,6 +283,6 @@
margin-bottom: 14px;
}
-.vector-palette {
+.bottomspace-palette {
padding-bottom: 20px;
}
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index fca20a369..f461a9a26 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -251,6 +251,18 @@ li.item.productsitem.inmotion,
position: relative;
border: 1px solid #333;
overflow: hidden;
+
+ &.mini {
+ min-height: 22px;
+
+ a.visibility.layer-hidden.disabled:hover {
+ cursor: grab;
+ }
+
+ .layer-main {
+ min-height: 22px;
+ }
+ }
}
.sidebar-panel li.item.productsitem:hover {
@@ -315,15 +327,21 @@ li.item.productsitem.inmotion,
color: #c5c5c8;
}
-/* ***********************************
- * Vector layer pointer icon *
- *************************************/
-.productsitem .layer-main .layer-pointer-icon {
+.layer-buttons-container {
position: absolute;
right: 4px;
bottom: 7px;
+ display: flex;
+
+ & > div {
+ position: relative;
+ margin-left: 4px;
+ }
}
+/* ***********************************
+ * Vector layer pointer icon *
+ *************************************/
.productsitem .layer-pointer-icon svg.svg-inline--fa {
color: #22a;
}
@@ -366,6 +384,20 @@ li.item.productsitem.inmotion,
* End -- vector layer pointer icon *
************************************/
+ /* ***********************************
+ * Chartable layer icon *
+ *************************************/
+.layer-chartable-icon i {
+ display: block;
+ width: 13px;
+ height: 13px;
+ background: url("../images/layers/charting/charting_icon_filled.svg");
+}
+
+/************************************
+ * End -- chartable layer icon *
+ ************************************/
+
/* ***********************************
* Granule active footprint toggle *
*************************************/