feat: make aruco markers a feature flag

- restore previous globe makers as default. - aruco markers are only used if option flag is set - add aruco markers flag to parameters of parametrized approval tests
GIScience · Nov 12, 2024 · fdd4059 · fdd4059
1 parent 0ec25c9
commit fdd4059
Show file tree

Hide file tree

Showing 116 changed files with 63 additions and 2 deletions.
diff --git a/sketch_map_tool/map_generation/generate_pdf.py b/sketch_map_tool/map_generation/generate_pdf.py
@@ -7,6 +7,7 @@
 import cv2
 import fitz
 from PIL import Image
+from reportlab.graphics import renderPDF
 from reportlab.graphics.shapes import Drawing
 from reportlab.lib.pagesizes import landscape
 from reportlab.lib.styles import ParagraphStyle, getSampleStyleSheet
@@ -32,6 +33,7 @@ def generate_pdf(
     format_: PaperFormat,
     scale: float,
     layer: Layer,
+    aruco_markers: bool = False,
 ) -> Tuple[BytesIO, BytesIO]:
     """
     Generate a sketch map pdf, i.e. a PDF containing the given map image
@@ -89,6 +91,7 @@ def generate_pdf(
         portrait,
         m_per_px,
         img_format,
+        aruco_markers,
     )
 
     map_pdf = BytesIO()
@@ -250,6 +253,7 @@ def create_map_frame(
     portrait: bool,
     m_per_px: float,
     img_format: str,
+    aruco_markers: bool = False,
 ) -> BytesIO:
     map_frame = BytesIO()
     canvas = Canvas(map_frame)
@@ -280,14 +284,65 @@ def create_map_frame(
             width=width,
             height=height,
         )
-        draw_markers(canvas, globe_size, height, width)
+        if aruco_markers:
+            draw_markers(canvas, globe_size, height, width)
+        else:
+            draw_globes(canvas, globe_size, height, width)
         add_scalebar(canvas, width, height, m_per_px, format_)
 
     canvas.save()
     map_frame.seek(0)
     return pdf_page_to_img(map_frame, img_format=img_format)
 
 
+def draw_globes(canvas: Canvas, size: float, height: float, width: float):
+    globe_1, globe_2, globe_3, globe_4 = get_globes(size)
+
+    h = height - size
+    w = width - size
+
+    globes = [
+        # corner
+        globe_1,
+        globe_3,
+        globe_4,
+        globe_2,
+        # middle
+        globe_2,
+        globe_1,
+        globe_3,
+        globe_4,
+    ]
+    positions = [
+        # corner globes
+        # bottom left
+        (0, 0),
+        # top left
+        (0, h),
+        # top right
+        (w, h),
+        # bottom right
+        (w, 0),
+        # middle globes
+        (0, h / 2),
+        (w / 2, h),
+        (w, h / 2),
+        (w / 2, 0),
+    ]
+    for globe, (x, y) in zip(globes, positions):
+        renderPDF.draw(globe, canvas, x, y)
+
+
+def get_globes(expected_size) -> Tuple[Drawing, ...]:
+    """Read globe as SVG from disk, convert to RLG and scale it."""
+    globes = []
+    for i in range(1, 5):
+        globe = svg2rlg(PDF_RESOURCES_PATH / "globe_{0}.svg".format(i))
+        globe = resize_rlg_by_width(globe, expected_size)
+        globes.append(globe)
+    return tuple(globes)
+
+
 def draw_markers(canvas: Canvas, size: float, height: float, width: float):
     markers = get_aruco_markers(int(size))
 

diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png
diff --git a/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png b/...e_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png
diff --git a/...gery-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png b/...gery-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png
diff --git a/...gery-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png b/...gery-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png
diff --git a/...gery-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png b/...gery-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png
diff --git a/...gery-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png b/...gery-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png
diff --git a/...gery-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png b/...gery-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png
diff --git a/...gery-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png b/...gery-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png
diff --git a/...gery-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png b/...gery-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png
diff --git a/...ery-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png b/...ery-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png
diff --git a/...ery-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png b/...ery-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png
diff --git a/...ery-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png b/...ery-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png
diff --git a/...ery-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png b/...ery-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png
diff --git a/...ery-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png b/...ery-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png
diff --git a/...ery-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png b/...ery-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png
diff --git a/...ery-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png b/...ery-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png
diff --git a/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png b/...ate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png
diff --git a/...py::test_generate_pdf_sketch_map[esri-world-imagery-landscape-paper_format0].approved.pdf b/...py::test_generate_pdf_sketch_map[esri-world-imagery-landscape-paper_format0].approved.pdf
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png
diff --git a/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png b/...y::test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png
diff --git a/...[osm-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png b/...[osm-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png
diff --git a/...[osm-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png b/...[osm-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png
diff --git a/...[osm-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png b/...[osm-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png
diff --git a/...[osm-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png b/...[osm-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png
diff --git a/...[osm-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png b/...[osm-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png
diff --git a/...[osm-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png b/...[osm-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png
diff --git a/...[osm-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png b/...[osm-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png
diff --git a/...osm-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png b/...osm-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png
diff --git a/...osm-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png b/...osm-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png
diff --git a/...osm-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png b/...osm-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png
diff --git a/...osm-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png b/...osm-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png
diff --git a/...osm-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png b/...osm-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png
diff --git a/...osm-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png b/...osm-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png
diff --git a/...osm-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png b/...osm-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png
diff --git a/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png b/....py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png
diff --git a/...map_generation.py::test_generate_pdf_sketch_map[osm-landscape-paper_format0].approved.pdf b/...map_generation.py::test_generate_pdf_sketch_map[osm-landscape-paper_format0].approved.pdf
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png
diff --git a/...tch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png b/...tch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png
diff --git a/...gery-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png b/...gery-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png
diff --git a/...gery-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png b/...gery-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png
diff --git a/...gery-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png b/...gery-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png
diff --git a/...gery-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png b/...gery-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png
diff --git a/...gery-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png b/...gery-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png
diff --git a/...gery-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png b/...gery-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png
diff --git a/...gery-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png b/...gery-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png
diff --git a/...ery-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png b/...ery-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png
diff --git a/...ery-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png b/...ery-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png
diff --git a/...ery-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png b/...ery-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png
diff --git a/...ery-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png b/...ery-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png
diff --git a/...ery-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png b/...ery-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png
diff --git a/...ery-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png b/...ery-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png
diff --git a/...ery-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png b/...ery-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png
diff --git a/...ketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png b/...ketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png
diff --git a/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png b/...enerate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png
diff --git a/...[osm-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png b/...[osm-portrait-paper_format0].approved.png → ...alse-portrait-paper_format0].approved.png
diff --git a/...[osm-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png b/...[osm-portrait-paper_format1].approved.png → ...alse-portrait-paper_format1].approved.png
diff --git a/...[osm-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png b/...[osm-portrait-paper_format2].approved.png → ...alse-portrait-paper_format2].approved.png
diff --git a/...[osm-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png b/...[osm-portrait-paper_format3].approved.png → ...alse-portrait-paper_format3].approved.png
diff --git a/...[osm-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png b/...[osm-portrait-paper_format4].approved.png → ...alse-portrait-paper_format4].approved.png
diff --git a/...[osm-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png b/...[osm-portrait-paper_format5].approved.png → ...alse-portrait-paper_format5].approved.png
diff --git a/...[osm-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png b/...[osm-portrait-paper_format6].approved.png → ...alse-portrait-paper_format6].approved.png
diff --git a/...osm-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png b/...osm-landscape-paper_format0].approved.png → ...rue-landscape-paper_format0].approved.png
diff --git a/...osm-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png b/...osm-landscape-paper_format1].approved.png → ...rue-landscape-paper_format1].approved.png
diff --git a/...osm-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png b/...osm-landscape-paper_format2].approved.png → ...rue-landscape-paper_format2].approved.png
diff --git a/...osm-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png b/...osm-landscape-paper_format3].approved.png → ...rue-landscape-paper_format3].approved.png
diff --git a/...osm-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png b/...osm-landscape-paper_format4].approved.png → ...rue-landscape-paper_format4].approved.png
diff --git a/...osm-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png b/...osm-landscape-paper_format5].approved.png → ...rue-landscape-paper_format5].approved.png
diff --git a/...osm-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png b/...osm-landscape-paper_format6].approved.png → ...rue-landscape-paper_format6].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png
diff --git a/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png b/..._generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png
diff --git a/tests/unit/test_map_generation.py b/tests/unit/test_map_generation.py
@@ -49,19 +49,22 @@ def qr_code(uuid, bbox, layer, format_):
 
 @pytest.mark.parametrize("paper_format", [A0, A1, A2, A3, A4, LETTER, TABLOID])
 @pytest.mark.parametrize("orientation", ["landscape", "portrait"])
+@pytest.mark.parametrize("aruco_markers", [True, False])
 def test_generate_pdf_sketch_map(
     map_image,
     qr_code,
     paper_format: PaperFormat,
     orientation,  # pyright: ignore reportUnusedVariable
     layer,
+    aruco_markers,
 ) -> None:
     sketch_map, _ = generate_pdf(
         map_image,
         qr_code,
         paper_format,
         1283.129,
         layer,
+        aruco_markers,
     )
     assert isinstance(sketch_map, BytesIO)
     # NOTE: The resulting PDFs across multiple test runs have slight non-visual
@@ -88,19 +91,22 @@ def test_generate_pdf_sketch_map(
 
 @pytest.mark.parametrize("paper_format", [A0, A1, A2, A3, A4, LETTER, TABLOID])
 @pytest.mark.parametrize("orientation", ["landscape", "portrait"])
-def test_generate_sketch_map_template(
+@pytest.mark.parametrize("aruco_markers", [True, False])
+def test_generate_pdf_sketch_map_template(
     map_image,
     qr_code,
     paper_format: PaperFormat,
     orientation,  # pyright: ignore reportUnusedVariable
     layer,
+    aruco_markers,
 ) -> None:
     _, sketch_map_template = generate_pdf(
         map_image,
         qr_code,
         paper_format,
         1283.129,
         layer,
+        aruco_markers,
     )
     assert isinstance(sketch_map_template, BytesIO)
     # fmt: off