Rename Masterportal layer paramters in settings; always set raster layer ID as first layer ID in URL

Author: tkleinke

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

@@ -34,12 +34,12 @@ 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.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
-server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_layer_ids.layer_id.label,Layer-ID,Layer ID
+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
+server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.masterportal_vector_layer_ids.label,Masterportal: Vektor-Layer-IDs (basierend auf 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.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

manifest.master.yml

@@ -66,16 +66,16 @@ base_config:
               - name: display_wfs_feature_type
                 type: text
                 position: 3
-              - name: masterportal_default_layer_id
+              - name: masterportal_raster_layer_id
                 type: text
                 position: 4
-              - name: masterportal_additional_layer_id
+              - name: masterportal_default_vector_layer_id
                 type: text
                 position: 5
-              - name: masterportal_layer_field_name
+              - name: masterportal_vector_layer_field_name
                 type: text
                 position: 6
-              - name: masterportal_layer_ids
+              - name: masterportal_vector_layer_ids
                 type: table
                 fields:
                   - name: field_value

src/webfrontend/js/contentLoader.js

@@ -574,17 +574,17 @@ 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;
+    const rasterLayerId = fieldConfiguration.masterportal_raster_layer_id;
+    const vectorLayerIds = getMasterportalVectorLayerIds(fieldConfiguration, wfsData);
+    
+    return rasterLayerId
+        ? [rasterLayerId].concat(vectorLayerIds)
+        : vectorLayerIds;
 }
 
-function getMainMasterportalLayerIds(fieldConfiguration, wfsData) {
-    const fieldName = fieldConfiguration.masterportal_layer_field_name;
-    const mapping = fieldConfiguration.masterportal_layer_ids;
+function getMasterportalVectorLayerIds(fieldConfiguration, wfsData) {
+    const fieldName = fieldConfiguration.masterportal_vector_layer_field_name;
+    const mapping = fieldConfiguration.masterportal_vector_layer_ids;
 
     let result;
     if (fieldName && mapping && wfsData) {
@@ -599,7 +599,7 @@ function getMainMasterportalLayerIds(fieldConfiguration, wfsData) {
     if (result?.length) {
         return result;
     } else {
-        const defaultLayerId = fieldConfiguration.masterportal_default_layer_id;
+        const defaultLayerId = fieldConfiguration.masterportal_default_vector_layer_id;
         return defaultLayerId ? [defaultLayerId] : [];
     }
 }