tests: use real photos of marked sketch map

instead of rendering digital marking onto sketch maps.

Author: matthiasschaub

tests/comparator.py

@@ -17,17 +17,27 @@ def compare(self, received_path: str, approved_path: str) -> bool:
         df_received = geopandas.read_file(received_path).to_crs("EPSG:8857")
         df_approved = geopandas.read_file(approved_path).to_crs("EPSG:8857")
 
-        if len(df_approved.index) != len(df_received.index):
-            print("Different numbers of features detected.")
+        df_received_points = df_received[df_received.geometry.type == "Point"]
+        df_approved_points = df_approved[df_approved.geometry.type == "Point"]
+
+        df_approved_polygons = df_approved[df_approved.geometry.type == "Polygon"]
+        df_received_polygons = df_received[df_received.geometry.type == "Polygon"]
+
+        if len(df_approved_polygons.index) != len(df_received_polygons.index):
+            logging.warning("Different number of polygon features detected.")
+            return False
+
+        if len(df_approved_points.index) != len(df_received_points.index):
+            logging.warning("Different number of point features detected.")
             return False
 
         # NOTE: Hausdorff distance might be better to determine similarity
-        area_diff = df_received.symmetric_difference(df_approved).area
-        area_union = df_received.union(df_approved).area
+        area_diff = df_received_polygons.symmetric_difference(df_approved_polygons).area
+        area_union = df_received_polygons.union(df_approved_polygons).area
         diff = area_diff / area_union
         for d in diff.tolist():
-            if d > 0.05:
-                logging.warning(f"Area differs more by {d:.0%}")
+            if d > 0.1:
+                logging.warning(f"Area differs by more than {d:.0%}")
                 return False
         return True
 

tests/fixtures/sketch-map-marked-esri-world-imagery.jpg

@@ -1,18 +1,17 @@
 import json
 from dataclasses import astuple
 from io import BytesIO
-from typing import Generator
+from pathlib import Path
 from types import MappingProxyType
+from typing import Generator
 from uuid import UUID
 
-import fitz
 import pytest
 from celery.contrib.testing.tasks import ping  # noqa: F401
 from flask import Flask
 from flask.testing import FlaskClient
 from flask_babel import Babel
 from numpy.typing import NDArray
-from PIL import Image, ImageOps
 from testcontainers.postgres import PostgresContainer
 from testcontainers.redis import RedisContainer
 
@@ -27,9 +26,9 @@
 #   are registered correctly.
 from sketch_map_tool.routes import app as smt_flask_app
 from sketch_map_tool.upload_processing import clip
+from sketch_map_tool.upload_processing.qr_code_reader import read_qr_code
 from tests import FIXTURE_DIR
 from tests import vcr_app as vcr
-from sketch_map_tool.upload_processing.qr_code_reader import read_qr_code
 
 
 #
@@ -261,31 +260,19 @@ def map_frame(uuid_create, flask_app, tmp_path_factory) -> BytesIO:
 
 
 @pytest.fixture(scope="session")
-def sketch_map_marked(uuid_create, sketch_map, tmp_path_factory) -> bytes:
-    """Sketch map with markings as PNG."""
-    # TODO: increase resolution of PNG
-    path = tmp_path_factory.getbasetemp() / uuid_create / "sketch-map-marked.png"
-
-    # Convert PDF to PNG
-    pdf = fitz.open(stream=sketch_map)  # type: ignore
-    pag = pdf.load_page(0)
-    mat = fitz.Matrix(2, 2)
-    pag.get_pixmap(matrix=mat).save(path, output="png")
-
-    # Draw shapes on PNG (Sketch Map)
-    img1 = Image.open(path)  # Sketch Map (primary image)
-    img2 = Image.open(
-        FIXTURE_DIR / "upload-processing" / "markings-transparent.png"
-    )  # Markings (overlay image)
-    img2 = ImageOps.cover(img2, img1.size)  # type: ignore
-    img1.paste(img2, (0, 0), mask=img2)  # Overlay images starting at 0, 0
-
-    # Displaying the image
-    # img1.show()
-
-    # TODO: what should be the return type of the fixture?
-    img1.save(path)
-    with open(path, "rb") as file:
+def sketch_map_marked_path(layer) -> Path:
+    """Photo of the sketch map with markings."""
+    return FIXTURE_DIR / f"sketch-map-marked-{layer}.jpg"
+
+
+@pytest.fixture(scope="session")
+def sketch_map_marked(sketch_map_marked_path) -> bytes:
+    """Photo of the sketch map with markings."""
+    # NOTE: If you want to change the markings of this fixture:
+    #   (1) Run tests. (2) Print PDF written to tmp dir by uuid_create fixture.
+    #   (3) Put markings on printout. (4) Make a photo.
+    #   (5) put photo file in fixture dir.
+    with open(sketch_map_marked_path, "rb") as file:
         return file.read()
 
 
@@ -352,9 +339,13 @@ def read_qr_code_(image):
 
 
 @pytest.fixture(scope="session")
-def vector(uuid_digitize, tmp_path_factory) -> bytes:
-    path = tmp_path_factory.getbasetemp() / uuid_digitize / "vector.geojson"
-    with open(path, "rb") as file:
+def vector_path(uuid_digitize, tmp_path_factory) -> Path:
+    return tmp_path_factory.getbasetemp() / uuid_digitize / "vector.geojson"
+
+
+@pytest.fixture(scope="session")
+def vector(vector_path) -> bytes:
+    with open(vector_path, "rb") as file:
         return file.read()
 
 

tests/fixtures/sketch-map-marked-oam:59e62beb3d6412ef7220c58e.jpg

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import pytest
 from approvaltests import Options, verify_binary
 
@@ -7,22 +9,17 @@
 
 
 @pytest.fixture(scope="session")
-def vector_path(tmp_path_factory, uuid_digitize) -> bytes:
+def vector_path(tmp_path_factory, uuid_digitize) -> Path:
     return tmp_path_factory.getbasetemp() / uuid_digitize / "vector.geojson"
 
 
-@pytest.mark.usefixtures("sketch_map_marked")
-@pytest.fixture(scope="session")
-def sketch_map_marked_path(tmp_path_factory, uuid_create) -> bytes:
-    return tmp_path_factory.getbasetemp() / uuid_create / "sketch-map-marked.png"
-
-
-def test_smt_approver(sketch_map_marked_path, vector_path, layer):
+def test_smt_approver(sketch_map_marked_path, vector_path):
     options = (
         Options()
         .with_reporter(SketchMapToolReporter(sketch_map=sketch_map_marked_path))
         .with_comparator(GeoJSONComparator())
         .with_namer(PytestNamer())
     )
     with open(vector_path, "rb") as f:
+        # TODO: One false positives for OAM based sketch map
         verify_binary(f.read(), ".geojson", options=options)

tests/fixtures/sketch-map-marked-osm.jpg

@@ -81,14 +81,17 @@ def test_detect_markings(
         yolo_cls,
         sam_predictor,
     )
-    if layer.startswith("esri"):
-        # TODO: one marking for esri layer is not detected
+    if layer.startswith("osm"):
+        assert len(markings) == 8
+    elif layer.startswith("esri"):
+        assert len(markings) == 9
+    elif layer.startswith("oam"):
         assert len(markings) == 5
     else:
-        assert len(markings) == 6
+        raise ValueError("Not reachable")
 
     # NOTE: uncomment for manual/visual assessment of detected markings
-    show_bbox_of_markings(map_frame_marked, markings)
+    # show_bbox_of_markings(map_frame_marked, markings)
 
 
 def show_bbox_of_markings(map_frame_marked, markings):