From 40a79e5f9c2fdd6dac44ba3b770388f9a4cb2512 Mon Sep 17 00:00:00 2001 From: Gareth Harper Date: Wed, 22 Sep 2021 14:30:16 +0000 Subject: [PATCH 1/4] added extra journal events and navroute --- schemas/journal-v1.0.json | 4 +- schemas/navroute-v3.0.json | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 schemas/navroute-v3.0.json diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index 341c6b5..99ae709 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -40,7 +40,7 @@ "format" : "date-time" }, "event" : { - "enum" : [ "Docked", "FSDJump", "Scan", "Location", "SAASignalsFound", "CarrierJump", "CodexEntry" ] + "enum" : [ "Docked", "FSDJump", "Scan", "Location", "SAASignalsFound", "CarrierJump", "CodexEntry", "ScanBaryCentre", "FSSDiscoveryScan", "NavBeaconScan" ] }, "horizons": { "type" : "boolean", @@ -102,7 +102,7 @@ "_Localised$" : { "$ref" : "#/definitions/disallowed" }, "^(Materials|StationEconomies|Signals)$" : { "type" : "array", - "description" : "Present in Scan, Docked and SAASignalsFound messages", + "description" : "Present in Scan, ScanBaryCentre, Docked and SAASignalsFound messages", "items" : { "type" : "object", "patternProperties" : { diff --git a/schemas/navroute-v3.0.json b/schemas/navroute-v3.0.json new file mode 100644 index 0000000..0bfcf34 --- /dev/null +++ b/schemas/navroute-v3.0.json @@ -0,0 +1,75 @@ +{ + "$schema" : "http://json-schema.org/draft-04/schema#", + "id" : "https://eddn.edcd.io/schemas/navroute/3#", + "type" : "object", + "additionalProperties" : false, + "required": [ "$schemaRef", "header", "message" ], + "properties": { + "$schemaRef": { + "type" : "string" + }, + "header": { + "type" : "object", + "additionalProperties" : true, + "required" : [ "uploaderID", "softwareName", "softwareVersion" ], + "properties" : { + "uploaderID": { + "type" : "string" + }, + "softwareName": { + "type" : "string" + }, + "softwareVersion": { + "type" : "string" + }, + "gatewayTimestamp": { + "type" : "string", + "format" : "date-time", + "description" : "Timestamp upon receipt at the gateway. If present, this property will be overwritten by the gateway; submitters are not intended to populate this property." + } + } + }, + "message": { + "type" : "object", + "additionalProperties" : false, + "required" : [ "timestamp", "event", "Route" ], + "properties" : { + "timestamp": { + "type" : "string", + "format" : "date-time" + }, + "event": { + "enum" : [ "Route" ] + }, + "Route": { + "type" : "array", + "description" : "Route generated by in game plotter", + "items" : { + "type" : "object", + "additionalProperties" : false, + "required" : [ "StarSystem", "SystemAddress", "StarPos", "StarClass" ], + "properties" : { + "StarSystem": { + "type" : "string", + "minLength" : 1 + }, + "StarPos": { + "type" : "array", + "items" : { "type": "number" }, + "minItems" : 3, + "maxItems" : 3 + }, + "SystemAddress": { + "type" : "integer" + }, + "StarClass": { + "type" : "string", + "minLength" : 1 + } + } + } + } + } + } + } +} From ede43c0b5081e654d54e80f13627bb3e0171a994 Mon Sep 17 00:00:00 2001 From: Gareth Harper Date: Thu, 23 Sep 2021 08:33:04 +0000 Subject: [PATCH 2/4] renamed to remove version --- schemas/{navroute-v3.0.json => navroute-v1.0.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename schemas/{navroute-v3.0.json => navroute-v1.0.json} (100%) diff --git a/schemas/navroute-v3.0.json b/schemas/navroute-v1.0.json similarity index 100% rename from schemas/navroute-v3.0.json rename to schemas/navroute-v1.0.json From ccf48cc0e33e74cd57dadc32af99db3f68890c87 Mon Sep 17 00:00:00 2001 From: Gareth Harper Date: Thu, 23 Sep 2021 11:41:34 +0000 Subject: [PATCH 3/4] removed changes --- schemas/journal-v1.0.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index 99ae709..341c6b5 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -40,7 +40,7 @@ "format" : "date-time" }, "event" : { - "enum" : [ "Docked", "FSDJump", "Scan", "Location", "SAASignalsFound", "CarrierJump", "CodexEntry", "ScanBaryCentre", "FSSDiscoveryScan", "NavBeaconScan" ] + "enum" : [ "Docked", "FSDJump", "Scan", "Location", "SAASignalsFound", "CarrierJump", "CodexEntry" ] }, "horizons": { "type" : "boolean", @@ -102,7 +102,7 @@ "_Localised$" : { "$ref" : "#/definitions/disallowed" }, "^(Materials|StationEconomies|Signals)$" : { "type" : "array", - "description" : "Present in Scan, ScanBaryCentre, Docked and SAASignalsFound messages", + "description" : "Present in Scan, Docked and SAASignalsFound messages", "items" : { "type" : "object", "patternProperties" : { From 0b5ea050a273dd9f1ab9c4d7b411a98a21eac3fe Mon Sep 17 00:00:00 2001 From: Gareth Harper Date: Thu, 23 Sep 2021 11:42:42 +0000 Subject: [PATCH 4/4] switched version from 3 to 1 --- schemas/navroute-v1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/navroute-v1.0.json b/schemas/navroute-v1.0.json index 0bfcf34..98a4ade 100644 --- a/schemas/navroute-v1.0.json +++ b/schemas/navroute-v1.0.json @@ -1,6 +1,6 @@ { "$schema" : "http://json-schema.org/draft-04/schema#", - "id" : "https://eddn.edcd.io/schemas/navroute/3#", + "id" : "https://eddn.edcd.io/schemas/navroute/1#", "type" : "object", "additionalProperties" : false, "required": [ "$schemaRef", "header", "message" ],