updates based on wigosbox/wis2-gdc implementation

examples/0-20008-0-THE.json

@@ -122,27 +122,25 @@
                 "territory": "GRC"
             }
         ],
-        "deployments": [
+        "observingCapabilities": [
             {
-                "id": "deployment:123",
-                "instrument": "instrument:456",
+                "id": "observingCapability:123",
+                "observingMethod": "78",
+                "observedProperty": "12164",
                 "sourceOfObservation": "automaticReading",
-                "time": {
-                    "interval": [
-                        "1982-03-13",
-                        ".."
-                    ]
+                "deployment": {
+                    "id": "deployment:456",
+                    "time": {
+                        "interval": [
+                            "1982-03-13",
+                            ".."
+                        ]
+                    },
+                    "instrument": {
+                        "id": "instrument:789"
+                    }
                 }
             }
-        ],
-        "instruments": [
-            {
-                "id": "instrument:456",
-                "observingCapabilities": [{
-                     "observingMethod": "78",
-                     "observedProperty": "12164"
-                }]
-            }
         ]
     },
     "links": [

schemas/deployment.yaml

@@ -2,26 +2,32 @@
 type: object
 properties:
   id:
-    oneOf:
-      - type: string
-      - type: integer
-    description: deployment identifier
+    type:
+      - string
+      - integer
+    description: instrument identifier
   geometry:
     $ref: 'https://schemas.opengis.net/ogcapi/features/part1/1.0/openapi/schemas/pointGeoJSON.yaml'
   time:
     $ref: 'https://raw.githubusercontent.com/wmo-im/wcmp2/refs/heads/main/schemas/wcmpRecordGeoJSON.yaml#/properties/time'
+  keywords:
+    $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/recordCommonProperties.yaml#/properties/keywords'
   instrument:
-    type: string
-    description: instrument identifier
-  sourceOfObservation:
-    type: string
-    description: Source of observation
-    $comment: https://codes.wmo.int/wmdr/SourceOfObservation
+    oneOf:
+      - type: object
+        properties:
+          id:
+            type:
+              - string
+              - integer
+        required:
+          - id
+      - $ref: 'instrument.yaml'
   referenceSurfaces:
     type: array
     minItems: 1
     items:
-      tye: object
+      type: object
       properties:
         referenceSurface:
           type: string
@@ -33,7 +39,6 @@ properties:
       required:
         - referenceSurface
         - verticalDistance
-  keywords:
-    $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/recordCommonProperties.yaml#/properties/keywords'
 required:
   - id
+  - instrument

schemas/instrument.yaml

@@ -2,35 +2,10 @@
 type: object
 properties:
   id:
-    oneOf:
-      - type: string
-      - type: integer
+    type:
+      - string
+      - integer
     description: instrument identifier
-  observingCapabilities:
-    type: array
-    minItems: 1
-    items:
-      type: object
-      properties:
-        observingMethod:
-          type: string
-          description: observing method
-          $comment: |-
-            - https://codes.wmo.int/wmdr/ObservingMethodAtmosphere
-            - https://codes.wmo.int/wmdr/ObservingMethodTerrestrial
-            - https://codes.wmo.int/wmdr/ObservingMethodEarth
-        observedProperty:
-          type: string
-          description: observed property
-          $comment: |-
-            - https://codes.wmo.int/wmdr/ObservedVariableAtmosphere
-            - https://codes.wmo.int/wmdr/ObservedVariableEarth
-            - https://codes.wmo.int/wmdr/ObservedVariableOcean
-            - https://codes.wmo.int/wmdr/ObservedVariableOuterSpace
-            - https://codes.wmo.int/wmdr/ObservedVariableTerrestrial
-      required:
-        - observingMethod
-        - observedProperty
   manufacturer:
     type: string
     description: instrument manufacturer
@@ -42,4 +17,3 @@ properties:
     description: instrument serial number
 required:
   - id
-  - observingCapabilities

schemas/observingCapability.yaml

@@ -0,0 +1,38 @@
+---
+type: object
+properties:
+  time:
+    $ref: 'https://raw.githubusercontent.com/wmo-im/wcmp2/refs/heads/main/schemas/wcmpRecordGeoJSON.yaml#/properties/time'
+  observedProperty:
+    type: string
+    description: observed property
+    $comment: |-
+      - https://codes.wmo.int/wmdr/ObservedVariableAtmosphere
+      - https://codes.wmo.int/wmdr/ObservedVariableEarth
+      - https://codes.wmo.int/wmdr/ObservedVariableOcean
+      - https://codes.wmo.int/wmdr/ObservedVariableOuterSpace
+      - https://codes.wmo.int/wmdr/ObservedVariableTerrestrial
+  observingMethod:
+    type: string
+    description: observing method
+    $comment: |-
+      - https://codes.wmo.int/wmdr/ObservingMethodAtmosphere
+      - https://codes.wmo.int/wmdr/ObservingMethodTerrestrial
+      - https://codes.wmo.int/wmdr/ObservingMethodEarth
+  operatingStatus:
+    type: string
+    description: operating status
+    $comment: |-
+      - https://codes.wmo.int/wmdr/InstrumentOperatingStatus
+  sourceOfObservation:
+    type: string
+    description: Source of observation
+    $comment: https://codes.wmo.int/wmdr/SourceOfObservation
+  deployments:
+    type: array
+    description: deployments
+    maxItems: 1
+    items:
+      $ref: 'deployment.yaml'
+required:
+  - observedProperty

schemas/wmdr2-bundled.json

@@ -115,6 +115,10 @@
           "type": "string",
           "description": "facility name (primary)"
         },
+        "description": {
+          "type": "string",
+          "description": "facility description"
+        },
         "additionalTitles": {
           "type": "array",
           "minItems": 1,
@@ -528,29 +532,20 @@
             }
           }
         },
