Handle rotated images in the demo

maploc/demo.py

@@ -70,22 +70,8 @@ def read_input_image(
     tile_size_meters: int = 64,
 ):
     image = read_image(image_path)
-
-    roll_pitch = None
-    if calibrator is not None:
-        roll_pitch, fov = image_calibration(image_path)
-    else:
-        logger.info("Could not call PerspectiveFields, maybe install gradio_client?")
-    if roll_pitch is not None:
-        logger.info("Using (roll, pitch) %s.", roll_pitch)
-
     with open(image_path, "rb") as fid:
         exif = EXIF(fid, lambda: image.shape[:2])
-    camera = camera_from_exif(exif, fov)
-    if camera is None:
-        raise ValueError(
-            "No camera intrinsics found in the EXIF, provide an FoV guess."
-        )
 
     latlon = None
     if prior_latlon is not None:
@@ -110,10 +96,25 @@ def read_input_image(
             logger.info("Could not find any prior location in the image EXIF metadata.")
     if latlon is None:
         raise ValueError(
-            "No location prior given: maybe provide the name of a street, building or neighborhood?"
+            "No location prior given or found in the image EXIF metadata: "
+            "maybe provide the name of a street, building or neighborhood?"
         )
     latlon = np.array(latlon)
 
+    roll_pitch = None
+    if calibrator is not None:
+        roll_pitch, fov = image_calibration(image_path)
+    else:
+        logger.info("Could not call PerspectiveFields, maybe install gradio_client?")
+    if roll_pitch is not None:
+        logger.info("Using (roll, pitch) %s.", roll_pitch)
+
+    camera = camera_from_exif(exif, fov)
+    if camera is None:
+        raise ValueError(
+            "No camera intrinsics found in the EXIF, provide an FoV guess."
+        )
+
     proj = Projection(*latlon)
     center = proj.project(latlon)
     bbox = BoundaryBox(center, center) + tile_size_meters

maploc/utils/exif.py

@@ -87,7 +87,7 @@ def unescape_string(s) -> str:
 
 class EXIF:
     def __init__(
-        self, fileobj, image_size_loader, use_exif_size=True, name=None
+        self, fileobj, image_size_loader=None, use_exif_size=True, name=None
     ) -> None:
         self.image_size_loader = image_size_loader
         self.use_exif_size = use_exif_size
@@ -97,7 +97,9 @@ class EXIF:
         self.fileobj_name = self.fileobj.name if name is None else name
 
     def extract_image_size(self) -> Tuple[int, int]:
-        if (
+        if self.image_size_loader is not None:
+            height, width = self.image_size_loader()
+        elif (
             self.use_exif_size
             and "EXIF ExifImageWidth" in self.tags
             and "EXIF ExifImageLength" in self.tags
@@ -116,7 +118,7 @@ class EXIF:
                 int(self.tags["Image ImageLength"].values[0]),
             )
         else:
-            height, width = self.image_size_loader()
+            raise ValueError("Missing image size in EXIF tags or loader.")
         return width, height
 
     def _decode_make_model(self, value) -> str: