Fix log_info as having nested objects

aurora-opensource · Jul 8, 2019 · 8cfc7b6 · 8cfc7b6
1 parent 6f0e4ff
commit 8cfc7b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 281 deletions.
diff --git a/modules/schema/proto/v2/session.proto b/modules/schema/proto/v2/session.proto
diff --git a/modules/schema/schema/session/log_info.schema.json b/modules/schema/schema/session/log_info.schema.json
@@ -2,7 +2,6 @@
   "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"

diff --git a/modules/schema/schema/session/metadata.schema.json b/modules/schema/schema/session/metadata.schema.json
@@ -32,10 +32,7 @@
       }
     },
     "log_info": {
-      "type": "object",
-      "additionalProperties": {
-        "$ref": "https://xviz.org/schema/session/log_info.json"
-      }
+      "$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
@@ -93,6 +93,7 @@ message Metadata {
   map<string, CameraInfo> cameras = 3;
   map<string, string> stream_aliases = 4;
   map<string, UIPanelInfo> 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;
+}