From 1421a486eee9b217a5e52cdc7b37b84b2f6c8bf0 Mon Sep 17 00:00:00 2001
From: Fabien Amarger <881739+Murloc6@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:30:24 +0100
Subject: [PATCH] feat: Consider owl:unionOf for the rdfs:domain and rdfs:range

---
 src/main/webapp/extraction.xsl | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index 2bab10e..a44cd86 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -1509,7 +1509,13 @@
 		<xsl:variable name="about" select="@*:about|@*:ID"
 			as="xs:string" />
 		<xsl:variable name="properties" as="attribute()*"
-			select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:domain/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        select="
+        /rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)
+        [some $res in (rdfs:domain/@*:resource | rdfs:domain/owl:Class/owl:unionOf/rdf:Description/@*:about)
+            satisfies $res = $about
+        ]
+        /(@*:about|@*:ID)
+        " />
 		<xsl:if test="exists($properties)">
 			<dt>
 				<xsl:value-of
@@ -1536,7 +1542,13 @@
 		<xsl:variable name="about" select="(@*:about|@*:ID)"
 			as="xs:string" />
 		<xsl:variable name="properties" as="attribute()*"
-			select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:range/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        select="
+        /rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)
+        [some $res in (rdfs:range/@*:resource | rdfs:range/owl:Class/owl:unionOf/rdf:Description/@*:about)
+            satisfies $res = $about
+        ]
+        /(@*:about|@*:ID)
+        " />
 		<xsl:if test="exists($properties)">
 			<dt>
 				<xsl:value-of
@@ -2460,13 +2472,27 @@
 	<xsl:function name="f:isInRange" as="xs:boolean">
 		<xsl:param name="el" as="element()" />
 		<xsl:value-of
-			select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:range/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+            select="
+            exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)
+                [some $res in (rdfs:range/@*:resource | rdfs:range/owl:Class/owl:unionOf/rdf:Description/@*:about)
+                    satisfies $res = $el/(@*:about|@*:ID)
+                ]
+            )
+            "
+        />
 	</xsl:function>
 
 	<xsl:function name="f:isInDomain" as="xs:boolean">
 		<xsl:param name="el" as="element()" />
 		<xsl:value-of
-			select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:domain/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+            select="
+            exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)
+                [some $res in (rdfs:domain/@*:resource | rdfs:domain/owl:Class/owl:unionOf/rdf:Description/@*:about)
+                    satisfies $res = $el/(@*:about|@*:ID)
+                ]
+            )
+            "
+        />
 	</xsl:function>
 
 	<xsl:function name="f:hasSubproperties" as="xs:boolean">