Use type values in STACObjectType

Author: duckontheweb

pystac/serialization/identify.py

@@ -31,15 +31,6 @@ class OldExtensionShortIDs(Enum):
     FILE = "file"
 
 
-class STACType(str, Enum):
-    def __str__(self) -> str:
-        return str(self.value)
-
-    CATALOG = "Catalog"
-    COLLECTION = "Collection"
-    ITEM = "Feature"
-
-
 @total_ordering
 class STACVersionID:
     """Defines STAC versions in an object that is orderable based on version number.
@@ -206,11 +197,11 @@ def identify_stac_object_type(
             return None
 
         # Try to match the "type" attribute
-        if obj_type == STACType.CATALOG:
+        if obj_type == pystac.STACObjectType.CATALOG:
             return pystac.STACObjectType.CATALOG
-        elif obj_type == STACType.COLLECTION:
+        elif obj_type == pystac.STACObjectType.COLLECTION:
             return pystac.STACObjectType.COLLECTION
-        elif obj_type == STACType.ITEM:
+        elif obj_type == pystac.STACObjectType.ITEM:
             return pystac.STACObjectType.ITEM
         else:
             return None

pystac/serialization/migrate.py

@@ -7,7 +7,6 @@
     OldExtensionShortIDs,
     STACJSONDescription,
     STACVersionID,
-    STACType,
 )
 
 if TYPE_CHECKING:
@@ -17,7 +16,7 @@
 def _migrate_catalog(
     d: Dict[str, Any], version: STACVersionID, info: STACJSONDescription
 ) -> None:
-    d["type"] = STACType.CATALOG
+    d["type"] = pystac.STACObjectType.CATALOG
 
 
 def _migrate_collection_summaries(
@@ -35,7 +34,7 @@ def _migrate_collection_summaries(
 def _migrate_collection(
     d: Dict[str, Any], version: STACVersionID, info: STACJSONDescription
 ) -> None:
-    d["type"] = STACType.COLLECTION
+    d["type"] = pystac.STACObjectType.COLLECTION
     _migrate_collection_summaries(d, version, info)
 
 

pystac/stac_object.py

@@ -15,9 +15,9 @@ class STACObjectType(str, Enum):
     def __str__(self) -> str:
         return str(self.value)
 
-    CATALOG = "CATALOG"
-    COLLECTION = "COLLECTION"
-    ITEM = "ITEM"
+    CATALOG = "Catalog"
+    COLLECTION = "Collection"
+    ITEM = "Feature"
 
 
 class STACObject(ABC):