Merge pull request #373 from gadomski/fix/collection-assets

Fix collection assets

Author: Jon Duckworth

CHANGELOG.md

@@ -15,9 +15,12 @@
 
 - Links to STAC Spec point to latest supported version ([#368](https://github.com/stac-utils/pystac/pull/368))
 - Links to STAC Extension pages point to repos in `stac-extensions` GitHub org ([#368](https://github.com/stac-utils/pystac/pull/368))
+- Collection assets ([#373](https://github.com/stac-utils/pystac/pull/373))
 
 ### Removed
 
+- Two v0.6.0 examples from the test suite ([#373](https://github.com/stac-utils/pystac/pull/373))
+
 ## [1.0.0-beta.2]
 
 ### Changed

pystac/collection.py

@@ -715,7 +715,7 @@ def from_dict(
 
         if assets is not None:
             for asset_key, asset_dict in assets.items():
-                collection.add_asset(asset_key, Asset(asset_dict))
+                collection.add_asset(asset_key, Asset.from_dict(asset_dict))
 
         return collection
 

tests/data-files/collections/with-assets.json

@@ -0,0 +1,57 @@
+{
+    "type": "Collection",
+    "id": "area-1-1",
+    "stac_version": "1.0.0-rc.4",
+    "description": "test collection country-1",
+    "links": [
+        {
+            "rel": "root",
+            "href": "./multi-extent.json",
+            "type": "application/json"
+        },
+        {
+            "rel": "item",
+            "href": "./area-1-1-imagery/area-1-1-imagery.json",
+            "type": "application/json"
+        },
+        {
+            "rel": "item",
+            "href": "./area-1-1-labels/area-1-1-labels.json",
+            "type": "application/json"
+        },
+        {
+            "rel": "parent",
+            "href": "../catalog.json",
+            "type": "application/json"
+        }
+    ],
+    "stac_extensions": [],
+    "extent": {
+        "spatial": {
+            "bbox": [
+                [
+                    -2.5048828125,
+                    3.8916575492899987,
+                    -1.9610595703125,
+                    4.275202171119132
+                ]
+            ]
+        },
+        "temporal": {
+            "interval": [
+                [
+                    "2019-10-04T18:55:37Z",
+                    null
+                ]
+            ]
+        }
+    },
+    "license": "proprietary",
+    "assets": {
+        "thumbnail": {
+            "title": "thumbnail",
+            "href": "http://example.com/thumbnail.png",
+            "media_type": "image/png"
+        }
+    }
+}

tests/data-files/examples/example-info.csv

@@ -121,19 +121,6 @@
 "iserv-0.6.1/2013/03/catalog.json","CATALOG","0.6.1",""
 "iserv-0.6.1/2013/catalog.json","CATALOG","0.6.1",""
 "iserv-0.6.1/catalog.json","COLLECTION","0.6.1",""
-"landsat-0.6.0/010/117/2015-01-02/LC80101172015002LGN00.json","ITEM","0.6.0","eo"
-"landsat-0.6.0/010/117/catalog.json","CATALOG","0.6.0",""
-"landsat-0.6.0/010/catalog.json","COLLECTION","0.6.0",""
-"landsat-0.6.0/156/029/2015-01-01/LC81560292015001LGN00.json","ITEM","0.6.0","eo"
-"landsat-0.6.0/156/029/catalog.json","CATALOG","0.6.0",""
-"landsat-0.6.0/156/catalog.json","COLLECTION","0.6.0",""
-"landsat-0.6.0/catalog.json","CATALOG","0.6.0",""
-"sentinel-0.6.0/catalog.json","CATALOG","0.6.0",""
-"sentinel-0.6.0/sentinel-2-l1c/9/V/XK/2017-10-13/S2B_9VXK_20171013_0.json","ITEM","0.6.0","eo"
-"sentinel-0.6.0/sentinel-2-l1c/9/V/XK/catalog.json","CATALOG","0.6.0",""
-"sentinel-0.6.0/sentinel-2-l1c/9/V/catalog.json","CATALOG","0.6.0",""
-"sentinel-0.6.0/sentinel-2-l1c/9/catalog.json","CATALOG","0.6.0",""
-"sentinel-0.6.0/sentinel-2-l1c/catalog.json","COLLECTION","0.6.0",""
 "hand-0.9.0/collection.json","COLLECTION","0.9.0",""
 "hand-0.8.1/collection.json","COLLECTION","0.8.1",""
 "1.0.0-RC3/catalog.json","CATALOG","1.0.0-rc.3",""