Merge configuration options masterportal_default_vector_layer_id & masterportal_vector_layer_ids

Author: tkleinke

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

@@ -61,12 +61,10 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.add_icon_points_to_polygons.label,Darstellung von Polygonen,Display of polygons
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.add_icon_points_to_polygons.checkbox,Punkte zur Icon-Anzeige hinzufügen,Add points for displaying icons
 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_default_vector_layer_id.group_id.label,Benutzergruppen-ID (optional),User group ID (optional)
-server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_default_vector_layer_id.layer_id.label,Layer-ID,Layer ID
 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
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_ids.label,Masterportal: Vektor-Layer-IDs abhängig von WFS-Feldwert,Masterportal: Vector layer IDs based on WFS field value
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_ids.field_value.label,Feldwert,Field value
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_ids.group_id.label,Benutzergruppen-ID,User group ID
 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

manifest.master.yml

@@ -116,32 +116,25 @@ base_config:
               - name: masterportal_raster_layer_id
                 type: text
                 position: 8
-              - name: masterportal_default_vector_layer_id
-                type: table
-                fields:
-                  - name: group_id
-                    type: int
-                    position: 0
-                  - name: layer_id
-                    type: text
-                    position: 1
-                position: 9
               - name: masterportal_vector_layer_field_name
                 type: text
-                position: 10
+                position: 9
               - name: masterportal_vector_layer_ids
                 type: table
                 fields:
                   - name: field_value
                     type: text
                     position: 0
+                  - name: group_id
+                    type: int
+                    position: 1
                   - name: layer_id
                     type: text
-                    position: 1
-                position: 11
+                    position: 2
+                position: 10
               - name: send_data_to_geoserver
                 type: bool
-                position: 12
+                position: 11
               - name: fields
                 type: table
                 fields:
@@ -154,7 +147,7 @@ base_config:
                   - name: fylr_function
                     type: text
                     position: 2
-                position: 13
+                position: 12
               - name: tags
                 type: table
                 fields:
@@ -170,6 +163,7 @@ base_config:
                   - name: wfs_field_value
                     type: text
                     position: 3
+                position: 13
               - name: wfs_pool_field
                 type: text
                 position: 14

src/webfrontend/js/customDataType/contentLoader.js

@@ -590,8 +590,7 @@ function configureCursor(map) {
 function getViewGeometriesUrl(settings, extent, wfsData) {
     const url = getMasterportalUrl();
     const masterportalVersion = getBaseConfiguration().masterportal_version;
-    const vectorLayerIds = getMasterportalVectorLayerIds(settings.fieldConfiguration, wfsData);
-    const layerId = vectorLayerIds?.length ? vectorLayerIds[0] : undefined;
+    const layerId = getMasterportalVectorLayerId(settings.fieldConfiguration, wfsData);
 
     if (!url || !layerId) return '';
 
@@ -622,39 +621,23 @@ function getEditGeometryUrl(settings, wfsData, extent, geometryId, upload = fals
 
 function getMasterportalLayerIds(fieldConfiguration, wfsData) {
     const rasterLayerId = fieldConfiguration.masterportal_raster_layer_id;
-    const vectorLayerIds = getMasterportalVectorLayerIds(fieldConfiguration, wfsData);
-    
-    return rasterLayerId
-        ? [rasterLayerId].concat(vectorLayerIds)
-        : vectorLayerIds;
+    const vectorLayerId = getMasterportalVectorLayerId(fieldConfiguration, wfsData);
+
+    const result = [];
+    if (rasterLayerId) result.push(rasterLayerId);
+    if (vectorLayerId) result.push(vectorLayerId);
+
+    return result;
 }
 
-function getMasterportalVectorLayerIds(fieldConfiguration, wfsData) {
+function getMasterportalVectorLayerId(fieldConfiguration, wfsData) {
     const fieldName = fieldConfiguration.masterportal_vector_layer_field_name;
     const mapping = fieldConfiguration.masterportal_vector_layer_ids;
 
-    let result;
-    if (fieldName && mapping && wfsData) {
-        result = wfsData.features.map(feature => feature.properties[fieldName])
-            .reduce((result, value) => {
-                const layerId = mapping.find(entry => entry.field_value === value)?.layer_id;
-                if (layerId && !result.includes(layerId)) result.push(layerId);
-                return result;
-            }, []);
-    }
-
-    if (result?.length) {
-        return result;
-    } else {
-        const defaultLayerId = getDefaultMasterportalVectorLayerId(fieldConfiguration);
-        return defaultLayerId ? [defaultLayerId] : [];
-    }
-}
-
-function getDefaultMasterportalVectorLayerId(fieldConfiguration) {
-    return fieldConfiguration.masterportal_default_vector_layer_id
-        ?.find(entry => entry.group_id === null || getUserGroupIds().includes(entry.group_id))
-        ?.layer_id;
+    return mapping.find(entry => {
+        return (!entry.field_value || wfsData?.features.find(feature => feature.properties[fieldName] === entry.field_value))
+            && (!entry.group_id || getUserGroupIds().includes(entry.group_id));
+    })?.layer_id;
 }
 
 function getMasterportalUrl() {