From 302e66317cdcce7f8ae06fc8c6db5cf161881ad4 Mon Sep 17 00:00:00 2001
From: dragoni <dragoni@fbk.eu>
Date: Thu, 27 Feb 2020 10:19:27 +0100
Subject: [PATCH] Fixed mapping with SAREF.

---
 ontology/catalog-v001.xml |  1 +
 ontology/saref4wear.ttl   | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ontology/catalog-v001.xml b/ontology/catalog-v001.xml
index 5cbe3cf..062908d 100644
--- a/ontology/catalog-v001.xml
+++ b/ontology/catalog-v001.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="Imports Wizard Entry" name="https://w3id.org/saref" uri="https://ontology.tno.nl/saref.ttl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base=""/>
 </catalog>
diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 24af5c8..5077547 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -14,6 +14,7 @@
 
 <https://saref.etsi.org/saref4wear#> rdf:type owl:Ontology ;
                                       owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear#> ;
+                                      owl:imports <https://w3id.org/saref> ;
                                       dcterms:contributor <https://www.linkedin.com/in/maurodragoni/MauroDragoni> ;
                                       dcterms:created "start date of the STF 2019-01-01"^^xsd:date ;
                                       dcterms:description "SAREF4WEAR is an extension of SAREF for Wearables"@en ;
@@ -237,7 +238,6 @@ s4wear:hasCommand rdf:type owl:DatatypeProperty ;
 
 ###  https://saref.etsi.org/s4wear#hasDataTransmissionRate
 s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
-                               rdfs:subPropertyOf owl:topDataProperty ;
                                rdfs:domain s4wear:Wearable ;
                                rdfs:range xsd:double .
 
@@ -263,7 +263,7 @@ s4wear:hasLength rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/s4wear#hasOperatingTemperature
 s4wear:hasOperatingTemperature rdf:type owl:DatatypeProperty ;
                                rdfs:domain s4wear:Wearable ;
-                               rdfs:range xsd:long .
+                               rdfs:range xsd:double .
 
 
 ###  https://saref.etsi.org/s4wear#hasStorage
@@ -332,6 +332,7 @@ s4wear:ActuableObject rdf:type owl:Class .
 
 ###  https://saref.etsi.org/s4wear#Actuator
 s4wear:Actuator rdf:type owl:Class ;
+                owl:equivalentClass <https://w3id.org/saref#Actuator> ;
                 rdfs:subClassOf s4wear:WearableComponent .
 
 
@@ -364,7 +365,8 @@ s4wear:Control rdf:type owl:Class ;
 
 
 ###  https://saref.etsi.org/s4wear#Device
-s4wear:Device rdf:type owl:Class .
+s4wear:Device rdf:type owl:Class ;
+              owl:equivalentClass <https://w3id.org/saref#Device> .
 
 
 ###  https://saref.etsi.org/s4wear#ElectricalSafety
@@ -470,6 +472,7 @@ s4wear:Sensing rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/s4wear#Sensor
 s4wear:Sensor rdf:type owl:Class ;
+              owl:equivalentClass <https://w3id.org/saref#Sensor> ;
               rdfs:subClassOf s4wear:WearableComponent .
 
 
@@ -542,6 +545,12 @@ The definition of this concept satisfies the requirement WEAR-2."""@en ;
               rdfs:label "Wearer"@en .
 
 
+###  https://w3id.org/saref#Actuator
+
+###  https://w3id.org/saref#Device
+
+###  https://w3id.org/saref#Sensor
+
 #################################################################
 #    Individuals
 #################################################################
-- 
GitLab