Update to v1.0.0-rc.1

stac-utils · Jun 9, 2021 · 1826810 · 1826810
1 parent 0e48d2f
commit 1826810
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/stac_pydantic/catalog.py b/stac_pydantic/catalog.py
@@ -18,6 +18,7 @@ class Catalog(BaseModel):
     links: Links
     stac_extensions: Optional[List[str]]
     title: Optional[str]
+    type: str = "catalog"
 
     class Config:
         use_enum_values = True

diff --git a/stac_pydantic/collection.py b/stac_pydantic/collection.py
@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 from stac_pydantic.catalog import Catalog
-from stac_pydantic.shared import NumType, Provider
+from stac_pydantic.shared import Asset, NumType, Provider
 
 
 class SpatialExtent(BaseModel):
@@ -31,23 +31,25 @@ class Extent(BaseModel):
     temporal: TimeInterval
 
 
-class Stats(BaseModel):
+class Range(BaseModel):
     """
     https://github.com/radiantearth/stac-spec/blob/v1.0.0-beta.1/collection-spec/collection-spec.md#stats-object
     """
 
-    min: Union[NumType, str]
-    max: Union[NumType, str]
+    minimum: Union[NumType, str]
+    maximum: Union[NumType, str]
 
 
 class Collection(Catalog):
     """
     https://github.com/radiantearth/stac-spec/blob/v1.0.0-beta.1/collection-spec/collection-spec.md
     """
 
+    assets: Dict[str, Asset]
     license: str
     extent: Extent
     title: Optional[str]
     keywords: Optional[List[str]]
     providers: Optional[List[Provider]]
-    summaries: Optional[Dict[str, Union[Stats, List[Any]]]]
+    summaries: Optional[Dict[str, Union[Range, List[Any], Dict[str, Any]]]]
+    type: str = "collection"
diff --git a/stac_pydantic/extensions/projection.py b/stac_pydantic/extensions/projection.py
@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Union
 
-from geojson_pydantic.geometries import Polygon
+from geojson_pydantic.geometries import Geometry
 from pydantic import BaseModel, Field
 
 from stac_pydantic.shared import BBox, NumType
@@ -23,7 +23,7 @@ class ProjectionExtension(BaseModel):
     epsg: Optional[Union[int]] = Field(..., alias="proj:epsg")
     wk2: Optional[Union[str, None]] = Field(None, alias="proj:wk2")
     projjson: Optional[Union[Dict[Any, Any], None]] = Field(None, alias="proj:projjson")
-    geometry: Optional[Polygon] = Field(None, alias="proj:geometry")
+    geometry: Optional[Geometry] = Field(None, alias="proj:geometry")
     bbox: Optional[BBox] = Field(None, alias="proj:bbox")
     centroid: Optional[CentroidObject] = Field(None, alias="proj:centroid")
     shape: Optional[List[int]] = Field(None, alias="proj:shape")