Maxime Lefrançois · Maxime Lefrançois · Maxime Lefrançois · 18af2132 · 18af2132 · 18af2132
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: openjdk:8-jdk
-
 variables:
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 0
    SAREF_DEV_KEY: <my_private_key>
    SAREF_PORTAL_KEY: <my_private_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/

--- a/examples/example1.ttl
+++ b/examples/example1.ttl
 @prefix : <https://saref.etsi.org/saref4city/v1.1.2/example/example1/> .
-@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 xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -91,16 +91,16 @@
 <https://saref.etsi.org/saref4city/data/city/example1/Car35> rdf:type owl:NamedIndividual ,
                                                                      <http://www.opengis.net/ont/geosparql#SpatialObject> ,
                                                                      saref:FeatureOfInterest ;
-                                                             geo:location <https://saref.etsi.org/saref4city/data/city/example1/CarLocation2018-11-20T13-30-00> ;
+                                                             wgs84:location <https://saref.etsi.org/saref4city/data/city/example1/CarLocation2018-11-20T13-30-00> ;
                                                             saref:hasProperty <https://saref.etsi.org/saref4city/data/city/example1/Speed> .


 ###  https://saref.etsi.org/saref4city/data/city/example1/CarLocation2018-11-20T13-30-00
 <https://saref.etsi.org/saref4city/data/city/example1/CarLocation2018-11-20T13-30-00> rdf:type owl:NamedIndividual ,
-                                                                                               geo:Point ;
+                                                                                               wgs84:Point ;
                                                                                      <http://www.opengis.net/ont/geosparql#sfWithin> <https://saref.etsi.org/saref4city/data/city/example1/RoadSegment50> ;
-                                                                                      geo:lat 40.405013 ;
-                                                                                      geo:long -3.839349 .
+                                                                                      wgs84:lat 40.405013 ;
+                                                                                      wgs84:long -3.839349 .


 ###  https://saref.etsi.org/saref4city/data/city/example1/CarsSpeed2018-11-20

--- a/ontology/saref4city.ttl
+++ b/ontology/saref4city.ttl
 @prefix : <https://saref.etsi.org/saref4city/> .
-@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 xml: <http://www.w3.org/XML/1998/namespace> .
@@ -9,7 +9,7 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
-@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
+@prefix geo: <http://www.opengis.net/ont/geosparql#> .
 @prefix saref: <https://saref.etsi.org/core/> .
 @prefix s4city: <https://saref.etsi.org/saref4city/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
@@ -93,21 +93,21 @@ cpsv:uses a owl:ObjectProperty ;
 # 
 # http://www.opengis.net/ont/geosparql#hasGeometry

-geosp:hasGeometry a owl:ObjectProperty ;
+geo:hasGeometry a owl:ObjectProperty ;
 	rdfs:comment "A spatial representation for a given feature."@en ;
 	rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
 	rdfs:label "has geometry"@en .
 # 
 # http://www.opengis.net/ont/geosparql#sfContains

-geosp:sfContains a owl:ObjectProperty ;
+geo:sfContains a owl:ObjectProperty ;
 	rdfs:comment "Exists if the subject SpatialObject spatially contains the object SpatialObject. DE-9IM: T*****FF*"@en ;
 	rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "contains"@en .
 # 
 # http://www.opengis.net/ont/geosparql#sfWithin

-geosp:sfWithin a owl:ObjectProperty ;
+geo:sfWithin a owl:ObjectProperty ;
 	rdfs:comment "Exists if the subject SpatialObject is spatially within the object SpatialObject. DE-9IM: T*F**F***"@en ;
 	rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "within"@en .
@@ -277,7 +277,7 @@ saref:relatesToProperty a owl:ObjectProperty ;

 # http://www.w3.org/2003/01/geo/wgs84_pos#location

-geo:location a owl:ObjectProperty ;
+wgs84:location a 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 ." ;
 	rdfs:label "location" .
 # 
