updates based on wigosbox/wis2-gdc implementation

examples/0-20008-0-THE.json

@@ -20,10 +20,13 @@
     ],
     "properties": {
         "type": "facility",
+        "facilityType": {
+            "id": "landFixed"
+        },
         "title": "Thessaloniki",
         "created": "2024-12-11T00:00:00Z",
         "updated": "2024-12-11T00:00:00Z",
-        "description": "The Brewer spectrophotometers and all radaition instruments are located on the roof of the 4-storey building of the Physics Dept., of the Aristotle University of Thessaloniki. The Campus is located in the city center about 500 m east of the seashore. The highest elevation of about 1100 m is at a distance of about 15 km towards the east. Thessaloniki is the second largest city of Greece with about 1000000 inhabitants in the greater metropolitan area.",
+        "description": "The Brewer spectrophotometers and all radiation instruments are located on the roof of the 4-storey building of the Physics Dept., of the Aristotle University of Thessaloniki. The Campus is located in the city center about 500 m east of the seashore. The highest elevation of about 1100 m is at a distance of about 15 km towards the east. Thessaloniki is the second largest city of Greece with about 1000000 inhabitants in the greater metropolitan area.",
         "contacts": [
             {
                 "identifier": "contact:aristotle-university-of-thessaloniki--ed7b7e4a",
@@ -85,63 +88,81 @@
                 ]
             }
         ],
-        "facilityType": "landFixed",
-        "wmoRegion": "europe",
-        "programAffiliations": [
-            {
-                "dates": [
-                        "1982-03-13",
-                        ".."
-                    ],
-                "programAffiliation": "GAWregional",
-                "facilityId": "THE",
-                "reportingStatus": "operational"
-            },
-            {
-                "dates":[
-                        "2008-01-01",
-                        "2024-12-11"
-                    ],
-                "programAffiliation": "GALION",
-                "facilityId": "THE",
-                "reportingStatus": "operational"
-            },
-            {
-                "dates": [
-                        "2003-06-01",
-                        "2024-12-11"
-                    ],
-                "programAffiliation": "AERONET",
-                "facilityId": "Thessaloniki",
-                "reportingStatus": "operational"
-            }
-        ],
+        "wmoRegion": {
+            "id": "europe"
+        },
         "territories": [
             {
-                "dates": ["2011-02-16", ".."],
-                "territory": "GRC"
-            }
-        ],
-        "deployments": [
-            {
-                "id": "deployment:123",
-                "instrument": "instrument:456",
-                "sourceOfObservation": "automaticReading",
-                "time": {
-                    "interval": [
-                        "1982-03-13",
-                        ".."
-                    ]
-                }
+                "dates": [
+                    "2011-02-16",
+                    ".."
+                ],
+                "territory": {"id": "GRC"}
             }
         ],
-        "instruments": [
+        "observations": [
             {
-                "id": "instrument:456",
-                "observingCapabilities": [{
-                     "observingMethod": "78",
-                     "observedProperty": "12164"
-                }]
+                "observedProperty": {
+                    "id": "12164"
+                },
+                "programAffiliations": [
+                    {
+                        "dates": [
+                            "1982-03-13",
+                            ".."
+                        ],
+                        "programAffiliation": {
+                            "id": "GAWregional"
+                        },
+                        "reportingStatus": {
+                            "id": "operational"
+                        }
+                    },
+                    {
+                        "dates": [
+                            "2008-01-01",
+                            "2024-12-11"
+                        ],
+                        "programAffiliation": {
+                            "id": "GALION"
+                        },
+                        "reportingStatus": {
+                            "id": "operational"
+                        }
+                    },
+                    {
+                        "dates": [
+                            "2003-06-01",
+                            "2024-12-11"
+                        ],
+                        "programAffiliation": {
+                            "id": "AERONET"
+                        },
+                        "reportingStatus": {
+                            "id": "operational"
+                        }
+                    }
+                ],
+                "configurations": [
+                    {
+                        "id": "configuration-456",
+                        "time": {
+                            "interval": [
+                                "1982-03-13",
+                                ".."
+                            ]
+                        },
+                        "observingMethod": {
+                            "id": "78"
+                        },
+                        "sourceOfObservation": {
+                            "id": "automaticReading"
+                        },
+                        "instrument": {
+                            "id": "instrument-789"
+                        }
+                    }
+                ]
             }
         ]
     },

