From 0808ea91879afce19baf22490b223b362bd3bbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Garc=C3=ADa=20Castro?= Date: Wed, 29 May 2024 17:41:44 +0200 Subject: [PATCH] Made instances of s4watr:Water instances of s4watr:WaterKind --- documentation/description.html | 10 +++++----- examples/WaterInfrastructure.ttl | 2 +- ontology/saref4watr.ttl | 17 ++++++++++++----- tests/tests.csv | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/documentation/description.html b/documentation/description.html index 56c14d9..b6c4bb5 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -75,13 +75,13 @@ There are different types of tariffs, depending on whether they are based on thr -

Water types

+

Water kinds

-

SAREF4WATR defines four types of water as instances of the s4watr:Water class: raw water (s4watr:RawWater), drinking water (s4watr:DrinkingWater), storm water (s4watr:StormWater), and waste water (s4watr:WasteWater). All these types of water, depicted in Figure 8, are defined as features of interest (saref:FeatureOfInterest), so measurements and key performance indicators can be defined over them.

+

SAREF4WATR defines four kinds of water as instances of the s4watr:WaterKind class: raw water (s4watr:RawWater), drinking water (s4watr:DrinkingWater), storm water (s4watr:StormWater), and waste water (s4watr:WasteWater). All these kinds of water, depicted in Figure 8, are defined as feature kinds (saref:FeatureKind).

- Water types model -
Figure 8: Water types model
+ Water kinds model +
Figure 8: Water kinds model
@@ -98,7 +98,7 @@ The extension defines different individuals for each type of water property, bas

Water infrastructure

-

In SAREF4WATR water infrastructures can be defined using the s4watr:WaterInfrastructure class. Such infrastructures may be designed for one of the water types described above (through the s4watr:isDesignedFor property), may have an intended use (through the s4watr:isIntendedFor property), and may be classified into five different types, although others may be defined if needed: distribution systems (s4watr:DistributionSystem), storage infrastructures (s4watr:StorageInfrastructure), treatment plants (s4watr:TreatmentPlant), hydroelectric power plants (s4watr:HydroelectricPowerPlant), and monitoring infrastructures (s4watr:MonitoringInfrastructure).

+

In SAREF4WATR water infrastructures can be defined using the s4watr:WaterInfrastructure class. Such infrastructures may be designed for one of the water kinds described above (through the s4watr:isDesignedFor property), may have an intended use (through the s4watr:isIntendedFor property), and may be classified into five different types, although others may be defined if needed: distribution systems (s4watr:DistributionSystem), storage infrastructures (s4watr:StorageInfrastructure), treatment plants (s4watr:TreatmentPlant), hydroelectric power plants (s4watr:HydroelectricPowerPlant), and monitoring infrastructures (s4watr:MonitoringInfrastructure).

In order to represent the topology of a water infrastructure or its assets, the GeoSPARQL ontology has been reused and connected to the SARE4WATR terms. As shown in Figure 10, for representing spatial objects the geo:SpatialObject class from GeoSPARQL has been reused along with its subclasses that allow defining spatial features (geo:Feature) and geometries (geo:Geometry). Different properties from GeoSPARQL can be reused to define spatial relations among spatial objects (e.g., geo:sfContains, or geo:sfWithin)or to define the geometry of a feature (geo:hasGeometry). Two types of geometries from the GeoSPARQL Simple Features ontology are proposed to be used: points (sf:Point) and polygons (sf:Polygon), although others may also be used from that same ontology or from another one. We refer to the GeoSPARQL standard for further details on how to define the topology of water infrastructures.

