Removed the apparently-unnecessary anyOf blocks (#338)

* removed the apparently-unnecessary anyOf blocks

* should fix doc generation script

* jq-ification

* reverts maximum value to 2**63-1

Author: gmabey

docs-generator.py

@@ -123,16 +123,16 @@ def gen_fields(doc, d):
         doc.append("\n\n")
         doc.append(NoEscape("\\rowcolors{1}{}{lightblue}"))
         with doc.create(Tabular("lllp{3.8in}")) as table:
-            gen_table(table, data["properties"]["captures"]["items"]["anyOf"][0])
-        gen_fields(doc, data["properties"]["captures"]["items"]["anyOf"][0])
+            gen_table(table, data["properties"]["captures"]["items"])
+        gen_fields(doc, data["properties"]["captures"]["items"])
 
     with doc.create(Subsection("Annotations Array")):
         doc.append(NoEscape(add_code_tags(data["properties"]["annotations"]["description"])))
         doc.append("\n\n")
         doc.append(NoEscape("\\rowcolors{1}{}{lightblue}"))
         with doc.create(Tabular("lllp{3.8in}")) as table:
-            gen_table(table, data["properties"]["annotations"]["items"]["anyOf"][0])
-        gen_fields(doc, data["properties"]["annotations"]["items"]["anyOf"][0])
+            gen_table(table, data["properties"]["annotations"]["items"])
+        gen_fields(doc, data["properties"]["annotations"]["items"])
 
     with doc.create(Subsection("SigMF Collection Format")):
         doc.append(NoEscape(add_code_tags(data_collection["properties"]["collection"]["description"])))
@@ -158,8 +158,8 @@ def gen_fields(doc, d):
         doc.append("\n\n")
         doc.append(NoEscape("\\rowcolors{1}{}{lightblue}"))
         with doc.create(Tabular("lllp{3.8in}")) as table:
-            gen_table(table, data_antenna["properties"]["annotations"]["items"]["anyOf"][0])
-        gen_fields(doc, data_antenna["properties"]["annotations"]["items"]["anyOf"][0])
+            gen_table(table, data_antenna["properties"]["annotations"]["items"])
+        gen_fields(doc, data_antenna["properties"]["annotations"]["items"])
 
         doc.append(NoEscape("\\nn"))
         doc.append(NoEscape(add_code_tags(data_antenna["properties"]["collection"]["description"])))

extensions/antenna-schema.json

@@ -8,7 +8,9 @@
     "global": {
       "description": "The following names are specified in the `antenna` namespace and should be used in the `global` object:",
       "type": "object",
-      "required": ["antenna:model"],
+      "required": [
+        "antenna:model"
+      ],
       "properties": {
         "antenna:model": {
           "description": "Antenna make and model number. E.g. ARA CSB-16, L-com HG3512UP-NF.",
@@ -83,26 +85,20 @@
       "type": "array",
       "items": {
         "type": "object",
-        "anyOf": [
-          {
-            "description": "The annotations value is an array of annotation segment objects that describe anything regarding the signal data not part of the Captures and Global objects. It MUST be sorted by the value of each Annotation Segment's `core:sample_start` key, ascending.",
-            "type": "object",
-            "properties": {
-              "antenna:azimuth_angle": {
-                "description": "Angle of main beam in azimuthal plane from North, in degrees.",
-                "type": "number"
-              },
-              "antenna:elevation_angle": {
-                "description": "Angle of main beam in elevation plane from horizontal, in degrees.",
-                "type": "number"
-              },
-              "antenna:polarization": {
-                "description": "E.g. \"vertical\", \"horizontal\", \"slant-45\", \"left-hand circular\", \"right-hand circular\".",
-                "type": "string"
-              }
-            }
+        "properties": {
+          "antenna:azimuth_angle": {
+            "description": "Angle of main beam in azimuthal plane from North, in degrees.",
+            "type": "number"
+          },
+          "antenna:elevation_angle": {
+            "description": "Angle of main beam in elevation plane from horizontal, in degrees.",
+            "type": "number"
+          },
+          "antenna:polarization": {
+            "description": "E.g. \"vertical\", \"horizontal\", \"slant-45\", \"left-hand circular\", \"right-hand circular\".",
+            "type": "string"
           }
-        ]
+        }
       }
     },
     "collection": {