pull request changes

Author: simonkassel

pystac/eo.py

@@ -78,7 +78,7 @@ def from_item(cls, item):
         e.assets = item.assets
 
         for k, v in item.assets.items():
-            if v.is_eo():
+            if is_eo(v):
                 e.assets[k] = EOAsset.from_asset(v)
             e.assets[k].set_owner(e)
 
@@ -88,7 +88,7 @@ def get_eo_assets(self):
         return {k: v for k, v in self.assets.items() if isinstance(v, EOAsset)}
 
     def add_asset(self, key, asset):
-        if asset.is_eo() and not isinstance(asset, EOAsset):
+        if is_eo(asset) and not isinstance(asset, EOAsset):
             asset = EOAsset.from_asset(asset)
         asset.set_owner(self)
         self.assets[key] = asset
@@ -103,8 +103,8 @@ def clone(self):
         self.add_eo_fields_to_dict(c.properties)
         return EOItem.from_item(c)
 
-    def to_dict(self):
-        d = super().to_dict()
+    def to_dict(self, include_self_link=True):
+        d = super().to_dict(include_self_link=include_self_link)
         if 'properties' not in d.keys():
             d['properties'] = {}
         self.add_eo_fields_to_dict(d['properties'])
@@ -251,3 +251,10 @@ def band_desc(common_name):
     if isinstance(r, str):
         return "Common name: {}".format(common_name)
     return "Common name: {}, Range: {} to {}".format(common_name, r[0], r[1])
+
+
+def is_eo(obj):
+    if obj.properties:
+        if obj.properties.get('eo:bands', None):
+            return True
+    return False

pystac/item.py

@@ -189,8 +189,7 @@ class MEDIA_TYPE:
         GEOJSON = 'application/geo+json'
         GEOPACKAGE = 'application/geopackage+sqlite3'
         HDF5 = 'application/x-hdf5'  # Hierarchical Data Format version 5
-        # Hierarchical Data Format versions 4 and earlier.
-        HDF = 'application/x-hdf'
+        HDF = 'application/x-hdf' # Hierarchical Data Format versions 4 and earlier.
 
     def __init__(self, href, title=None, media_type=None, properties=None):
         self.href = href
@@ -228,8 +227,8 @@ def to_dict(self):
             d['title'] = self.title
 
         if self.properties is not None:
-            for k in self.properties:
-                d[k] = self.properties[k]
+            for k, v in self.properties.items():
+                d[k] = v
 
         return deepcopy(d)
 
@@ -255,10 +254,4 @@ def from_dict(d):
         return Asset(href=href,
                      media_type=media_type,
                      title=title,
-                     properties=properties)
-
-    def is_eo(self):
-        if self.properties:
-            if self.properties.get('eo:bands', None):
-                return True
-        return False
+                     properties=properties)

tests/test_eo.py

@@ -2,6 +2,7 @@
 import os
 import unittest
 from jsonschema import ValidationError
+from tempfile import TemporaryDirectory
 
 from pystac import *
 from pystac.eo import (Band, EOAsset, EOItem, band_desc, band_range, eo_key)
@@ -89,6 +90,20 @@ def test_validate_eo(self):
         with self.assertRaises(ValidationError):
             sv.validate_dict(eo_dict_2, EOItem)
 
+        with TemporaryDirectory() as tmp_dir:
+            cat_dir = os.path.join(tmp_dir, 'catalog')
+            catalog = TestCases.test_case_1()
+            eo_item = EOItem.from_dict(self.eo_dict)
+            catalog.add_item(eo_item)
+            catalog.normalize_and_save(cat_dir, catalog_type=CatalogType.ABSOLUTE_PUBLISHED)
+
+            cat_read = Catalog.from_file(os.path.join(cat_dir, 'catalog.json'))
+            eo_item_read = cat_read.get_item("LC08_L1TP_107018_20181001_20181001_01_RT")
+            sv = SchemaValidator()
+            sv.validate_object(eo_item_read)
+            sv.validate_dict(eo_item_read.to_dict(), EOItem)
+            
+
 class EOAssetTest(unittest.TestCase):
     def setUp(self):
         self.EO_ITEM_URI = TestCases.get_path(