From 56a0b9a5df037c662ba4e4292d1b493cf537a983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= <maxime.lefrancois.86@gmail.com>
Date: Fri, 5 Jun 2020 17:52:25 +0200
Subject: [PATCH] enhanced examples

---
 examples/exampleIrrigationUseCase1.ttl |  29 ++++---
 examples/saref4agri-ex1.ttl            | 102 +++++++++++++------------
 ontology/saref4agri.ttl                |  32 ++++----
 3 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/examples/exampleIrrigationUseCase1.ttl b/examples/exampleIrrigationUseCase1.ttl
index 6c1b074..dfe4a16 100644
--- a/examples/exampleIrrigationUseCase1.ttl
+++ b/examples/exampleIrrigationUseCase1.ttl
@@ -1,22 +1,31 @@
-# baseURI: https://w3id.org/def/saref4agri/example1
-
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix ex: <https://w3id.org/def/saref4agri/example1#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/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/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix s4agri: <https://w3id.org/def/saref4agri#> .
-@prefix saref: <https://w3id.org/saref#> .
+@prefix s4agri: <https://saref.etsi.org/saref4agri/> .
+@prefix saref: <https://saref.etsi.org/core/> .
 @prefix sosa: <http://www.w3.org/ns/sosa/> .
 @prefix ssn: <http://www.w3.org/ns/ssn/> .
 @prefix time: <http://www.w3.org/2006/time#> .
-@prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
+<https://saref.etsi.org/saref4agri/v1.1.2/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:title "SAREF4AGRI example for the Smar Irrigation use case."@en ;
+  dcterms:description "SAREF4AGRI example for the Smar Irrigation use case."@en .
+
+time:hasEnd a owl:ObjectProperty .
+time:hasBeginning a owl:ObjectProperty .
+time:inXSDDateTimeStamp a owl:DatatypeProperty .
+
+
 om:millibar
   rdf:type owl:NamedIndividual ;
   rdf:type saref:UnitOfMeasure ;
@@ -27,11 +36,7 @@ s4agri:SoilMoisture
   rdf:type saref:Property ;
   rdfs:label "Soil moisture"@en ;
 .
-<https://w3id.org/def/saref4agri/example1>
-  rdf:type owl:Ontology ;
-  dc:description "SAREF4AGRI example for the Smar Irrigation use case."@en ;
-  owl:versionIRI <https://w3id.org/def/v1/saref4agri/example1> ;
-.
+
 ex:ArvalisDeployment20162017Land07
   rdf:type owl:NamedIndividual ;
   rdf:type s4agri:Deployment ;
diff --git a/examples/saref4agri-ex1.ttl b/examples/saref4agri-ex1.ttl
index c935f50..9f98cdc 100644
--- a/examples/saref4agri-ex1.ttl
+++ b/examples/saref4agri-ex1.ttl
@@ -1,7 +1,4 @@
-# baseURI: http://ontology.tno.nl/examples/saref4agri-ex1
-# imports: http://w3id.org/def/saref4agri
-
-@prefix ex: <http://ontology.tno.nl/examples/saref4agri-ex1#> .
+@prefix ex: <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/> .
 @prefix foaf: <http://xmlns.com/foaf/spec/#> .
 @prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix obo: <http://purl.obolibrary.org/obo/> .
@@ -10,18 +7,23 @@
 @prefix org: <https://schema.org/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix s4agri: <http://w3id.org/def/saref4agri#> .
-@prefix saref: <http://w3id.org/saref#> .
+@prefix s4agri: <https://saref.etsi.org/saref4agri/> .
+@prefix saref: <https://saref.etsi.org/core/> .
 @prefix ssn: <http://www.w3.org/ns/ssn/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
 
-<http://ontology.tno.nl/examples/saref4agri-ex1>
-  rdf:type owl:Ontology ;
-  owl:imports <http://w3id.org/def/saref4agri> ;
-  owl:versionInfo "Created with TopBraid Composer"^^xsd:string ;
-.
-<http://ontology.tno.nl/examples/saref4agri-ex1#5-5-5_crop_fertilizer>
+<https://saref.etsi.org/saref4agri/v1.1.2/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 <http://purl.obolibrary.org/obo/> ;
+  dcterms:title "SAREF4AGRI example"@en ;
+  dcterms:description "SAREF4AGRI example"@en .
+
+<https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/5-5-5_crop_fertilizer>
   rdf:type owl:NamedIndividual ;
 .
 ex:Animalia
