Replace "Remove link" button with "Delete geometry" button

Author: tkleinke

README.md

@@ -37,15 +37,15 @@ make
         * *Style object UUID*: The UUID of the style object to be used for this geometry field
         * *WFS URL for map display*: The base URL of the WFS to be used for displaying data on the map provided by the plugin. It has to be a WFS provided by the configured Geoserver instance. No data is changed via this WFS.
         * *WFS feature type for map display*: The feature type to use when displaying data on the map
+        * *WFS URL for editing data*: The base URL of the WFS to be used for editing and deleting geometries. It has to be a WFS-T provided by the configured Geoserver instance.
+        * *WFS feature type for editing data*: The feature type to use when editing or deleting geometries via WFS
         * *Masterportal: Raster layer ID*: The ID of a raster layer that should be displayed in addition to the vector data in Masterportal.
         * *Masterportal: Vector layer ID (Default)*: The ID of the default layer used for displaying WFS data in Masterportal. This layer is used if no other layers are configured or if no geometries have been added yet to a geometry field.
         * *Masterportal: Name of WFS field for assigning Masterportal vector layer ID*: The value of this field is used for selecting Masterportal layers based on WFS data (see next setting)
         * *Masterportal: Vector layer IDs (based on WFS field value)*:
            * *Field value*: If this value is found in the configured WFS field, the corresponding layer is shown in Masterportal
            * *Layer ID*: The ID of the layer to show in Masterportal
         * *Data transfer to geoserver*: If activated, field data is transferred from the fylr object to the Geoserver (via the configured WFS).
-        * *WFS URL for data transfer*: The base URL of the WFS to be used for transferring data to the Geoserver. It has to be a WFS-T provided by the configured Geoserver instance.
-        * *WFS feature type for data transfer*: The feature type to use when writing data to the WFS
         * *Field data to be transferred*: Mappings of a source field (fylr) to a target field (WFS). For each geometry field defined, entered field data is added to the corresponding geometry via a WFS provided by the configured Geoserver instance
            * *Name of WFS target field*: The target field of the WFS to which the data is transferred
            * *Name of field in fylr object*: The source field that contains the data to be transferred

l10n/custom-data-type-nfis-geometry.csv

@@ -8,7 +8,7 @@ custom.data.type.nfis.geometry.search.badge.without,Ohne,Without
 custom.data.type.nfis.geometry.createNewGeometry,Neue Geometrie anlegen,Create new geometry
 custom.data.type.nfis.geometry.linkExistingGeometry,Existierende Geometrie verknüpfen,Link existing geometry
 custom.data.type.nfis.geometry.editGeometry,Bearbeiten,Edit
-custom.data.type.nfis.geometry.removeGeometry,Verknüpfung entfernen,Remove link
+custom.data.type.nfis.geometry.deleteGeometry,Geometrie löschen,Delete geometry
 custom.data.type.nfis.geometry.viewGeometry,Im Masterportal anzeigen,View in Masterportal
 custom.data.type.nfis.geometry.modal.cancel,Abbrechen,cancel
 custom.data.type.nfis.geometry.modal.ok,Ok,Ok
@@ -34,6 +34,8 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.field_path.label,Feldname (inkl. Pfad),Field name (including path)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.display_wfs_url.label,WFS-URL für Kartendarstellung,WFS URL for map display
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.display_wfs_feature_type.label,WFS-Feature-Type für Kartendarstellung,WFS feature type for map display
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.edit_wfs_url.label,WFS-URL für Bearbeitung,WFS URL for editing data
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.edit_wfs_feature_type.label,WFS-Feature-Type für Bearbeitung,WFS feature type for editing data
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_raster_layer_id.label,Masterportal: Raster-Layer-ID,Masterportal: Raster layer ID
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_default_vector_layer_id.label,Masterportal: Vektor-Layer-ID (Standard),Masterportal: Vector layer ID (default)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_field_name.label,Masterportal: Name des WFS-Feldes für Zuordnung der Masterportal-Vektor-Layer-ID,Masterportal: Name of WFS field for assigning Masterportal vector layer ID
@@ -42,8 +44,6 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_ids.layer_id.label,Layer-ID,Layer ID
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.send_data_to_geoserver.label,Datenübertragung an Geoserver,Data transfer to geoserver
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.send_data_to_geoserver.checkbox,Aktivieren,Activate
-server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.edit_wfs_url.label,WFS-URL für Datenübertragung,WFS URL for data transfer
-server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.edit_wfs_feature_type.label,WFS-Feature-Type für Datenübertragung,WFS feature type for data transfer
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.style_uuid.label,UUID des Style-Objekts,Style object UUID
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.fields.label,Zu übertragende Felddaten,Field data to be transferred
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.fields.wfs_field_name.label,Name des WFS-Zielfeldes,Name of WFS target field

