Merge pull request stac-extensions#11 from linz/feat/fix-lints

emmanuelmathot · web-flow · commit 6daf1aabd67d · 2021-11-27T16:18:56.000+01:00
feat: Fix lints reported by ajv
diff --git a/json-schema/schema.json b/json-schema/schema.json
@@ -47,6 +47,7 @@
       "type": "object",
       "allOf": [
         {
+          "type": "object",
           "required": [
             "type"
           ],
@@ -77,6 +78,7 @@
                   {
                     "allOf": [
                       {
+                        "type": "object",
                         "required": [
                           "roles"
                         ],
@@ -112,6 +114,7 @@
           }
         },
         {
+          "type": "object",
           "$comment": "This validates the fields in Collection Assets, but does not require them.",
           "required": [
             "assets"
@@ -137,6 +140,7 @@
           }
         },
         {
+          "type": "object",
           "$comment": "This is the schema for the fields in Item Asset Definitions. It doesn't require any fields.",
           "required": [
             "item_assets"
@@ -162,6 +166,7 @@
           }
         },
         {
+          "type": "object",
           "$comment": "This is the schema for the fields in Summaries. By default, only checks the existance of the properties, but not the schema of the summaries.",
           "required": [
             "summaries"
@@ -193,11 +198,11 @@
     "require_any_field": {
       "$comment": "Please list all fields here so that we can force the existence of one of them in other parts of the schemas.",
       "anyOf": [
-        {"required": ["processing:expression"]},
-        {"required": ["processing:lineage"]},
-        {"required": ["processing:level"]},
-        {"required": ["processing:facility"]},
-        {"required": ["processing:software"]}
+        {"type": "object", "required": ["processing:expression"]},
+        {"type": "object", "required": ["processing:lineage"]},
+        {"type": "object", "required": ["processing:level"]},
+        {"type": "object", "required": ["processing:facility"]},
+        {"type": "object", "required": ["processing:software"]}
       ]
     },
     "fields": {
@@ -264,4 +269,4 @@
       "additionalProperties": false
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`"type": "object",`
`48`	`48`	`"allOf": [`
`49`	`49`	`{`
	`50`	`+ "type": "object",`
`50`	`51`	`"required": [`
`51`	`52`	`"type"`
`52`	`53`	`],`
`@@ -77,6 +78,7 @@`
`77`	`78`	`{`
`78`	`79`	`"allOf": [`
`79`	`80`	`{`
	`81`	`+ "type": "object",`
`80`	`82`	`"required": [`
`81`	`83`	`"roles"`
`82`	`84`	`],`
`@@ -112,6 +114,7 @@`
`112`	`114`	`}`
`113`	`115`	`},`
`114`	`116`	`{`
	`117`	`+ "type": "object",`
`115`	`118`	`"$comment": "This validates the fields in Collection Assets, but does not require them.",`
`116`	`119`	`"required": [`
`117`	`120`	`"assets"`
`@@ -137,6 +140,7 @@`
`137`	`140`	`}`
`138`	`141`	`},`
`139`	`142`	`{`
	`143`	`+ "type": "object",`
`140`	`144`	`"$comment": "This is the schema for the fields in Item Asset Definitions. It doesn't require any fields.",`
`141`	`145`	`"required": [`
`142`	`146`	`"item_assets"`
`@@ -162,6 +166,7 @@`
`162`	`166`	`}`
`163`	`167`	`},`
`164`	`168`	`{`
	`169`	`+ "type": "object",`
`165`	`170`	`"$comment": "This is the schema for the fields in Summaries. By default, only checks the existance of the properties, but not the schema of the summaries.",`
`166`	`171`	`"required": [`
`167`	`172`	`"summaries"`
`@@ -193,11 +198,11 @@`
`193`	`198`	`"require_any_field": {`
`194`	`199`	`"$comment": "Please list all fields here so that we can force the existence of one of them in other parts of the schemas.",`
`195`	`200`	`"anyOf": [`
`196`		`- {"required": ["processing:expression"]},`
`197`		`- {"required": ["processing:lineage"]},`
`198`		`- {"required": ["processing:level"]},`
`199`		`- {"required": ["processing:facility"]},`
`200`		`- {"required": ["processing:software"]}`
	`201`	`+ {"type": "object", "required": ["processing:expression"]},`
	`202`	`+ {"type": "object", "required": ["processing:lineage"]},`
	`203`	`+ {"type": "object", "required": ["processing:level"]},`
	`204`	`+ {"type": "object", "required": ["processing:facility"]},`
	`205`	`+ {"type": "object", "required": ["processing:software"]}`
`201`	`206`	`]`
`202`	`207`	`},`
`203`	`208`	`"fields": {`
`@@ -264,4 +269,4 @@`
`264`	`269`	`"additionalProperties": false`
`265`	`270`	`}`
`266`	`271`	`}`
`267`		`-}`
	`272`	`+}`