@@ -55,13 +57,13 @@ ex:CompostIntake
   rdfs:subClassOf s4agri:Intake ;
 .
 ex:Compost_2019-02-02
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasValue 370 ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:CompostIntake ;
 .
 ex:Compost_2019-02-16
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Parcel_East ;
   saref:hasValue 240 ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
@@ -112,14 +114,14 @@ ex:Cow_3_Birth
   rdf:type time:Instant ;
 .
 ex:Cow_Activity_2019_03_01-14_00
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow3 ;
   saref:hasValue "20"^^xsd:string ;
   saref:isMeasuredIn time:minute ;
   saref:relatesToProperty ex:Eating_Activity_in_minutes_per__hour ;
 .
 ex:Cow_Activity_2019_03_01-15_00
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow3 ;
   saref:hasValue "15"^^xsd:string ;
   saref:isMeasuredIn time:minute ;
@@ -129,8 +131,8 @@ ex:Cow_Eating_Activity_Sensor_33
   rdf:type ex:EatingActivitySensor ;
   rdf:type owl:NamedIndividual ;
   saref:relatesToProperty ex:Eating_Activity_in_minutes_per__hour ;
-  <https://w3id.org/saref#makesMeasurement> ex:Cow_Activity_2019_03_01-14_00 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Cow_Activity_2019_03_01-15_00 ;
+  saref:makesMeasurement ex:Cow_Activity_2019_03_01-14_00 ;
+  saref:makesMeasurement ex:Cow_Activity_2019_03_01-15_00 ;
 .
 ex:Cow_Group_A
   rdf:type s4agri:AnimalGroup ;
@@ -159,7 +161,7 @@ ex:Cyperales
 .
 ex:EatingActivitySensor
   rdf:type owl:Class ;
-  rdfs:subClassOf <https://w3id.org/saref#Sensor> ;
+  rdfs:subClassOf saref:Sensor ;
 .
 ex:Eating_Activity_in_minutes_per__hour
   rdf:type s4agri:Property ;
@@ -203,7 +205,7 @@ ex:Greenhouse
   rdfs:label "Greenhouse"^^xsd:string ;
   rdfs:subClassOf s4agri:Building ;
 .
-<http://ontology.tno.nl/examples/saref4agri-ex1#H._Jansen>
+<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"@en ;
@@ -217,7 +219,7 @@ ex:Humidity_Percentage
 ex:Intake_Sugar_Corn
   rdf:type ex:CropIntake ;
 .
-<http://ontology.tno.nl/examples/saref4agri-ex1#J._Jansen>
+<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"@en ;
@@ -258,12 +260,12 @@ ex:MilkYield
 ex:MilkYieldSensor
   rdf:type ex:MilkingSensor ;
   saref:measuresProperty ex:MilkYield ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-01_1 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-01_2 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-02_1 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-02_2 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-03_1 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Milk_Yield_2019-03-03_2 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-01_1 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-01_2 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-02_1 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-02_2 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-03_1 ;
+  saref:makesMeasurement ex:Milk_Yield_2019-03-03_2 ;
 .
 ex:Milk_Cow_Barn
   rdf:type ex:FarmingBuilding ;
@@ -272,42 +274,42 @@ ex:Milk_Cow_Meat
   rdf:type ex:MeatYield ;
 .
 ex:Milk_Yield_2019-03-01_1
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_A ;
   saref:hasValue "4,7"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:MilkYield ;
 .
 ex:Milk_Yield_2019-03-01_2
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_A ;
   saref:hasValue "3,9"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:MilkYield ;
 .
 ex:Milk_Yield_2019-03-02_1
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_A ;
   saref:hasValue "2,1"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:MilkYield ;
 .
 ex:Milk_Yield_2019-03-02_2
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_A ;
   saref:hasValue "2,7"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:MilkYield ;
 .
 ex:Milk_Yield_2019-03-03_1
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_B ;
   saref:hasValue "5,2"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
   saref:relatesToProperty ex:MilkYield ;
 .
 ex:Milk_Yield_2019-03-03_2
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Cow_Group_B ;
   saref:hasValue "3,7"@en ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Liter> ;
@@ -315,12 +317,12 @@ ex:Milk_Yield_2019-03-03_2
 .
 ex:MilkingSensor
   rdf:type owl:Class ;
-  rdfs:subClassOf <https://w3id.org/saref#Sensor> ;
+  rdfs:subClassOf saref:Sensor ;
 .
 ex:Milking_Machine
-  rdf:type <https://w3id.org/saref#Device> ;
+  rdf:type saref:Device ;
   rdfs:label "Milking Machine"^^xsd:string ;
-  <https://w3id.org/saref#consistsOf> ex:MilkYieldSensor ;
+  saref:consistsOf ex:MilkYieldSensor ;
 .
 ex:Minutes
   rdf:type saref:Time ;
@@ -328,7 +330,7 @@ ex:Minutes
 .
 ex:MovementActivitySensor
   rdf:type owl:Class ;
-  rdfs:subClassOf <https://w3id.org/saref#Sensor> ;
+  rdfs:subClassOf saref:Sensor ;
 .
 ex:Parcel_East
   rdf:type s4agri:Parcel ;
@@ -349,7 +351,7 @@ ex:Parcel_West
   s4agri:contains ex:Sweet_Corn_2 ;
   s4agri:receives ex:Compost_2019-02-02 ;
 .
-<http://ontology.tno.nl/examples/saref4agri-ex1#Pisum_sativum_var._macrocarpon_Ser.>
+<https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/Pisum_sativum_var._macrocarpon_Ser.>
   rdf:type obo:TAXRANK_0000016 ;
   rdfs:label "Pisum sativum var. macrocarpon Ser."^^xsd:string ;
 .
@@ -363,18 +365,18 @@ ex:Rosanae_Fabales
 .
 ex:Soil_Acidity
   rdf:type s4agri:Property ;
-  rdf:type <https://w3id.org/saref#Property> ;
+  rdf:type saref:Property ;
   rdfs:label "Acidity"^^xsd:string ;
 .
 ex:Soil_Acidity_2019_03_04
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Parcel_East ;
   saref:hasValue "7.4"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Acidity> ;
   saref:relatesToProperty ex:Soil_Acidity ;
 .
 ex:Soil_Acidity_2019_03_05
-  rdf:type <https://w3id.org/saref#Measurement> ;
+  rdf:type saref:Measurement ;
   saref:hasFeatureOfInterest ex:Parcel_East ;
   saref:hasValue "7.5"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/Acidity> ;
@@ -393,11 +395,11 @@ ex:Soil_Platform
   rdfs:label "Soil Platform"^^xsd:string ;
 .
 ex:Soil_Sensor
-  rdf:type <https://w3id.org/saref#Sensor> ;
+  rdf:type saref:Sensor ;
   saref:measuresProperty ex:Humidity_Percentage ;
   saref:measuresProperty ex:Soil_Acidity ;
-  <https://w3id.org/saref#makesMeasurement> ex:Soil_Acidity_2019_03_04 ;
-  <https://w3id.org/saref#makesMeasurement> ex:Soil_Acidity_2019_03_05 ;
+  saref:makesMeasurement ex:Soil_Acidity_2019_03_04 ;
+  saref:makesMeasurement ex:Soil_Acidity_2019_03_05 ;
 .
 ex:Storage_Barn
   rdf:type ex:FarmingBuilding ;
@@ -407,25 +409,25 @@ ex:Sugar_Corn_Yield
 .
 ex:Sugar_Snaps_1
   rdf:type s4agri:Crop ;
-  obo:TAXRANK_1000000 <http://ontology.tno.nl/examples/saref4agri-ex1#Pisum_sativum_var._macrocarpon_Ser.> ;
+  obo:TAXRANK_1000000 <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/Pisum_sativum_var._macrocarpon_Ser.> ;
   obo:TAXRANK_1000000 ex:Plantae ;
 .
 ex:Sweet_Corn_1
   rdf:type s4agri:Crop ;
   obo:TAXRANK_1000000 ex:Plantae ;
   obo:TAXRANK_1000000 ex:Rosanae_Fabales ;
-  obo:TAXRANK_1000000 <http://ontology.tno.nl/examples/saref4agri-ex1#Zea_mays_L.> ;
+  obo:TAXRANK_1000000 <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/Zea_mays_L.> ;
 .
 ex:Sweet_Corn_2
   rdf:type s4agri:Crop ;
   obo:TAXRANK_1000000 ex:Plantae ;
   obo:TAXRANK_1000000 ex:Rosanae_Fabales ;
-  obo:TAXRANK_1000000 <http://ontology.tno.nl/examples/saref4agri-ex1#Zea_mays_L.> ;
+  obo:TAXRANK_1000000 <https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/Zea_mays_L.> ;
 .
 ex:Vermicompost
   rdf:type owl:NamedIndividual ;
 .
-<http://ontology.tno.nl/examples/saref4agri-ex1#Zea_mays_L.>
+<https://saref.etsi.org/saref4agri/v1.1.2/example/saref4agri-ex1/Zea_mays_L.>
   rdf:type obo:TAXRANK_0000006 ;
   rdfs:label "Zea mays L."^^xsd:string ;
 .
@@ -460,10 +462,10 @@ saref:hasFeatureOfInterest
   owl:inverseOf saref:isFeatureOfInterestOf ;
 .
 <http://www.wurvoc.org/vocabularies/om-1.8/Acidity>
-  rdf:type <https://w3id.org/saref#UnitOfMeasure> ;
+  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 ;
   rdfs:label "ph"^^xsd:string ;
 .
 <http://www.wurvoc.org/vocabularies/om-1.8/Liter>
-  rdf:type <https://w3id.org/saref#UnitOfMeasure> ;
+  rdf:type saref:UnitOfMeasure ;
 .
diff --git a/ontology/saref4agri.ttl b/ontology/saref4agri.ttl
index 7b300ce..05d8009 100644
--- a/ontology/saref4agri.ttl
+++ b/ontology/saref4agri.ttl
@@ -117,6 +117,15 @@ wgs84:lat rdf:type owl:DatatypeProperty ;
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#location
 wgs84:location rdf:type owl:ObjectProperty ;
+  rdfs:comment """The relation between something and the point, 
+ or other geometrical thing in space, where it is.  For example, the realtionship between
+ a radio tower and a Point with a given lat and long.
+ Or a relationship between a park and its outline as a closed arc of points, or a road and
+ its location as a arc (a sequence of points).
+ Clearly in practice there will be limit to the accuracy of any such statement, but one would expect
+ an accuracy appropriate for the size of the object and uses such as mapping .
+ """@en ;
+  rdfs:label "location"@en ;
   rdfs:subPropertyOf foaf:based_near .
 
 
@@ -1237,28 +1246,13 @@ s4agri:SoilTemperature rdf:type owl:NamedIndividual ,
   rdfs:comment "The degree or intensity of heat present in the soil."@en ;
   rdfs:label "Soil temperature"@en .
 
-
-#################################################################
-#    Annotations
-#################################################################
-
-wgs84:location rdfs:comment """The relation between something and the point, 
- or other geometrical thing in space, where it is.  For example, the realtionship between
- a radio tower and a Point with a given lat and long.
- Or a relationship between a park and its outline as a closed arc of points, or a road and
- its location as a arc (a sequence of points).
- Clearly in practice there will be limit to the accuracy of any such statement, but one would expect
- an accuracy appropriate for the size of the object and uses such as mapping .
- """@en ;
-  rdfs:label "location"@en .
-
-
-s4agri:Intake rdfs:comment "The amount of food or other substance taken into the body of an animal or into the soil."@en ;
+s4agri:Intake a owl:Class ;
+  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 rdfs:comment "The produced amount of food for animals or of agricultural products."@en ;
+s4agri:Yield a owl:Class ;
+  rdfs:comment "The produced amount of food for animals or of agricultural products."@en ;
   rdfs:label "Yield"@en .
 
 
-###  Generated by the OWL API (version 5.1.9) https://github.com/owlcs/owlapi/
\ No newline at end of file
-- 
GitLab