Unverified Commit 0cd38a7b authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'develop-v3.1.1' into release-v3.1.1

parents 104b962c 70f4f33e

.gitignore

+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
catalog-v001.xml

saref-pipeline.jar

target

ts
 
 No newline at end of file

examples/doorswitch.ttl

+5 −5
Changes for examples/doorswitch.ttl: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line 
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@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#> .
@@ -15,8 +15,8 @@ 
  dcterms:title "Example doorswitch"@en ;

  dcterms:description "Example doorswitch"@en .



geo:lat a owl:DatatypeProperty .

geo:long a owl:DatatypeProperty .

wgs84:lat a owl:DatatypeProperty .

wgs84:long a owl:DatatypeProperty .



ex:BuildingObject_MainDoor

#  rdf:type saref:Door ;
@@ -25,8 +25,8 @@ ex:BuildingObject_MainDoor 
ex:BuildingSpace_OfficeHall

#  rdf:type saref:BuildingSpace ;

  rdfs:label "Office Hall"^^xsd:string ;

  geo:lat "52.0821"^^xsd:string ;

  geo:long "4.3251"^^xsd:string ;

  wgs84:lat "52.0821"^^xsd:string ;

  wgs84:long "4.3251"^^xsd:string ;

#  saref:contains ex:BuildingObject_MainDoor ;

#  saref:hasSpaceType "Office hall"^^xsd:string ;

.

examples/lightswitch.ttl

+5 −5
Changes for examples/lightswitch.ttl: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line 
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@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#> .
@@ -15,8 +15,8 @@ 
  dcterms:title "Example lightswitch"@en ;

  dcterms:description "Example lightswitch"@en .



geo:lat a owl:DatatypeProperty .

geo:long a owl:DatatypeProperty .

wgs84:lat a owl:DatatypeProperty .

wgs84:long a owl:DatatypeProperty .



ex:LightingDevice rdf:type owl:Class ;

#                     rdfs:subClassOf saref:FunctionRelated ;
@@ -25,8 +25,8 @@ ex:LightingDevice rdf:type owl:Class ; 
ex:BuildingSpace_OfficeHall

#  rdf:type saref:BuildingSpace ;

  rdfs:label "Office Hall"^^xsd:string ;

  geo:lat "52.0821"^^xsd:string ;

  geo:long "4.3251"^^xsd:string ;

  wgs84:lat "52.0821"^^xsd:string ;

  wgs84:long "4.3251"^^xsd:string ;

#  saref:hasSpaceType "Office hall"^^xsd:string ;

.

ex:Light

examples/multimedia.ttl

+0 −1
Changes for examples/multimedia.ttl: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@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#> .

examples/smokesensor.ttl

+5 −5
Changes for examples/smokesensor.ttl: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line 
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@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#> .
@@ -15,8 +15,8 @@ 
  dcterms:title "Example smokesensor"@en ;

  dcterms:description "Example smokesensor"@en .



geo:lat a owl:DatatypeProperty .

geo:long a owl:DatatypeProperty .

wgs84:lat a owl:DatatypeProperty .

wgs84:long a owl:DatatypeProperty .



ex:Audio

  rdf:type saref:Property ;
@@ -31,8 +31,8 @@ ex:BuildingObject_Window 
ex:BuildingSpace_HotelRoom

#  rdf:type saref:BuildingSpace ;

  rdfs:label "Hotel room"^^xsd:string ;

  geo:lat "52.0705"^^xsd:string ;

  geo:long "4.30070"^^xsd:string ;

  wgs84:lat "52.0705"^^xsd:string ;

  wgs84:long "4.30070"^^xsd:string ;

#  saref:contains <http://ontology.tno.nl/saref/tempsensor#BuildingObject_window> ;

#  saref:hasSpaceType "Hotel room"^^xsd:string ;

.