Applying changes from commit a846b63096d20ce833f898c0cc71d7a8276579fa

SEMICeu · Dec 18, 2024 · 29582ee · 29582ee
1 parent 3bc6762
commit 29582ee
Show file tree

Hide file tree

Showing 20 changed files with 415 additions and 809 deletions.
diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/context/rrmv.jsonld b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/context/rrmv.jsonld
@@ -138,8 +138,7 @@
       "@type": "@id"
     },
     "rrmv:value": {
-      "@id": "http://data.europa.eu/2qy/rrmv#value",
-      "@type": "http://www.w3.org/2001/XMLSchema#string"
+      "@id": "http://data.europa.eu/2qy/rrmv#value"
     },
     "rrmv:withRole": {
       "@container": "@set",

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/context/rrmv_en.jsonld b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/context/rrmv_en.jsonld
@@ -138,8 +138,7 @@
       "@type": "@id"
     },
     "rrmv:value": {
-      "@id": "http://data.europa.eu/2qy/rrmv#value",
-      "@type": "http://www.w3.org/2001/XMLSchema#string"
+      "@id": "http://data.europa.eu/2qy/rrmv#value"
     },
     "rrmv:withRole": {
       "@container": "@set",

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/index.html b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/index.html
@@ -2628,7 +2628,7 @@ <h3 id="Frequency">
                                 <td>
 
 
-                                            <a href="#xsd%3Astring" data-placement="right">xsd:string</a>
+                                            <a href="#Literal" data-placement="right">Literal</a>
 
 
                                 </td>
@@ -3460,7 +3460,7 @@ <h3 id="Role">
                                     0..*
                                 </td>
                                 <td property="rdfs:comment">
-                                    Assign the type to SKOS controlled vocabulary.
+                                    A kind of Role 
                                 </td>
                                 <td property="skos:scopeNote">
 
@@ -4399,19 +4399,35 @@ <h3 id="cr7">Reduce the number of connectors and associated classes by using att
 
 <h3 id="cr7">Reduce the number of connectors and associated classes by using attributes</h3>
 
-<p class="ednote">
+<div class="ednote">
 The following properties are changed
 
 <ul>
  <li> rrmv:hasTitle becomes dct:title </li>
  <li> replace range xsd:string with a language aware string literal as range. </li>
  <li> replace rrmv:hasTemporalEntity with rrmv:hasUnit </li>
+ <li> replace range xsd:float for property rrmv:hasUnit with rdfs:Literal to enable more representations.</li>
  <li> the property rrmv:hasTemporalEntity and class TemporalEntity are replaced with rrmv:hasUnit refering to a to be determined codelist</li>
  <li> the class PeriodOfTime is aligned with the SEMIC Core Vocs decision to follow the W3C vocabulary [[owl-time]] for temporal information.</li>
  <li> any ELI class has a URI according to the ELI usage conventions. Therefore the property rrmv:hasURI is removed from these classes.</li>
 </ul>
-</p>
 
+</div>
+
+
+<div class="ednote">
+The following changes in the OWL file were also performed.
+
+<ul>
+  <li> replace the incorrect use of rdf:type as Datatypeproperty by reusing the rrmv property rrmv:hasType.  </li>
+  <li> change label ActionResult to singular</li>
+  <li> turn multiple rdf:domain statements for a property into an union, because multiple rdfs:domain statements mean the intersection</li>
+  <li> turn multiple rdf:range statements for a property into an union, because multiple rdfs:range statements mean the intersection</li>
+  <li> change the labels for properties and classes to the natural language representation and not the technical identifier. </li>
+  <li>
+/ul>
+
+</div>
 
 
 <h3 id="cr8">Consider “Request” as a separate entity from eli:LegalExpression</h3>

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/index_en.html b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/index_en.html
@@ -2628,7 +2628,7 @@ <h3 id="Frequency">
                                 <td>
 
 
-                                            <a href="#xsd%3Astring" data-placement="right">xsd:string</a>
+                                            <a href="#Literal" data-placement="right">Literal</a>
 
 
                                 </td>
@@ -3460,7 +3460,7 @@ <h3 id="Role">
                                     0..*
                                 </td>
                                 <td property="rdfs:comment">
-                                    Assign the type to SKOS controlled vocabulary.
+                                    A kind of Role 
                                 </td>
                                 <td property="skos:scopeNote">
 
@@ -4399,19 +4399,35 @@ <h3 id="cr7">Reduce the number of connectors and associated classes by using att
 
 <h3 id="cr7">Reduce the number of connectors and associated classes by using attributes</h3>
 
-<p class="ednote">
+<div class="ednote">
 The following properties are changed
 
 <ul>
  <li> rrmv:hasTitle becomes dct:title </li>
  <li> replace range xsd:string with a language aware string literal as range. </li>
  <li> replace rrmv:hasTemporalEntity with rrmv:hasUnit </li>
+ <li> replace range xsd:float for property rrmv:hasUnit with rdfs:Literal to enable more representations.</li>
  <li> the property rrmv:hasTemporalEntity and class TemporalEntity are replaced with rrmv:hasUnit refering to a to be determined codelist</li>
  <li> the class PeriodOfTime is aligned with the SEMIC Core Vocs decision to follow the W3C vocabulary [[owl-time]] for temporal information.</li>
  <li> any ELI class has a URI according to the ELI usage conventions. Therefore the property rrmv:hasURI is removed from these classes.</li>
 </ul>
-</p>
 
+</div>
+
+
+<div class="ednote">
+The following changes in the OWL file were also performed.
+
+<ul>
+  <li> replace the incorrect use of rdf:type as Datatypeproperty by reusing the rrmv property rrmv:hasType.  </li>
+  <li> change label ActionResult to singular</li>
+  <li> turn multiple rdf:domain statements for a property into an union, because multiple rdfs:domain statements mean the intersection</li>
+  <li> turn multiple rdf:range statements for a property into an union, because multiple rdfs:range statements mean the intersection</li>
+  <li> change the labels for properties and classes to the natural language representation and not the technical identifier. </li>
+  <li>
+/ul>
+
+</div>
 
 
 <h3 id="cr8">Consider “Request” as a separate entity from eli:LegalExpression</h3>

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL.jsonld b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL.jsonld
@@ -461,18 +461,6 @@
             "en": "value"
           },
           "sh:path": "http://data.europa.eu/2qy/rrmv#value"
