Fix typing issues in geo tags

Author: idle-code

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.8
+python_version = 3.10
 files = tempren
 disable_error_code = type-abstract
 
@@ -20,3 +20,6 @@ ignore_missing_imports = True
 
 [mypy-isodate.*]
 ignore_missing_imports = True
+
+[mypy-geopy.*]
+follow_untyped_imports = True

tempren/tags/geo.py

@@ -4,7 +4,9 @@
 from pathlib import Path
 from typing import List, Optional
 
+import fastkml.geometry
 import fastkml.kml
+import fastkml.views
 from geopy import Point
 from geopy.distance import great_circle
 
@@ -40,7 +42,7 @@ class KmlPlaceNameTag(Tag):
     def __init__(self):
         self.log = logging.getLogger(self.__class__.__name__)
 
-    def configure(
+    def configure(  # type: ignore[override]
         self,
         kml: str,
         use_look_at: bool = True,
@@ -68,7 +70,7 @@ def configure(
             with open(to_csv, "w") as csv_file:
                 csv_file.writelines(
                     [
-                        f"{p.latitude}, {p.longitude}, {p.radius / 1000}, {p.name}\n"
+                        f"{p.latitude}, {p.longitude}, {p.radius / 1000 if p.radius else 0}, {p.name}\n"
                         for p in self.places
                     ]
                 )
@@ -81,7 +83,17 @@ def _load_file(
 
         def _collect_places(kml, prefix: List[str]) -> List[Place]:
             if isinstance(kml, fastkml.containers.Folder):
-                if use_folders and kml.view is not None:
+                if (
+                    use_folders
+                    and kml.view is not None
+                    and isinstance(kml.view, fastkml.views.LookAt)
+                ):
+                    assert kml.name is not None, "Folder name is required"
+                    assert kml.view.latitude is not None, "Folder latitude is required"
+                    assert (
+                        kml.view.longitude is not None
+                    ), "Folder longitude is required"
+                    assert kml.view.range is not None, "Folder range is required"
                     folder_place = Place(
                         "/".join(prefix + [kml.name]),
                         kml.view.latitude,
@@ -94,9 +106,22 @@ def _collect_places(kml, prefix: List[str]) -> List[Place]:
                             [_collect_places(f, prefix) for f in kml.features]
                         )
                     )
+                assert kml.name is not None, "Folder name is required"
                 prefix = prefix + [kml.name]
             elif isinstance(kml, fastkml.containers.Placemark):
-                if use_look_at and kml.view is not None:
+                if (
+                    use_look_at
+                    and kml.view is not None
+                    and isinstance(kml.view, fastkml.views.LookAt)
+                ):
+                    assert kml.name is not None, "Placemark name is required"
+                    assert (
+                        kml.view.latitude is not None
+                    ), "Placemark latitude is required"
+                    assert (
+                        kml.view.longitude is not None
+                    ), "Placemark longitude is required"
+                    assert kml.view.range is not None, "Placemark range is required"
                     return [
                         Place(
                             "/".join(prefix + [kml.name]),
@@ -106,9 +131,25 @@ def _collect_places(kml, prefix: List[str]) -> List[Place]:
                         )
                     ]
                 else:
-                    latitude = kml.kml_geometry.kml_coordinates.coords[0][0]
-                    longitude = kml.kml_geometry.kml_coordinates.coords[0][1]
-                    radius = kml.view.range if kml.view / 2 is not None else None
+                    assert kml.name is not None, "Placemark name is required"
+                    assert (
+                        kml.kml_geometry is not None
+                    ), "Placemark geometry is required"
+                    assert isinstance(
+                        kml.kml_geometry, fastkml.geometry.Point
+                    ), "Only Point geometry is supported"
+                    assert (
+                        kml.kml_geometry.kml_coordinates is not None
+                    ), "Point coordinates are required"
+                    latitude = kml.kml_geometry.kml_coordinates.coords[0][1]
+                    longitude = kml.kml_geometry.kml_coordinates.coords[0][0]
+                    radius = (
+                        kml.view.range / 2
+                        if kml.view is not None
+                        and isinstance(kml.view, fastkml.views.LookAt)
+                        and kml.view.range is not None
+                        else None
+                    )
                     return [
                         Place(
                             "/".join(prefix + [kml.name]),
@@ -146,15 +187,17 @@ def process(self, file: File, context: Optional[str]) -> str:
     def _find_best_match(places: List[Place], point: Point) -> Optional[Place]:
         gc = great_circle()
 
-        places_in_range = filter(
-            lambda p: gc.measure(p.position, point) < p.radius, places
-        )
+        places_in_range = [
+            p
+            for p in places
+            if p.radius is not None and gc.measure(p.position, point) < p.radius
+        ]
+
+        if not places_in_range:
+            return None
 
-        # FIXME: Fix the types
-        smallest_place_in_range = next(
-            sorted(places_in_range, key=lambda p: p.radius), None
-        )
-        return smallest_place_in_range
+        # Return place with smallest radius
+        return min(places_in_range, key=lambda p: p.radius or float("inf"))
 
         # min_distance: float = -1
         # min_distance_place: Optional[Place] = None

tests/test_primitives.py

@@ -1,4 +1,4 @@
-from _pytest.python_api import raises
+from pytest import raises
 
 from tempren.primitives import CategoryName, TagName