Fix #9620 better error handling of GeoProcessing (#9621) (#9630)

geosolutions-it · Oct 19, 2023 · 0111fcf · 0111fcf
1 parent 32eb916
commit 0111fcf
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 127 deletions.
diff --git a/web/client/actions/__tests__/geoProcessing-test.js b/web/client/actions/__tests__/geoProcessing-test.js
@@ -164,14 +164,16 @@ describe('Test Geo Processing Tools related actions', () => {
  const source = "";
  const data = {};
  const nextPage = 2;
+ const geometryProperty = {};
 
- const action = setFeatures(layerId, source, data, nextPage);
+ const action = setFeatures(layerId, source, data, nextPage, geometryProperty);
  expect(action).toEqual({
  type: SET_FEATURES,
  layerId,
  source,
  data,
- nextPage
+ nextPage,
+ geometryProperty
  });
  });
  it('setFeatureSourceLoading', () => {

diff --git a/web/client/actions/geoProcessing.js b/web/client/actions/geoProcessing.js
@@ -197,12 +197,13 @@ export const setBufferCapStyle = (capStyle) => ({
  * @param {string} source can be "source" or "intersection"
  * @param {object[]|object} data list of features or error
  */
-export const setFeatures = (layerId, source, data, nextPage) => ({
+export const setFeatures = (layerId, source, data, nextPage, geometryProperty) => ({
  type: SET_FEATURES,
  layerId,
  source,
  data,
- nextPage
+ nextPage,
+ geometryProperty
 });
 /**
  * action for the loading flag of the features

diff --git a/web/client/epics/geoProcessing.js b/web/client/epics/geoProcessing.js
@@ -130,9 +130,10 @@ import {
  calculateDistance
 } from "../utils/CoordinatesUtils";
 import {buildIdentifyRequest} from "../utils/MapInfoUtils";
+import {logError} from "../utils/DebugUtils";
 import {getFeatureInfo} from "../api/identify";
 import {getFeatureSimple} from '../api/WFS';
-import {findNonGeometryProperty} from '../utils/ogc/WFS/base';
+import {findNonGeometryProperty, findGeometryProperty} from '../utils/ogc/WFS/base';
 import toWKT from '../utils/ogc/WKT/toWKT';
 
 const OFFSET = 550;
@@ -211,7 +212,7 @@ export const checkWPSAvailabilityGPTEpic = (action$, store) => action$
  );
  })
  .catch((e) => {
- console.error(e);
+ logError(e);
  return Rx.Observable.of(
  setWPSAvailability(layerId, false, source),
  checkingWPS(false)
@@ -260,6 +261,7 @@ export const getFeaturesGPTEpic = (action$, store) => action$
  startIndex: page * maxFeatures,
  maxFeatures
  };
+ const geometryProperty = findGeometryProperty(layer.describeFeatureType);
  return Rx.Observable.merge(
  getLayerJSONFeature({
  ...layer,
@@ -269,9 +271,19 @@ export const getFeaturesGPTEpic = (action$, store) => action$
  url: layer.url
  }
  }, filterObj, options)
- .map(data => setFeatures(layerId, source, data, page))
- .catch(error => {
- return Rx.Observable.of(setFeatures(layerId, source, error, page));
+ .map(data => setFeatures(layerId, source, data, page, geometryProperty))
+ .catch(e => {
+ logError(e);
+ return Rx.Observable.of(
+ setFeatures(layerId, source, e, page, geometryProperty),
+ showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorGettingFeaturesList",
+ autoDismiss: 6,
+ position: "tc",
+ values: {layerName: layer.name + " - " + layer.title}
+ })
+ );
  })
  .startWith(setFeatureLoading(true))
  .concat(Rx.Observable.of(setFeatureLoading(false))));
@@ -316,7 +328,8 @@ export const getFeatureDataGPTEpic = (action$, store) => action$
  ]);
 
  })
- .catch(() => {
+ .catch((e) => {
+ logError(e);
  return Rx.Observable.of(showErrorNotification({
  title: "errorTitleDefault",
  message: "GeoProcessing.notifications.errorGetFeature",
@@ -364,7 +377,8 @@ export const getIntersectionFeatureDataGPTEpic = (action$, store) => action$
  ]);
 
  })
- .catch(() => {
+ .catch((e) => {
+ logError(e);
  return Rx.Observable.of(showErrorNotification({
  title: "errorTitleDefault",
  message: "GeoProcessing.notifications.errorGetFeature",
@@ -486,7 +500,8 @@ export const runBufferProcessGPTEpic = (action$, store) => action$
  )
  );
  })
- .catch(() => {
+ .catch((e) => {
+ logError(e);
  return Rx.Observable.of(showErrorNotification({
  title: "errorTitleDefault",
  message: "GeoProcessing.notifications.errorBuffer",
@@ -504,19 +519,34 @@ export const runBufferProcessGPTEpic = (action$, store) => action$
  executeOptions,
  {
  headers: {'Content-Type': 'application/xml', 'Accept': `application/xml, application/json`}
- }).catch(() => {
- return Rx.Observable.of(showErrorNotification({
- title: "errorTitleDefault",
- message: "GeoProcessing.notifications.errorBuffer",
- autoDismiss: 6,
- position: "tc"
- }));
- });
+ })
+ .catch((e) => {
+ logError(e);
+ return Rx.Observable.of({error: e, layerName: layer.name, layerTitle: layer.title});
+ });
  return executeCollectProcess$
- .switchMap((geom) => {
+ .switchMap((result) => {
+ if (result.error) {
+ if (result.error.message.includes("Failed to retrieve value for input features")) {
+ console.error("layerName " + result.layerName + " - " + result.layerTitle);
+ return Rx.Observable.of(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorGettingFC",
+ autoDismiss: 6,
+ position: "tc",
+ values: {layerName: result.layerName + " - " + result.layerTitle}
+ }));
+ }
+ return Rx.Observable.of(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorBuffer",
+ autoDismiss: 6,
+ position: "tc"
+ }));
+ }
  const ft = {
  type: "Feature",
- geometry: geom
+ geometry: result
  };
  const featureReprojected = reprojectGeoJson(ft, "EPSG:4326", "EPSG:3857");
  const geometry3857 = toWKT(featureReprojected.geometry);
@@ -574,6 +604,10 @@ export const runIntersectProcessGPTEpic = (action$, store) => action$
  executeOptions,
  {
  headers: {'Content-Type': 'application/xml', 'Accept': `application/xml, application/json`}
+ })
+ .catch((e) => {
+ logError(e);
+ return Rx.Observable.of({error: e, layerName: layer.name, layerTitle: layer.title});
  });
  } else {
  sourceFC$ = Rx.Observable.of(sourceFeature.geometry);
@@ -588,12 +622,46 @@ export const runIntersectProcessGPTEpic = (action$, store) => action$
  executeOptions,
  {
  headers: {'Content-Type': 'application/xml', 'Accept': `application/xml, application/json`}
+ })
+ .catch((e) => {
+ logError(e);
+ return Rx.Observable.of({error: e, layerName: intersectionLayer.name, layerTitle: intersectionLayer.title});
  });
  } else {
  intersectionFC$ = Rx.Observable.of(intersectionFeature.geometry);
  }
  return Rx.Observable.forkJoin(sourceFC$, intersectionFC$)
  .switchMap(([firstGeom, secondGeom]) => {
+ if (firstGeom?.error || secondGeom?.error) {
+ const errorActions = [];
+ if (firstGeom?.error?.message?.includes("Failed to retrieve value for input features")) {
+ logError(firstGeom.error);
+ errorActions.push(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorGettingFC",
+ autoDismiss: 6,
+ position: "tc",
+ values: {layerName: firstGeom.layerName + " - " + firstGeom.layerTitle}
+ }));
+ }
+ if (secondGeom?.error?.message?.includes("Failed to retrieve value for input features")) {
+ logError(secondGeom.error);
+ errorActions.push(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorGettingFC",
+ autoDismiss: 6,
+ position: "tc",
+ values: {layerName: secondGeom.layerName + " - " + secondGeom.layerTitle}
+ }));
+ }
+ errorActions.push(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.errorIntersectGFI",
+ autoDismiss: 6,
+ position: "tc"
+ }));
+ return Rx.Observable.from(errorActions);
+ }
 
  const executeProcess$ = executeProcess(
  layerUrl,
@@ -616,7 +684,16 @@ export const runIntersectProcessGPTEpic = (action$, store) => action$
  .switchMap((featureCollection) => {
  const groups = groupsSelector(state);
  const groupExist = find(groups, (g) => g.id === GPT_INTERSECTION_GROUP_ID);
- const extent = getGeoJSONExtent(featureCollection);
+ let extent = getGeoJSONExtent(featureCollection);
+ if (extent.some(coord => coord === Infinity )) {
+ // intersection is empty, return a message
+ return Rx.Observable.of(showErrorNotification({
+ title: "errorTitleDefault",
+ message: "GeoProcessing.notifications.emptyIntersection",
+ autoDismiss: 6,
+ position: "tc"
+ }));
+ }
  return (!groupExist ? Rx.Observable.of( addGroup("Intersected Layers", null, {id: GPT_INTERSECTION_GROUP_ID}, true)) : Rx.Observable.empty())
  .concat(
  Rx.Observable.of(
@@ -665,7 +742,8 @@ export const runIntersectProcessGPTEpic = (action$, store) => action$
  })
  ));
  })
- .catch(() => {
+ .catch((e) => {
+ logError(e);
  return Rx.Observable.of(showErrorNotification({
  title: "errorTitleDefault",
  message: "GeoProcessing.notifications.errorIntersectGFI",
@@ -804,7 +882,8 @@ export const clickToSelectFeatureGPTEpic = (action$, {getState}) =>
  position: "tc"
  }));
  })
- .catch(() => {
+ .catch((e) => {
+ logError(e);
  return Rx.Observable.of(showErrorNotification({
  title: "errorTitleDefault",
  message: "GeoProcessing.notifications.errorGFI",

diff --git a/web/client/observables/wfs.js b/web/client/observables/wfs.js
@@ -8,7 +8,7 @@
 
 import urlUtil from 'url';
 
-import { castArray, isNil, isObject } from 'lodash';
+import { isArray, castArray, isNil, isObject } from 'lodash';
 import Rx from 'rxjs';
 import { parseString } from 'xml2js';
 import { stripPrefix } from 'xml2js/lib/processors';
@@ -259,7 +259,7 @@ export const getLayerJSONFeature = ({ search = {}, url, name } = {}, filter, {so
  } : getFeature(
  query(name,
  [
- sortBy(pn[0]),
+ sortBy(isArray(pn) ? pn[0] : pn),
  ...(pn ? [propertyName(pn)] : []),
  ...(filter ? castArray(filter) : [])
  ]),

diff --git a/web/client/plugins/GeoProcessing/processes.js b/web/client/plugins/GeoProcessing/processes.js
@@ -115,10 +115,11 @@ export const processes = [
  {props.runningProcess ? <Loader size={14} style={{margin: '0 auto'}}/> : null}
  </Button>
  <InfoPopover
- bsStyle={props.isIntersectionLayerInvalid || props.isSourceLayerInvalid ? "danger" : "info"}
+ bsStyle={!props.isIntersectionEnabled || props.isIntersectionLayerInvalid || props.isSourceLayerInvalid ? "danger" : "info"}
  text={
- props.isIntersectionLayerInvalid || props.isSourceLayerInvalid ?
- getMessageById(props.messages, "GeoProcessing.tooltip.invalidLayers") : getMessageById(props.messages, "GeoProcessing.tooltip.fillRequiredDataIntersection")
+ !props.isIntersectionEnabled ? getMessageById(props.messages, "GeoProcessing.tooltip.pointAndPolygon") :
+ props.isIntersectionLayerInvalid || props.isSourceLayerInvalid ?
+ getMessageById(props.messages, "GeoProcessing.tooltip.invalidLayers") : getMessageById(props.messages, "GeoProcessing.tooltip.fillRequiredDataIntersection")
  }
  />
  </div>);

diff --git a/web/client/reducers/__tests__/geoProcessing-test.js b/web/client/reducers/__tests__/geoProcessing-test.js
@@ -288,7 +288,6 @@ describe('Test Geo Processing Tools reducer', () => {
  }, action);
  expect(state.source.feature).toEqual(feature);
  expect(state.source.features).toEqual([feature]);
- expect(state.flags.isIntersectionEnabled).toEqual(true);
  });
  it('SET_INTERSECTION_LAYER_ID', () => {
  const layerId = "id";
@@ -354,7 +353,6 @@ describe('Test Geo Processing Tools reducer', () => {
  }
  }, action);
  expect(state.intersection.feature).toEqual(feature);
- expect(state.flags.isIntersectionEnabled).toEqual(true);
  });
  it('SET_INTERSECTION_FIRST_ATTRIBUTE', () => {
  const firstAttributeToRetain = "attr";

diff --git a/web/client/reducers/geoProcessing.js b/web/client/reducers/geoProcessing.js
@@ -46,7 +46,6 @@ import {
  RESET_CONTROLS
 } from '../actions/controls';
 import { LOCATION_CHANGE } from 'connected-react-router';
-import { checkIfIntersectionIsPossible } from '../utils/GeoProcessingUtils';
 
 /**
  * reducer for GeoProcessing
@@ -208,6 +207,10 @@ function geoProcessing( state = {
  features: (state[action.source].features || []).concat(action.data.features || []),
  totalCount: action.data.totalFeatures,
  currentPage: action.nextPage
+ },
+ flags: {
+ ...state.flags,
+ isIntersectionEnabled: action.source === "source" ? !action.geometryProperty?.type?.includes("Point") : state.flags.isIntersectionEnabled
  }
  } : {
  ...state,
@@ -308,10 +311,6 @@ function geoProcessing( state = {
  ...state.source,
  feature: action.feature,
  features: find(state.source.features, ft => ft.id === action.feature.id) ? state.source.features : [action.feature]
- },
- flags: {
- ...state.flags,
- isIntersectionEnabled: checkIfIntersectionIsPossible(action?.feature, state?.intersection?.feature)
  }
  };
  }
@@ -350,10 +349,6 @@ function geoProcessing( state = {
  ...state.intersection,
  feature: action.feature,
  features: find(state.intersection.features, ft => ft.id === action.feature.id) ? state.intersection.features : [action.feature]
- },
- flags: {
- ...state.flags,
- isIntersectionEnabled: checkIfIntersectionIsPossible(state?.source?.feature, action?.feature)
  }
  };
  }

diff --git a/web/client/translations/data.de-DE.json b/web/client/translations/data.de-DE.json
@@ -3947,7 +3947,10 @@
  "noLayerSelected": "Bitte wählen Sie zuerst die Ebene aus.",
  "successfulIntersection": "Der Schnittvorgang war erfolgreich und ein neuer Layer wurde erstellt und dem Inhaltsverzeichnis hinzugefügt",
  "successfulBuffer": "Der Puffervorgang war erfolgreich und eine neue Ebene wurde erstellt und dem Inhaltsverzeichnis hinzugefügt",
- "errorBuffer": "Der Puffervorgang ist fehlgeschlagen"
+ "errorBuffer": "Der Puffervorgang ist fehlgeschlagen",
+ "emptyIntersection": "Es gibt keine Schnittmenge zwischen den angegebenen Datensätzen.",
+ "errorGettingFC": "Es war nicht möglich, die Geometrie aus der Ebene zu erfassen {layerName}",
+ "errorGettingFeaturesList": "Es war nicht möglich, die Liste der Features aus dem Layer abzurufen {layerName}"
  },
  "warningTitle": "Warnung",
  "warningBody": "Sie haben keine Funktion ausgewählt und dies kann die Leistung im Geoserver verlangsamen. Möchten Sie fortfahren?",
@@ -3958,6 +3961,7 @@
  "invalidLayers": "Eine der von Ihnen ausgewählten Ebenen kann in diesem Prozess nicht verwendet werden",
  "fillRequiredDataIntersection": "Bitte wählen Sie mindestens den Quell-Layer und den Schnittpunkt-Layer aus",
  "fillRequiredDataBuffer": "Bitte wählen Sie mindestens die Quellebene aus",
+ "pointAndPolygon": "Sie können einen Punktlayer nur für den Schnittpunktlayer auswählen",
  "siderBarBtn": "Geoverarbeitung",
  "selectFeature": "Bitte wählen Sie eine Funktion aus",
  "validFeature": "Diese Funktion ist gültig",

diff --git a/web/client/translations/data.en-US.json b/web/client/translations/data.en-US.json
@@ -3921,7 +3921,10 @@
  "noLayerSelected": "Please select layer first.",
  "successfulIntersection": "The intersection operation was successful and a new layer has ben created and added to the TOC",
  "successfulBuffer": "The Buffer operation was successful and a new layer has ben created and added to the TOC",
- "errorBuffer": "The Buffer operation has failed"
+ "errorBuffer": "The Buffer operation has failed",
+ "emptyIntersection": "There is no intersection between the given datasets.",
+ "errorGettingFC": "It was not possible to collect the geometry from the layer {layerName}",
+ "errorGettingFeaturesList": "It was not possible to fetch the list of features from the layer {layerName}"
  },
  "warningTitle": "Warning",
  "warningBody": "You have not selected a feature and this may slow down performances in geoserver. Do you want to continue?",
@@ -3932,6 +3935,7 @@
  "invalidLayers": "One of the layers you have selected cannot be used within this process",
  "fillRequiredDataIntersection": "Please select at least the source layer and the intersection layer",
  "fillRequiredDataBuffer": "Please select at least the source layer",
+ "pointAndPolygon": "You can select a point layer only for the intersection layer",
  "siderBarBtn": "GeoProcessing",
  "selectFeature": "Please select a feature",
  "validFeature": "This feature is valid",