WIP: Reworking place matching algorithm

Author: idle-code

tempren/cli.py

@@ -681,9 +681,9 @@ def main() -> int:
     except FileNotSupportedError as exc:
         log.error(f"Error: {exc}")
         return ErrorCode.INVALID_DESTINATION_ERROR
-    except Exception as exc:  # NOCOVER: not really testable - final fallback
-        log.error(f"Unknown error: {exc.__class__.__name__} {exc}")
-        return ErrorCode.UNKNOWN_ERROR
+    # except Exception as exc:  # NOCOVER: not really testable - final fallback
+    #     log.error(f"Unknown error: {exc.__class__.__name__} {exc}")
+    #     return ErrorCode.UNKNOWN_ERROR
     finally:
         os.chdir(original_cwd)
 

tempren/tags/geo.py

@@ -46,6 +46,7 @@ def configure(
         use_look_at: bool = True,
         use_folders: bool = True,
         default: str = "",
+        to_csv: Optional[str] = None,
     ) -> None:
         """
         :param kml: Path to the KML file containing the places
@@ -63,6 +64,15 @@ def configure(
         self.places = self._load_file(kml, use_look_at, use_folders)
         self.default = default
 
+        if to_csv is not None:
+            with open(to_csv, "w") as csv_file:
+                csv_file.writelines(
+                    [
+                        f"{p.latitude}, {p.longitude}, {p.radius / 1000}, {p.name}\n"
+                        for p in self.places
+                    ]
+                )
+
     def _load_file(
         self, kml_path: str, use_look_at: bool, use_folders: bool
     ) -> List[Place]:
@@ -76,7 +86,7 @@ def _collect_places(kml, prefix: List[str]) -> List[Place]:
                         "/".join(prefix + [kml.name]),
                         kml.view.latitude,
                         kml.view.longitude,
-                        radius=kml.view.range,
+                        radius=kml.view.range / 2,
                     )
                     prefix = prefix + [kml.name]
                     return [folder_place] + list(
@@ -92,13 +102,13 @@ def _collect_places(kml, prefix: List[str]) -> List[Place]:
                             "/".join(prefix + [kml.name]),
                             kml.view.latitude,
                             kml.view.longitude,
-                            radius=kml.view.range,
+                            radius=kml.view.range / 2,
                         )
                     ]
                 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 is not None else None
+                    radius = kml.view.range if kml.view / 2 is not None else None
                     return [
                         Place(
                             "/".join(prefix + [kml.name]),
@@ -135,10 +145,25 @@ def process(self, file: File, context: Optional[str]) -> str:
     @staticmethod
     def _find_best_match(places: List[Place], point: Point) -> Optional[Place]:
         gc = great_circle()
-        min_distance_place: Optional[Place] = None
-        for place in places:
-            if min_distance_place is None or gc.measure(
-                place.position, point
-            ) < gc.measure(min_distance_place.position, point):
-                min_distance_place = place
-        return min_distance_place
+
+        places_in_range = filter(
+            lambda p: gc.measure(p.position, point) < p.radius, places
+        )
+
+        # FIXME: Fix the types
+        smallest_place_in_range = next(
+            sorted(places_in_range, key=lambda p: p.radius), None
+        )
+        return smallest_place_in_range
+
+        # min_distance: float = -1
+        # min_distance_place: Optional[Place] = None
+        #
+        # for place in places_in_range:
+        #     distance = gc.measure(place.position, point)
+        #     if distance > place.radius:
+        #         continue
+        #     if min_distance_place is None or distance < min_distance:
+        #         min_distance = distance
+        #         min_distance_place = place
+        # return min_distance_place

tempren/tags/image.py

@@ -157,6 +157,8 @@ def convert_tag_value(tag_type, tag_value):
             if tag_value[1] == 1:
                 return tag_value[0]
             else:
+                if tag_value[1] == 0:
+                    return 0
                 return tag_value[0] / tag_value[1]
     if tag_type == TAG_TYPES.Ascii:
         return tag_value.decode("ascii")
@@ -227,16 +229,26 @@ def process(self, file: File, context: Optional[str]) -> Any:
         assert context is None
 
         exif_dict = piexif.load(str(file.absolute_path))
-        latitude = extract_exif_value(exif_dict, "GPSLatitude")
-        latitude_ref = extract_exif_value(exif_dict, "GPSLatitudeRef")
-        longitude = extract_exif_value(exif_dict, "GPSLongitude")
-        longitude_ref = extract_exif_value(exif_dict, "GPSLongitudeRef")
+        try:
+            latitude = extract_exif_value(exif_dict, "GPSLatitude")
+            latitude_ref = extract_exif_value(exif_dict, "GPSLatitudeRef")
+            longitude = extract_exif_value(exif_dict, "GPSLongitude")
+            longitude_ref = extract_exif_value(exif_dict, "GPSLongitudeRef")
 
-        degrees_notation = f"{latitude}{latitude_ref}, {longitude}{longitude_ref}"
-        if self.use_decimal:
-            return Point.from_string(degrees_notation).format_decimal()
-        return degrees_notation
+            degrees_notation = f"{latitude}{latitude_ref}, {longitude}{longitude_ref}"
+            if self.use_decimal:
+                return Point.from_string(degrees_notation).format_decimal()
+            return degrees_notation
+        except ValueError:
+            return ""
 
 
-class HasGpsPositionTagAlias(TagAlias):
-    """%Core.Not(){%Text.IsEmpty(){%Image.GpsPosition()}}"""
+class HasGpsPositionTag(GpsPositionTag):
+    """Check if file contains valid GPS coordinates that can be extracted by GpsPosition tag"""
+
+    def process(self, file: File, context: Optional[str]) -> bool:
+        # noinspection PyBroadException
+        try:
+            return super().process(file, context) != ""
+        except:
+            return False