Merge branch 'stf-refinement' into 'develop-v2.1.1'

Stf refinement

Closes #21, #8, and #17

See merge request !3

examples/exampleIrrigationUseCase1.ttl

 @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,17 +14,19 @@
 @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 .
+  dcterms:description "SAREF4AGRI example for the Smar Irrigation use case."@en ;
+  owl:imports saref:, s4agri: ;
+.
 
 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 ;
@@ -93,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

examples/saref4agri-ex1.ttl

-@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,13 +15,17 @@
 @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 .
+  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 .
@@ -181,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 ;
@@ -217,7 +221,7 @@ ex:Greenhouse
 <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/H._Jansen>
   rdf:type ex:Farmer ;
   s4agri:isMemberOf ex:Jansen_and_Sons ;
-  s4agri:hasName "Hendricus Jansen" ;
+  rdfs:label "Hendricus Jansen" ;
 .
 ex:Heated_Glass_Greenhouse
   rdf:type ex:Greenhouse ;
@@ -231,7 +235,7 @@ ex:Intake_Sugar_Corn
 <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/J._Jansen>
   rdf:type ex:Farmer ;
   s4agri:isMemberOf ex:Jansen_and_Sons ;
-  s4agri:hasName "Johannes Jansen" ;
+  rdfs:label "Johannes Jansen" ;
 .
 ex:Jansen_and_Sons
   rdf:type ex:FarmHolding ;
@@ -343,13 +347,13 @@ ex:MovementActivitySensor
 ex:Parcel_East
   rdf:type s4agri:Parcel ;
   s4agri:contains ex:Sugar_Snaps_1 ;
-  s4agri:hasName "Field Frontyard" ;
+  rdfs:label "Field Frontyard" ;
   s4agri:receives ex:Compost_2019-02-16 ;
 .
 ex:Parcel_North
   rdf:type s4agri:Parcel ;
   s4agri:contains ex:Cow_Group_A ;
-  s4agri:hasName "Grazing Plot" ;
+  rdfs:label "Grazing Plot" ;
 .
 ex:Parcel_South
   rdf:type s4agri:Parcel ;
@@ -438,33 +442,6 @@ ex:Vermicompost
   rdf:type obo:TAXRANK_0000006 ;
   rdfs:label "Zea mays L."^^xsd:string ;
 .
-#s4agri:Location   # does not exist in SAREF4AGRI
-#  rdf:type owl:ObjectProperty ;
-#.
-s4agri:hasID
-  rdf:type owl:ObjectProperty ;
-.
-s4agri:hasMember
-  rdf:type owl:ObjectProperty ;
-  rdfs:label "has member"^^xsd:string ;
-.
-# s4agri:hasSpace # does not exist in SAREF4AGRI
-#   rdf:type owl:ObjectProperty ;
-# .
-# s4agri:isProducedBy # does not exist in SAREF4AGRI
-#   rdf:type owl:ObjectProperty ;
-# .
-
-s4agri:managesFarm
-  rdf:type owl:ObjectProperty ;
-
-.
-s4agri:receives
-  rdf:type owl:ObjectProperty ;
-.
-saref:isMeasurementOf
-  owl:inverseOf saref:hasMeasurement ;
-.
 <http://www.wurvoc.org/vocabularies/om-1.8/Acidity>
   rdf:type saref:UnitOfMeasure ;
   rdfs:comment "pH is a scale used to specify how acidic or basic a water-based solution is. Acidic solutions have a lower pH, basic solutions have a higher pH. At room temperature, pure water is neither acidic nor basic and has a pH of 7."^^xsd:string ;
@@ -473,3 +450,5 @@ saref:isMeasurementOf
 <http://www.wurvoc.org/vocabularies/om-1.8/Liter>
   rdf:type saref:UnitOfMeasure ;
 .
+time:Instant a owl:Class ; rdfs:isDefinedBy time: .
+dcterms:conformsTo a owl:AnnotationProperty; rdfs:isDefinedBy dcterms: .
\ No newline at end of file