Merge pull request #1 from geopython/v32-improvements

Improvements to v3.2 parsing

Author: constantinius

pygml/basics.py

@@ -26,11 +26,9 @@
 # ------------------------------------------------------------------------------
 
 
-from typing import Callable, List
+from typing import Callable
 
-# Definition of a coordinate list
-Coordinate = List[float]
-Coordinates = List[Coordinate]
+from .types import Coordinates, Coordinate
 
 
 def _make_number_parser(decimal: str) -> Callable[[str], float]:

pygml/parse.py

@@ -32,7 +32,7 @@
 from .pre_v32 import parse_pre_v32
 from .v32 import parse_v32
 from .v33 import parse_v33_ce
-from .geometry import Geometry
+from .types import Geometry
 
 
 def parse(source: Union[etree._Element, str]) -> Geometry:

pygml/geometry.py renamed to pygml/types.py

@@ -27,14 +27,30 @@
 
 
 from dataclasses import dataclass
+from typing import List, Optional, Tuple, Union
+
+try:
+    from typing import TypedDict
+
+    class GeomDict(TypedDict, total=True):
+        type: str
+        coordinates: Union[Tuple, List]
+        crs: Optional[dict]
+
+except ImportError:
+    GeomDict = dict
+
+# Definition of a coordinate list
+Coordinate = List[float]
+Coordinates = List[Coordinate]
 
 
 @dataclass(frozen=True)
 class Geometry:
     """ Simple container class to hold a geometry and expose it via the
         `__geo_interface__`
     """
-    geometry: dict
+    geometry: GeomDict
 
     @property
     def __geo_interface__(self):