HTM-2139: Add keywords to map response

Author: matthijsln

src/main/java/org/tailormap/api/persistence/helper/ApplicationHelper.java

@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.ObjectUtils;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
@@ -458,6 +459,11 @@ private boolean addAppLayerItem(AppTreeLayerNode layerRef) {
 
       boolean webMercatorAvailable = this.isWebMercatorAvailable(service, serviceLayer, hiDpiSubstituteLayer);
 
+      Set<String> keywords = serviceLayer.getKeywords().stream()
+          .filter(k -> !serviceLayerSettings.getHiddenKeywords().contains(k))
+          .collect(Collectors.toSet());
+      keywords.addAll(serviceLayerSettings.getExtraKeywords());
+
       mapResponse.addAppLayersItem(new AppLayer()
           .id(layerRef.getId())
           .serviceId(serviceLayerServiceIds.get(serviceLayer))
@@ -492,6 +498,7 @@ private boolean addAppLayerItem(AppTreeLayerNode layerRef) {
           .visible(layerRef.getVisible())
           .attribution(attribution)
           .description(description)
+          .keywords(keywords)
           .webMercatorAvailable(webMercatorAvailable)
           .tileset3dStyle(appLayerSettings.getTileset3dStyle())
           .hiddenFunctionality(appLayerSettings.getHiddenFunctionality())

src/main/resources/openapi/viewer-schemas.yaml

@@ -149,6 +149,12 @@ components:
         description:
           description: 'Description text to show for this layer, may contain some links and images (see htmlify pipe)'
           type: string
+        keywords:
+          description: 'Keywords for this layer, to be used for filtering layers'
+          type: array
+          items:
+            type: string
+          uniqueItems: true
         autoRefreshInSeconds:
           description: 'Automatically refresh the layer (in seconds)'
           type: number