manifest.master.yml

@@ -66,15 +66,21 @@ base_config:
               - name: display_wfs_feature_type
                 type: text
                 position: 3
-              - name: masterportal_raster_layer_id
+              - name: edit_wfs_url
                 type: text
                 position: 4
-              - name: masterportal_default_vector_layer_id
+              - name: edit_wfs_feature_type
                 type: text
                 position: 5
-              - name: masterportal_vector_layer_field_name
+              - name: masterportal_raster_layer_id
                 type: text
                 position: 6
+              - name: masterportal_default_vector_layer_id
+                type: text
+                position: 7
+              - name: masterportal_vector_layer_field_name
+                type: text
+                position: 8
               - name: masterportal_vector_layer_ids
                 type: table
                 fields:
@@ -84,15 +90,9 @@ base_config:
                   - name: layer_id
                     type: text
                     position: 1
-                position: 7
+                position: 9
               - name: send_data_to_geoserver
                 type: bool
-                position: 8
-              - name: edit_wfs_url
-                type: text
-                position: 9
-              - name: edit_wfs_feature_type
-                type: text
                 position: 10
               - name: fields
                 type: table

src/server/sendDataToGeoserver.js

@@ -24,6 +24,7 @@ process.stdin.on('end', async () => {
             object[object._objecttype],
             object._objecttype,
             object._uuid,
+            await getCurrentObjectData(object[object._objecttype], object._objecttype, object._mask),
             configuration,
             authorizationString
         );
@@ -70,7 +71,25 @@ function getAuthorizationString(serverConfiguration) {
     return btoa(username + ':' + password);
 }
 
-async function updateObject(object, objectType, uuid, configuration, authorizationString) {
+async function getCurrentObjectData(object, objectType, mask) {
+    const url = info.api_url + '/api/v1/db/' + objectType + '/' + mask + '/' + object._id
+        + '?access_token=' + info.api_user_access_token;
+
+    try {
+        const response = await fetch(url, {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        });
+        const result = await response.json();
+        return result.length ? result[0][objectType] : undefined;
+    } catch (err) {
+        throwErrorToFrontend('Retrieving current object data failed', JSON.stringify(err));
+    }
+}
+
+async function updateObject(object, objectType, uuid, currentObject, configuration, authorizationString) {
     const wfsConfiguration = getWFSConfiguration(configuration, objectType);
     if (!wfsConfiguration) return;
 
@@ -80,26 +99,11 @@ async function updateObject(object, objectType, uuid, configuration, authorizati
             return throwErrorToFrontend('Eine oder mehrere Geometrien sind bereits mit anderen Objekten verknüpft.', undefined, 'multipleGeometryLinking');
         }
 
-        const poolName = getPoolName(object, fieldConfiguration);
-        if (isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName)) {
-            const changeMap = getChangeMap(object, fieldConfiguration, poolName);
-            if (Object.keys(changeMap).length) {
-                await performTransaction(
-                    geometryIds, changeMap, fieldConfiguration.edit_wfs_url.ValueText,
-                    fieldConfiguration.edit_wfs_feature_type.ValueText, authorizationString
-                );
-            }
-        }
+        await editGeometries(object, fieldConfiguration, geometryIds, authorizationString);
+        await deleteGeometries(fieldConfiguration, geometryIds, currentObject, authorizationString);
     }
 }
 