schemas/configurations.yaml

@@ -0,0 +1,62 @@
+---
+type: object
+properties:
+  id:
+    type:
+      - string
+      - integer
+    description: configuration 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'
+  observingMethod:
+    allOf:
+      - $ref: 'definitions.yaml#/concept_or_null'
+    description: observing method
+    $comment: |-
+      - https://codes.wmo.int/wmdr/ObservingMethodAtmosphere
+      - https://codes.wmo.int/wmdr/ObservingMethodTerrestrial
+      - https://codes.wmo.int/wmdr/ObservingMethodOcean
+  operatingStatus:
+    allOf:
+      - $ref: 'definitions.yaml#/concept_or_null'
+    description: operating status
+    $comment: |-
+      - https://codes.wmo.int/wmdr/InstrumentOperatingStatus
+  sourceOfObservation:
+    allOf:
+      - $ref: 'definitions.yaml#/concept_or_null'
+    description: Source of observation
+    $comment: https://codes.wmo.int/wmdr/SourceOfObservation
+  instrument:
+    $ref: 'instrument.yaml'
+  instrumentSerialNumber:
+    type: string
+    description: instrument serial number
+  verticalDistance:
+    type: object
+    properties:
+      distances:
+        type: array
+        description: Signed vertical distances from reference surface
+        minItems: 1
+        items:
+          type: number
+      unit:
+        allOf:
+          - $ref: 'definitions.yaml#/concept_or_null'
+        description: Measurement unit
+        $comment: https://codes.wmo.int/wmdr/unit
+      referenceSurface:
+        allOf:
+          - $ref: 'definitions.yaml#/concept_or_null'
+        description: Type of reference surface
+        $comment: https://codes.wmo.int/wmdr/ReferenceSurfaceType
+    required:
+      - distances
+      - unit
+      - referenceSurface
+required:
+  - id
+  - time

schemas/definitions.yaml

@@ -0,0 +1,5 @@
+concept_or_null:
+  oneOf:
+    - $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/theme.yaml#/properties/concepts/items'
+    - enum:
+      - null

schemas/instrument.yaml

@@ -2,44 +2,15 @@
 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
   model:
     type: string
     description: instrument model
-  serialNumber:
-    type: string
-    description: instrument serial number
 required:
   - id
-  - observingCapabilities

schemas/observations.yaml

@@ -0,0 +1,47 @@
+---
+type: object
+properties:
+  observedGeometry:
+    $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/theme.yaml#/properties/concepts/items'
+    description: observed geometry
+    $comment: |-
+      - https://codes.wmo.int/wmdr/Geometry
+  observedProperty:
+    $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/theme.yaml#/properties/concepts/items'
+    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
+  programAffiliations:
+    type: array
+    description: program affiliations
+    minItems: 1
+    items:
+      type: object
+      properties:
+        programAffiliation:
+          $ref: 'https://schemas.opengis.net/ogcapi/records/part1/1.0/openapi/schemas/theme.yaml#/properties/concepts/items'
+          description: Programme/network affiliation
+          $comment: https://codes.wmo.int/wmdr/ProgramAffiliation
+        reportingStatus:
+          allOf:
+            - $ref: 'definitions.yaml#/concept_or_null'
+          description: Station/Platform operating status
+          $comment: https://codes.wmo.int/wmdr/ReportingStatus
+        dates:
+              $ref: 'temporal.yaml#/dates'
+      required:
+        - programAffiliation
+  configurations:
+    type: array
+    description: configurations
+    minItems: 1
+    items:
+      $ref: 'configurations.yaml'
+required:
+  - observedProperty
+  - programAffiliations
+  - configurations

schemas/temporal.yaml

@@ -2,6 +2,7 @@
 dates:
   type: array
   minItems: 1
+  maxItems: 2
   items:
     oneOf:
       - type: string