Add option to base configuration for specifying the name of the geometry ID field in the WFS

Author: tkleinke

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

@@ -32,6 +32,7 @@ server.config.parameter.system.nfisGeoservices.geoserver_read_username.label,Geo
 server.config.parameter.system.nfisGeoservices.geoserver_read_password.label,Geoserver-Account (nur Leserechte): Passwort,Geoserver account (read only): Password
 server.config.parameter.system.nfisGeoservices.geoserver_write_username.label,Geoserver-Account (Schreibrechte): Username,Geoserver account (write permissions): User name
 server.config.parameter.system.nfisGeoservices.geoserver_write_password.label,Geoserver-Account (Schreibrechte): Passwort,Geoserver account (write permissions): Password
+server.config.parameter.system.nfisGeoservices.wfs_geometry_id_field_name.label,Name des Geometrie-ID-Feldes im WFS,Name of the geometry ID field in the WFS
 server.config.parameter.system.nfisGeoservices.wfs_configuration.label,Objekttypen,Object types
 server.config.parameter.system.nfisGeoservices.wfs_configuration.object_type.label,Name des Objekttyps,Object type name
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.label,Geometrie-Felder,Geometry fields

manifest.master.yml

@@ -53,6 +53,9 @@ base_config:
       geoserver_write_password:
         type: secret
         position: 5
+      wfs_geometry_id_field_name:
+        type: text
+        position: 6
       wfs_configuration:
         type: table
         fields:
@@ -136,7 +139,7 @@ base_config:
                     position: 0
                 position: 14
             position: 1
-        position: 6
+        position: 7
       masterportal_configurations:
         type: table
         fields:
@@ -149,7 +152,7 @@ base_config:
           - name: file_name
             type: text
             position: 2
-        position: 7
+        position: 8
 
 callbacks:
   db_pre_save:

src/webfrontend/js/customDataType/contentLoader.js

@@ -20,7 +20,12 @@ export function load(contentElement, cdata, objectType, fieldPath, isMultiSelect
     const fieldConfiguration = getFieldConfiguration(objectType, fieldPath);
     if (!fieldConfiguration) return console.error('No configuration found for field path "' + fieldPath + '"');
 
-    const settings = { isMultiSelect, fieldConfiguration };
+    const settings = {
+        isMultiSelect,
+        fieldConfiguration,
+        geometryIdFieldName: getGeometryIdFieldName()
+    };
+
     loadWFSData(settings, cdata.geometry_ids).then(
         wfsData => renderContent(contentElement, cdata, settings, mode, wfsData),
         error => console.error(error)
@@ -161,7 +166,10 @@ function createLinkExistingGeometryButton(contentElement, cdata, settings) {
 }
 
 function editGeometry(contentElement, cdata, settings, wfsData, uuid) {
-    const extent = wfsData?.features.find(feature => feature.properties.ouuid === uuid)?.bbox;
+    const extent = wfsData?.features.find(feature => {
+        return feature.properties[settings.geometryIdFieldName] === uuid;
+    })?.bbox;
+
     if (!extent) return;
 
     window.open(getEditGeometryUrl(settings, wfsData, extent), '_blank');
@@ -500,7 +508,7 @@ function configureGeometrySelection(map, contentElement, cdata, settings, wfsDat
     map.addInteraction(select);
     select.on('select', event => {
         const selectedGeometryId = event.selected.length > 0
-            ? event.selected[0].get('ouuid')
+            ? event.selected[0].get(settings.geometryIdFieldName)
             : undefined;
         rerenderEditorButtons(contentElement, cdata, settings, wfsData, extent, selectedGeometryId);
     });
@@ -562,7 +570,6 @@ function getMasterportalVectorLayerIds(fieldConfiguration, wfsData) {
 }
 
 function getDefaultMasterportalVectorLayerId(fieldConfiguration) {
-
     return fieldConfiguration.masterportal_default_vector_layer_id
         ?.find(entry => entry.group_id === null || getUserGroupIds().includes(entry.group_id))
         ?.layer_id;
@@ -579,7 +586,6 @@ function getMasterportalUrl() {
 }
 
 function getConfigurationFileName() {
-
     const configurationId = getUserConfiguration().masterportal_configuration;
     if (!configurationId?.length) return undefined;
 
@@ -597,7 +603,9 @@ function getWfsUrl(settings, geometryIds) {
     return baseUrl
         + '?service=WFS&version=1.1.0&request=GetFeature&typename='
         + featureType
-        + '&outputFormat=application/json&srsname=EPSG:25832&cql_filter=ouuid in ('
+        + '&outputFormat=application/json&srsname=EPSG:25832&cql_filter='
+        + settings.geometryIdFieldName
+        + ' in ('
         + geometryIds.map(id => '\'' + id + '\'').join(',')
         + ')';
 }
@@ -609,6 +617,14 @@ function getAuthorizationString() {
     return 'Basic ' + window.btoa(username + ':' + password);
 }
 
+function getGeometryIdFieldName() {
+    const fieldName = getBaseConfiguration().wfs_geometry_id_field_name;
+
+    return fieldName?.length
+        ? fieldName
+        : 'ouuid';
+}
+
 function getBaseConfiguration() {
     return ez5.session.getBaseConfig('plugin', 'custom-data-type-nfis-geometry')['nfisGeoservices'];
 }