-function isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName) {
-    return fieldConfiguration.send_data_to_geoserver?.ValueBool
-        && fieldConfiguration.edit_wfs_url?.ValueText
-        && geometryIds?.length
-        && poolName !== undefined;
-}
-
 function getGeometryIds(object, pathSegments) {
     let geometryIds = [];
 
@@ -156,23 +160,34 @@ function getGeometryFieldPaths(configuration) {
     return fieldPaths;
 }
 
-function getFieldValues(object, pathSegments) {
-    const fieldName = pathSegments.shift();
-    const field = object[fieldName];
-
-    if (field === undefined) {
-        return [];
-    } else if (pathSegments.length === 0) {
-        return [field];
-    } else if (Array.isArray(field)) {
-        return field.map(entry => getFieldValues(entry, pathSegments.slice()))
-            .filter(data => data !== undefined)
-            .reduce((result, fieldValues) => result.concat(fieldValues), []);
-    } else {
-        return getFieldValues(field, pathSegments);
+async function editGeometries(object, fieldConfiguration, geometryIds, authorizationString) {
+    const poolName = getPoolName(object, fieldConfiguration);
+    if (isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName)) {
+        const changeMap = getChangeMap(object, fieldConfiguration, poolName);
+        if (Object.keys(changeMap).length) {
+            await performEditTransaction(geometryIds, changeMap, fieldConfiguration, authorizationString);
+        }
     }
 }
 
+async function deleteGeometries(fieldConfiguration, geometryIds, currentObject, authorizationString) {
+    if (!currentObject) return;
+    const deletedGeometryIds = getDeletedGeometryIds(geometryIds, currentObject, fieldConfiguration);
+    if (deletedGeometryIds.length) await performDeleteTransaction(deletedGeometryIds, fieldConfiguration, authorizationString);
+}
+
+function getDeletedGeometryIds(geometryIds, currentObject, fieldConfiguration) {
+    const currentGeometryIds = getGeometryIds(currentObject, fieldConfiguration.field_path.ValueText.split('.'));
+    return currentGeometryIds.filter(geometryId => !geometryIds.includes(geometryId));
+}
+
+function isSendingDataToGeoserverActivated(fieldConfiguration, geometryIds, poolName) {
+    return fieldConfiguration.send_data_to_geoserver?.ValueBool
+        && fieldConfiguration.edit_wfs_url?.ValueText
+        && geometryIds?.length
+        && poolName !== undefined;
+}
+
 function getPoolName(object, fieldConfiguration) {
     if (!object._pool) return undefined;
 
@@ -210,6 +225,23 @@ function getChangeMap(object, fieldConfiguration, poolName) {
     }, changeMap);
 }
 
+function getFieldValues(object, pathSegments) {
+    const fieldName = pathSegments.shift();
+    const field = object[fieldName];
+
+    if (field === undefined) {
+        return [];
+    } else if (pathSegments.length === 0) {
+        return [field];
+    } else if (Array.isArray(field)) {
+        return field.map(entry => getFieldValues(entry, pathSegments.slice()))
+            .filter(data => data !== undefined)
+            .reduce((result, fieldValues) => result.concat(fieldValues), []);
+    } else {
+        return getFieldValues(field, pathSegments);
+    }
+}
+
 function getValueFromCustomFunction(object, functionDefinition) {
     const customFunction = new Function('object', functionDefinition);
     return customFunction(object);
@@ -239,8 +271,25 @@ function isDanteConcept(fieldValue) {
         && fieldValue.conceptURI !== undefined;
 }
 
-async function performTransaction(geometryIds, changeMap, wfsUrl, wfsFeatureType, authorizationString) {
-    const requestXml = getRequestXml(geometryIds, changeMap, wfsFeatureType);
+async function performEditTransaction(geometryIds, changeMap, fieldConfiguration, authorizationString) {
+    await performTransaction(
+        geometryIds,
+        getEditRequestXml(geometryIds, changeMap, fieldConfiguration.edit_wfs_feature_type.ValueText),
+        fieldConfiguration.edit_wfs_url.ValueText,
+        authorizationString
+    );
+}
+
+async function performDeleteTransaction(geometryIds, fieldConfiguration, authorizationString) {
+    await performTransaction(
+        geometryIds,
+        getDeleteRequestXml(geometryIds, fieldConfiguration.edit_wfs_feature_type.ValueText),
+        fieldConfiguration.edit_wfs_url.ValueText,
+        authorizationString
+    );
+}
+
+async function performTransaction(geometryIds, requestXml, wfsUrl, authorizationString) {
     const transactionUrl = wfsUrl + '?service=WFS&version=1.1.0&request=Transaction';
 
     try {
@@ -261,20 +310,34 @@ async function performTransaction(geometryIds, changeMap, wfsUrl, wfsFeatureType
     }    
 }
 
-function getRequestXml(geometryIds, changeMap, featureType) {
-    return '<?xml version="1.0" ?>'
-        + '<wfs:Transaction '
-        + 'version="1.1.0" '
-        + 'service="WFS" '
-        + 'xmlns:ogc="http://www.opengis.net/ogc" '
-        + 'xmlns:wfs="http://www.opengis.net/wfs" '
-        + 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
-        + 'xsi:schemaLocation="http://www.opengis.net/wfs">'
-        + '<wfs:Update typeName="' + featureType + '">'
+function getEditRequestXml(geometryIds, changeMap, featureType) {
+    return getTransactionXml(
+        '<wfs:Update typeName="' + featureType + '">'
         + getPropertiesXml(changeMap)
         + getFilterXml(geometryIds)
         + '</wfs:Update>'
-        + '</wfs:Transaction>';
+    );
+}
+
+function getDeleteRequestXml(geometryIds, featureType) {
+    return getTransactionXml(
+        '<wfs:Delete typeName="' + featureType + '">'
+        + getFilterXml(geometryIds)
+        + '</wfs:Delete>'
+    );
+}
+
+function getTransactionXml(actionXml) {
+    return '<?xml version="1.0" ?>'
+    + '<wfs:Transaction '
+    + 'version="1.1.0" '
+    + 'service="WFS" '
+    + 'xmlns:ogc="http://www.opengis.net/ogc" '
+    + 'xmlns:wfs="http://www.opengis.net/wfs" '
+    + 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
+    + 'xsi:schemaLocation="http://www.opengis.net/wfs">'
+    + actionXml
+    + '</wfs:Transaction>';
 }
 
 function getPropertiesXml(changeMap) {
@@ -302,7 +365,6 @@ function getGeometryFilterXml(geometryId) {
         + '</ogc:PropertyIsEqualTo>';
 }
 
-
 function throwErrorToFrontend(error, description, realm) {
     console.log(JSON.stringify({
         error: {

src/webfrontend/js/contentLoader.js

@@ -146,7 +146,7 @@ function renderEditorButtons(contentElement, cdata, settings, wfsData, selectedG
             }
         } else {
             buttons.push(createEditGeometryButton(contentElement, cdata, settings, wfsData, selectedGeometryId));
-            buttons.push(createRemoveGeometryButton(contentElement, cdata, settings, selectedGeometryId));
+            buttons.push(createDeleteGeometryButton(contentElement, cdata, settings, selectedGeometryId));
         }
 
         const buttonBarElement = new CUI.Buttonbar({ buttons: buttons });
@@ -180,11 +180,11 @@ function createEditGeometryButton(contentElement, cdata, settings, wfsData, uuid
     });
 }
 
-function createRemoveGeometryButton(contentElement, cdata, settings, uuid) {
+function createDeleteGeometryButton(contentElement, cdata, settings, uuid) {
     return new CUI.Button({
-        text: $$('custom.data.type.nfis.geometry.removeGeometry'),
+        text: $$('custom.data.type.nfis.geometry.deleteGeometry'),
         icon_left: new CUI.Icon({ class: 'fa-trash' }),
-        onClick: () => removeGeometryId(contentElement, cdata, settings, uuid)
+        onClick: () => deleteGeometry(contentElement, cdata, settings, uuid)
     });
 }
 
@@ -311,8 +311,9 @@ function setGeometryId(contentElement, cdata, settings, newGeometryId) {
     });
 }
 
-function removeGeometryId(contentElement, cdata, settings, uuid) {
+function deleteGeometry(contentElement, cdata, settings, uuid) {
     cdata.geometry_ids = cdata.geometry_ids.filter(geometryId => geometryId !== uuid);
+    notifyEditor(contentElement);
     reloadEditorContent(contentElement, cdata, settings);
 }