diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fda4ae18c308adeaa52797040011d4613546e149..8eb754add957115001807157a3c2597844d66126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +1,20 @@ -image: openjdk:8-jdk - variables: + GIT_STRATEGY: fetch + GIT_DEPTH: 0 SAREF_DEV_KEY: SAREF_PORTAL_KEY: -before_script: - - eval $(ssh-agent -s) - - ssh-add <(echo "$SAREF_DEV_KEY") - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - stages: - test - build - deploy + test-develop: stage: test + image: openjdk:11-jre 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 allow_failure: true except: @@ -34,8 +30,9 @@ test-develop: test-prerelease: stage: test + image: openjdk:11-jre 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 allow_failure: true only: @@ -48,19 +45,27 @@ test-prerelease: reports: junit: target/report_output.xml -deploy-report: - stage: deploy - script: - - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID - - echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" - - exit $(test -f target/success) $? - except: - - /^release-v/ +# deploy-report: +# stage: deploy +# image: alpine:latest +# script: +# - apk update +# - apk add openssh +# - eval $(ssh-agent -s) +# - ssh-add <(echo "$SAREF_DEV_KEY") +# - mkdir -p ~/.ssh +# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' +# - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID +# - echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" +# - exit $(test -f target/success) $? +# except: +# - /^release-v/ test-release: stage: test + image: openjdk:11-jre 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 only: - /^release-v/ diff --git a/documentation/description.html b/documentation/description.html index e2e88b8cf1c7eea466d37224f3e264c75cb0f52c..66feca42b4252d785f8399decdc248c94c1b5ad1 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -83,9 +83,9 @@

Occurrence

-

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

+

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

-

In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (s4city:Event, a subclass of s4wear:Occurrence) that take place at (s4city:takesPlaceAtFacility) facilities (s4city:Facility, a subclass of geosp:Feature).

+

In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (s4city:Event, a subclass of s4wear:Occurrence) that take place at (s4city:takesPlaceAtFacility) facilities (s4city:Facility, a subclass of geo:Feature).

