merge

Author: vincentsarago

geojson_pydantic/geometries.py

@@ -3,8 +3,9 @@
 import abc
 from typing import Any, Dict, Iterator, List, Literal, Union
 
-from pydantic import BaseModel, ValidationError, validator
+from pydantic import BaseModel, Field, ValidationError, validator
 from pydantic.error_wrappers import ErrorWrapper
+from typing_extensions import Annotated
 
 from geojson_pydantic.types import (
     LinearRing,
@@ -186,9 +187,9 @@ def check_closure(cls, coordinates: List) -> List:
         return coordinates
 
     @property
-    def exterior(self) -> LinearRing:
+    def exterior(self) -> Union[LinearRing, None]:
         """Return the exterior Linear Ring of the polygon."""
-        return self.coordinates[0]
+        return self.coordinates[0] if self.coordinates else None
 
     @property
     def interiors(self) -> Iterator[LinearRing]:
@@ -236,8 +237,19 @@ def _wkt_coordinates(self) -> str:
             f"({_lines_wtk_coordinates(polygon)})" for polygon in self.coordinates
         )
 
+    @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]):
+            raise ValueError("All linear rings have the same start and end coordinates")
+
+        return coordinates
 
-Geometry = Union[Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon]
+
+Geometry = Annotated[
+    Union[Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon],
+    Field(discriminator="type"),
+]
 
 
 class GeometryCollection(BaseModel):
@@ -271,7 +283,11 @@ def _wkt_coordinates(self) -> str:
     @property
     def wkt(self) -> str:
         """Return the Well Known Text representation."""
-        return f"{self._wkt_type} ({self._wkt_coordinates})"
+        return (
+            self._wkt_type
+            + " "
+            + (f"({self._wkt_coordinates})" if self._wkt_coordinates else "EMPTY")
+        )
 
     @property
     def __geo_interface__(self) -> Dict[str, Any]:

geojson_pydantic/types.py

@@ -11,18 +11,14 @@
 Position = Union[Tuple[float, float], Tuple[float, float, float]]
 
 # Coordinate arrays
-
 if TYPE_CHECKING:
-    MultiPointCoords = List[Position]
     LineStringCoords = List[Position]
-    MultiLineStringCoords = List[List[Position]]
     LinearRing = List[Position]
-    PolygonCoords = List[List[Position]]
-    MultiPolygonCoords = List[List[List[Position]]]
 else:
-    MultiPointCoords = conlist(Position, min_items=1)
     LineStringCoords = conlist(Position, min_items=2)
-    MultiLineStringCoords = conlist(LineStringCoords, min_items=1)
     LinearRing = conlist(Position, min_items=4)
-    PolygonCoords = conlist(LinearRing, min_items=1)
-    MultiPolygonCoords = conlist(PolygonCoords, min_items=1)
+
+MultiPointCoords = List[Position]
+MultiLineStringCoords = List[LineStringCoords]
+PolygonCoords = List[LinearRing]
+MultiPolygonCoords = List[PolygonCoords]

tests/test_geometries.py

@@ -28,7 +28,7 @@ def assert_wkt_equivalence(geom: Union[Geometry, GeometryCollection]):
 @pytest.mark.parametrize("coordinates", [(1.01, 2.01), (1.0, 2.0, 3.0), (1.0, 2.0)])
 def test_point_valid_coordinates(coordinates):
     """
-    Two or three number elements as coordinates shold be okay
+    Two or three number elements as coordinates should be okay
     """
     p = Point(type="Point", coordinates=coordinates)
     assert p.type == "Point"
@@ -38,7 +38,8 @@ def test_point_valid_coordinates(coordinates):
 
 
 @pytest.mark.parametrize(
-    "coordinates", [(1.0,), (1.0, 2.0, 3.0, 4.0), "Foo", (None, 2.0), (1.0, (2.0,))]
+    "coordinates",
+    [(1.0,), (1.0, 2.0, 3.0, 4.0), "Foo", (None, 2.0), (1.0, (2.0,)), (), [], None],
 )
 def test_point_invalid_coordinates(coordinates):
     """
@@ -51,6 +52,8 @@ def test_point_invalid_coordinates(coordinates):
 @pytest.mark.parametrize(
     "coordinates",
     [
+        # Empty array
+        [],
         # No Z
         [(1.0, 2.0)],
         [(1.0, 2.0), (1.0, 2.0)],
@@ -60,7 +63,7 @@ def test_point_invalid_coordinates(coordinates):
 )
 def test_multi_point_valid_coordinates(coordinates):
     """
