adam-ce · Oct 14, 2026 · Sep 6, 2026 · Sep 6, 2026 · Sep 8, 2026 · Sep 10, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
             build_type: Release
             sanitizer: normal
             warnings_as_errors: ON
-            cmake_flags: ""
+            cmake_flags: -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized
           - name: clang-23-asan
             cc: clang-23
             cxx: clang++-23
@@ -188,13 +188,14 @@ jobs:
         export GDAL_DATA="${{ github.workspace }}/build/alp_external/gdal/share/gdal"
         if [[ "${{ matrix.sanitizer }}" == "asan" ]]; then
           export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-23
+          export ASAN_OPTIONS="detect_leaks=1:halt_on_error=1"
+          export UBSAN_OPTIONS="halt_on_error=1:print_stacktrace=1:suppressions=${{ github.workspace }}/misc/suppression/ubsan.txt"
         fi
         if [[ "${{ matrix.sanitizer }}" == "tsan" ]]; then
-          export TSAN_OPTIONS="suppressions=${{ github.workspace }}/extern/tbb/cmake/suppressions/tsan.suppressions"
+          export TSAN_OPTIONS="suppressions=${{ github.workspace }}/misc/suppression/tsan.txt"
         fi
         status=0
         ./unittests/unittests_terrainlib "~mesh::clip_on_bounds benchmark" || status=$?
-        ./unittests/unittests_tilebuilder || status=$?
         ./unittests/unittests_sfbuilder || status=$?
         ./unittests/unittests_dagbuilder || status=$?
         ./unittests/unittests_sfmerger || status=$?

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,89 +1,19 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.25)
 
 project(alpine-terrain-builder LANGUAGES C CXX)
 
 # Executable targets
