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

closes #37

parent cdc91b71

.gitlab-ci.yml

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ stages: 
test-develop:

test-develop:

  stage: test

  stage: test

  script:

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar develop -s && touch target/success

    - java -jar saref-pipeline.jar develop -s && touch target/success

  allow_failure: true

  allow_failure: true

  except:

  except:
@@ -35,7 +35,7 @@ test-develop: 
test-prerelease:

test-prerelease:

  stage: test

  stage: test

  script:

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar release -t && touch target/success

    - java -jar saref-pipeline.jar release -t && touch target/success

  allow_failure: true

  allow_failure: true

  only:

  only:
@@ -60,7 +60,7 @@ deploy-report: 
test-release:

test-release:

  stage: test

  stage: test

  script:

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar release -t

    - java -jar saref-pipeline.jar release -t

  only:

  only:

    - /^release-v/

    - /^release-v/

documentation/description.html

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,9 +83,9 @@ 




<h3>Occurrence</h3>

<h3>Occurrence</h3>





<p>In some cases, wearables will be able to detect occurrences (<a href="#s4wear:Occurrence">s4wear:Occurrence</a>) taking place (<a href="#s4wear:takesPlaceAt">s4wear:takesPlaceAt</a>) in a location that is relevant to the wearer (geosp:Feature). These occurrences can be related to the device detecting them through the <a href="#s4wear:isDetectedBy">s4wear:isDetectedBy</a> property, as shown in <a href="#Figure_6">Figure 6</a>.</p>

<p>In some cases, wearables will be able to detect occurrences (<a href="#s4wear:Occurrence">s4wear:Occurrence</a>) taking place (<a href="#s4wear:takesPlaceAt">s4wear:takesPlaceAt</a>) in a location that is relevant to the wearer (geo:Feature). These occurrences can be related to the device detecting them through the <a href="#s4wear:isDetectedBy">s4wear:isDetectedBy</a> property, as shown in <a href="#Figure_6">Figure 6</a>.</p>

 

 

<p>In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (<a href="https://saref.etsi.org/saref4city/Event">s4city:Event</a>, a subclass of <a href="#s4wear:Occurrence">s4wear:Occurrence</a>) that take place at (<a href="https://saref.etsi.org/saref4city/takesPlaceAtFacility">s4city:takesPlaceAtFacility</a>) facilities (<a href="https://saref.etsi.org/saref4city/Facility">s4city:Facility</a>, a subclass of geosp:Feature).</p> 

<p>In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (<a href="https://saref.etsi.org/saref4city/Event">s4city:Event</a>, a subclass of <a href="#s4wear:Occurrence">s4wear:Occurrence</a>) that take place at (<a href="https://saref.etsi.org/saref4city/takesPlaceAtFacility">s4city:takesPlaceAtFacility</a>) facilities (<a href="https://saref.etsi.org/saref4city/Facility">s4city:Facility</a>, a subclass of geo:Feature).</p> 





<figure>

<figure>

  <a href="diagrams/SAREF4WEAR Occurrence.png"><img src="diagrams/SAREF4WEAR Occurrence.png" alt="Occurence model"/></a>

  <a href="diagrams/SAREF4WEAR Occurrence.png"><img src="diagrams/SAREF4WEAR Occurrence.png" alt="Occurence model"/></a>

examples/health-status-monitor.ttl

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .

@base <https://saref.etsi.org/saref4wear/example/> .

examples/indoor-event.ttl

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
@prefix saref: <https://saref.etsi.org/core/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .

@base <https://saref.etsi.org/saref4wear/example/> .
@@ -82,7 +82,7 @@ ex:FacilitySpeaker1 rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4wear/example/ForumAssago

###  https://saref.etsi.org/saref4wear/example/ForumAssago

ex:ForumAssago rdf:type owl:NamedIndividual ,

ex:ForumAssago rdf:type owl:NamedIndividual ,

                        s4city:Facility ;

                        s4city:Facility ;

               geosp:sfContains ex:SmokeSensor1 ,

               geo:sfContains ex:SmokeSensor1 ,

                                ex:SmokeSensor2 ,

                                ex:SmokeSensor2 ,

                                ex:Controller1 ,

                                ex:Controller1 ,

                                ex:Tracker1 ,

                                ex:Tracker1 ,

examples/openair-event.ttl

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
@prefix saref: <https://saref.etsi.org/core/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .

@base <https://saref.etsi.org/saref4wear/example/> .
@@ -113,7 +113,7 @@ ex:Customer3 rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4wear/example/Woodstock

###  https://saref.etsi.org/saref4wear/example/Woodstock

ex:Woodstock rdf:type owl:NamedIndividual ,

ex:Woodstock rdf:type owl:NamedIndividual ,

                      s4city:Facility ;

                      s4city:Facility ;

             geosp:sfContains ex:Receiver1 ,

             geo:sfContains ex:Receiver1 ,

                              ex:Tracker1 ,

                              ex:Tracker1 ,

                              ex:Tracker2 ,

                              ex:Tracker2 ,

                              ex:Tracker3 ,

                              ex:Tracker3 ,