Allow configuring additional layer ID that is added to all Masterportal URLs

Author: tkleinke

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

@@ -35,6 +35,7 @@ server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields
 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.masterportal_default_layer_id.label,Masterportal-Layer-ID (Standard),Masterportal layer ID (default)
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_additional_layer_id.label,Masterportal-Layer-ID (Zusatz),Masterportal layer ID (additional)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_layer_field_name.label,Name des WFS-Feldes für Zuordnung der Masterportal-Layer-ID,Name of WFS field for assigning Masterportal layer ID
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_layer_ids.label,Masterportal-Layer-IDs (basierend auf WFS-Feldwert),Masterportal layer IDs (based on WFS field value)
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_layer_ids.field_value.label,Feldwert,Field value

manifest.master.yml

@@ -69,9 +69,12 @@ base_config:
               - name: masterportal_default_layer_id
                 type: text
                 position: 4
-              - name: masterportal_layer_field_name
+              - name: masterportal_additional_layer_id
                 type: text
                 position: 5
+              - name: masterportal_layer_field_name
+                type: text
+                position: 6
               - name: masterportal_layer_ids
                 type: table
                 fields:
@@ -81,16 +84,16 @@ base_config:
                   - name: layer_id
                     type: text
                     position: 1
-                position: 6
+                position: 7
               - name: send_data_to_geoserver
                 type: bool
-                position: 7
+                position: 8
               - name: edit_wfs_url
                 type: text
-                position: 8
+                position: 9
               - name: edit_wfs_feature_type
                 type: text
-                position: 9
+                position: 10
               - name: fields
                 type: table
                 fields:
@@ -100,20 +103,20 @@ base_config:
                   - name: wfs_field_name
                     type: text
                     position: 1
-                position: 10
+                position: 11
               - name: wfs_event_status_field
                 type: text
-                position: 11
+                position: 12
               - name: wfs_pool_field
                 type: text
-                position: 12
+                position: 13
               - name: allowed_pool_names
                 type: table
                 fields:
                   - name: allowed_pool_name
                     type: text
                     position: 0
-                position: 13
+                position: 14
             position: 1
         position: 4
 

src/webfrontend/js/contentLoader.js

@@ -574,6 +574,15 @@ function configureCursor(map) {
 }
 
 function getMasterportalLayerIds(fieldConfiguration, wfsData) {
+    const mainLayerIds = getMainMasterportalLayerIds(fieldConfiguration, wfsData);
+    const additionalLayerId = fieldConfiguration.masterportal_additional_layer_id;
+
+    return additionalLayerId
+        ? mainLayerIds.concat([additionalLayerId])
+        : mainLayerIds;
+}
+
+function getMainMasterportalLayerIds(fieldConfiguration, wfsData) {
     const fieldName = fieldConfiguration.masterportal_layer_field_name;
     const mapping = fieldConfiguration.masterportal_layer_ids;