Merge pull request #53 from unity-sds/stac_collection

added collection info to stac items

Author: mike-gangl

CHANGELOG.md

@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 --------
 
-## UNRELEASED
 
+
+## [0.2.0] - 2023-08-10
 ### Added
+* Added parsing of collection in stac items 
 ### Fixed
 * fixed release workflow to test against `unity-sds-client` not `unity_py` 
 ### Changed

tests/test_files/SNDR.SS1330.CHIRP.20160829T2317.m06.g233.L1_AQ.std.v02_48.G.200425130422.json

@@ -1,6 +1,7 @@
 {
   "type": "Feature",
   "stac_version": "1.0.0",
+  "collection": "collection_test",
   "id": "SNDR.SS1330.CHIRP.20160829T2317.m06.g233.L1_AQ.std.v02_48.G.200425130422",
   "properties": {
     "datetime": "2016-08-29T23:17:00Z",

tests/test_unity_stac.py

@@ -23,6 +23,9 @@ def test_read_stac():
     datasets = collection.datasets
     assert len(datasets) == 2
 
+    # Added 8/10/23 to check the STAC collection information
+    assert datasets[1].collection_id == 'C2011289787-GES_DISC'
+
     data_files = collection.data_locations()
     assert len(data_files) == 6
     data_files = collection.data_locations(["data","opendap"])
@@ -37,6 +40,8 @@ def test_read_stac():
         #Try a "classic" catalog + item files stac catalog
     collection = Collection.from_stac("tests/test_files/catalog_01.json")
     datasets = collection.datasets
+    # Added 8/10/23 to check the STAC collection information
+    assert datasets[0].collection_id == 'collection_test'
     assert len(datasets) == 1
     data_files = collection.data_locations()
     assert len(data_files) == 2
@@ -102,6 +107,8 @@ def test_unity_to_stac():
     prop_count = 0
 
     for d in collection._datasets:
+        # Added 8/10/23 to check the STAC collection information
+        assert d.collection_id == 'SNDR13CHRP1AQCal_rebin'
         for df in d.datafiles:
             assert application_output_directory in df.location
             assert os.path.isabs(df.location) == True

unity_sds_client/resources/collection.py

@@ -88,6 +88,7 @@ def to_stac(collection, data_dir):
             id=dataset.id,
             geometry=dataset.geometry,
             bbox=dataset.bbox,
+            collection=dataset.collection_id,
             datetime = date_parser.parse(dataset.data_begin_time),
             properties={
                 "datetime": dataset.data_begin_time,
@@ -163,7 +164,17 @@ def from_stac(stac_file):
             collection = Collection(id)
             # Catch file not found... ?
             for item in items:
-                ds = Dataset(item.id, item.properties.get("collection"), item.properties.get("start_datetime",None), item.properties.get("end_datetime", None), item.properties.get("created", None))
+                # if the id of the catalog and the id of the collection items are not the same,
+                # then use the one that is a part of the collection item definition
+                # Added 8/10/23
+                ds = Dataset(item.id, id, item.properties.get("start_datetime", None),
+                             item.properties.get("end_datetime", None), item.properties.get("created", None))
+                if item.collection_id is not None and item.collection_id != id:
+                     print ("if2")
+                     ds = Dataset(item.id, item.collection_id, item.properties.get("start_datetime", None),
+                                 item.properties.get("end_datetime", None), item.properties.get("created", None))
+
+
                 ds.bbox = item.bbox
                 ds.geometry = item.geometry