Occurence model diff --git a/examples/health-status-monitor.ttl b/examples/health-status-monitor.ttl index 5c0cb50154cba78bf8f3dcb6266f352d136de899..0e6d76284ea6f1356cbb24ba00da67ea446e7702 100644 --- a/examples/health-status-monitor.ttl +++ b/examples/health-status-monitor.ttl @@ -6,7 +6,7 @@ @prefix rdfs: . @prefix saref: . @prefix s4wear: . -@prefix geosp: . +@prefix geo: . @prefix dctype: . @prefix dcterms: . @base . diff --git a/examples/indoor-event.ttl b/examples/indoor-event.ttl index 99dcc798d8477ce982d9afd9a2c9a91eb74a739c..ed469a80069874e4d5b90a440af1eb5721649984 100644 --- a/examples/indoor-event.ttl +++ b/examples/indoor-event.ttl @@ -7,7 +7,7 @@ @prefix saref: . @prefix s4city: . @prefix s4wear: . -@prefix geosp: . +@prefix geo: . @prefix dctype: . @prefix dcterms: . @base . @@ -82,7 +82,7 @@ ex:FacilitySpeaker1 rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4wear/example/ForumAssago ex:ForumAssago rdf:type owl:NamedIndividual , s4city:Facility ; - geosp:sfContains ex:SmokeSensor1 , + geo:sfContains ex:SmokeSensor1 , ex:SmokeSensor2 , ex:Controller1 , ex:Tracker1 , diff --git a/examples/openair-event.ttl b/examples/openair-event.ttl index 99cc93a3744392b1870046490c4be90760a74e31..1e72742edc9c5de4a5496c4063fcd90cc8046cb7 100644 --- a/examples/openair-event.ttl +++ b/examples/openair-event.ttl @@ -7,7 +7,7 @@ @prefix saref: . @prefix s4city: . @prefix s4wear: . -@prefix geosp: . +@prefix geo: . @prefix dctype: . @prefix dcterms: . @base . @@ -113,7 +113,7 @@ ex:Customer3 rdf:type owl:NamedIndividual , ### https://saref.etsi.org/saref4wear/example/Woodstock ex:Woodstock rdf:type owl:NamedIndividual , s4city:Facility ; - geosp:sfContains ex:Receiver1 , + geo:sfContains ex:Receiver1 , ex:Tracker1 , ex:Tracker2 , ex:Tracker3 , diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl index a0ea05f8470b0d14aeac628f17ec4a3272652d9b..bca1f7ac93fb4a7a583c521d8bbaae683d0d8935 100644 --- a/ontology/saref4wear.ttl +++ b/ontology/saref4wear.ttl @@ -1,5 +1,5 @@ @prefix : . -@prefix geo: . +@prefix wgs84: . @prefix owl: . @prefix rdf: . @prefix xml: . @@ -8,7 +8,7 @@ @prefix rdfs: . @prefix vann: . @prefix voaf: . -@prefix geosp: . +@prefix geo: . @prefix saref: . @prefix s4city: . @prefix s4syst: . @@ -121,30 +121,30 @@ schema:affiliation rdf:type owl:ObjectProperty ; rdfs:label "affiliation"@en. ### http://www.opengis.net/ont/geosparql#hasGeometry -geosp:hasGeometry rdf:type owl:ObjectProperty ; +geo:hasGeometry rdf:type owl:ObjectProperty ; rdfs:comment "A spatial representation for a given feature."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "hasGeometry"@en . ### http://www.opengis.net/ont/geosparql#sfContains -geosp:sfContains rdf:type owl:ObjectProperty ; +geo:sfContains rdf:type owl:ObjectProperty ; rdfs:comment "Exists if the subject SpatialObject spatially contains the object SpatialObject."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "sfContains"@en . ### http://www.opengis.net/ont/geosparql#sfWithin -geosp:sfWithin rdf:type owl:ObjectProperty ; +geo:sfWithin rdf:type owl:ObjectProperty ; rdfs:comment "Exists if the subject SpatialObject is spatially within the object SpatialObject."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "sfWithin"@en . ### http://www.w3.org/2003/01/geo/wgs84_pos#location -geo:location rdf:type owl:ObjectProperty ; +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 relationship 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:isDefinedBy geo: ; + rdfs:isDefinedBy wgs84: ; rdfs:label "location" . @@ -554,33 +554,33 @@ schema:Person rdf:type owl:Class ; ### http://www.opengis.net/ont/geosparql#Feature -geosp:Feature rdf:type owl:Class ; - rdfs:subClassOf geosp:SpatialObject ; +geo:Feature rdf:type owl:Class ; + rdfs:subClassOf geo:SpatialObject ; rdfs:comment "This class represents the top-level feature type. This class is equivalent to GFI_Feature defined in ISO 19156:2011, and it is superclass of all feature types."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "Feature"@en . ### http://www.opengis.net/ont/geosparql#Geometry -geosp:Geometry rdf:type owl:Class ; - rdfs:subClassOf geosp:SpatialObject ; +geo:Geometry rdf:type owl:Class ; + rdfs:subClassOf geo:SpatialObject ; rdfs:comment "The class represents the top-level geometry type. This class is equivalent to the UML class GM_Object defined in ISO 19107, and it is superclass of all geometry types."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "Geometry"@en . ### http://www.opengis.net/ont/geosparql#SpatialObject -geosp:SpatialObject rdf:type owl:Class ; +geo:SpatialObject rdf:type owl:Class ; rdfs:comment "The class spatial-object represents everything that can have a spatial representation. It is superclass of feature and geometry."@en ; - rdfs:isDefinedBy geosp: ; + rdfs:isDefinedBy geo: ; rdfs:label "Spatial object"@en . ### http://www.w3.org/2003/01/geo/wgs84_pos#Point -geo:Point rdf:type owl:Class ; - rdfs:subClassOf geosp:Geometry ; +wgs84:Point rdf:type owl:Class ; + rdfs:subClassOf geo:Geometry ; rdfs:comment "A point, typically described using a coordinate system relative to Earth, such as WGS84."@en ; - rdfs:isDefinedBy geo: ; + rdfs:isDefinedBy wgs84: ; rdfs:label "Point"@en . @@ -730,7 +730,7 @@ saref:UnitOfMeasure rdf:type owl:Class ; ### https://saref.etsi.org/saref4city/AdministrativeArea s4city:AdministrativeArea rdf:type owl:Class ; - rdfs:subClassOf geosp:Feature ; + rdfs:subClassOf geo:Feature ; rdfs:comment "An administrative division, unit, entity, area or region, also referred to as a subnational entity, constituent unit, or country subdivision, is a portion of a country or other region delineated for the purpose of administration. (https://en.wikipedia.org/wiki/Administrative_division)."@en ; rdfs:isDefinedBy s4city: ; rdfs:label "Administrative area"@en . @@ -738,7 +738,7 @@ s4city:AdministrativeArea rdf:type owl:Class ; ### https://saref.etsi.org/saref4city/CityObject s4city:CityObject rdf:type owl:Class ; - rdfs:subClassOf geosp:Feature ; + rdfs:subClassOf geo:Feature ; rdfs:comment "Generic class for describing city objects."@en ; rdfs:isDefinedBy s4city: ; rdfs:label "City object"@en . @@ -758,7 +758,7 @@ s4city:Event rdf:type owl:Class ; ### https://saref.etsi.org/saref4city/Facility s4city:Facility rdf:type owl:Class ; - rdfs:subClassOf geosp:Feature ; + rdfs:subClassOf geo:Feature ; rdfs:comment "A place, amenity, or piece of equipment provided for a particular purpose. (Definition taken from https://en.oxforddictionaries.com/definition/facility)."@en ; rdfs:isDefinedBy s4city: ; rdfs:label "Facility"@en . @@ -849,7 +849,7 @@ s4wear:Interface rdf:type owl:Class ; ### https://saref.etsi.org/saref4wear/LivingOrganism s4wear:LivingOrganism rdf:type owl:Class ; - rdfs:subClassOf geosp:Feature , + rdfs:subClassOf geo:Feature , saref:FeatureOfInterest ; rdfs:comment "A living organism is any entity composed of cells."@en ; rdfs:label "Living organism"@en . @@ -887,7 +887,7 @@ s4wear:NearBodyWearable rdf:type owl:Class ; s4wear:Occurrence rdf:type owl:Class ; rdfs:subClassOf [ rdf:type owl:Restriction ; owl:onProperty s4wear:takesPlaceAt ; - owl:allValuesFrom geosp:Feature + owl:allValuesFrom geo:Feature ] ; rdfs:comment "An occurrence is the fact of something existing or being found in a place."@en ; rdfs:label "Occurrence"@en . @@ -950,7 +950,7 @@ s4wear:User rdf:type owl:Class ; ### https://saref.etsi.org/saref4wear/Wearable s4wear:Wearable rdf:type owl:Class ; - rdfs:subClassOf geosp:Feature , + rdfs:subClassOf geo:Feature , saref:Device , [ rdf:type owl:Restriction ; owl:onProperty ssn-system:hasSystemCapability ; @@ -973,7 +973,7 @@ s4wear:WearableProperty rdf:type owl:Class ; ### https://saref.etsi.org/saref4wear/Wearer s4wear:Wearer rdf:type owl:Class ; - rdfs:subClassOf geosp:SpatialObject , + rdfs:subClassOf geo:SpatialObject , [ owl:intersectionOf ( s4wear:LivingOrganism [ rdf:type owl:Restriction ; owl:onProperty s4wear:featureIsMeasuredByDevice ;