-    Two or three number elements as coordinates shold be okay
+    Two or three number elements as coordinates should be okay, as well as an empty array.
     """
     p = MultiPoint(type="MultiPoint", coordinates=coordinates)
     assert p.type == "MultiPoint"
@@ -71,7 +74,7 @@ def test_multi_point_valid_coordinates(coordinates):
 
 @pytest.mark.parametrize(
     "coordinates",
-    [[(1.0,)], [(1.0, 2.0, 3.0, 4.0)], ["Foo"], [(None, 2.0)], [(1.0, (2.0,))]],
+    [[(1.0,)], [(1.0, 2.0, 3.0, 4.0)], ["Foo"], [(None, 2.0)], [(1.0, (2.0,))], None],
 )
 def test_multi_point_invalid_coordinates(coordinates):
     """
@@ -115,6 +118,8 @@ def test_line_string_invalid_coordinates(coordinates):
 @pytest.mark.parametrize(
     "coordinates",
     [
+        # Empty array
+        [],
         # One line, two points, no Z
         [[(1.0, 2.0), (3.0, 4.0)]],
         # One line, two points, has Z
@@ -139,7 +144,7 @@ def test_multi_line_string_valid_coordinates(coordinates):
 
 
 @pytest.mark.parametrize(
-    "coordinates", [[None], ["Foo"], [[]], [[(1.0, 2.0)]], [["Foo", "Bar"]]]
+    "coordinates", [None, [None], ["Foo"], [[]], [[(1.0, 2.0)]], [["Foo", "Bar"]]]
 )
 def test_multi_line_string_invalid_coordinates(coordinates):
     """
@@ -152,6 +157,8 @@ def test_multi_line_string_invalid_coordinates(coordinates):
 @pytest.mark.parametrize(
     "coordinates",
     [
+        # Empty array
+        [],
         # Polygon, no Z
         [[(1.0, 2.0), (3.0, 4.0), (5.0, 6.0), (1.0, 2.0)]],
         # Polygon, has Z
@@ -166,7 +173,10 @@ def test_polygon_valid_coordinates(coordinates):
     assert polygon.type == "Polygon"
     assert polygon.coordinates == coordinates
     assert hasattr(polygon, "__geo_interface__")
-    assert polygon.exterior == coordinates[0]
+    if polygon.coordinates:
+        assert polygon.exterior == coordinates[0]
+    else:
+        assert polygon.exterior is None
     assert not list(polygon.interiors)
     assert_wkt_equivalence(polygon)
 
@@ -212,10 +222,10 @@ def test_polygon_with_holes(coordinates):
     "coordinates",
     [
         "foo",
+        None,
         [[(1.0, 2.0), (3.0, 4.0), (5.0, 6.0), (1.0, 2.0)], "foo", None],
         [[(1.0, 2.0), (3.0, 4.0), (1.0, 2.0)]],
         [[(1.0, 2.0), (3.0, 4.0), (5.0, 6.0), (7.0, 8.0)]],
-        [],
     ],
 )
 def test_polygon_invalid_coordinates(coordinates):
@@ -233,6 +243,8 @@ def test_polygon_invalid_coordinates(coordinates):
 @pytest.mark.parametrize(
     "coordinates",
     [
+        # Empty array
+        [],
         # Multipolygon, no Z
         [
             [
@@ -270,6 +282,26 @@ def test_multi_polygon(coordinates):
     assert_wkt_equivalence(multi_polygon)
 
 
+@pytest.mark.parametrize(
+    "coordinates",
+    [
+        "foo",
+        None,
+        [
+            [
+                [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0), (0.0, 0.0)],
+            ],
+            [
+                [(2.1, 2.1), (2.2, 2.1), (2.2, 2.2), (2.1, 4.2)],
+            ],
+        ],
+    ],
+)
+def test_multipolygon_invalid_coordinates(coordinates):
+    with pytest.raises(ValidationError):
+        MultiPolygon(type="MultiPolygon", coordinates=coordinates)
+
+
 def test_parse_geometry_obj_point():
     assert parse_geometry_obj({"type": "Point", "coordinates": [102.0, 0.5]}) == Point(
         type="Point", coordinates=(102.0, 0.5)
@@ -557,3 +589,22 @@ def test_polygon_has_z(coordinates, expected):
 )
 def test_multipolygon_has_z(coordinates, expected):
     assert MultiPolygon(type="MultiPolygon", coordinates=coordinates).has_z == expected
+
+
+@pytest.mark.parametrize(
+    "shape",
+    [
+        MultiPoint,
+        MultiLineString,
+        Polygon,
+        MultiPolygon,
+    ],
+)
+def test_wkt_empty(shape):
+    assert shape(type=shape.__name__, coordinates=[]).wkt.endswith(" EMPTY")
+
+
+def test_wkt_empty_geometrycollection():
+    assert GeometryCollection(type="GeometryCollection", geometries=[]).wkt.endswith(
+        " EMPTY"
+    )