[API Part1] Updated SOSA URIs and added CURIE options

opengeospatial · Jun 5, 2024 · d371d28 · d371d28
1 parent 5db3311
commit d371d28
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 35 deletions.
diff --git a/api/part1/openapi/examples/deployments/deployment-geojson.json b/api/part1/openapi/examples/deployments/deployment-geojson.json
@@ -14,7 +14,7 @@
   "properties": {
     "uid": "urn:x-ogc:deployments:D001",
     "name": "Saildrone - 2017 Arctic Mission",
-    "featureType": "http://www.w3.org/ns/ssn/Deployment",
+    "featureType": "http://www.w3.org/ns/sosa/Deployment",
     "description": "In July 2017, three saildrones were launched from Dutch Harbor, Alaska, in partnership with NOAA Research...",
     "validTime": ["2017-07-17T00:00:00Z", "2017-09-29T00:00:00Z"],
     "platform@link": {

diff --git a/api/part1/openapi/examples/deployments/deployment-sml.json b/api/part1/openapi/examples/deployments/deployment-sml.json
@@ -1,7 +1,7 @@
 {
   "type": "Deployment",
   "id": "iv3f2kcq27gfi",
-  "definition": "http://www.w3.org/ns/ssn/Deployment",
+  "definition": "http://www.w3.org/ns/sosa/Deployment",
   "uniqueId": "urn:x-saildrone:mission:2025",
   "label": "Saildrone - 2017 Arctic Mission",
   "description": "In July 2017, three saildrones were launched from Dutch Harbor, Alaska, in partnership with NOAA Research...",

diff --git a/api/part1/openapi/examples/procedures/ins-sensor-sml.json b/api/part1/openapi/examples/procedures/ins-sensor-sml.json
@@ -1,7 +1,7 @@
 {
   "type": "PhysicalSystem",
   "id": "INS001",
-  "definition": "http://www.w3.org/ns/sosa/ObservingProcedure",
+  "definition": "http://www.w3.org/ns/ssn-system/SensorKind",
   "uniqueId": "urn:x-vectornav:sensor:vn200",
   "label": "VectorNav VN-200",
   "description": "Datasheet of VN-200 GNSS-aided inertial navigation system",

diff --git a/api/part1/openapi/examples/procedures/sensor-datasheet-geojson.json b/api/part1/openapi/examples/procedures/sensor-datasheet-geojson.json
@@ -6,7 +6,7 @@
     "uid": "urn:x-gill:datasheets:windmaster:v1",
     "name": "Gill WindMaster",
     "description": "Precision 3-axis ultrasonic anemometer",
-    "featureType": "http://www.w3.org/ns/sosa/ObservingProcedure"
+    "featureType": "http://www.w3.org/ns/ssn-system/SensorKind"
   },
   "links": [
     {

diff --git a/api/part1/openapi/examples/procedures/sensor-datasheet-sml.json b/api/part1/openapi/examples/procedures/sensor-datasheet-sml.json
@@ -1,7 +1,7 @@
 {
   "type": "PhysicalComponent",
   "id": "iv3f2kcq27gfi",
-  "definition": "http://www.w3.org/ns/sosa/ObservingProcedure",
+  "definition": "http://www.w3.org/ns/ssn-system/SensorKind",
   "uniqueId": "urn:osh:sensors:saildrone:S0004",
   "label": "3D Ultrasonic Anemometer",
   "description": "Precision 3-axis ultrasonic anemometer",

diff --git a/api/part1/openapi/schemas/common/uris.json b/api/part1/openapi/schemas/common/uris.json
@@ -0,0 +1,50 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "SystemTypeUris": {
+      "type": "string",
+      "enum": [
+        "http://www.w3.org/ns/sosa/Sensor",
+        "http://www.w3.org/ns/sosa/Actuator",
+        "http://www.w3.org/ns/sosa/Platform",
+        "http://www.w3.org/ns/sosa/Sampler",
+        "http://www.w3.org/ns/sosa/System",
+        "sosa:Sensor",
+        "sosa:Actuator",
+        "sosa:Platform",
+        "sosa:Sampler",
+        "sosa:System"
+      ]
+    },
+    "DeploymentTypeUris": {
+      "type": "string",
+      "enum": [
+        "http://www.w3.org/ns/sosa/Deployment",
+        "sosa:Deployment"
+      ]
+    },
+    "ProcedureTypeUris": {
+      "type": "string",
+      "enum": [
+        "http://www.w3.org/ns/sosa/Procedure",
+        "http://www.w3.org/ns/sosa/ObservingProcedure",
+        "http://www.w3.org/ns/sosa/ActuatingProcedure",
+        "http://www.w3.org/ns/sosa/SamplingProcedure",
+        "http://www.w3.org/ns/ssn-system/SystemKind",
+        "http://www.w3.org/ns/ssn-system/SensorKind",
+        "http://www.w3.org/ns/ssn-system/ActuatorKind",
+        "http://www.w3.org/ns/ssn-system/SamplerKind",
+        "http://www.w3.org/ns/ssn-system/PlatformKind",
+        "sosa:Procedure",
+        "sosa:ObservingProcedure",
+        "sosa:ActuatingProcedure",
+        "sosa:SamplingProcedure",
+        "ssn:SystemKind",
+        "ssn:SensorKind",
+        "ssn:ActuatorKind",
+        "ssn:SamplerKind",
+        "ssn:PlatformKind"
+      ]
+    }
+  }
+}
diff --git a/api/part1/openapi/schemas/geojson/deployment.json b/api/part1/openapi/schemas/geojson/deployment.json
@@ -8,7 +8,7 @@
           "required": [ "validTime" ],
           "properties": {
             "featureType": {
-              "const": "http://www.w3.org/ns/ssn/Deployment"
+              "$ref": "../common/uris.json#/definitions/DeploymentTypeUris"
             },
             "validTime": {
               "description": "Time period during which the systems are deployed.",

diff --git a/api/part1/openapi/schemas/geojson/procedure.json b/api/part1/openapi/schemas/geojson/procedure.json
@@ -11,13 +11,7 @@
         "properties": {
           "properties": {
             "featureType": {
-              "type": "string",
-              "enum": [
-                "http://www.w3.org/ns/sosa/ObservingProcedure",
-                "http://www.w3.org/ns/sosa/ActuationProcedure",
-                "http://www.w3.org/ns/sosa/SamplingProcedure",
-                "http://www.w3.org/ns/sosa/Procedure"
-              ]
+              "$ref": "../common/uris.json#/definitions/ProcedureTypeUris"
             }
           }
         }

diff --git a/api/part1/openapi/schemas/geojson/system.json b/api/part1/openapi/schemas/geojson/system.json
@@ -7,14 +7,7 @@
         "properties": {
           "properties": {
             "featureType": {
-              "type": "string",
-              "enum": [
-                "http://www.w3.org/ns/sosa/Sensor",
-                "http://www.w3.org/ns/sosa/Actuator",
-                "http://www.w3.org/ns/sosa/Platform",
-                "http://www.w3.org/ns/sosa/Sampler",
-                "http://www.w3.org/ns/ssn/System"
-              ]
+              "$ref": "../common/uris.json#/definitions/SystemTypeUris"
             },
             "assetType": {
               "description": "Type of asset represented by this system.",

diff --git a/api/part1/openapi/schemas/sensorml/deployment.json b/api/part1/openapi/schemas/sensorml/deployment.json
@@ -5,7 +5,7 @@
     {
       "properties": {
         "definition": {
-          "const": "http://www.w3.org/ns/ssn/Deployment"
+          "$ref": "../common/uris.json#/definitions/DeploymentTypeUris"
         },
         "links": {
           "description": "Links to related resources",

diff --git a/api/part1/openapi/schemas/sensorml/procedure.json b/api/part1/openapi/schemas/sensorml/procedure.json
@@ -12,12 +12,7 @@
     {
       "properties": {
         "definition": {
-          "enum": [
-            "http://www.w3.org/ns/sosa/ObservingProcedure",
-            "http://www.w3.org/ns/sosa/ActuationProcedure",
-            "http://www.w3.org/ns/sosa/SamplingProcedure",
-            "http://www.w3.org/ns/sosa/Procedure"
-          ]
+          "$ref": "../common/uris.json#/definitions/ProcedureTypeUris"
         },
         "position": {
           "not": {}

diff --git a/api/part1/openapi/schemas/sensorml/system.json b/api/part1/openapi/schemas/sensorml/system.json
@@ -12,13 +12,7 @@
     {
       "properties": {
         "definition": {
-          "enum": [
-            "http://www.w3.org/ns/ssn/System",
-            "http://www.w3.org/ns/sosa/Sensor",
-            "http://www.w3.org/ns/sosa/Actuator",
-            "http://www.w3.org/ns/sosa/Sampler",
-            "http://www.w3.org/ns/sosa/Platform"
-          ]
+          "$ref": "../common/uris.json#/definitions/SystemTypeUris"
         },
         "links": {
           "description": "Links to related resources",