feat(map_generation): use aruco markers on sketch map

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
   # Python
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.4.7
+    rev: v0.7.3
     hooks:
       # Run the linter.
       - id: ruff

pyproject.toml

@@ -6,7 +6,7 @@ authors = ["HeiGIT <info@heigit.org>"]
 license = "GNU Affero General Public License v3.0"
 
 [tool.poetry.dependencies]
-python="^3.11.0"
+python=">= 3.11, < 3.13"
 Flask = "^2.2.5"
 waitress = "^2.1.2"
 requests = "^2.28.1"
@@ -15,7 +15,7 @@ matplotlib = "^3.5.3"
 reportlab = "^3.6.11"
 toml = "^0.10.2"
 celery = {extras = ["SQLAlchemy", "redis"], version = "^5.2.7"}
-opencv-python-headless = "^4.10.0.84"
+opencv-python-headless = "<4.8.0.76" # https://github.com/ultralytics/ultralytics/issues/893
 qrcode = "^7.3.1"
 svglib = "^1.4.1"
 PyMuPDF = {extras = ["Pillow"], version = "^1.21.0"}
@@ -39,11 +39,11 @@ torchvision = [
     { version = "^0.19.0+cpu", source = "pytorch-cpu", platform = "linux" },
     { version = "^0.19.0", source = "pypi", platform = "darwin"}
 ]
-"sam 2" = { git = "https://github.com/facebookresearch/segment-anything-2.git" }
+"sam-2" = { git = "https://github.com/facebookresearch/segment-anything-2.git" }
 setuptools = "^72.2.0"  # dependencies of gdal
-numpy = "^2.0.1"  # dependencies of gdal
 wheel = "^0.43.0"  # dependencies of gdal
 flower = "^2.0.1"
+numpy = "<2"  # dependency of gdal and opencv
 
 [tool.poetry.group.dev.dependencies]
 # Versions are fixed to match versions used by pre-commit
@@ -56,12 +56,12 @@ vcrpy = "^4.2.1"
 pytest-celery = "^1.0.1"
 locust = "^2.14.2"
 hypothesis = "^6.88.4"
-ruff = "^0.4.7"
+ruff = "^0.7.3"
 approvaltests = "^12.0.0"
 matplotlib = "^3.8.4"
 geopandas = "^1.0.1"
 testcontainers = {extras = ["postgres", "redis"], version = "^4.7.1"}
-opencv-python = "^4.6.0"
+opencv-python = "<4.8.0.76"
 psycopg2-binary = "^2.9.9" # dev only. In prod psycopg2 (non-binary) depending on system libraries (libpg) is used.
 
 

sketch_map_tool/database/client_celery.py

@@ -39,6 +39,7 @@ def insert_map_frame(
     format_: PaperFormat,
     orientation: str,
     layer: Layer,
+    aruco: bool,
 ):
     """Insert map frame alongside map generation parameters into the database.
 
@@ -56,6 +57,7 @@ def insert_map_frame(
             orientation VARCHAR,
             layer VARCHAR,
             version VARCHAR,
+            aruco BOOLEAN DEFAULT FALSE,
             ts TIMESTAMP WITH TIME ZONE DEFAULT now()
             )
     """
@@ -69,6 +71,7 @@ def insert_map_frame(
             format,
             orientation,
             layer,
+            aruco,
             version
             )
         VALUES (
@@ -80,6 +83,7 @@ def insert_map_frame(
             %s,
             %s,
             %s,
+            %s,
             %s)
     """
     with db_conn.cursor() as curs:
@@ -95,6 +99,7 @@ def insert_map_frame(
                 str(format_),
                 orientation,
                 layer,
+                aruco,
                 __version__,
             ),
         )