Handle empty capabilities on DescribeLayer

oskariorg · Aug 15, 2023 · 6600cf4 · 6600cf4
1 parent d8ce410
commit 6600cf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/control-base/src/main/java/org/oskari/control/layer/DescribeLayerHandler.java b/control-base/src/main/java/org/oskari/control/layer/DescribeLayerHandler.java
@@ -169,7 +169,9 @@ private Map<String, Object> getControlData (LayerCapabilitiesWFS caps, WFSLayerA
         if (styleType == null) {
             String geomName = caps.getGeometryField();
             FeaturePropertyType fpt = caps.getFeatureProperty(geomName);
-            styleType = WFSConversionHelper.getStyleType(fpt.type);
+            if (fpt != null) {
+                styleType = WFSConversionHelper.getStyleType(fpt.type);
+            }
         }
         data.put(WFSLayerAttributes.KEY_STYLE_TYPE, styleType);
 

diff --git a/service-capabilities/src/main/java/org/oskari/capabilities/ogc/LayerCapabilitiesWFS.java b/service-capabilities/src/main/java/org/oskari/capabilities/ogc/LayerCapabilitiesWFS.java
@@ -55,6 +55,9 @@ public void setSupportedCrsURIs(Set<String> uris) {
 
     @JsonIgnore
     public FeaturePropertyType getFeatureProperty(String name) {
+        if (name == null) {
+            return null;
+        }
         return getFeatureProperties().stream().filter(p -> name.equals(p.name)).findFirst().orElse(null);
     }