Merge pull request #119 from bmschmidt/main

allow None bboxes

Author: vincentsarago

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [NEXT] - TBD
+
+### Fixed
+
+* Fix issue with null bbox validation (author @bmschmidt, https://github.com/developmentseed/geojson-pydantic/pull/119)
+
 ## [0.6.0] - 2023-05-09
 
 No change since 0.6.0a0

geojson_pydantic/features.py

@@ -30,18 +30,24 @@ class Config:
     @validator("bbox", pre=True)
     def check_bbox(cls, bbox: BBox) -> BBox:
         """Check that bbox is valid."""
+        if bbox is None:
+            return bbox
+
         if len(bbox) == 6:
             if bbox[0] > bbox[3] or bbox[1] > bbox[4] or bbox[2] > bbox[5]:  # type: ignore
                 raise ValueError(
                     "BBox must be in the form [west, south, bottom, east, north, top]"
                 )
+
         elif len(bbox) == 4:
             if bbox[0] > bbox[2] or bbox[1] > bbox[3]:
                 raise ValueError("BBox must be in the form [west, south, east, north]")
+
         else:
             raise ValueError(
                 "BBox must be in the form [west, south, east, north] or [west, south, bottom, east, north, top]"
             )
+
         return bbox
 
     @validator("geometry", pre=True, always=True)

geojson_pydantic/geometries.py

@@ -185,7 +185,7 @@ def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
     @validator("coordinates")
     def check_closure(cls, coordinates: List) -> List:
         """Validate that Polygon is closed (first and last coordinate are the same)."""
-        if any([ring[-1] != ring[0] for ring in coordinates]):
+        if any(ring[-1] != ring[0] for ring in coordinates):
             raise ValueError("All linear rings have the same start and end coordinates")
 
         return coordinates
@@ -238,7 +238,7 @@ def has_z(self) -> bool:
     @validator("coordinates")
     def check_closure(cls, coordinates: List) -> List:
         """Validate that Polygon is closed (first and last coordinate are the same)."""
-        if any([ring[-1] != ring[0] for polygon in coordinates for ring in polygon]):
+        if any(ring[-1] != ring[0] for polygon in coordinates for ring in polygon):
             raise ValueError("All linear rings have the same start and end coordinates")
 
         return coordinates

tests/test_features.py

@@ -213,6 +213,7 @@ def test_bad_feature_id(id):
 def test_feature_validation():
     """Test default."""
     assert Feature(type="Feature", properties=None, geometry=None)
+    assert Feature(type="Feature", properties=None, geometry=None, bbox=None)
 
     with pytest.raises(ValidationError):
         # should be type=Feature
@@ -230,10 +231,22 @@ def test_feature_validation():
         # missing geometry
         Feature(type="Feature", properties=None)
 
+    assert Feature(
+        type="Feature", properties=None, bbox=[0, 0, 100, 100], geometry=None
+    )
+    assert Feature(
+        type="Feature", properties=None, bbox=[0, 0, 0, 100, 100, 100], geometry=None
+    )
+
     with pytest.raises(ValidationError):
         # bad bbox2d
-        Feature(type="Feature", properties=None, bbox=[100, 100, 0, 0])
+        Feature(type="Feature", properties=None, bbox=[100, 100, 0, 0], geometry=None)
 
     with pytest.raises(ValidationError):
         # bad bbox3d
-        Feature(type="Feature", properties=None, bbox=[100, 100, 100, 0, 0, 0])
+        Feature(
+            type="Feature",
+            properties=None,
+            bbox=[100, 100, 100, 0, 0, 0],
+            geometry=None,
+        )