From 66b5d2dae3bb33869e11c30c49416bf8884b9cbc Mon Sep 17 00:00:00 2001 From: Timothy Wojtaszek Date: Mon, 8 Jul 2019 11:34:41 -0400 Subject: [PATCH] Add 'log_info' definition to metadata schema (#448) --- docs/api-reference/xviz-metadata-builder.md | 4 ++-- docs/protocol-schema/session-protocol.md | 7 ++++++- .../examples/session/metadata/complete.json | 4 ++++ .../schema/schema/session/log_info.schema.json | 15 +++++++++++++++ .../schema/schema/session/metadata.schema.json | 2 +- xviz/v2/session.proto | 8 ++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 modules/schema/schema/session/log_info.schema.json diff --git a/docs/api-reference/xviz-metadata-builder.md b/docs/api-reference/xviz-metadata-builder.md index a7e22696a..6b6fc25eb 100644 --- a/docs/api-reference/xviz-metadata-builder.md +++ b/docs/api-reference/xviz-metadata-builder.md @@ -213,8 +213,8 @@ special and cannot be overwritten. Special keys: -- `start_time` -- `end_time` +- `start_time` (Number) - Start time for the log data +- `end_time` (Number) - End time for the log data Parameters: diff --git a/docs/protocol-schema/session-protocol.md b/docs/protocol-schema/session-protocol.md index a572bc567..afa11ba57 100644 --- a/docs/protocol-schema/session-protocol.md +++ b/docs/protocol-schema/session-protocol.md @@ -146,7 +146,12 @@ created. **map_info** - currently unspecified -**log_info** - currently unspecified +**log_info** - timing information + +| Name | Type | Description | +| ------------ | --------------------- | ------------------------------ | +| `start_time` | `optional` | Starting timestamp for the log | +| `end_time` | `optional` | Final timestamp for the log | **vehicle_info** - currently unspecified diff --git a/modules/schema/examples/session/metadata/complete.json b/modules/schema/examples/session/metadata/complete.json index 5dba9c534..3e08f8d75 100644 --- a/modules/schema/examples/session/metadata/complete.json +++ b/modules/schema/examples/session/metadata/complete.json @@ -37,5 +37,9 @@ ], "config": "" } + }, + "log_info": { + "start_time": 1557530200.0, + "end_time": 1557530300.0 } } diff --git a/modules/schema/schema/session/log_info.schema.json b/modules/schema/schema/session/log_info.schema.json new file mode 100644 index 000000000..945d4efd0 --- /dev/null +++ b/modules/schema/schema/session/log_info.schema.json @@ -0,0 +1,15 @@ +{ + "id": "https://xviz.org/schema/session/log_info.json", + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "XVIZ Metadata Log timing information", + "type": "object", + "properties": { + "start_time": { + "type": "number" + }, + "end_time": { + "type": "number" + } + }, + "additionalProperties": true +} diff --git a/modules/schema/schema/session/metadata.schema.json b/modules/schema/schema/session/metadata.schema.json index b9df79776..cea335385 100644 --- a/modules/schema/schema/session/metadata.schema.json +++ b/modules/schema/schema/session/metadata.schema.json @@ -32,7 +32,7 @@ } }, "log_info": { - "type": "object" + "$ref": "https://xviz.org/schema/session/log_info.json" }, "map_info": { "type": "object" diff --git a/xviz/v2/session.proto b/xviz/v2/session.proto index 954a0e4e7..6cfdd588f 100644 --- a/xviz/v2/session.proto +++ b/xviz/v2/session.proto @@ -93,6 +93,7 @@ message Metadata { map cameras = 3; map stream_aliases = 4; map ui_config = 5; + LogInfo log_info = 6; } message Error { @@ -186,3 +187,10 @@ message UIPanelInfo { repeated string needed_streams = 2; string config = 3; } + +message LogInfo +{ + option (xviz_json_schema) = "session/log_info"; + double start_time = 1; + double end_time = 2; +}