Merge pull request #5 from TomAugspurger/fix/optional-columns

Don't require table:columns
stac-extensions · Aug 30, 2021 · c8d7bda · c8d7bda
2 parents 28dbd76 + 8d81afe
commit c8d7bda
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,9 +16,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [v1.0.1] - 2021-08-30
+
+### Changed
+
+- The `table:columns` field is no longer required on `Item`
+
 ## [v1.0.0] - 2021-08-27
 
 Initial release.
 
 [Unreleased]: <https://github.com/stac-extensions/table/compare/v1.0.0...HEAD>
+[v1.0.1]: <https://github.com/stac-extensions/table/tree/v1.0.1>
 [v1.0.0]: <https://github.com/stac-extensions/table/tree/v1.0.0>
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Additionally, Collections can describe many tabular datasets using [Table object
 
 |       Field Name       |                Type                 |                            Description                            |
 | ---------------------- | ----------------------------------- | ----------------------------------------------------------------- |
-| table:columns          | [ [Column Object](#column-object) ] | **REQUIRED**. A list of (#column objects) describing each column. |
+| table:columns          | [ [Column Object](#column-object) ] | A list of (#column objects) describing each column. |
 | table:primary_geometry | string                              | The primary geometry column name.                                 |
 | table:row_count        | number                              | The number of rows in the dataset.                                |
 

diff --git a/examples/collection.json b/examples/collection.json
@@ -63,15 +63,6 @@
     }
   ],
   "table:primary_geometry": "geometry",
-  "table:tables": [
-    {
-      "name": "first table",
-      "description": "This is my first table"
-    },
-    {
-      "name": "Second table"
-    }
-  ],
   "links": [
     {
       "href": "https://example.com/examples/collection.json",
@@ -82,4 +73,4 @@
       "rel": "item"
     }
   ]
-}
+}
diff --git a/examples/table-collection.json b/examples/table-collection.json
@@ -0,0 +1,70 @@
+{
+  "stac_version": "1.0.0",
+  "stac_extensions": [
+    "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/table/v1.0.0/schema.json"
+  ],
+  "type": "Collection",
+  "id": "collection",
+  "title": "A title",
+  "description": "A description",
+  "license": "Apache-2.0",
+  "extent": {
+    "spatial": {
+      "bbox": [
+        [
+          172.9,
+          1.3,
+          173,
+          1.4
+        ]
+      ]
+    },
+    "temporal": {
+      "interval": [
+        [
+          "2015-06-23T00:00:00Z",
+          null
+        ]
+      ]
+    }
+  },
+  "assets": {
+    "example": {
+      "href": "https://example.com/examples/file.xyz"
+    }
+  },
+  "item_assets": {
+    "data": {
+      "roles": [
+        "data"
+      ],
+      "description": "description"
+    }
+  },
+  "summaries": {
+    "datetime": {
+      "minimum": "2015-06-23T00:00:00Z",
+      "maximum": "2019-07-10T13:44:56Z"
+    }
+  },
+  "table:tables": [
+    {
+      "name": "first table",
+      "description": "This is my first table"
+    },
+    {
+      "name": "Second table"
+    }
+  ],
+  "links": [
+    {
+      "href": "https://example.com/examples/collection.json",
+      "rel": "self"
+    },
+    {
+      "href": "https://example.com/examples/item.json",
+      "rel": "item"
+    }
+  ]
+}
diff --git a/json-schema/schema.json b/json-schema/schema.json
@@ -25,9 +25,7 @@
               "allOf": [
                 {
                   "$comment": "Require fields here for Item Properties.",
-                  "required": [
-                    "table:columns"
-                  ]
+                  "required": []
                 },
                 {
                   "$ref": "#/definitions/fields"
@@ -69,9 +67,7 @@
           "allOf": [
             {
               "$comment": "Require fields here for Collections (top-level).",
-              "required": [
-                "table:columns"
-              ]
+              "required": []
             },
             {
               "$ref": "#/definitions/fields"
@@ -161,9 +157,7 @@
       "$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": [
-            "table:columns"
-          ]
+          "required": []
         }
       ]
     },
@@ -219,4 +213,4 @@
       }
     }
   }
-}
+}