Merge pull request #288 from volaya/type_property

added type property for catalogs and collections

Author: lossyrob

pystac/catalog.py

@@ -389,6 +389,7 @@ def to_dict(self, include_self_link=True):
             links = filter(lambda l: l.rel != 'self', links)
 
         d = {
+            'type': self.STAC_OBJECT_TYPE.value.title(),
             'id': self.id,
             'stac_version': pystac.get_stac_version(),
             'description': self.description,

pystac/serialization/identify.py

@@ -264,18 +264,25 @@ def identify_stac_object_type(json_dict):
     """
     object_type = None
 
-    # Identify pre-1.0 ITEMCOLLECTION (since removed)
-    if 'type' in json_dict and 'assets' not in json_dict:
-        if 'stac_version' in json_dict and json_dict['stac_version'].startswith('0'):
-            if json_dict['type'] == 'FeatureCollection':
-                object_type = STACObjectType.ITEMCOLLECTION
-
-    if 'extent' in json_dict:
-        object_type = STACObjectType.COLLECTION
-    elif 'assets' in json_dict:
-        object_type = STACObjectType.ITEM
-    else:
-        object_type = STACObjectType.CATALOG
+    if 'type' in json_dict:  # Try to identify using 'type' property
+        for t in STACObjectType:
+            if json_dict['type'].lower() == t.value.lower():
+                object_type = t
+                break
+
+    if object_type is None:  # Use old-approach based on other properties
+        # Identify pre-1.0 ITEMCOLLECTION (since removed)
+        if 'type' in json_dict and 'assets' not in json_dict:
+            if 'stac_version' in json_dict and json_dict['stac_version'].startswith('0'):
+                if json_dict['type'] == 'FeatureCollection':
+                    object_type = STACObjectType.ITEMCOLLECTION
+
+        if 'extent' in json_dict:
+            object_type = STACObjectType.COLLECTION
+        elif 'assets' in json_dict:
+            object_type = STACObjectType.ITEM
+        else:
+            object_type = STACObjectType.CATALOG
 
     return object_type