Merge pull request #115 from developmentseed/ignoreType

Ignore type

Author: vincentsarago

CHANGELOG.md

@@ -5,7 +5,7 @@ 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/).
 
-## [0.6.0] - TBD
+## [0.6.0a0] - 2023-04-04
 
 ### Added
 
@@ -29,14 +29,14 @@ 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. (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/108)
-- Add support for nested GeometryCollection and a corresponding warning. (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/111) 
+- Add support for nested GeometryCollection and a corresponding warning. (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/111)
 
 ### Changed
 
 - Refactor and simplify WKT construction (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/97)
 - Support empty geometry coordinates (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/100)
 - Refactored `__geo_interface__` to be a Mixin which returns `self.dict` (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/105)
-- GeometryCollection containing a single geometry or geometries of only one type will now produce a warning. (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/111) 
+- GeometryCollection containing a single geometry or geometries of only one type will now produce a warning. (author @eseglem, https://github.com/developmentseed/geojson-pydantic/pull/111)
 
 ### Fixed
 
@@ -268,7 +268,8 @@ Although the type file was added in `0.2.0` it wasn't included in the distribute
 ### Added
 - Initial Release
 
-[unreleased]: https://github.com/developmentseed/geojson-pydantic/compare/0.5.0...HEAD
+[unreleased]: https://github.com/developmentseed/geojson-pydantic/compare/0.6.0a...HEAD
+[0.6.0a]: https://github.com/developmentseed/geojson-pydantic/compare/0.5.0...0.6.0a
 [0.5.0]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.3...0.5.0
 [0.4.3]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.2...0.4.3
 [0.4.2]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.1...0.4.2

geojson_pydantic/geometries.py

@@ -3,7 +3,7 @@
 
 import abc
 import warnings
-from typing import Any, Iterator, List, Literal, Optional, Protocol, Union
+from typing import Any, Iterator, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field, ValidationError, validator
 from pydantic.error_wrappers import ErrorWrapper
@@ -72,19 +72,17 @@ def _polygons_wkt_coordinates(
     )
 
 
-class _WktCallable(Protocol):
-    def __call__(self, coordinates: Any, force_z: bool) -> str:
-        ...
-
-
 class _GeometryBase(BaseModel, abc.ABC, GeoInterfaceMixin):
     """Base class for geometry models"""
 
     type: str
     coordinates: Any
     bbox: Optional[BBox] = None
 
-    __wkt_coordinates__: _WktCallable
+    @abc.abstractmethod
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        ...
 
     @property
     @abc.abstractmethod
@@ -116,7 +114,9 @@ class Point(_GeometryBase):
     type: Literal["Point"]
     coordinates: Position
 
-    __wkt_coordinates__ = staticmethod(_position_wkt_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _position_wkt_coordinates(coordinates, force_z)
 
     @property
     def has_z(self) -> bool:
@@ -130,7 +130,9 @@ class MultiPoint(_GeometryBase):
     type: Literal["MultiPoint"]
     coordinates: MultiPointCoords
 
-    __wkt_coordinates__ = staticmethod(_position_list_wkt_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _position_list_wkt_coordinates(coordinates, force_z)
 
     @property
     def has_z(self) -> bool:
@@ -144,7 +146,9 @@ class LineString(_GeometryBase):
     type: Literal["LineString"]
     coordinates: LineStringCoords
 
-    __wkt_coordinates__ = staticmethod(_position_list_wkt_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _position_list_wkt_coordinates(coordinates, force_z)
 
     @property
     def has_z(self) -> bool:
@@ -158,7 +162,9 @@ class MultiLineString(_GeometryBase):
     type: Literal["MultiLineString"]
     coordinates: MultiLineStringCoords
 
-    __wkt_coordinates__ = staticmethod(_lines_wtk_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _lines_wtk_coordinates(coordinates, force_z)
 
     @property
     def has_z(self) -> bool:
@@ -172,7 +178,9 @@ class Polygon(_GeometryBase):
     type: Literal["Polygon"]
     coordinates: PolygonCoords
 
-    __wkt_coordinates__ = staticmethod(_lines_wtk_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _lines_wtk_coordinates(coordinates, force_z)
 
     @validator("coordinates")
     def check_closure(cls, coordinates: List) -> List:
@@ -218,7 +226,9 @@ class MultiPolygon(_GeometryBase):
     type: Literal["MultiPolygon"]
     coordinates: MultiPolygonCoords
 
-    __wkt_coordinates__ = staticmethod(_polygons_wkt_coordinates)
+    def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
+        """return WKT coordinates."""
+        return _polygons_wkt_coordinates(coordinates, force_z)
 
     @property
     def has_z(self) -> bool: