Merge branch 'master' into bugfix/102-wkt-mixed-dimensionality

Author: eseglem

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     ```
 
 - Add has_z function to Geometries (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/103)
+- Add optional bbox to geometries.
 
 ### Changed
 

geojson_pydantic/features.py

@@ -5,14 +5,15 @@
 from pydantic import BaseModel, Field, validator
 from pydantic.generics import GenericModel
 
+from geojson_pydantic.geo_interface import GeoInterfaceMixin
 from geojson_pydantic.geometries import Geometry, GeometryCollection
 from geojson_pydantic.types import BBox
 
 Props = TypeVar("Props", bound=Union[Dict[str, Any], BaseModel])
 Geom = TypeVar("Geom", bound=Union[Geometry, GeometryCollection])
 
 
-class Feature(GenericModel, Generic[Geom, Props]):
+class Feature(GenericModel, Generic[Geom, Props], GeoInterfaceMixin):
     """Feature Model"""
 
     type: Literal["Feature"]
@@ -34,30 +35,8 @@ def set_geometry(cls, geometry: Any) -> Any:
 
         return geometry
 
-    @property
-    def __geo_interface__(self) -> Dict[str, Any]:
-        """GeoJSON-like protocol for geo-spatial (GIS) vector data.
 
-        ref: https://gist.github.com/sgillies/2217756#__geo_interface
-        """
-        geo: Dict[str, Any] = {
-            "type": self.type,
-            "geometry": self.geometry.__geo_interface__
-            if self.geometry is not None
-            else None,
-            "properties": self.properties,
-        }
-
-        if self.bbox:
-            geo["bbox"] = self.bbox
-
-        if self.id:
-            geo["id"] = self.id
-
-        return geo
-
-
-class FeatureCollection(GenericModel, Generic[Geom, Props]):
+class FeatureCollection(GenericModel, Generic[Geom, Props], GeoInterfaceMixin):
     """FeatureCollection Model"""
 
     type: Literal["FeatureCollection"]
@@ -75,19 +54,3 @@ def __len__(self) -> int:
     def __getitem__(self, index: int) -> Feature:
         """get feature at a given index"""
         return self.features[index]
-
-    @property
-    def __geo_interface__(self) -> Dict[str, Any]:
-        """GeoJSON-like protocol for geo-spatial (GIS) vector data.
-
-        ref: https://gist.github.com/sgillies/2217756#__geo_interface
-        """
-        features: List[Dict[str, Any]] = []
-        for feat in self.features:
-            features.append(feat.__geo_interface__)
-
-        geo: Dict[str, Any] = {"type": self.type, "features": features}
-        if self.bbox:
-            geo["bbox"] = self.bbox
-
-        return geo

geojson_pydantic/geo_interface.py

@@ -0,0 +1,23 @@
+"""Mixin for __geo_interface__ on GeoJSON objects."""
+
+from typing import Any, Dict, Protocol
+
+
+class _DictProtocol(Protocol):
+    """Protocol for use as the type of self in the mixin."""
+
+    def dict(self, *, exclude_unset: bool, **args: Any) -> Dict[str, Any]:
+        """Define a dict function so the mixin knows it exists."""
+        ...
+
+
+class GeoInterfaceMixin:
+    """Mixin for __geo_interface__ on GeoJSON objects."""
+
+    @property
+    def __geo_interface__(self: _DictProtocol) -> Dict[str, Any]:
+        """GeoJSON-like protocol for geo-spatial (GIS) vector data.
+
+        ref: https://gist.github.com/sgillies/2217756#__geo_interface
+        """
+        return self.dict(exclude_unset=True)

geojson_pydantic/geometries.py

@@ -1,12 +1,14 @@
 """pydantic models for GeoJSON Geometry objects."""
 import abc
-from typing import Any, Dict, Iterator, List, Literal, Protocol, Union
+from typing import Any, Iterator, List, Literal, Optional, Protocol, Union
 
 from pydantic import BaseModel, Field, ValidationError, validator
 from pydantic.error_wrappers import ErrorWrapper
 from typing_extensions import Annotated
 
+from geojson_pydantic.geo_interface import GeoInterfaceMixin
 from geojson_pydantic.types import (
+    BBox,
     LinearRing,
     LineStringCoords,
     MultiLineStringCoords,
@@ -72,22 +74,15 @@ def __call__(self, coordinates: Any, force_z: bool) -> str:
         ...
 
 
-class _GeometryBase(BaseModel, abc.ABC):
+class _GeometryBase(BaseModel, abc.ABC, GeoInterfaceMixin):
     """Base class for geometry models"""
 
     type: str
     coordinates: Any
+    bbox: Optional[BBox] = None
 
     __wkt_coordinates__: _WktCallable
 
-    @property
-    def __geo_interface__(self) -> Dict[str, Any]:
-        """GeoJSON-like protocol for geo-spatial (GIS) vector data.
-
-        ref: https://gist.github.com/sgillies/2217756#__geo_interface
-        """
-        return {"type": self.type, "coordinates": self.coordinates}
-
     @property
     @abc.abstractmethod
     def has_z(self) -> bool:
@@ -168,18 +163,6 @@ def has_z(self) -> bool:
         return _lines_has_z(self.coordinates)
 
 
-class LinearRingGeom(LineString):
-    """LinearRing model."""
-
-    @validator("coordinates")
-    def check_closure(cls, coordinates: List) -> List:
-        """Validate that LinearRing is closed (first and last coordinate are the same)."""
-        if coordinates[-1] != coordinates[0]:
-            raise ValueError("LinearRing must have the same start and end coordinates")
-
-        return coordinates
-
-
 class Polygon(_GeometryBase):
     """Polygon Model"""
 
@@ -254,11 +237,12 @@ def check_closure(cls, coordinates: List) -> List:
 ]
 
 
-class GeometryCollection(BaseModel):
+class GeometryCollection(BaseModel, GeoInterfaceMixin):
     """GeometryCollection Model"""
 
     type: Literal["GeometryCollection"]
     geometries: List[Geometry]
+    bbox: Optional[BBox] = None
 
     def __iter__(self) -> Iterator[Geometry]:  # type: ignore [override]
         """iterate over geometries"""
@@ -290,18 +274,6 @@ def wkt(self) -> str:
         z = " Z " if "Z" in geometries else " "
         return f"{self.type.upper()}{z}{geometries}"
 
-    @property
-    def __geo_interface__(self) -> Dict[str, Any]:
-        """GeoJSON-like protocol for geo-spatial (GIS) vector data.
-
-        ref: https://gist.github.com/sgillies/2217756#__geo_interface
-        """
-        geometries: List[Dict[str, Any]] = []
-        for geom in self.geometries:
-            geometries.append(geom.__geo_interface__)
-
-        return {"type": self.type, "geometries": self.geometries}
-
 
 def parse_geometry_obj(obj: Any) -> Geometry:
     """

tests/test_features.py

@@ -168,7 +168,7 @@ class Pointy:
         __geo_interface__ = {"type": "Point", "coordinates": (0.0, 0.0)}
 
     feat = Feature(type="Feature", geometry=Pointy(), properties={})
-    assert feat.geometry.dict() == Pointy.__geo_interface__
+    assert feat.geometry.dict(exclude_unset=True) == Pointy.__geo_interface__
 
 
 def test_feature_with_null_geometry():