@@ -338,26 +338,26 @@ s4city:hasLastUpdateDate a owl:DatatypeProperty ;
 # 	rdfs:label "has value"@en .
 # http://www.w3.org/2003/01/geo/wgs84_pos#alt

-geo:SpatialThing a owl:Class .
+wgs84:SpatialThing a owl:Class .

-geo:alt a owl:DatatypeProperty ;
+wgs84:alt a owl:DatatypeProperty ;
 	rdfs:comment "The WGS84 altitude of a SpatialThing (decimal meters above the local reference ellipsoid)." ;
 	rdfs:label "altitude" ;
-	rdfs:domain geo:SpatialThing .
+	rdfs:domain wgs84:SpatialThing .
 # 
 # http://www.w3.org/2003/01/geo/wgs84_pos#lat

-geo:lat a owl:DatatypeProperty ;
+wgs84:lat a owl:DatatypeProperty ;
 	rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)." ;
 	rdfs:label "latitude" ;
-	rdfs:domain geo:SpatialThing .
+	rdfs:domain wgs84:SpatialThing .
 # 
 # http://www.w3.org/2003/01/geo/wgs84_pos#long

-geo:long a owl:DatatypeProperty ;
+wgs84:long a owl:DatatypeProperty ;
 	rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)." ;
 	rdfs:label "longitude" ;
-	rdfs:domain geo:SpatialThing .
+	rdfs:domain wgs84:SpatialThing .
 # 
 # 
 # 
@@ -381,32 +381,32 @@ cpsv:PublicService a owl:Class ;
 # 
 # http://www.opengis.net/ont/geosparql#Feature

-geosp:Feature a owl:Class ;
-	rdfs:subClassOf geosp:SpatialObject ;
-	owl:disjointWith geosp:Geometry ;
+geo:Feature a owl:Class ;
+	rdfs:subClassOf geo:SpatialObject ;
+	owl:disjointWith geo:Geometry ;
 	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 <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "Feature"@en .
 # 
 # http://www.opengis.net/ont/geosparql#Geometry

-geosp:Geometry a owl:Class ;
-	rdfs:subClassOf geosp:SpatialObject ;
+geo:Geometry a 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 <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "Geometry"@en .
 # 
 # http://www.opengis.net/ont/geosparql#SpatialObject

-geosp:SpatialObject a owl:Class ;
+geo:SpatialObject a 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 <http://www.opengis.net/ont/geosparql> ;
 	rdfs:label "SpatialObject"@en .
 # 
 # http://www.w3.org/2003/01/geo/wgs84_pos#Point

-geo:Point a owl:Class ;
-	rdfs:subClassOf geosp:Geometry ;
+wgs84:Point a owl:Class ;
+	rdfs:subClassOf geo:Geometry ;
 	rdfs:comment """ 
 Uniquely identified by lat/long/alt. i.e.

@@ -468,7 +468,7 @@ time:TemporalEntity a owl:Class ;
 # https://saref.etsi.org/saref4city/AdministrativeArea

 s4city:AdministrativeArea a 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:label "Administrative area"@en .
 # 
@@ -498,7 +498,7 @@ s4city:City a owl:Class ;
 # https://saref.etsi.org/saref4city/CityObject

 s4city:CityObject a owl:Class ;
-	rdfs:subClassOf geosp:Feature ;
+	rdfs:subClassOf geo:Feature ;
 	rdfs:comment "Generic class for describing city objects."@en ;
 	rdfs:label "City object"@en .
 # 
@@ -550,7 +550,7 @@ s4city:Event rdfs:comment "Temporary and scheduled event, like a festival or com
 # https://saref.etsi.org/saref4city/Facility

 s4city:Facility a 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:label "Facility"@en .
 # 
@@ -686,7 +686,7 @@ saref:Actuator a owl:Class ;
 # https://saref.etsi.org/core/Device

 saref:Device a owl:Class ;
-	rdfs:subClassOf geosp:Feature , 
+	rdfs:subClassOf geo:Feature , 
 					[	a owl:Restriction ;
 						owl:onProperty saref:controlsProperty ;
 						owl:allValuesFrom saref:Property ] ,