fix: pmtile basemap generation and remove temp workarounds (#1535)

* build: update osm-fieldwork --> 0.10.0 for pmtile fix

* build: remove go-pmtiles binary from docker image

* fix: simplify basemap creation code to remove pmtile workaround

src/backend/Dockerfile

@@ -17,7 +17,6 @@
 ARG PYTHON_IMG_TAG=3.10
 ARG MINIO_TAG=${MINIO_TAG:-RELEASE.2024-01-01T16-36-33Z}
 FROM docker.io/minio/minio:${MINIO_TAG} as minio
-FROM docker.io/protomaps/go-pmtiles:v1.19.0 as go-pmtiles
 
 
 # Includes all labels and timezone info to extend from
@@ -121,9 +120,6 @@ RUN set -ex \
     && rm -rf /var/lib/apt/lists/*
 # Copy minio mc client
 COPY --from=minio /usr/bin/mc /usr/local/bin/
-# Copy go-pmtiles until for mbtiles-->pmtiles conversion
-# FIXME osm-fieldwork should do this, but is currently broken
-COPY --from=go-pmtiles /go-pmtiles /usr/local/bin/pmtiles
 COPY *-entrypoint.sh /
 ENTRYPOINT ["/app-entrypoint.sh"]
 # Copy Python deps from build to runtime

src/backend/app/projects/project_crud.py

@@ -18,7 +18,6 @@
 """Logic for FMTM project routes."""
 
 import json
-import subprocess
 import uuid
 from asyncio import gather
 from io import BytesIO
@@ -1484,32 +1483,15 @@ def get_project_tiles(
             f"tms={tms}"
         )
 
-        # TODO replace this temp workaround with osm-fieldwork code
-        # TODO to generate pmtiles directly instead of with go-pmtiles
-        if output_format == "pmtiles":
-            create_basemap_file(
-                boundary=f"{min_lon},{min_lat},{max_lon},{max_lat}",
-                outfile=outfile.replace("pmtiles", "mbtiles"),
-                zooms=zooms,
-                outdir=tiles_dir,
-                source=source,
-                xy=False,
-                tms=tms,
-            )
-            subprocess.call(
-                "pmtiles convert " f"{outfile.replace('pmtiles', 'mbtiles')} {outfile}",
-                shell=True,
-            )
-        else:
-            create_basemap_file(
-                boundary=f"{min_lon},{min_lat},{max_lon},{max_lat}",
-                outfile=outfile,
-                zooms=zooms,
-                outdir=tiles_dir,
-                source=source,
-                xy=False,
-                tms=tms,
-            )
+        create_basemap_file(
+            boundary=f"{min_lon},{min_lat},{max_lon},{max_lat}",
+            outfile=outfile,
+            zooms=zooms,
+            outdir=tiles_dir,
+            source=source,
+            xy=False,
+            tms=tms,
+        )
 
         log.info(f"Basemap created for project ID {project_id}: {outfile}")
 

src/backend/pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "cryptography>=42.0.1",
     "defusedxml>=0.7.1",
     "osm-login-python==1.0.3",
-    "osm-fieldwork==0.9.2",
+    "osm-fieldwork==0.10.0",
     "osm-rawdata==0.3.0",
     "fmtm-splitter==1.2.1",
 ]