diff --git a/examples/WaterInfrastructure.ttl b/examples/WaterInfrastructure.ttl index ed93dd6..79acd19 100644 --- a/examples/WaterInfrastructure.ttl +++ b/examples/WaterInfrastructure.ttl @@ -47,7 +47,7 @@ om:litrePerHour rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/DrinkingWater s4watr:DrinkingWater rdf:type owl:NamedIndividual , - s4watr:Water ; + s4watr:WaterKind ; rdfs:label "Drinking water"@en , "Potable water"@en . diff --git a/ontology/saref4watr.ttl b/ontology/saref4watr.ttl index ab8afdb..c894f5d 100644 --- a/ontology/saref4watr.ttl +++ b/ontology/saref4watr.ttl @@ -664,7 +664,7 @@ s4watr:WaterInfrastructure rdf:type owl:Class ; saref:FeatureOfInterest , [ rdf:type owl:Restriction ; owl:onProperty s4watr:isDesignedFor ; - owl:someValuesFrom s4watr:Water + owl:someValuesFrom s4watr:WaterKind ] , [ rdf:type owl:Restriction ; owl:onProperty s4watr:isIntendedFor ; @@ -674,6 +674,13 @@ s4watr:WaterInfrastructure rdf:type owl:Class ; rdfs:label "Water infrastructure"@en . +### https://saref.etsi.org/saref4watr/WaterKind +s4watr:WaterKind rdf:type owl:Class ; + rdfs:subClassOf saref:FeatureKind ; + rdfs:comment "This class is used to define kinds of water features."@en ; + rdfs:label "Water kind"@en . + + ### https://saref.etsi.org/saref4watr/WaterMeter s4watr:WaterMeter rdf:type owl:Class ; rdfs:subClassOf s4watr:WaterDevice , @@ -928,7 +935,7 @@ s4watr:Domestic rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/DrinkingWater s4watr:DrinkingWater rdf:type owl:NamedIndividual , - s4watr:Water ; + s4watr:WaterKind ; rdfs:comment "Drinking water is water that is treated to comply with drinking water standards."@en ; rdfs:label "Drinking water"@en , "Potable water"@en . @@ -1136,7 +1143,7 @@ s4watr:PseudomonasAeruginosa rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/RawWater s4watr:RawWater rdf:type owl:NamedIndividual , - s4watr:Water ; + s4watr:WaterKind ; rdfs:comment "Raw water is water found in the environment that has not been treated and does not have any of its minerals, ions, particles, bacteria, or parasites removed."@en ; rdfs:label "Raw water"@en . @@ -1164,7 +1171,7 @@ s4watr:Sodium rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/Stormwater s4watr:Stormwater rdf:type owl:NamedIndividual , - s4watr:Water ; + s4watr:WaterKind ; rdfs:comment "Stormwater is water that originates during precipitation events and snow/ice melt."@en ; rdfs:label "Storm water"@en . @@ -1263,7 +1270,7 @@ s4watr:VinylChloride rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4watr/Wastewater s4watr:Wastewater rdf:type owl:NamedIndividual , - s4watr:Water ; + s4watr:WaterKind ; rdfs:comment "Wastewater is water that has been used in the home, in a business, or as part of an industrial process."@en ; rdfs:label "Waste water"@en . diff --git a/tests/tests.csv b/tests/tests.csv index d8046ae..54db7f8 100644 --- a/tests/tests.csv +++ b/tests/tests.csv @@ -4,8 +4,8 @@ WATR-TEST-2;WATR-1;Water infrastructure;Reservoir subClassOf WaterAsset WATR-TEST-3;WATR-1;Water infrastructure;Pipe subClassOf WaterAsset WATR-TEST-4;WATR-2;Water infrastructure;CatchmentWell subClassOf Well WATR-TEST-5;WATR-3;Water infrastructure;TreatmentPlant subClassOf WaterInfrastructure -WATR-TEST-6;WATR-3;Water infrastructure;TreatmentPlant isDesignedFor Water -WATR-TEST-7;WATR-3;Water infrastructure;Wastewater type Water +WATR-TEST-6;WATR-3;Water infrastructure;TreatmentPlant isDesignedFor WaterKind +WATR-TEST-7;WATR-3;Water infrastructure;Wastewater type WaterKind WATR-TEST-8;WATR-4;Water infrastructure;WaterInfrastructure hasSubSystem Sensor WATR-TEST-9;WATR-4;Water infrastructure;WaterMeter subClassOf Sensor WATR-TEST-10;WATR-5;Water infrastructure;WaterInfrastructure hasSubSystem Actuator -- GitLab