Skip to content

Commit

Permalink
Refacto: avoid duplication of code in selectionTool
Browse files Browse the repository at this point in the history 
Fix #5132
  • Loading branch information
@nboisteault
nboisteault committed Jan 21, 2025
1 parent a0aba31 commit cc8a36e
Showing 1 changed file with 76 additions and 148 deletions.
224 changes: 76 additions & 148 deletions assets/src/modules/SelectionTool.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,100 +156,15 @@ export default class SelectionTool {
this._bufferLayer.getSource().addFeature(bufferedFeature);

selectionFeature = this.featureDrawnBuffered;
});
}

for (const featureType of this.allFeatureTypeSelected) {
const lConfig = this._lizmap3.config.layers[featureType];
let typeName = featureType;
if ('typename' in lConfig) {
typeName = lConfig.typename;
} else if ('shortname' in lConfig) {
typeName = lConfig.shortname;
}

// Yo avoid applying reverseAxis (not supported by QGIS GML Parser)
// Choose a srsName without reverseAxis
let srsName = lConfig.crs;
if (srsName == 'EPSG:4326') {
srsName = 'CRS:84';
}
const gml = new GML3({srsName:srsName});

// Get the geometry in the layer projection
let geom = selectionFeature.getGeometry().clone();
geom.transform(this._map.getView().getProjection().getCode(), lConfig.crs);

// TODO create a geometry collection from the selection draw?
const gmlNode = gml.writeGeometryNode(geom);

const serializer = new XMLSerializer();

let spatialFilter = this._geomOperator + `($geometry, geom_from_gml('${serializer.serializeToString(gmlNode.firstChild)}'))`;


let rFilter = lConfig?.request_params?.filter;
if( rFilter ){
rFilter = rFilter.replace( typeName + ':', '');
spatialFilter = rFilter + ' AND ' + spatialFilter;
}

// Add exp_filter, for example if set by another tool( filter module )
// Often 'filter' is not set because filtertoken is set instead
// But in this case, exp_filter must also been set and must be added
let eFilter = lConfig?.request_params?.exp_filter;
if( eFilter ){
spatialFilter = eFilter +' AND '+ spatialFilter;
}

const wfs = new WFS();
const wfsParams = {
TYPENAME: typeName,
EXP_FILTER: spatialFilter
};

// Apply limit to bounding box config
if (this._lizmap3.config?.limitDataToBbox === 'True') {
wfsParams['BBOX'] = this._map.getView().calculateExtent();
wfsParams['SRSNAME'] = this._map.getView().getProjection().getCode();
}

// Restrict to current geometry extent for performance
// But not with 'disjoint' to get features
if (this._geomOperator !== 'disjoint') {
let geomExtent = geom.getExtent();
if (olExtent.getArea(geomExtent) == 0) {
geomExtent = olExtent.buffer(geomExtent, 0.000001);
for (const featureType of this.allFeatureTypeSelected) {
this.selectLayerFeaturesFromSelectionFeature(featureType, selectionFeature, this._geomOperator);
}
wfsParams['BBOX'] = geomExtent;
wfsParams['SRSNAME'] = lConfig.crs;
}

wfs.getFeature(wfsParams).then(response => {
const features = (new GeoJSON()).readFeatures(response);

// Array of feature ids matching geometry condition
let featureIds = features.map(feature => feature.getId().split('.')[1]);

if (this.newAddRemoveSelected === 'add' ) { // Add to selection
featureIds = config.layers[featureType]['selectedFeatures'].concat(featureIds);
// Remove duplicates
featureIds = [...new Set(featureIds)];
} else if (this.newAddRemoveSelected === 'remove' ) { // Remove from selection
const toRemove = new Set(featureIds);
featureIds = config.layers[featureType]['selectedFeatures'].filter( x => !toRemove.has(x) );
}

this._lizmap3.config.layers[featureType]['selectedFeatures'] = featureIds;
lizMap.events.triggerEvent("layerSelectionChanged",
{
'featureType': featureType,
'featureIds': this._lizmap3.config.layers[featureType]['selectedFeatures'],
'updateDrawing': true
}
);

});
} else {
for (const featureType of this.allFeatureTypeSelected) {
this.selectLayerFeaturesFromSelectionFeature(featureType, selectionFeature, this._geomOperator);
}
}
}
}
Expand Down Expand Up @@ -498,75 +413,88 @@ export default class SelectionTool {
* @param geomOperator
*/
selectLayerFeaturesFromSelectionFeature(targetFeatureType, selectionFeature, geomOperator = 'intersects'){
const lConfig = this._lizmap3.config.layers[targetFeatureType];
let typeName = targetFeatureType;
if ('typename' in lConfig) {
typeName = lConfig.typename;
} else if ('shortname' in lConfig) {
typeName = lConfig.shortname;
}

const lConfig = lizMap.config.layers[targetFeatureType];
// To avoid applying reverseAxis (not supported by QGIS GML Parser)
// Choose a srsName without reverseAxis
let srsName = lConfig.crs;
if (srsName == 'EPSG:4326') {
srsName = 'CRS:84';
}
const gml = new GML3({srsName:srsName});

const GML3Format = new GML3({srsName: this._lizmap3.map.getProjection()});
// Get the geometry in the layer projection
let geom = selectionFeature.getGeometry().clone();
geom.transform(this._map.getView().getProjection().getCode(), lConfig.crs);

const geomAsGML = GML3Format.writeGeometryNode( selectionFeature.getGeometry());
// TODO create a geometry collection from the selection draw?
const gmlNode = gml.writeGeometryNode(geom);

let spatialFilter = geomOperator+"($geometry, geom_from_gml('" + geomAsGML.innerHTML + "'))";
const serializer = new XMLSerializer();

if( 'request_params' in lConfig && 'filter' in lConfig['request_params'] ){
let rFilter = lConfig['request_params']['filter'];
if( rFilter ){
rFilter = rFilter.replace( targetFeatureType + ':', '');
spatialFilter = rFilter +' AND '+ spatialFilter;
}
let spatialFilter = geomOperator + `($geometry, geom_from_gml('${serializer.serializeToString(gmlNode.firstChild)}'))`;


let rFilter = lConfig?.request_params?.filter;
if( rFilter ){
rFilter = rFilter.replace( typeName + ':', '');
spatialFilter = rFilter + ' AND ' + spatialFilter;
}
if( 'request_params' in lConfig && 'exp_filter' in lConfig['request_params'] ){
// Add exp_filter, for example if set by another tool( filter module )
// Often 'filter' is not set because filtertoken is set instead
// But in this case, exp_filter must also been set and must be added
let eFilter = lConfig['request_params']['exp_filter'];
if( eFilter ){
spatialFilter = eFilter +' AND '+ spatialFilter;
}

// Add exp_filter, for example if set by another tool( filter module )
// Often 'filter' is not set because filtertoken is set instead
// But in this case, exp_filter must also been set and must be added
let eFilter = lConfig?.request_params?.exp_filter;
if( eFilter ){
spatialFilter = eFilter +' AND '+ spatialFilter;
}
let limitDataToBbox = false;
if ( 'limitDataToBbox' in lizMap.config.options && lizMap.config.options.limitDataToBbox == 'True'){
limitDataToBbox = true;

const wfs = new WFS();
const wfsParams = {
TYPENAME: typeName,
EXP_FILTER: spatialFilter
};

// Apply limit to bounding box config
if (this._lizmap3.config?.limitDataToBbox === 'True') {
wfsParams['BBOX'] = this._map.getView().calculateExtent();
wfsParams['SRSNAME'] = this._map.getView().getProjection().getCode();
}
let getFeatureUrlData = lizMap.getVectorLayerWfsUrl( targetFeatureType, spatialFilter, null, null, limitDataToBbox );

// add BBox to restrict to geom bbox but not with some geometry operator
if (geomOperator !== 'disjoint'){
getFeatureUrlData['options']['BBOX'] = selectionFeature.getGeometry().getExtent().join();
getFeatureUrlData['options']['SRSNAME'] = lConfig.crs;
// Restrict to current geometry extent for performance
// But not with 'disjoint' to get features
if (this._geomOperator !== 'disjoint') {
let geomExtent = geom.getExtent();
if (olExtent.getArea(geomExtent) == 0) {
geomExtent = olExtent.buffer(geomExtent, 0.000001);
}
wfsParams['BBOX'] = geomExtent;
wfsParams['SRSNAME'] = lConfig.crs;
}

// get features
fetch(getFeatureUrlData['url'], {
method: "POST",
body: new URLSearchParams(getFeatureUrlData['options'])
}).then(response => {
return response.json();
}).then(result => {
const features = (new GeoJSON()).readFeatures(result, {
featureProjection: this._lizmap3.map.getProjection()
});

let sfIds = features.map(feat => feat.getId().split('.')[1]);

if (this._newAddRemoveSelected === 'add') {
sfIds = lConfig['selectedFeatures'].concat(sfIds);
for (let i = 0; i < sfIds.length; ++i) {
for (let j = i + 1; j < sfIds.length; ++j) {
if (sfIds[i] === sfIds[j])
sfIds.splice(j--, 1);
}
}
} else if (this._newAddRemoveSelected === 'remove') {
let asfIds = lConfig['selectedFeatures'].concat([]);
for (let i = 0; i < sfIds.length; ++i) {
let asfIdIdx = asfIds.indexOf(sfIds[i]);
if (asfIdIdx != -1)
asfIds.splice(asfIdIdx, 1);
}
sfIds = asfIds;
wfs.getFeature(wfsParams).then(response => {
const features = (new GeoJSON()).readFeatures(response);

// Array of feature ids matching geometry condition
let featureIds = features.map(feature => feature.getId().split('.')[1]);

if (this.newAddRemoveSelected === 'add' ) { // Add to selection
featureIds = lConfig['selectedFeatures'].concat(featureIds);
// Remove duplicates
featureIds = [...new Set(featureIds)];
} else if (this.newAddRemoveSelected === 'remove' ) { // Remove from selection
const toRemove = new Set(featureIds);
featureIds = lConfig['selectedFeatures'].filter( x => !toRemove.has(x) );
}
lConfig['selectedFeatures'] = sfIds;
lizMap.events.triggerEvent("layerSelectionChanged",

lConfig['selectedFeatures'] = featureIds;
this._lizmap3.events.triggerEvent("layerSelectionChanged",
{
'featureType': targetFeatureType,
'featureIds': lConfig['selectedFeatures'],
Expand Down

0 comments on commit cc8a36e

Please sign in to comment.