Use Masterportal URL parameter "highlightFeaturesByAttribute" for "View in Masterportal" link if Masterportal version 3 is selected in configuration

Author: tkleinke

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

@@ -90,4 +90,5 @@ server.config.parameter.system.nfisGeoservices.masterportal_configurations.name.
 server.config.parameter.system.nfisGeoservices.masterportal_configurations.file_name.label,Name der Konfigurationsdatei,Name of configuration file
 server.config.option.system.nfisGeoservices.masterportal_version.2,2,2
 server.config.option.system.nfisGeoservices.masterportal_version.3,3,3
+server.config.option.system.nfisGeoservices.masterportal_version.3_use_extent,3 (ohne 'Highlight features by attribute'),3 (without 'Highlight features by attribute')
 base.error.realm.multipleGeometryLinking,Mehrfachverknüpfung von Geometrien nicht erlaubt,Multiple linking of geometries not permitted

manifest.master.yml

@@ -39,7 +39,7 @@ base_config:
         position: 0
       masterportal_version:
         type: select
-        options: ["2", "3"]
+        options: ["2", "3", "3_use_extent"]
         position: 1
       geoserver_read_username:
         type: text

src/webfrontend/js/customDataType/contentLoader.js

@@ -52,7 +52,7 @@ function renderDetailContent(contentElement, cdata, settings, wfsData) {
     } else {
         renderMap(
             contentElement, cdata, settings, wfsData, false,
-            renderViewGeometriesButton(contentElement)
+            renderViewGeometriesButton(contentElement, settings, wfsData)
         );
     }
 }
@@ -109,10 +109,10 @@ function isAddingGeometriesAllowed(cdata, settings) {
     return settings.isMultiSelect || !cdata.geometry_ids?.length
 }
 
-function renderViewGeometriesButton(contentElement) {
+function renderViewGeometriesButton(contentElement, settings, wfsData) {
     return extent => {
         const showGeometryButton = new CUI.ButtonHref({
-            href: getViewGeometriesUrl(extent),
+            href: getViewGeometriesUrl(settings, extent, wfsData),
             target: '_blank',
             icon_left: new CUI.Icon({ class: 'fa-external-link' }),
             text: $$('custom.data.type.nfis.geometry.viewGeometry')
@@ -587,11 +587,20 @@ function configureCursor(map) {
     });
 }
 
-function getViewGeometriesUrl(extent) {
+function getViewGeometriesUrl(settings, extent, wfsData) {
     const url = getMasterportalUrl();
-    if (!url) return '';
-    
-    return url + 'zoomToExtent=' + extent.join(',');
+    const masterportalVersion = getBaseConfiguration().masterportal_version;
+    const vectorLayerIds = getMasterportalVectorLayerIds(settings.fieldConfiguration, wfsData);
+    const layerId = vectorLayerIds?.length ? vectorLayerIds[0] : undefined;
+
+    if (!url || !layerId) return '';
+
+    return masterportalVersion === '2' || masterportalVersion === '3_use_extent'
+        ? (url + 'zoomToExtent=' + extent.join(','))
+        : (url + 'highlightFeaturesByAttribute=1&wfsId=' + layerId
+            + '&attributeName=' + settings.geometryIdFieldName
+            + '&attributeValue=' + wfsData.features.map(feature => feature.properties[settings.geometryIdFieldName])
+            + '&attributeQuery=isIn');
 }
 
 function getEditGeometryUrl(settings, wfsData, extent, geometryId, upload = false) {