-        "deployments": {
-          "type": "array",
-          "description": "facility deployments (placement / location of specific equipment)",
-          "minItems": 1,
-          "items": {
-            "$ref": "#/definitions/Deployment"
-          }
-        },
-        "instruments": {
+        "observingCapabilities": {
           "type": "array",
-          "description": "facility instruments",
+          "description": "observing configurations (placement / location of specific equipment)",
           "minItems": 1,
           "items": {
-            "$ref": "#/definitions/Instrument"
+            "$ref": "#/definitions/ObservingCapability"
           }
         }
       },
       "required": [
         "contacts",
         "created",
         "title",
-        "deployments",
-        "instruments"
+        "observingCapabilities"
       ]
     },
     "links": {
@@ -619,36 +614,47 @@
       "type": "object",
       "properties": {
         "id": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "integer"
-            }
+          "type": [
+            "string",
+            "integer"
           ],
-          "description": "deployment identifier"
+          "description": "instrument identifier"
         },
         "geometry": {
           "$ref": "#/properties/geometry"
         },
         "time": {
           "$ref": "#/properties/time"
         },
-        "instrument": {
-          "type": "string",
-          "description": "instrument identifier"
+        "keywords": {
+          "$ref": "#/properties/properties/properties/keywords"
         },
-        "sourceOfObservation": {
-          "type": "string",
-          "description": "Source of observation",
-          "$comment": "https://codes.wmo.int/wmdr/SourceOfObservation"
+        "instrument": {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": [
+                    "string",
+                    "integer"
+                  ]
+                }
+              },
+              "required": [
+                "id"
+              ]
+            },
+            {
+              "$ref": "#/definitions/Instrument"
+            }
+          ]
         },
         "referenceSurfaces": {
           "type": "array",
           "minItems": 1,
           "items": {
-            "tye": "object",
+            "type": "object",
             "properties": {
               "referenceSurface": {
                 "type": "string",
@@ -665,52 +671,23 @@
               "verticalDistance"
             ]
           }
-        },
-        "keywords": {
-          "$ref": "#/properties/properties/properties/keywords"
         }
       },
       "required": [
-        "id"
+        "id",
+        "instrument"
       ]
     },
     "Instrument": {
       "type": "object",
       "properties": {
         "id": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "integer"
-            }
+          "type": [
+            "string",
+            "integer"
           ],
           "description": "instrument identifier"
         },
-        "observingCapabilities": {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "type": "object",
-            "properties": {
-              "observingMethod": {
-                "type": "string",
-                "description": "observing method",
-                "$comment": "- https://codes.wmo.int/wmdr/ObservingMethodAtmosphere\n- https://codes.wmo.int/wmdr/ObservingMethodTerrestrial\n- https://codes.wmo.int/wmdr/ObservingMethodEarth"
-              },
-              "observedProperty": {
-                "type": "string",
-                "description": "observed property",
-                "$comment": "- https://codes.wmo.int/wmdr/ObservedVariableAtmosphere\n- https://codes.wmo.int/wmdr/ObservedVariableEarth\n- https://codes.wmo.int/wmdr/ObservedVariableOcean\n- https://codes.wmo.int/wmdr/ObservedVariableOuterSpace\n- https://codes.wmo.int/wmdr/ObservedVariableTerrestrial"
-              }
-            },
-            "required": [
-              "observingMethod",
-              "observedProperty"
-            ]
-          }
-        },
         "manufacturer": {
           "type": "string",
           "description": "instrument manufacturer"
@@ -725,8 +702,46 @@
         }
       },
       "required": [
-        "id",
-        "observingCapabilities"
+        "id"
+      ]
+    },
+    "ObservingCapability": {
+      "type": "object",
+      "properties": {
+        "time": {
+          "$ref": "#/properties/time"
+        },
+        "observedProperty": {
+          "type": "string",
+          "description": "observed property",
+          "$comment": "- https://codes.wmo.int/wmdr/ObservedVariableAtmosphere\n- https://codes.wmo.int/wmdr/ObservedVariableEarth\n- https://codes.wmo.int/wmdr/ObservedVariableOcean\n- https://codes.wmo.int/wmdr/ObservedVariableOuterSpace\n- https://codes.wmo.int/wmdr/ObservedVariableTerrestrial"
+        },
+        "observingMethod": {
+          "type": "string",
+          "description": "observing method",
+          "$comment": "- https://codes.wmo.int/wmdr/ObservingMethodAtmosphere\n- https://codes.wmo.int/wmdr/ObservingMethodTerrestrial\n- https://codes.wmo.int/wmdr/ObservingMethodEarth"
+        },
+        "operatingStatus": {
+          "type": "string",
+          "description": "operating status",
+          "$comment": "- https://codes.wmo.int/wmdr/InstrumentOperatingStatus"
+        },
+        "sourceOfObservation": {
+          "type": "string",
+          "description": "Source of observation",
+          "$comment": "https://codes.wmo.int/wmdr/SourceOfObservation"
+        },
+        "deployments": {
+          "type": "array",
+          "description": "deployments",
+          "maxItems": 1,
+          "items": {
+            "$ref": "#/definitions/Deployment"
+          }
+        }
+      },
+      "required": [
+        "observedProperty"
       ]
     }
   }