Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions project/standard/templates/configs/pluginsConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,17 @@
"description": "plugins.Permalink.description",
"denyUserSelection": true
},
{
"name": "LayersSelection",
"glyph": "hand-down",
"title": "plugins.LayersSelection.title",
"description": "plugins.LayersSelection.description",
"dependencies": [
"Toolbar",
"BurgerMenu",
"SidebarMenu"
]
},
{
"name": "BackgroundSelector",
"title": "plugins.BackgroundSelector.title",
Expand Down
11 changes: 11 additions & 0 deletions web/client/configs/pluginsConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,17 @@
"title": "plugins.Permalink.title",
"description": "plugins.Permalink.description"
},
{
"name": "LayersSelection",
"glyph": "hand-down",
"title": "plugins.LayersSelection.title",
"description": "plugins.LayersSelection.description",
"dependencies": [
"Toolbar",
"BurgerMenu",
"SidebarMenu"
]
},
{
"name": "BackgroundSelector",
"title": "plugins.BackgroundSelector.title",
Expand Down
96 changes: 96 additions & 0 deletions web/client/plugins/LayersSelection.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import React from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { get } from 'lodash';
import { Glyphicon } from 'react-bootstrap';

import { createPlugin } from '../utils/PluginsUtils';
import { layersSelector } from '../selectors/layers';
import { updateNode, addLayer, changeLayerProperties } from '../actions/layers';
import { zoomToExtent } from '../actions/map';
import controls from '../reducers/controls';
import { toggleControl } from '../actions/controls';
import Message from '../components/I18N/Message';

import SelectComponent from './layersSelection/components/LayersSelection';
import epics from './layersSelection/epics/layersSelection';
import select from './layersSelection/reducers/layersSelection';
import { storeConfiguration, cleanSelection, addOrUpdateSelection } from './layersSelection/actions/layersSelection';
import { getSelectSelections, getSelectQueryMaxFeatureCount } from './layersSelection/selectors/layersSelection';

/**
* Select plugin that enables layer feature selection in the map.
* It connects Redux state and actions to the SelectComponent UI.
* Uses selectors to retrieve visibility, layers, selection results, and feature count.
*
* @function
* @returns {Object} A plugin definition object used by the application to render and control the Select tool.
*/
export default createPlugin('LayersSelection', {
component: connect(
createSelector([
(state) => get(state, 'controls.select.enabled'),
layersSelector,
getSelectSelections,
getSelectQueryMaxFeatureCount
], (isVisible, layers, selections, maxFeatureCount) => ({
isVisible,
layers,
selections,
maxFeatureCount
})),
{
onClose: toggleControl.bind(null, 'select', null),
onUpdateNode: updateNode,
storeConfiguration,
cleanSelection,
addOrUpdateSelection,
zoomToExtent,
addLayer,
changeLayerProperties
}
)(SelectComponent),
options: {
disablePluginIf: "{state('mapType') === 'cesium'}"
},
reducers: {
...controls,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A reducer should not be spread. In this case if we want also to ensure controls reducer is included we should review reducers as:

reducers: {
  controls,
  layersSelection
}

And instead of select I propose to change the name of reducer to layersSelection

select
},
epics: epics,
containers: {
BurgerMenu: {
name: 'select',
position: 1000,
priority: 2,
doNotHide: true,
text: <Message msgId="layersSelection.title"/>,
tooltip: <Message msgId="layersSelection.tooltip"/>,
icon: <Glyphicon glyph="hand-down"/>,
action: toggleControl.bind(null, 'select', null),
toggle: true
},
SidebarMenu: {
name: 'select',
position: 1000,
priority: 1,
doNotHide: true,
text: <Message msgId="layersSelection.title"/>,
tooltip: <Message msgId="layersSelection.tooltip"/>,
icon: <Glyphicon glyph="hand-down"/>,
action: toggleControl.bind(null, 'select', null),
toggle: true
},
Toolbar: {
name: 'select',
alwaysVisible: true,
position: 2,
priority: 0,
doNotHide: true,
tooltip: <Message msgId="layersSelection.title"/>,
icon: <Glyphicon glyph="hand-down"/>,
action: toggleControl.bind(null, 'select', null),
toggle: true
}
}
});
5 changes: 4 additions & 1 deletion web/client/plugins/TOC/components/LayersTree.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const loopGroupCondition = (groupNode, condition) => {
* @prop {string} noFilteredResultsMsgId message id for no result on filter
* @prop {object} config optional configuration available for the nodes
* @prop {boolean} config.sortable activate the possibility to sort nodes
* @prop {component} treeHeader display a header on top of the layer tree
*/
const LayersTree = ({
tree,
Expand All @@ -90,7 +91,8 @@ const LayersTree = ({
nodeToolItems,
nodeContentItems,
singleDefaultGroup = isSingleDefaultGroup(tree),
theme
theme,
treeHeader
}) => {

const containerNode = useRef();
Expand Down Expand Up @@ -151,6 +153,7 @@ const LayersTree = ({
event.preventDefault();
}}
>
{treeHeader ?? null}
{(root || []).map((node, index) => {
return (
<DefaultLayerOrGroup
Expand Down
10 changes: 8 additions & 2 deletions web/client/plugins/TOC/components/TOC.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import {
* @prop {boolean} config.layerOptions.hideLegend hide the legend of the layer
* @prop {object} config.layerOptions.legendOptions additional options for WMS legend
* @prop {boolean} config.layerOptions.hideFilter hide the filter button in the layer nodes
* @prop {component} treeHeader display a header on top of the layer tree
*/
export function ControlledTOC({
tree,
Expand All @@ -77,7 +78,8 @@ export function ControlledTOC({
nodeToolItems,
nodeContentItems,
singleDefaultGroup,
theme
theme,
treeHeader
}) {
return (
<LayersTree
Expand All @@ -104,6 +106,7 @@ export function ControlledTOC({
nodeToolItems={nodeToolItems}
nodeContentItems={nodeContentItems}
singleDefaultGroup={singleDefaultGroup}
treeHeader={treeHeader}
/>
);
}
Expand Down Expand Up @@ -140,6 +143,7 @@ export function ControlledTOC({
* @prop {boolean} config.layerOptions.hideLegend hide the legend of the layer
* @prop {object} config.layerOptions.legendOptions additional options for WMS legend
* @prop {boolean} config.layerOptions.hideFilter hide the filter button in the layer nodes
* @prop {component} treeHeader display a header on top of the layer tree
*/
function TOC({
map = { layers: [], groups: [] },
Expand All @@ -154,7 +158,8 @@ function TOC({
singleDefaultGroup,
nodeItems,
theme,
filterText
filterText,
treeHeader
}) {
const { layers } = splitMapAndLayers(map) || {};
const tree = denormalizeGroups(layers.flat || [], layers.groups || []).groups;
Expand Down Expand Up @@ -218,6 +223,7 @@ function TOC({
nodeToolItems={nodeToolItems}
nodeContentItems={nodeContentItems}
singleDefaultGroup={singleDefaultGroup}
treeHeader={treeHeader}
/>
);
}
Expand Down
44 changes: 44 additions & 0 deletions web/client/plugins/layersSelection/actions/layersSelection.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
export const SELECT_CLEAN_SELECTION = "SELECT:CLEAN_SELECTION";
export const SELECT_STORE_CFG = "SELECT:STORE_CFG";
export const ADD_OR_UPDATE_SELECTION = "SELECT:ADD_OR_UPDATE_SELECTION";

/**
* Action creator to clean the current selection based on geometry type.
*
* @param {string} geomType - The type of geometry to clean (e.g., "Point", "Polygon").
* @returns {{ type: string, geomType: string }} The action object.
*/
export function cleanSelection(geomType) {
return {
type: SELECT_CLEAN_SELECTION,
geomType
};
}

/**
* Action creator to store configuration settings related to selection.
*
* @param {Object} cfg - Configuration object to store.
* @returns {{ type: string, cfg: Object }} The action object.
*/
export function storeConfiguration(cfg) {
return {
type: SELECT_STORE_CFG,
cfg
};
}

/**
* Action creator to add or update a layer selection with GeoJSON data.
*
* @param {string} layer - The name or ID of the layer.
* @param {Object} geoJsonData - The GeoJSON data representing the selection.
* @returns {{ type: string, layer: string, geoJsonData: Object }} The action object.
*/
export function addOrUpdateSelection(layer, geoJsonData) {
return {
type: ADD_OR_UPDATE_SELECTION,
layer,
geoJsonData
};
}
40 changes: 40 additions & 0 deletions web/client/plugins/layersSelection/assets/select.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
.ms-resizable-modal > .modal-content.select-dialog {
top: 0vh;
right: -100vw;
}

.select-content * .ms-node-title {
font-weight: bold;
}

.select-content * .ms-node-header-info > .ms-node-header-addons:nth-child(3) {
flex: 1 ;
justify-content: space-between;
}

.features-count-displayer{
display: flex;
}

.title-container {
display: flex;
}

.title-icon {
height: 100%;
width: auto;
margin-right: 0.5em;
}

.title-title {
flex-grow: 1;
text-align: center;
}

.tree-header {
background-color: #E9EDF4;
}

.features-count {
font-weight: bold;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
.ellipsis-container {
position: relative;
display: inline-block;
opacity: 1;
}

.ellipsis-button {
padding: 2%;
background-color: lightgray;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the styles related to theme colors should be included in the lesscss files under a including a new file with the name of plugin, in this case layer-selection.less. This is needed to use variables instead of hardcoded value for colors

/* border: none; */
border: 1px solid #ccc;
border-radius: 50%;
/* font-size: 16px; */
font-weight: bold;
cursor: pointer;
text-align: center;
line-height: 1;
}

.ellipsis-button:hover {
background-color: #e0e0e0;
}

.ellipsis-menu {
position: absolute;
top: 100%;
right: 0;
background-color: white;
border: 1px solid #ccc;
border-radius: 5px;
/* margin-top: 5px; */
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
z-index: 1;
width: 10vw;
}

.ellipsis-menu p {
margin: 0;
padding: 5%;
cursor: pointer;
}

.ellipsis-menu p:hover {
background-color: #f0f0f0;
}

.export-toggle {
display: flex;
justify-content: space-between;
align-items: center;
cursor: pointer;
padding: 5px 10px;
}

.export-toggle span:nth-of-type(2) {
font-weight: bold;
}
Loading