Update enum values for MessageEnvelope to allow kb-stations

schemas/data-ingress/knowledgebase/kb-stations.json

@@ -29,97 +29,91 @@
             "type": "array",
             "additionalItems": false,
             "items": {
-                "station": {
-                    "type": "object",
-                    "required": ["c", "l", "o"],
-                    "properties": {
-                        "c": {
-                            "type": "string",
-                            "name": "CRS Code",
-                            "description": "Station CRS (Primary Key)"
-                        },
-                        "n": {
-                            "type": "string",
-                            "name": "NLC Code",
-                            "description": "Station NLC Code"
-                        },
-                        "mc": {
-                            "type": "number",
-                            "name": "Minimum Connection Time",
-                            "description": "The minimum connection time at this station"
-                        },
-                        "a": {
-                            "type": "object",
-                            "name": "Address",
-                            "description": "The address of the station",
-                            "properties": {
-                                "l1": {
-                                    "type": "string",
-                                    "name": "Line 1"
-                                },
-                                "l2": {
-                                    "type": "string",
-                                    "name": "Line 2"
-                                },
-                                "l3": {
-                                    "type": "string",
-                                    "name": "Line 3"
-                                },
-                                "l4": {
-                                    "type": "string",
-                                    "name": "Line 4"
-                                },
-                                "l5": {
-                                    "type": "string",
-                                    "name": "Line 5"
-                                },
-                                "pc": {
-                                    "type": "string",
-                                    "name": "Postcode"
-                                }
+                "type": "object",
+                "required": [
+                    "c",
+                    "mc",
+                    "l",
+                    "o",
+                    "p",
+                    "a",
+                    "r",
+                    "d"
+                ],
+                "properties": {
+                    "c": {
+                        "type": "string",
+                        "name": "CRS Code",
+                        "description": "Station CRS (Primary Key)"
+                    },
+                    "n": {
+                        "type": "string",
+                        "name": "NLC Code",
+                        "description": "Station NLC Code"
+                    },
+                    "mc": {
+                        "type": "number",
+                        "name": "Minimum Connection Time",
+                        "description": "The minimum connection time at this station"
+                    },
+                    "a": {
+                        "type": "string",
+                        "name": "Address",
+                        "description": "The address of the station"
+                    },
+                    "p": {
+                        "type": "string",
+                        "name": "Postcode",
+                        "description": "The public postcode of the station"
+                    },
+                    "l": {
+                        "type": "object",
+                        "name": "Location",
+                        "description": "LatLon of the station",
+                        "required": ["lt", "ln"],
+                        "properties": {
+                            "lt": {
+                                "type": "number",
+                                "name": "Latitude",
+                                "description": "Stations Latitude"
+                            },
+                            "ln": {
+                                "type": "number",
+                                "name": "Longitude",
+                                "description": "Stations Longitude"
                             }
-                        },
-                        "l": {
-                            "type": "object",
-                            "name": "Location",
-                            "description": "LatLon of the station",
-                            "properties": {
-                                "lt": {
-                                    "type": "number",
-                                    "name": "Latitude",
-                                    "description": "Stations Latitude"
-                                },
-                                "ln": {
-                                    "type": "number",
-                                    "name": "Longitude",
-                                    "description": "Stations Longitude"
-                                }
-                            }
-                        },
-                        "o": {
-                            "type": "string",
-                            "name": "Operator",
-                            "description": "The two character code denoting the stations operator"
-                        },
-                        "m": {
-                            "type": "string",
-                            "name": "Map URL"
-                        },
-                        "r": {
-                            "name": "Request",
-                            "type": "boolean",
-                            "description": "Denotes whether station is Request Stop"
-                        },
-                        "d": {
-                            "name": "Defibrillator",
-                            "type": "boolean",
-                            "description": "Denotes whether defibrillator is available"
                         }
+                    },
+                    "o": {
+                        "type": "string",
+                        "name": "Operator",
+                        "description": "The two character code denoting the stations operator"
+                    },
+                    "m": {
+                        "type": "string",
+                        "name": "Map URL"
+                    },
+                    "r": {
+                        "name": "Request",
+                        "type": "boolean",
+                        "description": "Denotes whether station is Request Stop"
+                    },
+                    "d": {
+                        "name": "Defibrillator",
+                        "type": "boolean",
+                        "description": "Denotes whether defibrillator is available"
                     }
                 }
             }
         }
     },
-    "required": ["service_name", "service_id", "data_type", "data_kind", "sent_timestamp"],
+    "required": [
+        "service_name",
+        "service_id",
+        "data_type",
+        "data_kind",
+        "sent_timestamp",
+        "payload"
+    ],
     "additionalProperties": false
 }

schemas/data-ingress/message-envelope.json

@@ -23,7 +23,7 @@
         },
         "data_kind": {
             "type": "string",
-            "enum": ["pis", "timetable", "knowledgebase", "PushPort16Schedule", "darwin_ts", "darwin_ref"],
+            "enum": ["pis", "timetable", "kb-stations", "PushPort16Schedule", "darwin_ts", "darwin_ref"],
             "description": "The data type contained in the message.  Currently supported PIS: PIS Data, Timetable: CIF or VSTP Data, Knowledgebase: Station Data"
         },
         "payload": {}