-option(ALP_BUILD_TILE_BUILDER "Build tile-builder" ON)
-option(ALP_BUILD_SF_MERGER "Build sf-merger" ON)
-option(ALP_BUILD_SF_BUILDER "Build sf-builder" ON)
-option(ALP_BUILD_TILE_DOWNLOADER "Build tile-downloader" ON)
-option(ALP_BUILD_MESH_CONVERT "Build mesh-convert" ON)
-option(ALP_BUILD_SF_INDEX_BROWSER "Build sf-index-browser" ON)
-option(ALP_BUILD_DAG_BUILDER "Build dag-builder" ON)
-option(ALP_BUILD_DAG_CONVERT_DEBUG "Build dag-convert-debug" ON)
-option(ALP_BUILD_SF_BROWSER "Build sf-browser" ON)
-option(ALP_BUILD_UNITTESTS "Build unit tests for enabled components" ON)
-
-# Project configuration
-option(ALP_ENABLE_THREAD_SANITIZER "Compile with ThreadSanitizer enabled" OFF)
-option(ALP_ENABLE_ADDRESS_SANITIZER "Compile with AddressSanitizer enabled" OFF)
-option(ALP_ENABLE_OVERVIEW_READING "Enable GDAL overview reading (broken with newer GDAL versions)" OFF)
-option(ALP_ENABLE_UNITY_BUILD "Enable unity (jumbo) builds to speed compilation" OFF)
-option(ALP_WARNINGS_AS_ERRORS "Treat first-party compiler warnings as errors" OFF)
-
-set(ALP_ENABLE_ASSERTS_DEFAULT OFF)
-if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
-    set(ALP_ENABLE_ASSERTS_DEFAULT ON)
-endif()
-option(ALP_ENABLE_ASSERTS "Do not define NDEBUG, i.e., enable asserts" ${ALP_ENABLE_ASSERTS_DEFAULT})
-
-set(ALP_UNITY_BUILD_BATCH_SIZE 4 CACHE STRING "Number of source files per unity translation unit")
-set(ALP_RELEASE_OPT_LEVEL "3" CACHE STRING "Optimization level (0=O0,1=O1,2=O2,3=O3)")
-set(ALP_DEPENDENCIES_N_BUILD_JOBS "" CACHE STRING
-    "Maximum number of parallel jobs for independently built CMake dependencies")
-
-# Unit-test configuration
-option(ALP_UNITTESTS_EXTENDED "Perform extended unit tests (they take long)" OFF)
-option(ALP_UNITTESTS_DEBUG_IMAGES "Output debug height images for visual comparison" OFF)
-set(ALP_UNITTESTS_AUSTRIA_HIGHRES "" CACHE FILEPATH "Path to the high resolution Austrian terrain dataset")
-
-if(ALP_ENABLE_ADDRESS_SANITIZER AND ALP_ENABLE_THREAD_SANITIZER)
-    message(FATAL_ERROR "Cannot enable both AddressSanitizer and ThreadSanitizer")
-endif()
-
-set(ALP_SANITIZER_FLAGS)
-if(ALP_ENABLE_ADDRESS_SANITIZER)
-    message(STATUS "AddressSanitizer enabled")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        set(ALP_SANITIZER_FLAGS -fsanitize=address -fsanitize=leak -fsanitize=undefined -fno-omit-frame-pointer -g)
-        add_compile_options(${ALP_SANITIZER_FLAGS})
-        add_link_options(${ALP_SANITIZER_FLAGS})
-    else()
-        message(WARNING "ALP_ENABLE_ADDRESS_SANITIZER set but compiler is not GCC/Clang; ignoring")
-    endif()
-endif()
-
-if(ALP_ENABLE_THREAD_SANITIZER)
-    if(CMAKE_BUILD_TYPE STREQUAL "Release")
-        message(WARNING "ThreadSanitizer is not recommended with Release builds. Use Debug or RelWithDebInfo for accurate race detection.")
-    endif()
-    message(STATUS "ThreadSanitizer enabled")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        set(ALP_SANITIZER_FLAGS -fsanitize=thread -fno-omit-frame-pointer -fno-optimize-sibling-calls -g)
-        add_compile_options(${ALP_SANITIZER_FLAGS})
-        add_link_options(${ALP_SANITIZER_FLAGS})
-    else()
-        message(WARNING "ALP_ENABLE_THREAD_SANITIZER set but compiler is not GCC/Clang; ignoring")
-    endif()
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    message(STATUS "Using optimization level ${ALP_RELEASE_OPT_LEVEL}")
-    add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-O${ALP_RELEASE_OPT_LEVEL}>)
-endif()
-
-# Compiler launchers must be configured before targets are created.
-find_program(SCCACHE_PROGRAM sccache)
-find_program(CCACHE_PROGRAM ccache)
-if(SCCACHE_PROGRAM)
-    message(STATUS "Using sccache as compiler launcher: ${SCCACHE_PROGRAM}")
-    set(CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
-    set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
-elseif(CCACHE_PROGRAM)
-    message(STATUS "Using ccache as compiler launcher: ${CCACHE_PROGRAM}")
-    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
-    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
-endif()
+option(ALP_BUILD_SF_MERGER "Build sf-merger" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_SF_BUILDER "Build sf-builder" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_TILE_DOWNLOADER "Build tile-downloader" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_MESH_CONVERT "Build mesh-convert" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_SF_INDEX_BROWSER "Build sf-index-browser" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_DAG_BUILDER "Build dag-builder" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_DAG_CONVERT_DEBUG "Build dag-convert-debug" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_SF_BROWSER "Build sf-browser" ${PROJECT_IS_TOP_LEVEL})
+option(ALP_BUILD_UNITTESTS "Build unit tests for enabled components" ${PROJECT_IS_TOP_LEVEL})
+
+include(cmake/ConfigureBuild.cmake)
 
 include(cmake/AddRepo.cmake)
 include(cmake/SetupCMakeProject.cmake)

diff --git a/NOTICE b/NOTICE
diff --git a/README.md b/README.md
@@ -1,3 +1,38 @@
 # alpine-terrain-builder
 
 See the project [code style](docs/code-style.md) before contributing.
+
+The RF import, merge, and image-export tools live in
+[tile-foundry](https://github.com/AlpineMapsOrg/tile-foundry).
+This repository provides their `terrainlib` dependency, including raster-store.
+
+When included as a CMake subproject, tools and tests default to disabled.
+Enable individual `ALP_BUILD_*` options explicitly when needed.
+
+Sanitizer exclusions are maintained in `misc/suppression/`. CI's ASan job also
+enables UBSan and loads [ubsan.txt](misc/suppression/ubsan.txt) for the known CGAL
+arrangement downcasts and the ignored old Boolean value in
+`set_with_guarantees()`. These exclusions leave those upstream issues unfixed;
+address checks, leak detection and unrelated undefined-behavior checks remain
+enabled.
+
+To use the same UBSan exclusions locally, set these variables from the repository
+root before running an ASan test executable:
+
+```sh
+export ASAN_OPTIONS="detect_leaks=1:halt_on_error=1"
+export UBSAN_OPTIONS="halt_on_error=1:print_stacktrace=1:suppressions=$PWD/misc/suppression/ubsan.txt"
+```
+
+Ensure `llvm-symbolizer` is available on `PATH`, or set `ASAN_SYMBOLIZER_PATH` to
+its absolute path, so the function-specific exclusion can match.
+
+CI's TSan job loads [tsan.txt](misc/suppression/tsan.txt), containing the two
+oneTBB initialization exclusions and GDAL's unlocked cache-head comparison in
+`GDALRasterBlock::Touch()`. The GDAL race is accepted without patching the
+dependency; the suppression matches any race with that function in its stack.
+For local TSan tests, set this variable from the repository root:
+
+```sh
+export TSAN_OPTIONS="suppressions=$PWD/misc/suppression/tsan.txt"
+```
diff --git a/cmake/ConfigureBuild.cmake b/cmake/ConfigureBuild.cmake
@@ -0,0 +1,70 @@
+include_guard(GLOBAL)
+
+# Project configuration
+option(ALP_ENABLE_THREAD_SANITIZER "Compile with ThreadSanitizer enabled" OFF)
+option(ALP_ENABLE_ADDRESS_SANITIZER "Compile with AddressSanitizer enabled" OFF)
+option(ALP_ENABLE_UNITY_BUILD "Enable unity (jumbo) builds to speed compilation" OFF)
+option(ALP_WARNINGS_AS_ERRORS "Treat first-party compiler warnings as errors" OFF)
+
+set(ALP_ENABLE_ASSERTS_DEFAULT OFF)
+if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+    set(ALP_ENABLE_ASSERTS_DEFAULT ON)
+endif()
+option(ALP_ENABLE_ASSERTS "Do not define NDEBUG, i.e., enable asserts" ${ALP_ENABLE_ASSERTS_DEFAULT})
+
+set(ALP_UNITY_BUILD_BATCH_SIZE 4 CACHE STRING "Number of source files per unity translation unit")
+set(ALP_RELEASE_OPT_LEVEL "3" CACHE STRING "Optimization level (0=O0,1=O1,2=O2,3=O3)")
+set(ALP_DEPENDENCIES_N_BUILD_JOBS "" CACHE STRING
+    "Maximum number of parallel jobs for independently built CMake dependencies")
+
+# Unit-test configuration
+option(ALP_UNITTESTS_EXTENDED "Perform extended unit tests (they take long)" OFF)
+option(ALP_UNITTESTS_DEBUG_IMAGES "Output debug height images for visual comparison" OFF)
+
+if(ALP_ENABLE_ADDRESS_SANITIZER AND ALP_ENABLE_THREAD_SANITIZER)
+    message(FATAL_ERROR "Cannot enable both AddressSanitizer and ThreadSanitizer")
+endif()
+
+set(ALP_SANITIZER_FLAGS)
+if(ALP_ENABLE_ADDRESS_SANITIZER)
+    message(STATUS "AddressSanitizer enabled")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        set(ALP_SANITIZER_FLAGS -fsanitize=address -fsanitize=leak -fsanitize=undefined -fno-omit-frame-pointer -g)
+        add_compile_options(${ALP_SANITIZER_FLAGS})
+        add_link_options(${ALP_SANITIZER_FLAGS})
+    else()
+        message(WARNING "ALP_ENABLE_ADDRESS_SANITIZER set but compiler is not GCC/Clang; ignoring")
+    endif()
+endif()
+
+if(ALP_ENABLE_THREAD_SANITIZER)
+    if(CMAKE_BUILD_TYPE STREQUAL "Release")
+        message(WARNING "ThreadSanitizer is not recommended with Release builds. Use Debug or RelWithDebInfo for accurate race detection.")
+    endif()
+    message(STATUS "ThreadSanitizer enabled")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        set(ALP_SANITIZER_FLAGS -fsanitize=thread -fno-omit-frame-pointer -fno-optimize-sibling-calls -g)
+        add_compile_options(${ALP_SANITIZER_FLAGS})
+        add_link_options(${ALP_SANITIZER_FLAGS})
+    else()
+        message(WARNING "ALP_ENABLE_THREAD_SANITIZER set but compiler is not GCC/Clang; ignoring")
+    endif()
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    message(STATUS "Using optimization level ${ALP_RELEASE_OPT_LEVEL}")
+    add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-O${ALP_RELEASE_OPT_LEVEL}>)
+endif()
+
+# Compiler launchers must be configured before targets are created.
+find_program(SCCACHE_PROGRAM sccache)
+find_program(CCACHE_PROGRAM ccache)
+if(SCCACHE_PROGRAM)
+    message(STATUS "Using sccache as compiler launcher: ${SCCACHE_PROGRAM}")
+    set(CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
+    set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
+elseif(CCACHE_PROGRAM)
+    message(STATUS "Using ccache as compiler launcher: ${CCACHE_PROGRAM}")
+    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+endif()
diff --git a/cmake/SetupGDAL.cmake b/cmake/SetupGDAL.cmake
@@ -57,6 +57,7 @@ function(alp_setup_gdal)
             -DBUILD_CSHARP_BINDINGS=OFF
             -DGDAL_USE_ICONV=OFF
             -DGDAL_USE_EXTERNAL_LIBS=OFF
+            -DGDAL_USE_CURL=ON
             -DGDAL_USE_GEOS=ON
             -DGDAL_USE_SQLITE3=ON
             "-DCMAKE_INSTALL_RPATH=\$ORIGIN/../../proj/lib"

diff --git a/cmake/SetupJpegXL.cmake b/cmake/SetupJpegXL.cmake
@@ -0,0 +1,59 @@
+#############################################################################
+# AlpineMaps.org
+# Copyright (C) 2026 Adam Celarek <family name at cg tuwien ac at>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+
+if(NOT COMMAND alp_setup_cmake_project)
+    include(${CMAKE_CURRENT_LIST_DIR}/SetupCMakeProject.cmake)
+endif()
+
+# libjxl installs only pkg-config files. JpegXL::jxl is therefore defined from
+# the static libraries of the install, which also contains highway and brotli.
+function(alp_setup_jpegxl version)
+    alp_setup_cmake_project(libjxl
+        URL https://github.com/libjxl/libjxl.git COMMITISH ${version}
+        CMAKE_ARGUMENTS
+            -DBUILD_SHARED_LIBS=OFF
+            -DBUILD_TESTING=OFF
+            -DJPEGXL_ENABLE_TOOLS=OFF
+            -DJPEGXL_ENABLE_FUZZERS=OFF
+            -DJPEGXL_ENABLE_DOXYGEN=OFF
+            -DJPEGXL_ENABLE_MANPAGES=OFF
+            -DJPEGXL_ENABLE_BENCHMARK=OFF
+            -DJPEGXL_ENABLE_EXAMPLES=OFF
+            -DJPEGXL_ENABLE_JNI=OFF
+            -DJPEGXL_ENABLE_SJPEG=OFF
+            -DJPEGXL_ENABLE_OPENEXR=OFF
+            -DJPEGXL_ENABLE_TCMALLOC=OFF
+            -DJPEGXL_BUNDLE_LIBPNG=OFF
+        )
+
+    find_path(_alp_jpegxl_include_dir jxl/decode.h
+        PATHS "${ALP_libjxl_INSTALL_DIR}/include" NO_DEFAULT_PATH NO_CACHE REQUIRED)
+    # Static link order: dependents before their dependencies.
+    set(_alp_jpegxl_libraries)
+    foreach(_alp_name IN ITEMS jxl jxl_cms hwy brotlidec brotlienc brotlicommon)
+        find_library(_alp_jpegxl_${_alp_name} NAMES ${_alp_name}
+            PATHS "${ALP_libjxl_INSTALL_DIR}" PATH_SUFFIXES lib lib64 NO_DEFAULT_PATH NO_CACHE REQUIRED)
+        list(APPEND _alp_jpegxl_libraries "${_alp_jpegxl_${_alp_name}}")
+    endforeach()
+
+    # Global, because static libraries pass their private link dependencies on to every linking directory.
+    add_library(JpegXL::jxl INTERFACE IMPORTED GLOBAL)
+    target_include_directories(JpegXL::jxl INTERFACE "${_alp_jpegxl_include_dir}")
+    target_compile_definitions(JpegXL::jxl INTERFACE JXL_STATIC_DEFINE JXL_CMS_STATIC_DEFINE)
+    target_link_libraries(JpegXL::jxl INTERFACE ${_alp_jpegxl_libraries})
+endfunction()
diff --git a/cmake/SetupOpenCV.cmake b/cmake/SetupOpenCV.cmake
@@ -41,7 +41,7 @@ function(alp_setup_opencv version)
             -DWITH_OPENGL=OFF
             -DWITH_GSTREAMER=OFF
             -DWITH_FFMPEG=OFF
-            -DWITH_JPEG=ON -DWITH_PNG=ON -DWITH_TIFF=ON
+            -DWITH_JPEG=ON -DBUILD_JPEG=ON -DWITH_PNG=ON -DWITH_TIFF=ON
             -DWITH_GTK=OFF -DWITH_QT=OFF
             -DBUILD_LIST=core,imgproc,imgcodecs
         )

diff --git a/docs/adr/0001-shared-raster-attribution-table.md b/docs/adr/0001-shared-raster-attribution-table.md
@@ -0,0 +1,16 @@
+# Share an attribution table across raster snapshots
+
+RF snapshots normally share a source-attribution table. A TB receives an
+independent copy beside its index with the same attribution numbering. This
+allows compatible tiles to be hard-linked across RF and TB roots while the TB
+can be transferred as one directory and remains valid after RF removal or
+table edits. Lookup checks beside the index, then the index directory's parent
+and grandparent, giving the nearest table precedence.
+
+Independent numbering could assign the same index to different sources,
+requiring attribution rasters to be rewritten when combining snapshots.
+Preserving numbering avoids that rewrite. RF snapshots using a shared table
+depend on it; a TB with its local copy is self-contained. Entries are maintained
+manually and may be corrected or reused once the user knows that no retained
+snapshot using that table refers to them. Removing an entry and shifting later
+indices is forbidden. Tools do not edit entries; TB construction copies them.
diff --git a/docs/adr/0002-native-raster-pixel-buffers.md b/docs/adr/0002-native-raster-pixel-buffers.md
@@ -0,0 +1,11 @@
+# Store native raster pixel buffers inside the envelope
+
+The first `.amort` format stores dimensions and the native element bytes of
+the data and attribution rasters inside `io::envelope`. Supporting only x86
+and the project's current unpadded GLM configuration lets one templated codec
+preserve payload bits without per-component GLM serializers or an explicit
+matrix of type instantiations. This binds the byte encoding to the supported
+scalar representations and pixel layouts; it does not promise portability
+to other layouts or architectures. Compile-time layout checks and read-time
+byte-count checks enforce that representation, while the metadata retains the
+payload-type identifier.