From 4d862b0a8b435bbf2614614ca4dcb515e7653465 Mon Sep 17 00:00:00 2001 From: zyphlar Date: Sat, 3 Jan 2026 23:11:25 -0800 Subject: [PATCH] add file to cmake, improve cleanup script, don't install pip Signed-off-by: zyphlar --- .forgejo/workflows/map-generator.yml | 14 +++++++++----- generator/CMakeLists.txt | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/map-generator.yml b/.forgejo/workflows/map-generator.yml index d4d1dc1bd..5389ea83f 100644 --- a/.forgejo/workflows/map-generator.yml +++ b/.forgejo/workflows/map-generator.yml @@ -116,10 +116,15 @@ jobs: cd /mnt/4tbexternal/osm-maps/ # List all dated directories, sort by name (newest first) ls -1d */ 2>/dev/null | grep -E '^[0-9]{4}_[0-9]{2}_[0-9]{2}__[0-9]{2}_[0-9]{2}_[0-9]{2}/$' | while read dir; do - echo "Removing any intermediate data: $dir" - rm -rf "$dir/intermediate_data" - rm -rf "$dir/osm2ft" - rm -rf "$dir/world_roads.o5m" + if [ -d "$dir/intermediate_data" ]; then + echo "Removing $dir/intermediate_data" + fi + if [ -d "$dir/osm2ft" ]; then + echo "Removing $dir/osm2ft" + fi + if [ -f "$dir/world_roads.o5m" ]; then + echo "Removing $dir/world_roads.o5m" + fi done echo "Intermediate data cleaned up." - name: Remove old map builds (keep last 6) @@ -279,7 +284,6 @@ jobs: - name: Install Python dependencies shell: bash run: | - pip install --upgrade pip pip install pyarrow duckdb - name: Download Panoramax Geoparquet shell: bash diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index b1af498d3..3ba4d6348 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -147,6 +147,8 @@ set(SRC osm_o5m_source.hpp osm_source.cpp osm_xml_source.hpp + panoramax_generator.cpp + panoramax_generator.hpp place_processor.cpp place_processor.hpp platform_helpers.cpp