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/examples/example1ENVI.ttl b/examples/example1ENVI.ttl index cde57b4113e7b42d2115deb8894da48c51cc0ca1..9cf91249bb7de037c47b36bceb3b25609617182b 100644 --- a/examples/example1ENVI.ttl +++ b/examples/example1ENVI.ttl @@ -9,7 +9,7 @@ @prefix s4ener: . @prefix dcterms: . @prefix dctype: . -@prefix geo: . +@prefix wgs84: . @prefix time: . @prefix wurvoc: . @base . @@ -24,8 +24,8 @@ dcterms:description "Example of use for the SAREF extension for environment"@en . -geo:lat a owl:DatatypeProperty . -geo:long a owl:DatatypeProperty . +wgs84:lat a owl:DatatypeProperty . +wgs84:long a owl:DatatypeProperty . :Bluetoothv2-1 rdf:type owl:NamedIndividual , s4envi:CommunicationInterface ; @@ -41,9 +41,9 @@ geo:long a owl:DatatypeProperty . :LocationTESS005-UCM rdf:type owl:NamedIndividual , - geo:SpatialThing ; - geo:lat "40.451" ; - geo:long "-3.7261" ; + wgs84:SpatialThing ; + wgs84:lat "40.451" ; + wgs84:long "-3.7261" ; rdfs:label "Location of photometer TESS stars5"@en . @@ -89,7 +89,7 @@ geo:long a owl:DatatypeProperty . :RS232v24 , :Wi-Fiv802-11ah ; s4envi:usesCommunicationProtocol :MQTT-Broker ; - geo:location :LocationTESS005-UCM ; + wgs84:location :LocationTESS005-UCM ; s4ener:exposes :PowerProfileTESS005-UCM ; s4envi:hasVersion "v1"^^xsd:string ; saref:hasManufacturer "Universidad Complutense de Madrid"^^xsd:string ; diff --git a/ontology/saref4envi.ttl b/ontology/saref4envi.ttl index 9ce47814ffda3005b4ee0f470c2102aaf42e0940..51cbfc0ea251fe7e9399b9d57d638d29a7f52390 100644 --- a/ontology/saref4envi.ttl +++ b/ontology/saref4envi.ttl @@ -1,5 +1,5 @@ @prefix : . -@prefix geo: . +@prefix wgs84: . @prefix owl: . @prefix rdf: . @prefix xml: . @@ -13,22 +13,26 @@ @base . rdf:type owl:Ontology ; - owl:versionIRI ; + owl:versionIRI ; dcterms:description "This ontology extends the SAREF ontology for the environment domain, specifically for the light pollution domain, including concepts like photometers, light, etc."@en ; dcterms:publisher ; dcterms:title "SAREF extension for environment"@en ; dcterms:issued "2020-06-05"^^xsd:date ; - dcterms:modified "2020-06-05"^^xsd:date ; - dcterms:creator , - ; + dcterms:modified "2024-01-25"^^xsd:date ; + dcterms:creator ; + dcterms:creator ; + dcterms:contributor ; dcterms:license ; vann:preferredNamespacePrefix "s4envi" ; vann:preferredNamespaceUri "https://saref.etsi.org/saref4envi/" ; + rdfs:comment """Information about changes compared to version 1.1.2: + - See https://saref.etsi.org/sources/saref4envi/-/milestones/1"""@en ; rdfs:comment """Information about changes compared to version 1.1.1: - Updated namespaces for compatibility with SAREF v3."""@en ; + owl:imports ; # should be v4.1.1 in the future. dcterms:source ; - rdfs:seeAlso ; - owl:versionInfo "v1.1.2" . + rdfs:seeAlso ; + owl:versionInfo "v2.1.1" . ################################################################# # Annotation properties @@ -71,9 +75,9 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty . ################################################################# ### 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 realtionship 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"@en . @@ -335,14 +339,14 @@ saref:hasValue rdf:type owl:DatatypeProperty ; ################################################################# ### http://www.w3.org/2003/01/geo/wgs84_pos#Point -geo:Point rdf:type owl:Class ; +wgs84:Point rdf:type owl:Class ; rdfs:comment "A point, typically described using a coordinate system relative to Earth, such as WGS84. Uniquely identified by lat/long/alt. i.e. spaciallyIntersects(P1, P2) :- lat(P1, LAT), long(P1, LONG), alt(P1, ALT), at(P2, LAT), long(P2, LONG), alt(P2, ALT). sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P2)."@en ; - rdfs:isDefinedBy geo: ; + rdfs:isDefinedBy wgs84: ; rdfs:label "Point"@en . ### http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing -geo:SpatialThing rdf:type owl:Class ; +wgs84:SpatialThing rdf:type owl:Class ; owl:disjointWith saref:Measurement , saref:Service , :Color , @@ -352,7 +356,7 @@ geo:SpatialThing rdf:type owl:Class ; :DigitalRepresentation , :Geometry ; rdfs:comment "Anything with spatial extent, i.e. size, shape, or position. e.g. people, places, bowling balls, as well as abstract areas like cubes."@en ; - rdfs:isDefinedBy geo: ; + rdfs:isDefinedBy wgs84: ; rdfs:label "Spatial thing"@en . @@ -728,10 +732,10 @@ saref:UnitOfMeasure rdf:type owl:Class ; ### https://saref.etsi.org/saref4envi/LightPoint :LightPoint rdf:type owl:Class ; - rdfs:subClassOf geo:Point , + rdfs:subClassOf wgs84:Point , [ rdf:type owl:Restriction ; - owl:onProperty geo:location ; - owl:allValuesFrom geo:SpatialThing + owl:onProperty wgs84:location ; + owl:allValuesFrom wgs84:SpatialThing ] , [ rdf:type owl:Restriction ; owl:onProperty :projectsLight ; @@ -777,10 +781,10 @@ saref:UnitOfMeasure rdf:type owl:Class ; ### https://saref.etsi.org/saref4envi/PhysicalObject :PhysicalObject rdf:type owl:Class ; - rdfs:subClassOf geo:SpatialThing , + rdfs:subClassOf wgs84:SpatialThing , [ rdf:type owl:Restriction ; - owl:onProperty geo:location ; - owl:allValuesFrom geo:SpatialThing + owl:onProperty wgs84:location ; + owl:allValuesFrom wgs84:SpatialThing ] , [ rdf:type owl:Restriction ; owl:onProperty :contains ;