Handle geometries containing GML patches

src/main/java/org/opengis/cite/geomatics/Extents.java

@@ -31,6 +31,7 @@
 import org.opengis.util.FactoryException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -152,6 +153,11 @@ public static Envelope calculateEnvelopeUsingSingleGeometry(NodeList geomNodes)
             if (geom.getLocalName().equals("Curve") || geom.getLocalName().equals("Surface")) {
                 geom = GmlUtils.convertToMultiType(geomNodes.item(i));
             }
+
+            Node geomNode = geomNodes.item(i);
+            if (GmlUtils.checkForAbstractSurfacePatchTypes(geomNode)) {
+                geom = GmlUtils.handleAbstractSurfacePatch(geomNode);
+            }
             JAXBElement<AbstractGeometry> result = (JAXBElement<AbstractGeometry>) unmarshaller.unmarshal(geom);
             AbstractGeometry gmlGeom = result.getValue();
             String srsName = gmlGeom.getSrsName();

src/main/java/org/opengis/cite/geomatics/gml/GmlUtils.java

@@ -531,6 +531,40 @@ public static TemporalGeometricPrimitive gmlToTemporalGeometricPrimitive(Element
      */
     public static Element convertToMultiType(Node geomNode) {
         String typeName = "Multi" + geomNode.getLocalName();
+        return convertGeomNode(typeName, geomNode);
+    }
+
+    /**
+     * Rewrites a geometry Node that contain AbstractSurfacePatch elements. 
+     * See https://github.com/opengeospatial/ets-wfs20/issues/260
+     * 
+     * @param geomNode a geometry Node containing AbstractSurfacePatch elements.
+     * @return The rewritten geometry Node.
+     */
+    public static Element handleAbstractSurfacePatch(Node geomNode) {
+        String typeName = geomNode.getLocalName();
+        return convertGeomNode(typeName, geomNode);
+    }
+
+    /**
+     * Checks for <code>AbstractSurfacePatchTypes</code> in geometry nodes
+     * 
+     * @param node The geometry node
+     * @return true, if the geometry node contains a <code>AbstractSurfacePatchTypes</code>, otherwise false
+     */
+    public static boolean checkForAbstractSurfacePatchTypes(Node node) {
+        boolean result = false;
+        if (node.getLocalName().contains("Multi")) {
+            NodeList childNodes = node.getChildNodes();
+            for (int i = 0; i < childNodes.getLength(); i++) {
+                Node childNode = childNodes.item(i);
+                result = result || checkForAbstractSurfacePatchTypesRecursively(childNode);
+            }
+        }
+        return result;
+    }
+
+    private static Element convertGeomNode(String typeName, Node geomNode) {
         String geomMemberType = geomNode.getLocalName().equalsIgnoreCase("Curve") ? "curveMember" : "surfaceMember";
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db = null;
@@ -591,4 +625,23 @@ public static Element convertToMultiType(Node geomNode) {
         multiGeom.appendChild(memberType);
         return multiGeom;
     }
+
+    private static boolean checkForAbstractSurfacePatchTypesRecursively(Node node) {
+        boolean result = false;
+        if (node.getNodeType() == Node.TEXT_NODE) {
+            return false;
+        }
+        if (node.getLocalName().contains("patch")) {
+            return true;
+        }
+        if (!node.hasChildNodes()) {
+            return false;
+        }
+        NodeList childNodes = node.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node childNode = childNodes.item(i);
+            result = result || checkForAbstractSurfacePatchTypesRecursively(childNode);
+        }
+        return result;
+    }
 }