Align Met Office results with OSH schema

Author: Sam-Bolling

publishers/met_office_datahub/bootstrap_met_office_datahub.py

@@ -246,7 +246,6 @@ def _datastream_schema(station: dict, parameter: dict) -> dict:
                 "label": f"Met Office {parameter['label']} Observation",
                 "description": "Met Office Land Observations reading with source metadata.",
                 "fields": [
-                    {"type": "Time", "name": "timestamp", "label": "Observation Time", "definition": "http://www.opengis.net/def/property/OGC/0/SamplingTime", "referenceTime": "1970-01-01T00:00:00Z", "uom": {"code": "s"}},
                     {"type": "Text", "name": "locationId", "label": "Curated Location ID", "definition": "http://sensorml.com/ont/swe/property/StationID"},
                     {"type": "Text", "name": "geohash", "label": "Met Office Geohash", "definition": "http://sensorml.com/ont/swe/property/Identifier"},
                     {"type": "Text", "name": "parameter", "label": "Parameter", "definition": "http://sensorml.com/ont/swe/property/ObservableProperty"},

publishers/met_office_datahub/met_office_datahub_publisher.py

@@ -513,7 +513,6 @@ def _latest_for_station(self, station: dict) -> list[dict]:
             record, phenomenon_time, value = selected
             timestamp, _ = _parse_source_time(phenomenon_time)
             result = {
-                "timestamp": timestamp,
                 "locationId": station["id"],
                 "geohash": location["geohash"],
                 "parameter": parameter["label"],
@@ -525,6 +524,7 @@ def _latest_for_station(self, station: dict) -> list[dict]:
                 "station": station,
                 "parameter": parameter,
                 "phenomenonTime": phenomenon_time,
+                "timestamp": timestamp,
                 "value": value,
                 "result": result,
                 "dedupeKey": f"{station['id']}|{parameter['outputName']}|{phenomenon_time}|{value}",