-        },
-        {
-          "@id": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/e6ef62a70178318602d7f27504b53fd5102749a1",
-          "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Frequency.value",
-          "sh:datatype": "http://www.w3.org/2001/XMLSchema#string",
-          "sh:description": {
-            "en": "The value of the frequency."
-          },
-          "sh:name": {
-            "en": "value"
-          },
-          "sh:path": "http://data.europa.eu/2qy/rrmv#value"
         }
       ],
       "sh:targetClass": "http://data.europa.eu/2qy/rrmv#Frequency"
@@ -717,7 +705,7 @@
           "@id": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#RoleShape/26de3103378473bd7e70743bb33391753f1e6cbd",
           "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype",
           "sh:description": {
-            "en": "Assign the type to SKOS controlled vocabulary."
+            "en": "A kind of Role "
           },
           "sh:name": {
             "en": "has type"
@@ -730,7 +718,7 @@
           "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype",
           "sh:class": "http://data.europa.eu/2qy/rrmv#RoleType",
           "sh:description": {
-            "en": "Assign the type to SKOS controlled vocabulary."
+            "en": "A kind of Role "
           },
           "sh:name": {
             "en": "has type"

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL.ttl b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL.ttl
@@ -245,8 +245,7 @@
     <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/6698df8a2d713cf66720d7a2b1f4037f7f58d708>,
     <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/9e6efd49d4b4d8a4758672d9007bbe68237d359b>,
     <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/d6979a925fe55dfff828a2b49a43d8dc817fac76>,
-    <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/db15b7df9d94d285bd33d0966a4d2357f8333c31>,
-    <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/e6ef62a70178318602d7f27504b53fd5102749a1>;
+    <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/db15b7df9d94d285bd33d0966a4d2357f8333c31>;
   shacl:targetClass <http://data.europa.eu/2qy/rrmv#Frequency> .
 
 <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/239fafda2200c7002f9c9e9b52fe5071028b7e86> rdfs:seeAlso "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Frequency.hasunit";
@@ -291,12 +290,6 @@
   shacl:name "value"@en;
   shacl:path <http://data.europa.eu/2qy/rrmv#value> .
 
-<https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/e6ef62a70178318602d7f27504b53fd5102749a1> rdfs:seeAlso "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Frequency.value";
-  shacl:datatype xsd:string;
-  shacl:description "The value of the frequency."@en;
-  shacl:name "value"@en;
-  shacl:path <http://data.europa.eu/2qy/rrmv#value> .
-
 <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#InstantShape> a shacl:NodeShape;
   shacl:closed false;
   shacl:targetClass <http://www.w3.org/2006/time#Instant> .
@@ -546,14 +539,14 @@
   shacl:targetClass <http://data.europa.eu/2qy/rrmv#Role> .
 
 <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#RoleShape/26de3103378473bd7e70743bb33391753f1e6cbd> rdfs:seeAlso "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype";
-  shacl:description "Assign the type to SKOS controlled vocabulary."@en;
+  shacl:description "A kind of Role "@en;
   shacl:name "has type"@en;
   shacl:nodeKind shacl:BlankNodeOrIRI;
   shacl:path <http://data.europa.eu/2qy/rrmv#hasType> .
 
 <https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#RoleShape/73346d19590bfb11fb7f63af0fad3072e2df1f68> rdfs:seeAlso "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype";
   shacl:class <http://data.europa.eu/2qy/rrmv#RoleType>;
-  shacl:description "Assign the type to SKOS controlled vocabulary."@en;
+  shacl:description "A kind of Role "@en;
   shacl:name "has type"@en;
   shacl:path <http://data.europa.eu/2qy/rrmv#hasType> .
 

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL_en.jsonld b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/shacl/rrmv-SHACL_en.jsonld
@@ -461,18 +461,6 @@
             "en": "value"
           },
           "sh:path": "http://data.europa.eu/2qy/rrmv#value"
-        },
-        {
-          "@id": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#FrequencyShape/e6ef62a70178318602d7f27504b53fd5102749a1",
-          "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Frequency.value",
-          "sh:datatype": "http://www.w3.org/2001/XMLSchema#string",
-          "sh:description": {
-            "en": "The value of the frequency."
-          },
-          "sh:name": {
-            "en": "value"
-          },
-          "sh:path": "http://data.europa.eu/2qy/rrmv#value"
         }
       ],
       "sh:targetClass": "http://data.europa.eu/2qy/rrmv#Frequency"
@@ -717,7 +705,7 @@
           "@id": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#RoleShape/26de3103378473bd7e70743bb33391753f1e6cbd",
           "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype",
           "sh:description": {
-            "en": "Assign the type to SKOS controlled vocabulary."
+            "en": "A kind of Role "
           },
           "sh:name": {
             "en": "has type"
@@ -730,7 +718,7 @@
           "rdfs:seeAlso": "https://semiceu.github.io/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2#Role.hastype",
           "sh:class": "http://data.europa.eu/2qy/rrmv#RoleType",
           "sh:description": {
-            "en": "Assign the type to SKOS controlled vocabulary."
+            "en": "A kind of Role "
           },
           "sh:name": {
             "en": "has type"

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/xsd/rrmv.xsd b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/xsd/rrmv.xsd
@@ -203,7 +203,7 @@
     <xs:sequence>
       <xs:element name="hasType" ref="RoleTypeType" maxOccurs="unbounded" minOccurs="0">
         <xs:annotation>
-          <xs:documentation xml:lang="en">Assign the type to SKOS controlled vocabulary.</xs:documentation>
+          <xs:documentation xml:lang="en">A kind of Role </xs:documentation>
         </xs:annotation>
       </xs:element>
     </xs:sequence>

diff --git a/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/xsd/rrmv_en.xsd b/Reporting-Requirements-Metadata-Vocabulary/releases/0.0.2/xsd/rrmv_en.xsd
@@ -203,7 +203,7 @@
     <xs:sequence>
       <xs:element name="hasType" ref="RoleTypeType" maxOccurs="unbounded" minOccurs="0">
         <xs:annotation>
-          <xs:documentation xml:lang="en">Assign the type to SKOS controlled vocabulary.</xs:documentation>
+          <xs:documentation xml:lang="en">A kind of Role </xs:documentation>
         </xs:annotation>
       </xs:element>
     </xs:sequence>