update movie/screenshot schemas

Helioviewer-Project · Jun 18, 2024 · e39c185 · e39c185
1 parent 40105e3
commit e39c185
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/docroot/schema/event_layers.schema.json b/docroot/schema/event_layers.schema.json
@@ -46,7 +46,8 @@
                             },
                             "event_type": {
                                 "type": "string",
-                                "pattern": "^[A-Z0-9]{2}"
+                                "pattern": "^[A-Z0-9]{2}$",
+                                "maxLength": 2
                             },
                             "event_instances": {
                                 "type": "array",

diff --git a/docroot/schema/post_movie.schema.json b/docroot/schema/post_movie.schema.json
@@ -4,16 +4,15 @@
     "title": "Post Movie Parameters",
     "description": "Information used to generate a movie via helioviewer.org",
     "type": "object",
-    "additionalProperties": false,
+    "required": ["startTime", "endTime", "layers"],
     "properties": {
-        "required": ["startTime", "endTime", "layers"],
         "startTime": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "endTime": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "layers": {
             "type": "string",
@@ -26,7 +25,7 @@
         "imageScale": { "type": "number" },
         "format": {
             "type": "string",
-            "enum": ["mp4, webm"]
+            "enum": ["mp4", "webm"]
         },
         "frameRate": { "type": "number" },
         "maxFrames": { "type": "number" },
@@ -58,7 +57,7 @@
         "followViewport": { "type": "number" },
         "reqObservationDate": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         }
     }
 }
diff --git a/docroot/schema/post_screenshot.schema.json b/docroot/schema/post_screenshot.schema.json
@@ -4,12 +4,11 @@
     "title": "Post Screenshot Parameters",
     "description": "Information used to generate a screenshot via helioviewer.org",
     "type": "object",
-    "additionalProperties": false,
+    "required": ["date", "imageScale", "layers"],
     "properties": {
-        "required": ["date", "imageScale", "layers"],
         "date": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "imageScale": { "type": "number" },
         "layers": {

diff --git a/management/schema/event_layers.schema.json b/management/schema/event_layers.schema.json
@@ -46,7 +46,8 @@
                             },
                             "event_type": {
                                 "type": "string",
-                                "pattern": "^[A-Z0-9]{2}"
+                                "pattern": "^[A-Z0-9]{2}$",
+                                "maxLength": 2
                             },
                             "event_instances": {
                                 "type": "array",

diff --git a/management/schema/post_movie.schema.json b/management/schema/post_movie.schema.json
@@ -4,16 +4,15 @@
     "title": "Post Movie Parameters",
     "description": "Information used to generate a movie via helioviewer.org",
     "type": "object",
-    "additionalProperties": false,
+    "required": ["startTime", "endTime", "layers"],
     "properties": {
-        "required": ["startTime", "endTime", "layers"],
         "startTime": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "endTime": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "layers": {
             "type": "string",
@@ -26,7 +25,7 @@
         "imageScale": { "type": "number" },
         "format": {
             "type": "string",
-            "enum": ["mp4, webm"]
+            "enum": ["mp4", "webm"]
         },
         "frameRate": { "type": "number" },
         "maxFrames": { "type": "number" },
@@ -58,7 +57,7 @@
         "followViewport": { "type": "number" },
         "reqObservationDate": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         }
     }
 }
diff --git a/management/schema/post_screenshot.schema.json b/management/schema/post_screenshot.schema.json
@@ -4,12 +4,11 @@
     "title": "Post Screenshot Parameters",
     "description": "Information used to generate a screenshot via helioviewer.org",
     "type": "object",
-    "additionalProperties": false,
+    "required": ["date", "imageScale", "layers"],
     "properties": {
-        "required": ["date", "imageScale", "layers"],
         "date": {
             "type": "string",
-            "pattern": "\\d{4}-\\d{2}\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"
+            "pattern": "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z$"
         },
         "imageScale": { "type": "number" },
         "layers": {