fix: Include third party schemas on top level (#101)

Also de-duplicate references.
linz · Oct 8, 2021 · da277db · da277db
1 parent 5c8c1fc
commit da277db
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 46 deletions.
diff --git a/extensions/linz/examples/item.json b/extensions/linz/examples/item.json
@@ -1,6 +1,10 @@
 {
   "stac_version": "1.0.0",
-  "stac_extensions": ["https://linz.github.io/stac/_STAC_VERSION_/linz/schema.json"],
+  "stac_extensions": [
+    "https://linz.github.io/stac/_STAC_VERSION_/linz/schema.json",
+    "https://stac-extensions.github.io/projection/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/version/v1.0.0/schema.json"
+  ],
   "type": "Feature",
   "id": "item",
   "bbox": [172.9, 1.3, 173, 1.4],
@@ -17,7 +21,9 @@
     ]
   },
   "properties": {
-    "datetime": "2020-12-11T22:38:32Z"
+    "datetime": "2020-12-11T22:38:32Z",
+    "proj:epsg": 123,
+    "version": "1.0.0"
   },
   "links": [
     {

diff --git a/extensions/linz/schema.json b/extensions/linz/schema.json
@@ -3,57 +3,56 @@
   "$id": "https://linz.github.io/stac/_STAC_VERSION_/linz/schema.json",
   "title": "LINZ STAC Extension",
   "description": "LINZ STAC Extension.",
-  "oneOf": [
+  "allOf": [
     {
-      "$comment": "This is the schema for STAC Items.",
-      "allOf": [
-        {
-          "type": "object",
-          "required": ["linz:geospatial_type"]
-        },
-        {
-          "$ref": "https://schemas.stacspec.org/v1.0.0/item-spec/json-schema/item.json#"
-        },
-        {
-          "$ref": "#/definitions/fields"
-        },
-        {
-          "$ref": "#/definitions/stac_extensions"
-        }
-      ]
+      "$ref": "https://stac-extensions.github.io/version/v1.0.0/schema.json#"
     },
     {
-      "$comment": "This is the schema for STAC Collections.",
-      "allOf": [
+      "$ref": "https://stac-extensions.github.io/projection/v1.0.0/schema.json#"
+    },
+    {
+      "$ref": "#/definitions/fields"
+    },
+    {
+      "$ref": "#/definitions/stac_extensions"
+    },
+    {
+      "$comment": "Type-specific schemas",
+      "oneOf": [
         {
-          "type": "object",
-          "required": [
-            "linz:created",
-            "linz:lifecycle",
-            "linz:providers",
-            "linz:security_classification",
-            "linz:updated",
-            "providers",
-            "title"
+          "$comment": "This is the schema for STAC Items.",
+          "allOf": [
+            {
+              "type": "object",
+              "required": ["linz:geospatial_type"]
+            },
+            {
+              "$ref": "https://schemas.stacspec.org/v1.0.0/item-spec/json-schema/item.json#"
+            }
           ]
         },
         {
-          "$ref": "https://schemas.stacspec.org/v1.0.0/collection-spec/json-schema/collection.json#"
-        },
-        {
-          "$ref": "https://linz.github.io/stac/_STAC_VERSION_/quality/schema.json#"
-        },
-        {
-          "$ref": "https://stac-extensions.github.io/version/v1.0.0/schema.json#"
-        },
-        {
-          "$ref": "https://stac-extensions.github.io/projection/v1.0.0/schema.json#"
-        },
-        {
-          "$ref": "#/definitions/fields"
-        },
-        {
-          "$ref": "#/definitions/stac_extensions"
+          "$comment": "This is the schema for STAC Collections.",
+          "allOf": [
+            {
+              "type": "object",
+              "required": [
+                "linz:created",
+                "linz:lifecycle",
+                "linz:providers",
+                "linz:security_classification",
+                "linz:updated",
+                "providers",
+                "title"
+              ]
+            },
+            {
+              "$ref": "https://schemas.stacspec.org/v1.0.0/collection-spec/json-schema/collection.json#"
+            },
+            {
+              "$ref": "https://linz.github.io/stac/_STAC_VERSION_/quality/schema.json#"
+            }
+          ]
         }
       ]
     }