From 9847136adc618566b100cb9aea5d31d18e680cf1 Mon Sep 17 00:00:00 2001 From: Matthias Schaub Date: Wed, 13 Nov 2024 12:51:50 +1300 Subject: [PATCH] tests: save approved files to new directory New directories names are based on the test file names. PytestNamer class for managing approval test file paths got updated accordingly. --- ...approver[esri-world-imagery].approved.geojson} | 0 .../test_smt_approver[osm].approved.geojson} | 0 ...y-False-landscape-paper_format0].approved.png} | Bin ...y-False-landscape-paper_format1].approved.png} | Bin ...y-False-landscape-paper_format2].approved.png} | Bin ...y-False-landscape-paper_format3].approved.png} | Bin ...y-False-landscape-paper_format4].approved.png} | Bin ...y-False-landscape-paper_format5].approved.png} | Bin ...y-False-landscape-paper_format6].approved.png} | Bin ...ry-False-portrait-paper_format0].approved.png} | Bin ...ry-False-portrait-paper_format1].approved.png} | Bin ...ry-False-portrait-paper_format2].approved.png} | Bin ...ry-False-portrait-paper_format3].approved.png} | Bin ...ry-False-portrait-paper_format4].approved.png} | Bin ...ry-False-portrait-paper_format5].approved.png} | Bin ...ry-False-portrait-paper_format6].approved.png} | Bin ...ry-True-landscape-paper_format0].approved.png} | Bin ...ry-True-landscape-paper_format1].approved.png} | Bin ...ry-True-landscape-paper_format2].approved.png} | Bin ...ry-True-landscape-paper_format3].approved.png} | Bin ...ry-True-landscape-paper_format4].approved.png} | Bin ...ry-True-landscape-paper_format5].approved.png} | Bin ...ry-True-landscape-paper_format6].approved.png} | Bin ...ery-True-portrait-paper_format0].approved.png} | Bin ...ery-True-portrait-paper_format1].approved.png} | Bin ...ery-True-portrait-paper_format2].approved.png} | Bin ...ery-True-portrait-paper_format3].approved.png} | Bin ...ery-True-portrait-paper_format4].approved.png} | Bin ...ery-True-portrait-paper_format5].approved.png} | Bin ...ery-True-portrait-paper_format6].approved.png} | Bin ...m-False-landscape-paper_format0].approved.png} | Bin ...m-False-landscape-paper_format1].approved.png} | Bin ...m-False-landscape-paper_format2].approved.png} | Bin ...m-False-landscape-paper_format3].approved.png} | Bin ...m-False-landscape-paper_format4].approved.png} | Bin ...m-False-landscape-paper_format5].approved.png} | Bin ...m-False-landscape-paper_format6].approved.png} | Bin ...sm-False-portrait-paper_format0].approved.png} | Bin ...sm-False-portrait-paper_format1].approved.png} | Bin ...sm-False-portrait-paper_format2].approved.png} | Bin ...sm-False-portrait-paper_format3].approved.png} | Bin ...sm-False-portrait-paper_format4].approved.png} | Bin ...sm-False-portrait-paper_format5].approved.png} | Bin ...sm-False-portrait-paper_format6].approved.png} | Bin ...sm-True-landscape-paper_format0].approved.png} | Bin ...sm-True-landscape-paper_format1].approved.png} | Bin ...sm-True-landscape-paper_format2].approved.png} | Bin ...sm-True-landscape-paper_format3].approved.png} | Bin ...sm-True-landscape-paper_format4].approved.png} | Bin ...sm-True-landscape-paper_format5].approved.png} | Bin ...sm-True-landscape-paper_format6].approved.png} | Bin ...osm-True-portrait-paper_format0].approved.png} | Bin ...osm-True-portrait-paper_format1].approved.png} | Bin ...osm-True-portrait-paper_format2].approved.png} | Bin ...osm-True-portrait-paper_format3].approved.png} | Bin ...osm-True-portrait-paper_format4].approved.png} | Bin ...osm-True-portrait-paper_format5].approved.png} | Bin ...osm-True-portrait-paper_format6].approved.png} | Bin ...y-False-landscape-paper_format0].approved.png} | Bin ...y-False-landscape-paper_format1].approved.png} | Bin ...y-False-landscape-paper_format2].approved.png} | Bin ...y-False-landscape-paper_format3].approved.png} | Bin ...y-False-landscape-paper_format4].approved.png} | Bin ...y-False-landscape-paper_format5].approved.png} | Bin ...y-False-landscape-paper_format6].approved.png} | Bin ...ry-False-portrait-paper_format0].approved.png} | Bin ...ry-False-portrait-paper_format1].approved.png} | Bin ...ry-False-portrait-paper_format2].approved.png} | Bin ...ry-False-portrait-paper_format3].approved.png} | Bin ...ry-False-portrait-paper_format4].approved.png} | Bin ...ry-False-portrait-paper_format5].approved.png} | Bin ...ry-False-portrait-paper_format6].approved.png} | Bin ...ry-True-landscape-paper_format0].approved.png} | Bin ...ry-True-landscape-paper_format1].approved.png} | Bin ...ry-True-landscape-paper_format2].approved.png} | Bin ...ry-True-landscape-paper_format3].approved.png} | Bin ...ry-True-landscape-paper_format4].approved.png} | Bin ...ry-True-landscape-paper_format5].approved.png} | Bin ...ry-True-landscape-paper_format6].approved.png} | Bin ...ery-True-portrait-paper_format0].approved.png} | Bin ...ery-True-portrait-paper_format1].approved.png} | Bin ...ery-True-portrait-paper_format2].approved.png} | Bin ...ery-True-portrait-paper_format3].approved.png} | Bin ...ery-True-portrait-paper_format4].approved.png} | Bin ...ery-True-portrait-paper_format5].approved.png} | Bin ...ery-True-portrait-paper_format6].approved.png} | Bin ...m-False-landscape-paper_format0].approved.png} | Bin ...m-False-landscape-paper_format1].approved.png} | Bin ...m-False-landscape-paper_format2].approved.png} | Bin ...m-False-landscape-paper_format3].approved.png} | Bin ...m-False-landscape-paper_format4].approved.png} | Bin ...m-False-landscape-paper_format5].approved.png} | Bin ...m-False-landscape-paper_format6].approved.png} | Bin ...sm-False-portrait-paper_format0].approved.png} | Bin ...sm-False-portrait-paper_format1].approved.png} | Bin ...sm-False-portrait-paper_format2].approved.png} | Bin ...sm-False-portrait-paper_format3].approved.png} | Bin ...sm-False-portrait-paper_format4].approved.png} | Bin ...sm-False-portrait-paper_format5].approved.png} | Bin ...sm-False-portrait-paper_format6].approved.png} | Bin ...sm-True-landscape-paper_format0].approved.png} | Bin ...sm-True-landscape-paper_format1].approved.png} | Bin ...sm-True-landscape-paper_format2].approved.png} | Bin ...sm-True-landscape-paper_format3].approved.png} | Bin ...sm-True-landscape-paper_format4].approved.png} | Bin ...sm-True-landscape-paper_format5].approved.png} | Bin ...sm-True-landscape-paper_format6].approved.png} | Bin ...osm-True-portrait-paper_format0].approved.png} | Bin ...osm-True-portrait-paper_format1].approved.png} | Bin ...osm-True-portrait-paper_format2].approved.png} | Bin ...osm-True-portrait-paper_format3].approved.png} | Bin ...osm-True-portrait-paper_format4].approved.png} | Bin ...osm-True-portrait-paper_format5].approved.png} | Bin ...osm-True-portrait-paper_format6].approved.png} | Bin .../test_get_aruco_makers.[0].approved.npy} | Bin .../test_get_aruco_makers.[1].approved.npy} | Bin .../test_get_aruco_makers.[2].approved.npy} | Bin .../test_get_aruco_makers.[3].approved.npy} | Bin .../test_get_aruco_makers.[4].approved.npy} | Bin .../test_get_aruco_makers.[5].approved.npy} | Bin .../test_get_aruco_makers.[6].approved.npy} | Bin .../test_get_aruco_makers.[7].approved.npy} | Bin tests/namer.py | 14 ++++++++------ 123 files changed, 8 insertions(+), 6 deletions(-) rename tests/fixtures/approved/{test_approval-test_smt_approver-esri-world-imagery.approved.txt => test_approval/test_smt_approver[esri-world-imagery].approved.geojson} (100%) rename tests/fixtures/approved/{test_approval-test_smt_approver-osm.approved.txt => test_approval/test_smt_approver[osm].approved.geojson} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png => test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[0].approved.npy => test_map_generation/test_get_aruco_makers.[0].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[1].approved.npy => test_map_generation/test_get_aruco_makers.[1].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[2].approved.npy => test_map_generation/test_get_aruco_makers.[2].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[3].approved.npy => test_map_generation/test_get_aruco_makers.[3].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[4].approved.npy => test_map_generation/test_get_aruco_makers.[4].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[5].approved.npy => test_map_generation/test_get_aruco_makers.[5].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[6].approved.npy => test_map_generation/test_get_aruco_makers.[6].approved.npy} (100%) rename tests/fixtures/approved/{test_map_generation.py::test_get_aruco_makers.[7].approved.npy => test_map_generation/test_get_aruco_makers.[7].approved.npy} (100%) diff --git a/tests/fixtures/approved/test_approval-test_smt_approver-esri-world-imagery.approved.txt b/tests/fixtures/approved/test_approval/test_smt_approver[esri-world-imagery].approved.geojson similarity index 100% rename from tests/fixtures/approved/test_approval-test_smt_approver-esri-world-imagery.approved.txt rename to tests/fixtures/approved/test_approval/test_smt_approver[esri-world-imagery].approved.geojson diff --git a/tests/fixtures/approved/test_approval-test_smt_approver-osm.approved.txt b/tests/fixtures/approved/test_approval/test_smt_approver[osm].approved.geojson similarity index 100% rename from tests/fixtures/approved/test_approval-test_smt_approver-osm.approved.txt rename to tests/fixtures/approved/test_approval/test_smt_approver[osm].approved.geojson diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-False-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[esri-world-imagery-True-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-False-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map[osm-True-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-False-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[esri-world-imagery-True-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-False-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-landscape-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format0].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format1].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format2].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format3].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format4].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format5].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png b/tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png rename to tests/fixtures/approved/test_map_generation/test_generate_pdf_sketch_map_template[osm-True-portrait-paper_format6].approved.png diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[0].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[0].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[0].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[0].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[1].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[1].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[1].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[1].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[2].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[2].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[2].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[2].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[3].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[3].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[3].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[3].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[4].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[4].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[4].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[4].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[5].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[5].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[5].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[5].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[6].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[6].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[6].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[6].approved.npy diff --git a/tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[7].approved.npy b/tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[7].approved.npy similarity index 100% rename from tests/fixtures/approved/test_map_generation.py::test_get_aruco_makers.[7].approved.npy rename to tests/fixtures/approved/test_map_generation/test_get_aruco_makers.[7].approved.npy diff --git a/tests/namer.py b/tests/namer.py index f0349fb9..cb50ddb7 100644 --- a/tests/namer.py +++ b/tests/namer.py @@ -20,17 +20,19 @@ def __init__(self, extension=None): consist of the nodeid and the current stage: `relative/path/to/test_file.py::TestClass::test_func[a] (call)` """ + # pytest node ID w/out directories + self.nodeid = os.environ["PYTEST_CURRENT_TEST"].split("/")[-1] NamerBase.__init__(self, extension) def get_file_name(self) -> str: - # TODO: name clashes are possible. - # Include dir names (except tests/integration/) to avoid name clashes - nodeid = os.environ["PYTEST_CURRENT_TEST"] - nodeid_without_dir = nodeid.split("/")[-1] - return nodeid_without_dir.replace(" (call)", "") + """File name is pytest nodeid w/out file name and ` (call)` postfix.""" + return self.nodeid.split("::")[1].replace(" (call)", "") def get_directory(self) -> Path: - return APPROVED_DIR + """Directory is `tests/fixtures/approval/{file_name}/`.""" + # TODO: name clashes are possible. + # Include dir names (except tests/integration/) to avoid name clashes + return APPROVED_DIR / self.nodeid.split("::")[0].replace(".py", "") def get_config(self) -> dict: return {}