From 6c1b136e15fa19f4173901964ad00e88263f7437 Mon Sep 17 00:00:00 2001
From: Cornelis Bouter <cornelis.bouter@tno.nl>
Date: Mon, 10 Jun 2024 23:39:56 +0200
Subject: [PATCH] further pipeline fixes

---
 examples/exampleIrrigationUseCase1.ttl | 10 ++++++----
 examples/saref4agri-ex1.ttl            | 15 +++++++++------
 ontology/saref4agri.ttl                |  6 ++++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/examples/exampleIrrigationUseCase1.ttl b/examples/exampleIrrigationUseCase1.ttl
index 8793e97..018e9a5 100644
--- a/examples/exampleIrrigationUseCase1.ttl
+++ b/examples/exampleIrrigationUseCase1.ttl
@@ -1,6 +1,6 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix dctype: <http://purl.org/dc/dcmitype/> .
-@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/example/exampleIrrigationUseCase1/> .
+@prefix ex: <https://saref.etsi.org/saref4agri/v2.1.1/example/exampleIrrigationUseCase1/> .
 @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
@@ -14,10 +14,10 @@
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<https://saref.etsi.org/saref4agri/v1.1.2/example/exampleIrrigationUseCase1#> a dctype:Dataset ;
+<https://saref.etsi.org/saref4agri/v2.1.1/example/exampleIrrigationUseCase1#> a dctype:Dataset ;
   dcterms:license <https://forge.etsi.org/etsi-software-license> ;
   dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
-  dcterms:conformsTo <https://saref.etsi.org/saref4agri/v1.1.2/> ;
+  dcterms:conformsTo <https://saref.etsi.org/saref4agri/v2.1.1/> ;
   dcterms:title "SAREF4AGRI example for the Smar Irrigation use case."@en ;
   dcterms:description "SAREF4AGRI example for the Smar Irrigation use case."@en ;
   owl:imports saref:, s4agri: ;
@@ -26,7 +26,7 @@
 time:hasEnd a owl:ObjectProperty .
 time:hasBeginning a owl:ObjectProperty .
 time:inXSDDateTimeStamp a owl:DatatypeProperty .
-
+dctype:Dataset a owl:Class .
 
 om:millibar
   rdf:type owl:NamedIndividual ;
@@ -95,3 +95,5 @@ ex:instant_2017-12-31T235959
   rdf:type time:Instant ;
   time:inXSDDateTimeStamp "2017-12-31T23:59:59"^^xsd:dateTime ;
 .
+time:Instant a owl:Class; rdfs:isDefinedBy time: .
+dcterms:conformsTo a owl:AnnotationProperty; rdfs:isDefinedBy dcterms: .
\ No newline at end of file
diff --git a/examples/saref4agri-ex1.ttl b/examples/saref4agri-ex1.ttl
index 6a850cc..aed8428 100644
--- a/examples/saref4agri-ex1.ttl
+++ b/examples/saref4agri-ex1.ttl
@@ -1,5 +1,5 @@
-@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/> .
-@prefix foaf: <http://xmlns.com/foaf/spec/#> .
+@prefix ex: <https://saref.etsi.org/saref4agri/v2.1.1/example/saref4agri-ex1/> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix obo: <http://purl.obolibrary.org/obo/> .
 @prefix org: <https://schema.org/> .
@@ -15,16 +15,18 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix dctype: <http://purl.org/dc/dcmitype/> .
 
-<https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1#> a dctype:Dataset ;
+<https://saref.etsi.org/saref4agri/v2.1.1/example/saref4agri-ex1#> a dctype:Dataset ;
   dcterms:license <https://forge.etsi.org/etsi-software-license> ;
   dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
-  dcterms:conformsTo <https://saref.etsi.org/saref4agri/v1.1.2/> ;
+  dcterms:conformsTo <https://saref.etsi.org/saref4agri/v2.1.1/> ;
   # dcterms:conformsTo obo:TAXRANK_0000017, obo:TAXRANK_0000004 , obo:TAXRANK_0000006 , obo:TAXRANK_0000016 , obo:TAXRANK_0000003 ;
   dcterms:title "SAREF4AGRI example"@en ;
   dcterms:description "SAREF4AGRI example"@en ;
   owl:imports saref:, s4agri: ;
 .
 
+dctype:Dataset a owl:Class .
+
 obo:TAXRANK_0000004 a owl:Class .
 obo:TAXRANK_0000006 a owl:Class .
 obo:TAXRANK_0000003 a owl:Class .
@@ -183,7 +185,7 @@ ex:FarmHolding
   rdf:type owl:Class ;
   rdfs:comment "An organization specialized in farming."^^xsd:string ;
   rdfs:label "Farmer holding"^^xsd:string ;
-  rdfs:subClassOf org:Organization ;
+  rdfs:subClassOf foaf:Organization ;
 .
 ex:Farm_Jansen_and_Sons_Eindhoven
   rdf:type geosp:Feature ;
@@ -448,4 +450,5 @@ ex:Vermicompost
 <http://www.wurvoc.org/vocabularies/om-1.8/Liter>
   rdf:type saref:UnitOfMeasure ;
 .
-time:Instant a owl:Class ; rdfs:isDefinedBy time: .
\ No newline at end of file
+time:Instant a owl:Class ; rdfs:isDefinedBy time: .
+dcterms:conformsTo a owl:AnnotationProperty; rdfs:isDefinedBy dcterms: .
\ No newline at end of file
diff --git a/ontology/saref4agri.ttl b/ontology/saref4agri.ttl
index 3f9cfdc..2232c82 100644
--- a/ontology/saref4agri.ttl
+++ b/ontology/saref4agri.ttl
@@ -713,12 +713,14 @@ s4agri:SoilTemperature rdf:type owl:NamedIndividual ,
   rdfs:comment "The degree or intensity of heat present in the soil."@en ;
   rdfs:label "Soil temperature"@en .
 
-s4agri:Intake rdf:type saref:Property ;
+s4agri:Intake a owl:Class ; 
+  rdfs:subClassOf saref:Property ;
   rdfs:comment "The amount of food or other substance taken into the body of an animal or into the soil."@en ;
   rdfs:label "Intake"@en .
 
 
-s4agri:Yield rdf:type saref:Property ;
+s4agri:Yield a owl:Class ;
+  rdfs:subClassOf saref:Property ;
   rdfs:comment "The produced amount of food for animals or of agricultural products."@en ;
   rdfs:label "Yield"@en .
 
-- 
GitLab