Merge pull request #4480 from mapnik/configure-unbound-variable

Check for if VARS is set (ref #4478)

.clang-format

@@ -0,0 +1,94 @@
+Language: Cpp
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: Consecutive
+AlignEscapedNewlines: Right
+AlignOperands: Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Inline
+# AlwaysBreakAfterReturnType:
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BitFieldColonSpacing: After
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: false # see AllowShortEnumsOnASingleLine
+  AfterFunction: true # see AllowShortFunctionsOnASingleLine
+  AfterNamespace: false
+  AfterStruct: true
+  AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: AfterComma
+BreakStringLiterals: true
+ColumnLimit: 120
+CompactNamespaces: false
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+EmptyLineAfterAccessModifier: Leave
+EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: NoIndent
+IndentPPDirectives: None
+IndentRequires: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+# PackConstructorInitializers: CurrentLine # only clang-format > 14
+PointerAlignment: Left
+#QualifierAlignment: Left # only clang-format > 14
+ReferenceAlignment: Left
+ReflowComments: true
+SortIncludes: Never
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeInheritanceColon: true
+Standard: c++14
+BinPackParameters: false
+BreakBeforeInheritanceComma: false
+IncludeCategories:
+  # Headers in <> without extension.
+  - Regex: '<([A-Za-z0-9\Q/-_\E])+>'
+    Priority: 1
+  # Headers in <> from specific external libraries.
+  - Regex: '<(boost)\/'
+    Priority: 2
+  # Headers in <> from specific external libraries.
+  - Regex: '<(mapnik)\/'
+    Priority: 3
+  # Headers in <> with extension.
+  - Regex: '<([A-Za-z0-9.\Q/-_\E])+>'
+    Priority: 4
+  # Headers in "" with extension.
+  - Regex: '"([A-Za-z0-9.\Q/-_\E])+"'
+    Priority: 5

.gitattributes

@@ -0,0 +1,2 @@
+*.svg text eol=lf
+scons/** linguist-vendored

.github/actions/run_tests/action.yml

@@ -0,0 +1,85 @@
+name: Run tests with coverage
+description: Runs all mapnik tests with coverage
+inputs:
+  cmake-preset:
+    description: The used CMake preset
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Set PROJ_LIB
+      shell: bash
+      run: |
+        cmake --preset ${{ inputs.cmake-preset }} -N -L | grep -o "PROJ_LIB=.*" >> ${GITHUB_ENV}
+
+    - name: Set TEST_WRAPPER (Windows)
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |-
+          echo "TEST_WRAPPER=OpenCppCoverage \
+          --cover_children \
+          --export_type binary \
+          --modules '*.input' \
+          --modules '*libmapnik*' \
+          --modules 'mapnik*.exe' \
+          --quiet \
+          --sources '${{ github.workspace }}' \
+          --" >> ${GITHUB_ENV}
+
+    - name: Test
+      shell: bash
+      env:
+        UPDATE: 1
+      run: |
+        ${TEST_WRAPPER:-} ctest --preset ${{ inputs.cmake-preset }}
+
+    - name: Test visuals
+      continue-on-error: true
+      working-directory: build/out
+      shell: bash
+      run: |
+        ${TEST_WRAPPER:-} ./mapnik-test-visual -j ${CTEST_PARALLEL_LEVEL} --output-dir visual-test-result
+
+    - name: Pack visual test results
+      working-directory: build/out
+      shell: bash
+      run: |
+        tar -vzcf visual-test-results.tar.gz visual-test-result
+
+    - name: Upload visual test results
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.cmake-preset }}-visual-tests-${{ github.sha }}
+        path: build/out/visual-test-results.tar.gz
+
+    - name: Run Benchmarks (Linux & macOS)
+      working-directory: build/out
+      if: runner.os != 'Windows'
+      shell: bash
+      run: |
+        ./run_benchmarks
+
+    - name: Collect coverage (Linux & macOS)
+      working-directory: build
+      if: runner.os != 'Windows'
+      shell: bash
+      run: |
+        if [ "${RUNNER_OS}" == "macOS" ]; then
+          LCOV_EXTRA_OPTIONS="--ignore-errors count,gcov,inconsistent,range,unused --keep-going"
+        fi
+        lcov ${LCOV_EXTRA_OPTIONS:-} --directory . --capture --output-file coverage.info
+        lcov ${LCOV_EXTRA_OPTIONS:-} --remove coverage.info '/usr/*' '*/vcpkg_installed/*'  '/.cache/*' '*/test/*'  --output-file coverage.info
+        lcov ${LCOV_EXTRA_OPTIONS:-} --list coverage.info
+
+    - name: Upload coverage to Codecov (Linux & macOS)
+      if: runner.os != 'Windows'
+      uses: codecov/codecov-action@v4
+      with:
+        files: build/coverage.info
+
+    - name: Upload coverage to Codecov (Windows)
+      if: runner.os == 'Windows'
+      uses: codecov/codecov-action@v4
+      with:
+        files: ctest.cov,build/out/mapnik-test-visual.cov

.github/workflows/build_and_test.yml

@@ -0,0 +1,136 @@
+name: Build and Test
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches-ignore:
+      - "no-ci-*"
+
+env:
+  VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
+  VCPKG_RELEASE: 2024.06.15
+
+jobs:
+  checkSource:
+    name: Check Source Code
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - uses: pre-commit/action@v3.0.1
+
+  buildAndTest:
+    name: >-
+      Build & Test
+      (${{ matrix.os }})
+      (C++ ${{ matrix.cxx-standard }})
+      ${{ startsWith(matrix.os, 'macos-') && (matrix.os == 'macos-14' && '(ARM64)' || '(AMD64)') || '' }}
+    needs: checkSource
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-14
+          - ubuntu-22.04
+          - windows-2022
+        cxx-standard:
+          - 17
+
+    steps:
+      - name: Checkout Mapnik
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Checkout vcpkg
+        uses: actions/checkout@v4
+        with:
+          path: vcpkg
+          ref: ${{ env.VCPKG_RELEASE }}
+          repository: microsoft/vcpkg
+
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Install required system packages
+        shell: bash
+        run: |
+          if [ "${RUNNER_OS}" == "Linux" ]; then
+            sudo apt-get update
+            sudo apt-get -y install \
+              autoconf \
+              autoconf-archive \
+              automake \
+              gperf \
+              lcov \
+              libxxf86vm-dev \
+              ninja-build \
+              postgresql-client
+          elif [ "${RUNNER_OS}" == "macOS" ]; then
+            brew install \
+              autoconf \
+              autoconf-archive \
+              automake \
+              lcov \
+              libtool \
+              ninja \
+              vcpkg
+          elif [ "${RUNNER_OS}" == "Windows" ]; then
+            choco install \
+              ninja \
+              OpenCppCoverage
+            echo "C:\Program Files\OpenCppCoverage" >> ${GITHUB_PATH}
+          fi
+
+      - name: Enable Developer Command Prompt (Windows)
+        uses: ilammy/msvc-dev-cmd@v1
+        if: runner.os == 'Windows'
+
+      - name: Set CMAKE_BUILD_PARALLEL_LEVEL, CTEST_PARALLEL_LEVEL & PRESET
+        shell: bash
+        run: |
+          PRESET=$(echo "${RUNNER_OS}" | perl -ne "print lc")-ci
+          if [ "${RUNNER_OS}" == "Linux" ]; then
+            echo "CMAKE_BUILD_PARALLEL_LEVEL=$(nproc)" >> ${GITHUB_ENV}
+            echo "CTEST_PARALLEL_LEVEL=$(nproc)" >> ${GITHUB_ENV}
+          elif [ "${RUNNER_OS}" == "macOS" ]; then
+            echo "CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)" >> ${GITHUB_ENV}
+            echo "CTEST_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)" >> ${GITHUB_ENV}
+            PRESET=${PRESET}-${{ matrix.os == 'macos-14' && 'arm64' || 'x64' }}
+          elif [ "${RUNNER_OS}" == "Windows" ]; then
+            echo "CMAKE_BUILD_PARALLEL_LEVEL=$(pwsh -Command '(Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors')" >> ${GITHUB_ENV}
+            echo "CTEST_PARALLEL_LEVEL=$(pwsh -Command '(Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors')" >> ${GITHUB_ENV}
+          fi
+          echo "PRESET=${PRESET}" >> ${GITHUB_ENV}
+
+      - name: Configure CMake
+        shell: bash
+        run: |
+          cmake \
+            -DBUILD_SHARED_LIBS:BOOL=ON \
+            -DCMAKE_CXX_STANDARD:STRING=${{ matrix.cxx-standard }}  \
+            -DUSE_MEMORY_MAPPED_FILE:BOOL=ON \
+            -LA \
+            --preset ${PRESET}
+
+      - name: Build
+        shell: bash
+        run: |
+          cmake \
+            --build \
+            --preset ${PRESET}
+
+      - name: Run Tests
+        uses: ./.github/actions/run_tests
+        with:
+          cmake-preset: ${{ env.PRESET }}

.github/workflows/release_linux.yml

@@ -0,0 +1,55 @@
+name: Release Linux
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches-ignore:
+      - "no-ci-*"
+env:
+  PRESET: linux-ci-release
+
+jobs:
+  build:
+    runs-on: "ubuntu-22.04"
+    steps:
+
+      - name: checkout mapnik
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: "Install required system packages"
+        shell: bash
+        run: |
+          sudo apt update
+          sudo apt install -y ninja-build\
+            libicu-dev \
+            libfreetype6-dev \
+            libharfbuzz-dev \
+            libxml2-dev \
+            libjpeg-dev \
+            libtiff-dev \
+            libwebp-dev \
+            libcairo2-dev \
+            libproj-dev \
+            libgdal-dev \
+            libboost-filesystem-dev \
+            libboost-program-options-dev \
+            libboost-regex-dev
+
+      - name: Configure CMake
+        run: cmake -LA --preset ${{ env.PRESET }}
+
+      - name: Build
+        run: cmake --build --preset ${{ env.PRESET }}
+
+      - name: Package
+        run: cmake --build --preset ${{ env.PRESET }} --target package
+
+      - name: Upload mapnik debian package
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PRESET }}-deb
+          path: build/mapnik-*.deb

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+.vscode
+.cache
 *.gcov
 *.gcda
 *.gcno
@@ -11,6 +13,7 @@
 *.a
 *.swp
 *.dylib
+mapnik-gyp
 plugins/input/*.input
 plugins/input/templates/*.input
 demo/c++/rundemo
@@ -29,10 +32,11 @@ tests/python_tests/raster_colorizer_test.png
 tests/python_tests/raster_colorizer_test_save.xml
 utils/mapnik-config/mapnik-config
 utils/shapeindex/shapeindex
+utils/mapnik-index/mapnik-index
 utils/ogrindex/ogrindex
 utils/pgsql2sqlite/pgsql2sqlite
 utils/svg2png/svg2png
-utils/nik2img/nik2img
+utils/mapnik-render/mapnik-render
 demo/python/demo*
 demo/python/map.xml
 tests/data/sqlite/*index
@@ -54,3 +58,8 @@ demo/viewer/ui_layer_info.h
 test/standalone/*-bin
 test/unit/run
 test/visual/run
+# cmake 
+build
+.vs
+
+CMakeUserPresets.json

.gitmodules

@@ -1,8 +1,23 @@
 [submodule "test/data"]
 	path = test/data
 	url = https://github.com/mapnik/test-data.git
-	branch = large_csv
+	branch = master
 [submodule "test/data-visual"]
 	path = test/data-visual
 	url = https://github.com/mapnik/test-data-visual.git
 	branch = master
+[submodule "deps/mapbox/variant"]
+	path = deps/mapbox/variant
+	url = https://github.com/mapbox/variant.git
+        branch = master
+[submodule "deps/mapbox/geometry"]
+	path = deps/mapbox/geometry
+	url = https://github.com/mapbox/geometry.hpp.git
+        branch = master
+[submodule "deps/mapbox/protozero"]
+	path = deps/mapbox/protozero
+	url = https://github.com/mapbox/protozero.git
+        branch = master
+[submodule "deps/mapbox/polylabel"]
+	path = deps/mapbox/polylabel
+	url = https://github.com/mapbox/polylabel.git

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v4.6.0
+      hooks:
+          - id: trailing-whitespace
+            files: ^.*\.cmake|CMakeLists\.txt$
+          - id: end-of-file-fixer
+            files: ^.*\.cmake|CMakeLists\.txt$
+            
+    - repo: https://github.com/pre-commit/mirrors-clang-format
+      rev: v18.1.3
+      hooks:
+          - id: clang-format
+            types_or: [c++, c]

.travis.yml

@@ -1,86 +0,0 @@
-language: cpp
-
-sudo: false
-
-git:
-  depth: 10
-  submodules: true
-
-env:
-  global:
-   - secure: "N3a5nzzsgpuu45k8qWdYsHNxrSnqeAGLTOYpfYoAH7B94vuf7pa7XV1tQjXbxrnx2D6ryTdtUtyRKwy7zXbwXxGt4DpczWEo8f6DUd6+obAp3kdnXABg2Sj4oA7KMs0F0CmoADy0jdUZD5YyOJHu64LCIIgzEQ9q49PFMNbU3IE="
-   - secure: "iQYPNpMtejcgYeUkWZGIWz1msIco5qydJrhZTSCQOYahAQerdT7q5WZEpEo3G6IWOGgO1eo7GFuY8DvqQjw1+jC9b9mhkRNdo3LhGTKS9Gsbl5Q27k0rjlaFZmmQHrfPlQJwhfAIp+KLugHtQw5bCoLh+95E3j0F0DayF1tuJ3s="
-addons:
-  postgresql: "9.4"
-  apt:
-    sources:
-     - ubuntu-toolchain-r-test
-     - llvm-toolchain-precise-3.5
-    packages:
-     - clang-3.5
-
-cache:
-  directories:
-  - $HOME/.ccache
-
-matrix:
-  include:
-    - os: linux
-      compiler: clang
-      env: JOBS=8 MASON_PUBLISH=true
-    - os: linux
-      compiler: gcc
-      env: JOBS=6
-    #- os: osx
-    #  compiler: clang
-    #  env: JOBS=8 MASON_PUBLISH=true
-    #- os: osx
-    #  compiler: clang
-    #  env: JOBS=8 COVERAGE=true
-
-before_install:
- - export COVERAGE=${COVERAGE:-false}
- - export MASON_PUBLISH=${MASON_PUBLISH:-false}
- - if [[ ${TRAVIS_BRANCH} != 'master' ]]; then export MASON_PUBLISH=false; fi
- - if [[ ${TRAVIS_PULL_REQUEST} != 'false' ]]; then export MASON_PUBLISH=false; fi
-
-install:
- - if [[ $(uname -s) == 'Linux' ]]; then
-     psql -U postgres -c 'create database template_postgis;' -U postgres;
-     psql -U postgres -c 'create extension postgis;' -d template_postgis -U postgres;
-     export CXX="ccache clang++-3.5 -Qunused-arguments";
-     export CC="ccache clang-3.5 -Qunused-arguments";
-     export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python2.7/site-packages;
-   else
-     export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python/site-packages;
-   fi
- - if [[ ${COVERAGE} == true ]]; then
-     PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user cpp-coveralls;
-   fi
-
-script:
- - source bootstrap.sh
- - if [[ ${COVERAGE} == true ]]; then
-     ./configure CUSTOM_LDFLAGS='--coverage' CUSTOM_CXXFLAGS='--coverage' CUSTOM_CFLAGS='--coverage' DEBUG=True;
-   elif [[ ${MASON_PUBLISH} == true ]]; then
-     export MASON_NAME=mapnik;
-     export MASON_VERSION=latest;
-     export MASON_LIB_FILE=lib/libmapnik-wkt.a;
-     source ./.mason/mason.sh;
-     ./configure PREFIX=${MASON_PREFIX} PATH_REPLACE='' MAPNIK_BUNDLED_SHARE_DIRECTORY=True RUNTIME_LINK='static';
-   else
-     ./configure;
-   fi
- - make
- - make test
- - if [[ ${COVERAGE} == true ]]; then
-     ./mason_packages/.link/bin/cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude .sconf_temp --exclude benchmark --exclude deps --exclude scons --exclude test --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null; 
-   fi
- - if [[ ${COVERAGE} != true ]]; then
-     make bench;
-   fi
- - if [[ ${MASON_PUBLISH} == true ]]; then
-     ./mason_latest.sh build;
-     ./mason_latest.sh link;
-     ./mason_latest.sh publish;
-   fi

AUTHORS.md

@@ -80,3 +80,4 @@ Mapnik is written by Artem Pavlenko with contributions from:
 * Rich Wareham
 * Nick Whitelegg
 * Leslie Wu
+* Roman Galacz

CITATION.cff

@@ -0,0 +1,34 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: mapnik
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Artem
+    family-names: Pavlenko
+identifiers:
+  - type: url
+    value: 'https://github.com/mapnik/mapnik'
+    description: GitHub Repository
+  - type: swh
+    value: >-
+      swh:1:dir:3f5758e17e9d54016ca694268da68cf6856fab58
+    description: Software Archive
+repository-code: 'https://github.com/mapnik/mapnik'
+url: 'https://mapnik.org/'
+abstract: >-
+  Mapnik is an open source toolkit for developing
+  mapping applications. At the core is a C++ shared
+  library providing algorithms and patterns for
+  spatial data access and visualization.
+keywords:
+  - mapping
+  - gis
+  - cartography
+  - beautiful-maps
+  - rendering
+license: LGPL-2.1

CMakeLists.txt

@@ -0,0 +1,472 @@
+cmake_minimum_required(VERSION 3.15)
+# 3.15 is required since the Boost::XXXX targets was first added. https://cmake.org/cmake/help/latest/module/FindBoost.html#imported-targets
+# 3.14 is required since SQLite3 Module was first added. https://cmake.org/cmake/help/latest/module/FindSQLite3.html#findsqlite3
+
+include(cmake/GetVersion.cmake)
+get_mapnik_version()
+
+project(mapnik
+    VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION}
+    HOMEPAGE_URL "https://mapnik.org/"
+    DESCRIPTION "Mapnik is an open source toolkit for developing mapping applications"
+    LANGUAGES CXX
+)
+message(STATUS "mapnik version: ${PROJECT_VERSION}")
+
+# https://cliutils.gitlab.io/modern-cmake/chapters/features/ides.html
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON) # with newer cmake versions put all find_package in global scope
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(FeatureSummary)
+include(MapnikOption)
+include(MapnikMinimumVersions)
+include(MapnikFindPackage)
+include(MapnikInstall)
+
+include(CTest)
+add_feature_info(BUILD_TESTING BUILD_TESTING "Adds tests")
+
+mapnik_option(INSTALL_DEPENDENCIES "if ON, all dependencies (eg. required dlls) will be copied into CMAKE_INSTALL_PREFIX/MAPNIK_BIN_DIR." ON)
+mapnik_option(BUILD_SHARED_LIBS "build mapnik dynamic(ON) or static(OFF)" ON)
+mapnik_option(BUILD_SHARED_PLUGINS "build dynamic plugins" ${BUILD_SHARED_LIBS}) # use BUILD_SHARED_LIBS as default option
+mapnik_option(BUILD_SHARED_CRT "(only windows with msvc) use msvc shared crt" ON)
+if(WIN32 AND BUILD_SHARED_PLUGINS AND NOT BUILD_SHARED_LIBS)
+    message(FATAL_ERROR "static libmapnik and dynamic plugins won't work correctly")
+endif()
+
+mapnik_option(USE_EXTERNAL_MAPBOX_GEOMETRY "Use a external mapnik/geometry.hpp. If off, use the submodule" OFF)
+mapnik_option(USE_EXTERNAL_MAPBOX_POLYLABEL "Use a external mapnik/polylabel. If off, use the submodule" OFF)
+mapnik_option(USE_EXTERNAL_MAPBOX_PROTOZERO "Use a external mapnik/protozero. If off, use the submodule" OFF)
+mapnik_option(USE_EXTERNAL_MAPBOX_VARIANT "Use a external mapnik/variant. If off, use the submodule" OFF)
+mapnik_option(USE_JPEG "adds jpeg support" ON)
+mapnik_option(USE_PNG "adds png support" ON)
+mapnik_option(USE_TIFF "adds tiff support" ON)
+mapnik_option(USE_WEBP "adds webp support" ON)
+mapnik_option(USE_LIBXML2 "adds libxml2 support" ON)
+mapnik_option(USE_CAIRO "adds the cairo renderer" ON)
+mapnik_option(USE_PROJ "adds proj support" ON)
+mapnik_option(USE_GRID_RENDERER "adds grid renderer" ON)
+mapnik_option(USE_SVG_RENDERER "adds svg renderer" ON)
+mapnik_option(USE_BIGINT "uses 64 bit instead of 32" ON)
+mapnik_option(USE_BOOST_FILESYSTEM "use boost::filesytem even if `std::filesystem` is available (since c++17)" OFF)
+mapnik_option(USE_MEMORY_MAPPED_FILE "uses file cache" ON)
+mapnik_option(USE_MULTITHREADED "enables the multithreaded features (threadsafe)" ON)
+mapnik_option(USE_NO_ATEXIT "disable atexit" OFF)
+mapnik_option(USE_NO_DLCLOSE "disable dlclose" OFF)
+mapnik_option(USE_DEBUG_OUTPUT "enables some debug messages for development" OFF)
+mapnik_option(USE_LOG "enables logging output. See log severity level." OFF)
+# 0 = debug
+# 1 = warn
+# 2 = error
+# 3 = none
+set(USE_LOG_SEVERITY "1" CACHE STRING "sets the logging severity (only applies when USE_LOG is ON")
+mapnik_option(USE_STATS "Enable statistics reporting" OFF)
+
+mapnik_option(DISABLE_MAPNIK_AUTOSETUP "disables the autosetup. Need to call mapnik::setup() then" OFF)
+
+mapnik_option(USE_PLUGIN_INPUT_CSV "adds plugin input csv" ON)
+mapnik_option(USE_PLUGIN_INPUT_GDAL "adds plugin input gdal" ON)
+mapnik_option(USE_PLUGIN_INPUT_GEOBUF "adds plugin input geobuf" ON)
+mapnik_option(USE_PLUGIN_INPUT_GEOJSON "adds plugin input geojson" ON)
+mapnik_option(USE_PLUGIN_INPUT_OGR "adds plugin input ogr" ON)
+mapnik_option(USE_PLUGIN_INPUT_PGRASTER "adds plugin input pgraster" ON)
+mapnik_option(USE_PLUGIN_INPUT_POSTGIS "adds plugin input postgis" ON)
+mapnik_option(USE_PLUGIN_INPUT_RASTER "adds plugin input raster" ON)
+mapnik_option(USE_PLUGIN_INPUT_SHAPE "adds plugin input shape" ON)
+mapnik_option(USE_PLUGIN_INPUT_SQLITE "adds plugin input sqlite" ON)
+mapnik_option(USE_PLUGIN_INPUT_TOPOJSON "adds plugin input topojson" ON)
+
+mapnik_option(BUILD_DEMO_VIEWER "builds the demo viewer" ON)
+mapnik_option(BUILD_DEMO_CPP "builds the demo c++ application" ON)
+
+mapnik_option(BUILD_BENCHMARK "builds benchmark project" ON)
+
+mapnik_option(BUILD_UTILITY_GEOMETRY_TO_WKB "builds the utility program geometry_to_wkb" ON)
+mapnik_option(BUILD_UTILITY_MAPNIK_INDEX "builds the utility program mapnik_index" ON)
+mapnik_option(BUILD_UTILITY_MAPNIK_RENDER "builds the utility program mapnik_render" ON)
+mapnik_option(BUILD_UTILITY_OGRINDEX "builds the utility program ogrindex" OFF)
+mapnik_option(BUILD_UTILITY_PGSQL2SQLITE "builds the utility program pgsql2sqlite" ON)
+mapnik_option(BUILD_UTILITY_SHAPEINDEX "builds the utility program shapeindex" ON)
+mapnik_option(BUILD_UTILITY_SVG2PNG "builds the utility program svg2png" ON)
+
+mapnik_option(USE_BOOST_REGEX_ICU_WORKAROUND "if you don't use your system libraries and get double linked icu libraries set this to ON" OFF)
+mapnik_option(USE_GLIBC_WORKAROUND "see https://github.com/mapnik/mapnik/pull/3792 if you building with libstdc++-4.9" OFF)
+
+feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
+feature_summary(FILENAME "${CMAKE_CURRENT_BINARY_DIR}/features.log" WHAT ENABLED_FEATURES DISABLED_FEATURES)
+
+include(GNUInstallDirs)
+# See for more details: https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html
+set(MAPNIK_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Install directory for binaries")
+set(MAPNIK_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Install directory for libraries")
+set(MAPNIK_ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Install directory for archives")
+set(MAPNIK_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Install directory for the headers")
+set(MAPNIK_CMAKE_DIR ${MAPNIK_LIB_DIR}/cmake/mapnik CACHE STRING "Install directory of the cmake targets")
+set(MAPNIK_PKGCONF_DIR ${MAPNIK_LIB_DIR}/pkgconfig CACHE STRING "Install directory for the .pc files for pkg-config")
+set(MAPNIK_OUTPUT_DIR "${CMAKE_BINARY_DIR}/out")
+if(WIN32)
+    set(DEFAULT_PLUGINS_INSTALL_DIR ${MAPNIK_BIN_DIR}/mapnik/input)
+else()
+    set(DEFAULT_PLUGINS_INSTALL_DIR ${MAPNIK_LIB_DIR}/mapnik/input)
+endif()
+set(PLUGINS_INSTALL_DIR ${DEFAULT_PLUGINS_INSTALL_DIR} CACHE STRING "installs the plugins in the specified directory")
+message(STATUS "Installing plugins to ${PLUGINS_INSTALL_DIR}")
+
+set(FONTS_INSTALL_DIR ${MAPNIK_LIB_DIR}/mapnik/fonts CACHE STRING "installs the fonts in the specified directory")
+message(STATUS "Installing fonts to ${FONTS_INSTALL_DIR}")
+
+set(MAPNIK_COMPILE_DEFS "")
+set(MAPNIK_OPTIONAL_LIBS "")
+set(MAPNIK_OPTIONAL_LIBS_INCLUDE "")
+
+#############################
+#############################
+# Begin project configuration
+#############################
+#############################
+
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "Sets the c++ standard. c++17 is minimum.")
+set(CMAKE_CXX_STANDARD_REQUIRED ON) # require the specified CMAKE_CXX_STANDARD
+set(CMAKE_CXX_EXTENSIONS OFF CACHE STRING "Enables the compiler specific extensions.") # Fallsback to -std=c++<ver> if off
+message(STATUS "Using c++${CMAKE_CXX_STANDARD}")
+message(STATUS "Using c++ extensions: ${CXX_EXTENSIONS}")
+
+# add debug postfix to the libraries
+set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "sets the debug library postfix on mapnik, wkt and json")
+message(STATUS "postfix for debug libraries: ${CMAKE_DEBUG_POSTFIX}")
+
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${BUILD_SHARED_CRT}>:DLL>")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}/lib")
+
+# needs to be before the first call of find_boost.
+if(CMAKE_CXX_STANDARD VERSION_LESS 17)
+    list(APPEND MAPNIK_COMPILE_DEFS BOOST_SPIRIT_X3_HIDE_CXX17_WARNING)
+endif()
+
+if(USE_MULTITHREADED)
+    set(Boost_USE_MULTITHREADED ON)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_THREADSAFE)
+else()
+    set(Boost_USE_MULTITHREADED OFF)
+endif()
+
+
+mapnik_find_package(PkgConfig REQUIRED)
+mapnik_find_threads()
+mapnik_find_package(ICU REQUIRED COMPONENTS uc i18n data)
+
+mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS regex)
+if(CMAKE_CXX_STANDARD VERSION_LESS 17)
+    set(USE_BOOST_FILESYSTEM ON CACHE BOOL "Use boost::filesystem" FORCE)
+endif()
+if(USE_BOOST_FILESYSTEM)
+    mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS filesystem system)
+endif()
+
+list(APPEND MAPNIK_COMPILE_DEFS BOOST_REGEX_HAS_ICU)
+if(USE_BOOST_REGEX_ICU_WORKAROUND)
+    message(STATUS "using boost regex workaround")
+    set_property(TARGET Boost::regex PROPERTY INTERFACE_LINK_LIBRARIES)
+endif()
+include(CheckBoostRegexIcu)
+check_boost_regex()
+if(BOOST_REGEX_HAS_ICU)
+    message(STATUS "boost regex has icu support")
+    list(APPEND MAPNIK_COMPILE_DEFS BOOST_REGEX_HAS_ICU)
+endif()
+
+mapnik_find_package(Freetype REQUIRED)
+
+# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz
+mapnik_find_package(harfbuzz CONFIG QUIET)
+if(harfbuzz_FOUND)
+    message(STATUS "Found harfbuzz native cmake")
+    list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz)
+else()
+    # Use pkg-config when harfbuzz is not found.
+    # It might be possible that in future version harfbuzz could only be found via pkg-config.
+    # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
+    message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
+    mapnik_pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
+    list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
+endif()
+
+if(USE_EXTERNAL_MAPBOX_GEOMETRY)
+    # this is used to provide a way to specify include dirs with CACHE VARIABLES
+    if(NOT MAPBOX_GEOMETRY_INCLUDE_DIRS)
+        message(STATUS "Searching for the include dir of mapbox/geometry.hpp")
+        find_path(MAPBOX_GEOMETRY_INCLUDE_DIRS "mapbox/geometry.hpp" REQUIRED)
+    endif()
+else()
+    set(MAPBOX_GEOMETRY_INCLUDE_DIRS
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/geometry/include>
+        $<INSTALL_INTERFACE:include>
+    )
+endif()
+if(NOT MAPBOX_GEOMETRY_INCLUDE_DIRS)
+    message(FATAL_ERROR "Set -DMAPBOX_GEOMETRY_INCLUDE_DIRS to the mapbox/geometry.hpp include dir")
+endif()
+
+if(USE_EXTERNAL_MAPBOX_POLYLABEL)
+    if(NOT MAPBOX_POLYLABEL_INCLUDE_DIRS)
+        message(STATUS "Searching for the include dir of mapbox/polylabel")
+        find_path(MAPBOX_POLYLABEL_INCLUDE_DIRS "mapbox/polylabel.hpp")
+    endif()
+else()
+    set(MAPBOX_POLYLABEL_INCLUDE_DIRS
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/polylabel/include>
+        $<INSTALL_INTERFACE:include>
+    )
+endif()
+if(NOT MAPBOX_POLYLABEL_INCLUDE_DIRS)
+    message(FATAL_ERROR "Set MAPBOX_POLYLABEL_INCLUDE_DIRS to the mapbox/geometry include dir")
+endif()
+
+if(USE_EXTERNAL_MAPBOX_PROTOZERO)
+    if(NOT MAPBOX_PROTOZERO_INCLUDE_DIRS)
+        message(STATUS "Searching for the include dir of mapbox/protozero")
+        find_path(MAPBOX_PROTOZERO_INCLUDE_DIRS "protozero/pbf_message.hpp")
+    endif()
+else()
+    set(MAPBOX_PROTOZERO_INCLUDE_DIRS
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/protozero/include>
+        $<INSTALL_INTERFACE:include>
+    )
+endif()
+if(NOT MAPBOX_PROTOZERO_INCLUDE_DIRS)
+    message(FATAL_ERROR "Set MAPBOX_PROTOZERO_INCLUDE_DIRS to the mapbox/protozero include dir")
+endif()
+
+if(USE_EXTERNAL_MAPBOX_VARIANT)
+    if(NOT MAPBOX_VARIANT_INCLUDE_DIRS)
+        message(STATUS "Searching for the include dir of mapbox/variant")
+        find_path(MAPBOX_VARIANT_INCLUDE_DIRS "mapbox/variant.hpp")
+    endif()
+else()
+    set(MAPBOX_VARIANT_INCLUDE_DIRS
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/variant/include>
+        $<INSTALL_INTERFACE:include>
+    )
+endif()
+if(NOT MAPBOX_VARIANT_INCLUDE_DIRS)
+    message(FATAL_ERROR "Set MAPBOX_VARIANT_INCLUDE_DIRS to the mapbox/variant include dir")
+endif()
+
+# (used by MapnikInstall.cmake. properties are needed since "set(...)" will be out of scope
+set_property(GLOBAL PROPERTY TARGETS "")
+set_property(GLOBAL PROPERTY PLUGINS "")
+set_property(GLOBAL PROPERTY MAPNIK_UTILITIES "")
+
+if(USE_GLIBC_WORKAROUND)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_ENABLE_GLIBC_WORKAROUND)
+endif()
+
+if(USE_BIGINT)
+    list(APPEND MAPNIK_COMPILE_DEFS BIGINT)
+endif()
+
+if(USE_BOOST_FILESYSTEM)
+    list(APPEND MAPNIK_COMPILE_DEFS USE_BOOST_FILESYSTEM)
+    list(APPEND MAPNIK_OPTIONAL_LIBS Boost::filesystem)
+endif()
+
+if(USE_MEMORY_MAPPED_FILE)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_MEMORY_MAPPED_FILE)
+endif()
+
+if(USE_NO_ATEXIT)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_NO_ATEXIT)
+endif()
+
+if(USE_NO_DLCLOSE)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_NO_DLCLOSE)
+endif()
+
+if(USE_DEBUG_OUTPUT)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_DEBUG)
+endif()
+
+if(USE_LOG)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_LOG MAPNIK_DEFAULT_LOG_SEVERITY=${USE_LOG_SEVERITY})
+endif()
+
+if(USE_STATS)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_STATS)
+endif()
+
+if(USE_LIBXML2)
+    mapnik_find_package(LibXml2 REQUIRED)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_LIBXML2)
+    list(APPEND MAPNIK_OPTIONAL_LIBS LibXml2::LibXml2)
+endif()
+
+if(USE_PNG)
+    mapnik_find_package(PNG REQUIRED)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_PNG)
+    list(APPEND MAPNIK_OPTIONAL_LIBS PNG::PNG)
+endif()
+
+if(USE_JPEG)
+    mapnik_find_package(JPEG REQUIRED)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_JPEG)
+    list(APPEND MAPNIK_OPTIONAL_LIBS JPEG::JPEG)
+endif()
+
+if(USE_TIFF)
+    mapnik_find_package(TIFF REQUIRED)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_TIFF)
+    list(APPEND MAPNIK_OPTIONAL_LIBS TIFF::TIFF)
+endif()
+
+if(USE_WEBP)
+    mapnik_pkg_check_modules(WebP REQUIRED IMPORTED_TARGET libwebp)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_WEBP)
+    list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::WebP)
+endif()
+
+if(USE_CAIRO)
+    mapnik_pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo)
+    list(APPEND MAPNIK_COMPILE_DEFS HAVE_CAIRO)
+    list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo)
+endif()
+
+if(USE_PROJ)
+    #https://proj.org/development/cmake.html
+    mapnik_find_package(PROJ QUIET)
+    # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config
+    if(NOT PROJ_FOUND)
+        message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...")
+        mapnik_pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj>=${PROJ_MIN_VERSION})
+        string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}")
+        set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}")
+        set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}")
+        set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}")
+        list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::PROJ)
+    else()
+        if(PROJ_VERSION VERSION_LESS PROJ_MIN_VERSION)
+            message(FATAL_ERROR "Proj needs to be at least version ${PROJ_MIN_VERSION}")
+        endif()
+        list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES})
+        list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE $<BUILD_INTERFACE:${PROJ_INCLUDE_DIRS}>)
+    endif()
+    math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
+    message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}")
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION})
+endif()
+
+if(USE_GRID_RENDERER)
+    list(APPEND MAPNIK_COMPILE_DEFS GRID_RENDERER)
+endif()
+
+if(USE_SVG_RENDERER)
+    list(APPEND MAPNIK_COMPILE_DEFS SVG_RENDERER)
+endif()
+
+if(NOT WIN32)
+    message(STATUS "Compiling with -DMAPNIK_HAS_DLCFN")
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_HAS_DLCFN)
+    list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS})
+endif()
+
+if(NOT BUILD_SHARED_PLUGINS)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_STATIC_PLUGINS)
+endif()
+# when building static, this have to be public so that all depending libs know about
+if(NOT BUILD_SHARED_LIBS)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_STATIC_DEFINE)
+endif()
+
+if(DISABLE_MAPNIK_AUTOSETUP)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_DISABLE_AUTOSETUP)
+endif()
+
+# force utf-8 source code processing
+# see https://docs.microsoft.com/de-de/cpp/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8?view=msvc-170
+add_compile_options(
+    "$<$<CXX_COMPILER_ID:MSVC>:/utf-8>"
+    "$<$<CXX_COMPILER_ID:MSVC>:/EHsc>"
+)
+
+add_library(core INTERFACE)
+add_library(mapnik::core ALIAS core)
+
+target_include_directories(core INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${MAPBOX_GEOMETRY_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${MAPBOX_POLYLABEL_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${MAPBOX_VARIANT_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${MAPBOX_PROTOZERO_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps>
+    $<INSTALL_INTERFACE:include>
+    ${MAPNIK_OPTIONAL_LIBS_INCLUDE}
+)
+target_link_libraries(core INTERFACE
+    Threads::Threads
+    ICU::uc
+    ICU::data
+    ICU::i18n
+    Boost::headers
+    Boost::regex
+    Freetype::Freetype
+    ${MAPNIK_OPTIONAL_LIBS}
+)
+
+target_compile_definitions(core INTERFACE ${MAPNIK_COMPILE_DEFS})
+
+mapnik_install(core)
+
+###
+# forward declaring libraries to consume them when building static plugins (circle deps between mapnik <-> plugin_target)
+add_library(mapnik "")
+add_library(mapnik::mapnik ALIAS mapnik)
+add_library(wkt STATIC "")
+add_library(mapnik::wkt ALIAS wkt)
+add_library(json STATIC "")
+add_library(mapnik::json ALIAS json)
+# end forward declaration
+###
+
+add_subdirectory(deps)
+add_subdirectory(plugins)
+add_subdirectory(src)
+add_subdirectory(utils)
+add_subdirectory(demo)
+if(BUILD_BENCHMARK)
+    add_subdirectory(benchmark)
+endif()
+if(BUILD_TESTING)
+    add_subdirectory(test)
+endif()
+file(COPY fonts DESTINATION "${MAPNIK_OUTPUT_DIR}")
+
+feature_summary(FILENAME "${CMAKE_CURRENT_BINARY_DIR}/packages.log" WHAT PACKAGES_FOUND PACKAGES_NOT_FOUND INCLUDE_QUIET_PACKAGES)
+
+# start package mapnik
+include(MapnikExport)
+include(MapnikExportPkgConfig)
+
+install(DIRECTORY include/mapnik/ DESTINATION "${MAPNIK_INCLUDE_DIR}/mapnik")
+install(DIRECTORY deps/agg/include/ DESTINATION "${MAPNIK_INCLUDE_DIR}/mapnik/agg")
+install(DIRECTORY deps/mapnik DESTINATION "${MAPNIK_INCLUDE_DIR}")
+file(GLOB TTF_FONT_FILES "fonts/*/*/*.ttf")
+install(FILES ${TTF_FONT_FILES} DESTINATION "${FONTS_INSTALL_DIR}")
+
+if(NOT USE_EXTERNAL_MAPBOX_GEOMETRY)
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/geometry/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
+endif()
+if(NOT USE_EXTERNAL_MAPBOX_POLYLABEL)
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/polylabel/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
+endif()
+if(NOT USE_EXTERNAL_MAPBOX_PROTOZERO)
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/protozero/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
+endif()
+if(NOT USE_EXTERNAL_MAPBOX_VARIANT)
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/variant/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
+endif()
+
+mapnik_install_targets()
+
+include(pack)

CMakePresets.json

@@ -0,0 +1,350 @@
+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 25,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "use-ninja",
+            "hidden": true,
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "default-build-dir",
+            "hidden": true,
+            "binaryDir": "${sourceDir}/build"
+        },
+        {
+            "name": "debug-build",
+            "hidden": true,
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "USE_DEBUG_OUTPUT": "ON",
+                "USE_LOG": "ON",
+                "USE_LOG_SEVERITY": "0"
+            }
+        },
+        {
+            "name": "release-with-debug-build",
+            "hidden": true,
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+                "USE_DEBUG_OUTPUT": "OFF",
+                "USE_LOG": "OFF"
+            }
+        },
+        {
+            "name": "release-build",
+            "hidden": true,
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "USE_DEBUG_OUTPUT": "OFF",
+                "USE_LOG": "OFF"
+            }
+        },
+        {
+            "name": "use-clang",
+            "hidden": true,
+            "inherits": [
+                "default-build-dir",
+                "use-ninja"
+            ],
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "CMAKE_CXX_FLAGS": "-stdlib=libc++",
+                "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++",
+                "CMAKE_SHARED_LINKER_FLAGS": "-stdlib=libc++"
+            }
+        },
+        {
+            "name": "use-gcc",
+            "hidden": true,
+            "inherits": [
+                "default-build-dir",
+                "use-ninja"
+            ],
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "gcc",
+                "CMAKE_CXX_COMPILER": "g++"
+            }
+        },
+        {
+            "name": "use-msvc-cl",
+            "hidden": true,
+            "inherits": [
+                "default-build-dir",
+                "use-ninja"
+            ],
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "cl",
+                "CMAKE_CXX_COMPILER": "cl"
+            }
+        },
+        {
+            "name": "use-msvc-clang-cl",
+            "hidden": true,
+            "inherits": [
+                "default-build-dir",
+                "use-ninja"
+            ],
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "clang-cl",
+                "CMAKE_CXX_COMPILER": "clang-cl"
+            }
+        },
+        {
+            "name": "linux-clang-debug",
+            "displayName": "Linux clang debug",
+            "inherits": [
+                "use-clang",
+                "debug-build"
+            ]
+        },
+        {
+            "name": "linux-clang-release",
+            "displayName": "Linux clang release",
+            "inherits": [
+                "use-clang",
+                "release-build"
+            ]
+        },
+        {
+            "name": "linux-gcc-debug",
+            "displayName": "Linux gcc debug",
+            "inherits": [
+                "use-gcc",
+                "debug-build"
+            ]
+        },
+        {
+            "name": "linux-gcc-release",
+            "displayName": "Linux gcc release",
+            "inherits": [
+                "use-gcc",
+                "release-build"
+            ]
+        },
+        {
+            "name": "windows-arch-x64",
+            "hidden": true,
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
+            },
+            "toolset": {
+                "value": "host=x64",
+                "strategy": "external"
+            }
+        },
+        {
+            "name": "windows-default",
+            "displayName": "Windows x64 Debug",
+            "hidden": true,
+            "inherits": [
+                "use-msvc-cl",
+                "windows-arch-x64"
+            ],
+            "vendor": {
+                "microsoft.com/VisualStudioSettings/CMake/1.0": {
+                    "hostOS": [
+                        "Windows"
+                    ]
+                }
+            }
+        },
+        {
+            "name": "windows-debug",
+            "displayName": "Windows x64 Debug",
+            "inherits": [
+                "windows-default",
+                "debug-build"
+            ]
+        },
+        {
+            "name": "windows-release",
+            "displayName": "Windows x64 Release",
+            "inherits": [
+                "windows-default",
+                "release-build"
+            ]
+        },
+        {
+            "name": "ci-options",
+            "hidden": true,
+            "cacheVariables": {
+                "BUILD_TESTING": "ON",
+                "BUILD_DEMO_VIEWER": "OFF",
+                "DISABLE_MAPNIK_AUTOSETUP": "ON"
+            },
+            "toolchainFile": "vcpkg/scripts/buildsystems/vcpkg.cmake"
+        },
+        {
+            "name": "windows-ci",
+            "description": "used by the ci pipeline",
+            "inherits": [
+                "windows-release",
+                "ci-options"
+            ],
+            "cacheVariables": {
+                "INSTALL_DEPENDENCIES": "ON",
+                "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/vcpkg_installed/x64-windows/bin"
+            },
+            "environment": {
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-windows/share/proj"
+            }
+        },
+        {
+            "name": "linux-ci",
+            "description": "used by the ci pipeline",
+            "inherits": [
+                "release-with-debug-build",
+                "use-gcc",
+                "ci-options"
+            ],
+            "cacheVariables": {
+                "CMAKE_CXX_FLAGS": "--coverage"
+            },
+            "environment": {
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-linux/share/proj"
+            }
+        },
+        {
+            "name": "linux-ci-release",
+            "description": "used by the ci pipeline for releasing",
+            "inherits": [
+                "release-build",
+                "linux-gcc-release"
+            ],
+            "cacheVariables": {
+                "BUILD_TESTING": "OFF",
+                "BUILD_DEMO_VIEWER": "OFF",
+                "USE_MEMORY_MAPPED_FILE": "ON"
+            }
+        },
+        {
+            "name": "macos-ci-arm64",
+            "description": "used by the ci pipeline",
+            "inherits": [
+                "use-ninja",
+                "release-with-debug-build",
+                "default-build-dir",
+                "ci-options"
+            ],
+            "cacheVariables": {
+                "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
+            },
+            "environment": {
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/arm64-osx/share/proj"
+            }
+        },
+        {
+            "name": "macos-ci-x64",
+            "description": "used by the ci pipeline",
+            "inherits": [
+                "use-ninja",
+                "release-with-debug-build",
+                "default-build-dir",
+                "ci-options"
+            ],
+            "cacheVariables": {
+                "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
+            },
+            "environment": {
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-osx/share/proj"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "windows-debug",
+            "configurePreset": "windows-debug"
+        },
+        {
+            "name": "windows-release",
+            "configurePreset": "windows-release"
+        },
+        {
+            "name": "linux-clang-debug",
+            "configurePreset": "linux-clang-debug"
+        },
+        {
+            "name": "linux-clang-release",
+            "configurePreset": "linux-clang-release"
+        },
+        {
+            "name": "linux-gcc-debug",
+            "configurePreset": "linux-gcc-debug"
+        },
+        {
+            "name": "linux-gcc-release",
+            "configurePreset": "linux-gcc-release"
+        },
+        {
+            "name": "windows-ci",
+            "configurePreset": "windows-ci"
+        },
+        {
+            "name": "linux-ci",
+            "configurePreset": "linux-ci"
+        },
+        {
+            "name": "linux-ci-release",
+            "configurePreset": "linux-ci-release"
+        },
+        {
+            "name": "macos-ci-arm64",
+            "configurePreset": "macos-ci-arm64"
+        },
+        {
+            "name": "macos-ci-x64",
+            "configurePreset": "macos-ci-x64"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "test-default",
+            "hidden": true,
+            "output": {
+                "outputOnFailure": true
+            },
+            "execution": {
+                "noTestsAction": "error",
+                "stopOnFailure": false
+            }
+        },
+        {
+            "name": "windows-ci",
+            "configurePreset": "windows-ci",
+            "inherits": [
+                "test-default"
+            ]
+        },
+        {
+            "name": "linux-ci",
+            "configurePreset": "linux-ci",
+            "inherits": [
+                "test-default"
+            ]
+        },
+        {
+            "name": "macos-ci-arm64",
+            "configurePreset": "macos-ci-arm64",
+            "inherits": [
+                "test-default"
+            ]
+        },
+        {
+            "name": "macos-ci-x64",
+            "configurePreset": "macos-ci-x64",
+            "inherits": [
+                "test-default"
+            ]
+        }
+    ]
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

INSTALL.md

@@ -2,6 +2,21 @@
 
 Mapnik runs on Linux, OS X, Windows, and BSD systems.
 
+## Package managers
+### vcpkg 
+To install mapnik with vcpkg type `vcpkg install mapnik`. It will install a minimal version of mapnik and all the needed dependencies. 
+To install more features, type `vcpkg search mapnik` to see all available features.
+
+## Source build
+
+First clone mapnik from github and initialize submodules
+
+```bash
+git clone https://github.com/mapnik/mapnik.git
+cd mapnik
+git submodule update --init
+```
+
 To configure and build Mapnik do:
 
 ```bash
@@ -27,15 +42,14 @@ To use a Python interpreter that is not named `python` for your build, do
 something like the following instead:
 
 ```bash
-    $ PYTHON=python2 ./configure
-    $ make PYTHON=python2
+    $ PYTHON=python3 ./configure
+    $ make PYTHON=python3
 ```
 
 NOTE: the above will not work on windows, rather see https://github.com/mapnik/mapnik/wiki/WindowsInstallation
 
 Then to run the tests locally (without needing to install):
 
-    git submodule update --init
     make test
 
 Install like:
@@ -57,15 +71,15 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT
 
 Build system dependencies are:
 
- * C++ compiler supporting `-std=c++11` (like >= g++ 4.8 or >= clang++ 3.4)
- * >= 2 GB RAM (> 5 GB for g++)
- * Python 2.4-2.7 
- * Scons (a copy is bundled)
+ * C++ compiler supporting `-std=c++17` (like >= g++ 9 or >= clang++ 5)
+ * \>= 2 GB RAM (> 5 GB for g++)
+ * Python 3
+ * Scons (a copy is bundled) or CMake >= 3.15 see [docs/cmake-usage.md](./docs/cmake-usage.md)
 
 Mapnik Core depends on:
 
  * Boost
-    - >= 1.47 is required and >= 1.56 recommended
+    - \>= 1.73 is required
     - These libraries are used:
       - filesystem
       - system
@@ -83,7 +97,7 @@ Mapnik Core optionally depends on:
  * libjpeg - JPEG graphics (Default enabled, if found)
  * libtiff - TIFF graphics (Default enabled, if found)
  * libwebp - WEBP graphics  (Default enabled, if found)
- * libproj - PROJ.4 projection library (Default enabled, if found)
+ * libproj >= 7.2.0 - PROJ projection library (Default enabled, if found)
 
 Additional optional dependencies:
 
@@ -92,11 +106,8 @@ Additional optional dependencies:
  * PostgreSQL (for PostGIS plugin support)
     - libpq - PostreSQL libraries
     - pg_config - PostgreSQL installation capabilities
- * libgdal - GDAL/OGR input (For gdal and ogr plugin support)
+ * libgdal - GDAL/OGR input (For gdal and ogr plugin support) (>= GDAL 2.0.2 for thread safety - https://github.com/mapnik/mapnik/issues/3339)
  * libsqlite3 - SQLite input (needs RTree support builtin) (sqlite plugin support)
- * libocci - Oracle input plugin support
- * libcurl - OSM input plugin support
- * librasterlite - Rasterlite input plugin support
 
 Instructions for installing many of these dependencies on
 various platforms can be found at the Mapnik Wiki:
@@ -159,6 +170,12 @@ You can run the Mapnik tests locally (without installing) like:
 
     make test
 
+## Python Bindings
+
+Python bindings are not included by default. You'll need to add those separately. 
+
+ * Build from source: https://github.com/mapnik/python-mapnik
+
 ## Learning Mapnik
 
 ### Help
@@ -174,7 +191,7 @@ If you need help or want to participate starting points include:
 ### Cartographers
 
 TileMill, which uses Mapnik internally, offers great step by step tutorials for
-learning advanced map styling: http://mapbox.com/tilemill/docs/crashcourse/introduction/
+learning advanced map styling: https://tilemill-project.github.io/tilemill/docs/crashcourse/introduction/
 
 ### Programmers
 
@@ -182,6 +199,6 @@ Mapnik is great for building your own mapping applications. Visit
 https://github.com/mapnik/mapnik/wiki/LearningMapnik for basic
 tutorials on how to programmatically use Mapnik.
 
-### Contributers
+### Contributors
 
-Read docs/contributing.md for resources for getting involved with Mapnik development.
+Read [docs/contributing.md](docs/contributing.md) for resources for getting involved with Mapnik development.

Makefile

@@ -1,58 +1,47 @@
-
 OS := $(shell uname -s)
 
-PYTHON = python
-
 ifeq ($(JOBS),)
 	JOBS:=1
 endif
 
+ifeq ($(HEAVY_JOBS),)
+	HEAVY_JOBS:=1
+endif
+
 all: mapnik
 
 install:
 	$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install
 
 release:
-	export MAPNIK_VERSION=$(shell ./utils/mapnik-config/mapnik-config --version) && \
-	export TARBALL_NAME="mapnik-v$${MAPNIK_VERSION}" && \
-	cd /tmp/ && \
-	rm -rf $${TARBALL_NAME} && \
-	git clone --depth 1 --branch v$${MAPNIK_VERSION} git@github.com:mapnik/mapnik.git $${TARBALL_NAME} && \
-	cd $${TARBALL_NAME} && \
-	git checkout "tags/v$${MAPNIK_VERSION}" && \
-	git submodule update --depth 1 --init && \
-	rm -rf test/data/.git && \
-	rm -rf test/data/.gitignore && \
-	rm -rf test/data-visual/.git && \
-	rm -rf test/data-visual/.gitignore && \
-	rm -rf .git && \
-	rm -rf .gitignore && \
-	cd ../ && \
-	tar cjf $${TARBALL_NAME}.tar.bz2 $${TARBALL_NAME}/ && \
-	aws s3 cp --acl public-read $${TARBALL_NAME}.tar.bz2 s3://mapnik/dist/v$${MAPNIK_VERSION}/
+	./scripts/publish_release.sh
 
-python:
-	if [ ! -d ./bindings/python ]; then git clone git@github.com:mapnik/python-mapnik.git --recursive ./bindings/python; else (cd bindings/python && git pull && git submodule update --init); fi;
-	make
-	python bindings/python/test/visual.py -q
+test-release:
+	./scripts/test_release.sh
 
 src/json/libmapnik-json.a:
-	# we first build memory intensive files with -j1
-	$(PYTHON) scons/scons.py -j1 \
+	# we first build memory intensive files with -j$(HEAVY_JOBS)
+	$(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \
 		--config=cache --implicit-cache --max-drift=1 \
-		src/renderer_common/process_group_symbolizer.os \
+		src/renderer_common/render_group_symbolizer.os \
+		src/renderer_common/render_markers_symbolizer.os \
+		src/renderer_common/render_thunk_extractor.os \
 		src/json/libmapnik-json.a \
 		src/wkt/libmapnik-wkt.a \
-		src/css_color_grammar.os \
-		src/expression_grammar.os \
-		src/transform_expression_grammar.os \
-		src/image_filter_types.os \
-		src/agg/process_markers_symbolizer.os \
-		src/agg/process_group_symbolizer.os \
-		src/grid/process_markers_symbolizer.os \
-		src/grid/process_group_symbolizer.os \
-		src/cairo/process_markers_symbolizer.os \
-		src/cairo/process_group_symbolizer.os \
+		src/css/css_grammar_x3.os \
+		src/css/css_color_grammar_x3.os \
+		src/expression_grammar_x3.os \
+		src/transform_expression_grammar_x3.os \
+		src/image_filter_grammar_x3.os \
+		src/marker_helpers.os \
+		src/svg/svg_transform_parser.os \
+		src/agg/process_line_symbolizer.os \
+		plugins/input/geojson/geojson_datasource.os \
+		src/svg/svg_path_parser.os \
+		src/svg/svg_parser.os \
+		src/svg/svg_points_parser.os \
+		src/svg/svg_transform_parser.os \
+
 
 mapnik: src/json/libmapnik-json.a
 	# then install the rest with -j$(JOBS)
@@ -70,6 +59,8 @@ clean:
 	@find ./src/ -name "*.so" -exec rm {} \;
 	@find ./ -name "*.o" -exec rm {} \;
 	@find ./src/ -name "*.a" -exec rm {} \;
+	@find ./ -name "*.gcda" -exec rm {} \;
+	@find ./ -name "*.gcno" -exec rm {} \;
 
 distclean:
 	if test -e "config.py"; then mv "config.py" "config.py.backup"; fi
@@ -82,10 +73,13 @@ rebuild:
 uninstall:
 	@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall
 
-test/data:
-	git submodule update --init
+test/data-visual:
+	./scripts/ensure_test_data.sh
 
-test: ./test/data
+test/data:
+	./scripts/ensure_test_data.sh
+
+test: ./test/data test/data-visual
 	@./test/run
 
 check: test
@@ -96,13 +90,6 @@ bench:
 demo:
 	cd demo/c++; ./rundemo `mapnik-config --prefix`
 
-pep8:
-	# https://gist.github.com/1903033
-	# gsed on osx
-	@pep8 -r --select=W293 -q --filename=*.py `pwd`/tests/ | xargs gsed -i 's/^[ \r\t]*$$//'
-	@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs gsed -i -e :a -e '/^\n*$$/{$$d;N;ba' -e '}'
-	@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs ged -i '/./,/^$$/!d'
-
 # note: pass --gen-suppressions=yes to create new suppression entries
 grind:
 	@source localize.sh && \

README.md

@@ -8,7 +8,8 @@ _/      _/    _/_/_/  _/_/_/    _/    _/  _/  _/    _/
                     _/
 ```
 
-[![Build Status](https://secure.travis-ci.org/mapnik/mapnik.png)](http://travis-ci.org/mapnik/mapnik)
+[![TravisCI](https://api.travis-ci.com/mapnik/mapnik.svg?branch=master)](http://travis-ci.com/mapnik/mapnik)
+[![codecov](https://codecov.io/gh/mapnik/mapnik/branch/master/graph/badge.svg)](https://codecov.io/gh/mapnik/mapnik)
 
 Mapnik is an open source toolkit for developing mapping applications. At the core is a C++ shared library providing algorithms and patterns for spatial data access and visualization.
 
@@ -18,8 +19,12 @@ For further information see [http://mapnik.org](http://mapnik.org) and also our
 
 # Installation
 
-See [INSTALL.md](https://github.com/mapnik/mapnik/blob/master/INSTALL.md) for installation instructions and the [Install](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) page on the wiki for guides.
+See [INSTALL.md](INSTALL.md) for installation instructions and the [Install](https://github.com/mapnik/mapnik/wiki/Mapnik-Installation) page on the wiki for guides.
+
+# Code of Conduct
+
+Please note that this project is released with a [Contributor Code of Conduct](https://github.com/mapnik/mapnik/blob/master/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
 # License
 
-Mapnik software is free and is released under the LGPL ([GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl.html_)). Please see [COPYING](https://github.com/mapnik/mapnik/blob/master/COPYING) for more information.
+Mapnik software is free and is released under the LGPL v2.1 ([GNU Lesser General Public License, version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)). Please see [COPYING](https://github.com/mapnik/mapnik/blob/master/COPYING) for more information.

benchmark/CMakeLists.txt

@@ -0,0 +1,52 @@
+project(mapnik-benchmark)
+
+set(BENCHMARK_SRCS
+    src/normalize_angle.cpp
+    src/test_array_allocation.cpp
+    src/test_expression_parse.cpp
+    src/test_face_ptr_creation.cpp
+    src/test_font_registration.cpp
+    src/test_getline.cpp
+    src/test_marker_cache.cpp
+    src/test_noop_rendering.cpp
+    src/test_numeric_cast_vs_static_cast.cpp
+    src/test_offset_converter.cpp
+    src/test_png_encoding1.cpp
+    src/test_png_encoding2.cpp
+    src/test_polygon_clipping_rendering.cpp
+    src/test_polygon_clipping.cpp
+    src/test_proj_transform1.cpp
+    src/test_quad_tree.cpp
+    src/test_rendering_shared_map.cpp
+    src/test_rendering.cpp
+    src/test_to_bool.cpp
+    src/test_to_double.cpp
+    src/test_to_int.cpp
+    src/test_to_string1.cpp
+    src/test_to_string2.cpp
+    src/test_utf_encoding.cpp
+)
+function(mapnik_create_benchmark)
+    get_filename_component(BENCHNAME ${ARGV0} NAME_WE)
+    set(TARGET_NAME "mapnik-benchmark-${BENCHNAME}")
+    add_executable(${TARGET_NAME} ${ARGV0})
+    target_include_directories(${TARGET_NAME} PRIVATE include)
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        mapnik::agg
+        mapnik::mapnik
+        ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
+    )
+    set_target_properties(${TARGET_NAME} PROPERTIES
+        OUTPUT_NAME "${BENCHNAME}"
+    )
+endfunction()
+
+foreach(benchmark ${BENCHMARK_SRCS})
+    mapnik_create_benchmark(${benchmark})
+endforeach()
+
+file(COPY data DESTINATION "${MAPNIK_OUTPUT_DIR}/benchmark")
+file(COPY run_benchmarks
+    DESTINATION "${MAPNIK_OUTPUT_DIR}"
+    FILE_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ
+)

benchmark/bench_framework.hpp

@@ -1,139 +0,0 @@
-#ifndef __MAPNIK_BENCH_FRAMEWORK_HPP__
-#define __MAPNIK_BENCH_FRAMEWORK_HPP__
-
-// mapnik
-#include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
-#include <mapnik/safe_cast.hpp>
-#include "../test/cleanup.hpp"
-
-// stl
-#include <chrono>
-#include <iomanip>
-#include <iostream>
-#include <set>
-#include <sstream>
-#include <thread>
-#include <vector>
-
-namespace benchmark {
-
-class test_case
-{
-protected:
-    mapnik::parameters params_;
-    std::size_t threads_;
-    std::size_t iterations_;
-public:
-    test_case(mapnik::parameters const& params)
-       : params_(params),
-         threads_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("threads",0))),
-         iterations_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("iterations",0)))
-         {}
-    std::size_t threads() const
-    {
-        return threads_;
-    }
-    std::size_t iterations() const
-    {
-        return iterations_;
-    }
-    virtual bool validate() const = 0;
-    virtual bool operator()() const = 0;
-    virtual ~test_case() {}
-};
-
-void handle_args(int argc, char** argv, mapnik::parameters & params)
-{
-    if (argc > 0) {
-        for (int i=1;i<argc;++i) {
-            std::string opt(argv[i]);
-            // parse --foo bar
-            if (!opt.empty() && (opt.find("--") != 0)) {
-                std::string key = std::string(argv[i-1]);
-                if (!key.empty() && (key.find("--") == 0)) {
-                    key = key.substr(key.find_first_not_of("-"));
-                    params[key] = opt;
-                }
-            }
-        }
-    }
-}
-
-#define BENCHMARK(test_class,name)                      \
-    int main(int argc, char** argv)                     \
-    {                                                   \
-        try                                             \
-        {                                               \
-            mapnik::parameters params;                  \
-            benchmark::handle_args(argc,argv,params);   \
-            test_class test_runner(params);             \
-            auto result = run(test_runner,name);        \
-            testing::run_cleanup();                     \
-            return result;                              \
-        }                                               \
-        catch (std::exception const& ex)                \
-        {                                               \
-            std::clog << ex.what() << "\n";             \
-            testing::run_cleanup();                     \
-            return -1;                                  \
-        }                                               \
-    }                                                   \
-
-template <typename T>
-int run(T const& test_runner, std::string const& name)
-{
-    try
-    {
-        if (!test_runner.validate())
-        {
-            std::clog << "test did not validate: " << name << "\n";
-            return -1;
-        }
-        // run test once before timing
-        // if it returns false then we'll abort timing
-        if (test_runner())
-        {
-            std::chrono::high_resolution_clock::time_point start;
-            std::chrono::high_resolution_clock::duration elapsed;
-            std::stringstream s;
-            s << name << ":"
-                << std::setw(45 - (int)s.tellp()) << std::right
-                << " t:" << test_runner.threads()
-                << " i:" << test_runner.iterations();
-            if (test_runner.threads() > 0)
-            {
-                using thread_group = std::vector<std::unique_ptr<std::thread> >;
-                using value_type = thread_group::value_type;
-                thread_group tg;
-                for (std::size_t i=0;i<test_runner.threads();++i)
-                {
-                    tg.emplace_back(new std::thread(test_runner));
-                }
-                start = std::chrono::high_resolution_clock::now();
-                std::for_each(tg.begin(), tg.end(), [](value_type & t) {if (t->joinable()) t->join();});
-                elapsed = std::chrono::high_resolution_clock::now() - start;
-            }
-            else
-            {
-                start = std::chrono::high_resolution_clock::now();
-                test_runner();
-                elapsed = std::chrono::high_resolution_clock::now() - start;
-            }
-            s << std::setw(65 - (int)s.tellp()) << std::right
-                << std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count() << " milliseconds\n";
-            std::clog << s.str();
-        }
-        return 0;
-    }
-    catch (std::exception const& ex)
-    {
-        std::clog << "test runner did not complete: " << ex.what() << "\n";
-        return -1;
-    }
-    return 0;
-}
-
-}
-
-#endif // __MAPNIK_BENCH_FRAMEWORK_HPP__

benchmark/build.py

@@ -9,6 +9,7 @@ test_env = env.Clone()
 test_env['LIBS'] = [env['MAPNIK_NAME']]
 test_env.AppendUnique(LIBS=copy(env['LIBMAPNIK_LIBS']))
 test_env.AppendUnique(LIBS='mapnik-wkt')
+test_env.AppendUnique(LIBS='sqlite3')
 if env['PLATFORM'] == 'Linux':
     test_env.AppendUnique(LIBS='dl')
     test_env.AppendUnique(LIBS='rt')
@@ -18,39 +19,19 @@ test_env.Append(CPPDEFINES = env['LIBMAPNIK_DEFINES'])
 if test_env['HAS_CAIRO']:
     test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS'])
     test_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
+test_env.PrependUnique(CPPPATH='include', delete_existing=True)
 test_env['LINKFLAGS'] = copy(test_env['LIBMAPNIK_LINKFLAGS'])
 if env['PLATFORM'] == 'Darwin':
     test_env.Append(LINKFLAGS='-F/ -framework CoreFoundation')
 
 test_env_local = test_env.Clone()
 
-#benchmarks = glob.glob('test*cpp')
-benchmarks = [
-    #"test_array_allocation.cpp",
-    #"test_png_encoding1.cpp",
-    #"test_png_encoding2.cpp",
-    #"test_to_string1.cpp",
-    #"test_to_string2.cpp",
-    #"test_to_bool.cpp",
-    #"test_to_double.cpp",
-    #"test_to_int.cpp",
-    #"test_utf_encoding.cpp"
-    "test_polygon_clipping.cpp",
-    #"test_polygon_clipping_rendering.cpp",
-    "test_proj_transform1.cpp",
-    "test_expression_parse.cpp",
-    "test_face_ptr_creation.cpp",
-    "test_font_registration.cpp",
-    "test_rendering.cpp",
-    "test_rendering_shared_map.cpp",
-    "test_offset_converter.cpp",
-    "test_marker_cache.cpp",
-    "test_quad_tree.cpp",
-    "test_noop_rendering.cpp",
-#    "test_numeric_cast_vs_static_cast.cpp",
-]
-for cpp_test in benchmarks:
-    test_program = test_env_local.Program('out/'+cpp_test.replace('.cpp',''), source=[cpp_test])
+benchmarks = glob.glob("src/*.cpp")
+
+for src in benchmarks:
+    name, ext = os.path.splitext(os.path.basename(src))
+    out = os.path.join("out", name)
+    test_program = test_env_local.Program(out, source=[src])
     if 'install' in COMMAND_LINE_TARGETS:
         env.Alias('install',test_program)
     #Depends(test_program, env.subst('../src/%s' % env['MAPNIK_LIB_NAME']))

benchmark/compare_images.hpp

@@ -1,37 +0,0 @@
-#ifndef __MAPNIK_COMPARE_IMAGES_HPP__
-#define __MAPNIK_COMPARE_IMAGES_HPP__
-
-#include <mapnik/image.hpp>
-#include <mapnik/image_util.hpp>
-#include <mapnik/image_reader.hpp>
-
-using namespace mapnik;
-
-namespace benchmark {
-
-    bool compare_images(std::string const& src_fn,std::string const& dest_fn)
-    {
-        std::unique_ptr<mapnik::image_reader> reader1(mapnik::get_image_reader(dest_fn,"png"));
-        if (!reader1.get())
-        {
-            throw mapnik::image_reader_exception("Failed to load: " + dest_fn);
-        }
-
-        std::unique_ptr<mapnik::image_reader> reader2(mapnik::get_image_reader(src_fn,"png"));
-        if (!reader2.get())
-        {
-            throw mapnik::image_reader_exception("Failed to load: " + src_fn);
-        }
-
-        const image_any desc_any = reader1->read(0,0,reader1->width(), reader1->height());
-        const image_any src_any = reader2->read(0,0,reader2->width(), reader2->height());
-
-        image_rgba8 const& dest = util::get<image_rgba8>(desc_any);
-        image_rgba8 const& src = util::get<image_rgba8>(src_any);
-
-        return compare(dest, src, 0, true) == 0;
-    }
-
-}
-
-#endif // __MAPNIK_COMPARE_IMAGES_HPP__

benchmark/data/gdal-wgs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map
-  srs="+init=epsg:4326"
+  srs="epsg:4326"
   background-color="#dfd8c9">
 
 <Style name="style">
@@ -10,7 +10,7 @@
   </Rule>
 </Style>
 <Layer name="layer"
-  srs="+init=epsg:4326">
+  srs="epsg:4326">
     <StyleName>style</StyleName>
     <Datasource>
        <Parameter name="file">./valid.geotiff.tif</Parameter>

benchmark/data/polygon_rendering_clip.xml

@@ -7,7 +7,7 @@
     <Layer name="world" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>style</StyleName>
         <Datasource>
-            <Parameter name="file">../../tests/data/shp/world_merc.shp</Parameter>
+            <Parameter name="file">../../test/data/shp/world_merc.shp</Parameter>
             <Parameter name="type">shape</Parameter>
         </Datasource>
     </Layer>

benchmark/data/polygon_rendering_no_clip.xml

@@ -7,7 +7,7 @@
     <Layer name="world" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
         <StyleName>style</StyleName>
         <Datasource>
-            <Parameter name="file">../../tests/data/shp/world_merc.shp</Parameter>
+            <Parameter name="file">../../test/data/shp/world_merc.shp</Parameter>
             <Parameter name="type">shape</Parameter>
         </Datasource>
     </Layer>

benchmark/data/raster-wgs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map
-  srs="+init=epsg:4326"
+  srs="epsg:4326"
   background-color="#dfd8c9">
 
 <Style name="style">
@@ -10,7 +10,7 @@
   </Rule>
 </Style>
 <Layer name="layer"
-  srs="+init=epsg:4326">
+  srs="epsg:4326">
     <StyleName>style</StyleName>
     <Datasource>
        <Parameter name="file">./valid.geotiff.tif</Parameter>

benchmark/data/roads.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE Map[]>
 <Map
   srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over"
-  font-directory="../../fonts/dejavu-fonts-ttf-2.34/ttf/DejaVuSans.ttf"
+  font-directory="../../fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf"
   background-color="#dfd8c9">
 
 <Style name="marking" filter-mode="first">

benchmark/include/bench_framework.hpp

@@ -0,0 +1,302 @@
+#ifndef MAPNIK_BENCH_FRAMEWORK_HPP
+#define MAPNIK_BENCH_FRAMEWORK_HPP
+
+// mapnik
+#include <mapnik/mapnik.hpp>
+#include <mapnik/debug.hpp>
+#include <mapnik/params.hpp>
+#include <mapnik/value/types.hpp>
+#include <mapnik/safe_cast.hpp>
+#include "../test/cleanup.hpp"
+
+// stl
+#include <chrono>
+#include <cmath>  // log10, round
+#include <cstdio> // snprintf
+#include <iomanip>
+#include <iostream>
+#include <thread>
+#include <mutex>
+#include <vector>
+
+namespace benchmark {
+
+template<typename T>
+using milliseconds = std::chrono::duration<T, std::milli>;
+
+template<typename T>
+using seconds = std::chrono::duration<T>;
+
+class test_case
+{
+  protected:
+    mapnik::parameters params_;
+    std::size_t threads_;
+    std::size_t iterations_;
+
+  public:
+    test_case(mapnik::parameters const& params)
+        : params_(params)
+        , threads_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("threads", 0)))
+        , iterations_(mapnik::safe_cast<std::size_t>(*params.get<mapnik::value_integer>("iterations", 0)))
+    {}
+    std::size_t threads() const { return threads_; }
+    std::size_t iterations() const { return iterations_; }
+    mapnik::parameters const& params() const { return params_; }
+    virtual bool validate() const = 0;
+    virtual bool operator()() const = 0;
+};
+
+// gathers --long-option values in 'params';
+// returns the index of the first non-option argument,
+// or negated index of an ill-formed option argument
+inline int parse_args(int argc, char** argv, mapnik::parameters& params)
+{
+    for (int i = 1; i < argc; ++i)
+    {
+        const char* opt = argv[i];
+        if (opt[0] != '-')
+        {
+            // non-option argument, return its index
+            return i;
+        }
+        if (opt[1] != '-')
+        {
+            // we only accept --long-options, but instead of throwing,
+            // just issue a warning and let the caller decide what to do
+            std::clog << argv[0] << ": invalid option '" << opt << "'\n";
+            return -i; // negative means ill-formed option #i
+        }
+        if (opt[2] == '\0')
+        {
+            // option-list terminator '--'
+            return i + 1;
+        }
+
+        // take option name without the leading '--'
+        std::string key(opt + 2);
+        size_t eq = key.find('=');
+        if (eq != std::string::npos)
+        {
+            // one-argument form '--foo=bar'
+            params[key.substr(0, eq)] = key.substr(eq + 1);
+        }
+        else if (i + 1 < argc)
+        {
+            // two-argument form '--foo' 'bar'
+            params[key] = std::string(argv[++i]);
+        }
+        else
+        {
+            // missing second argument
+            std::clog << argv[0] << ": missing option '" << opt << "' value\n";
+            return -i; // negative means ill-formed option #i
+        }
+    }
+    return argc; // there were no non-option arguments
+}
+
+inline void handle_common_args(mapnik::parameters const& params)
+{
+    if (auto severity = params.get<std::string>("log"))
+    {
+        if (*severity == "debug")
+            mapnik::logger::set_severity(mapnik::logger::debug);
+        else if (*severity == "warn")
+            mapnik::logger::set_severity(mapnik::logger::warn);
+        else if (*severity == "error")
+            mapnik::logger::set_severity(mapnik::logger::error);
+        else if (*severity == "none")
+            mapnik::logger::set_severity(mapnik::logger::none);
+        else
+            std::clog << "ignoring option --log='" << *severity << "' (allowed values are: debug, warn, error, none)\n";
+    }
+}
+
+inline int handle_args(int argc, char** argv, mapnik::parameters& params)
+{
+    int res = parse_args(argc, argv, params);
+    handle_common_args(params);
+    return res;
+}
+
+#define BENCHMARK(test_class, name)                                                                                    \
+    int main(int argc, char** argv)                                                                                    \
+    {                                                                                                                  \
+        mapnik::setup();                                                                                               \
+        try                                                                                                            \
+        {                                                                                                              \
+            mapnik::parameters params;                                                                                 \
+            benchmark::handle_args(argc, argv, params);                                                                \
+            test_class test_runner(params);                                                                            \
+            auto result = run(test_runner, name);                                                                      \
+            testing::run_cleanup();                                                                                    \
+            return result;                                                                                             \
+        }                                                                                                              \
+        catch (std::exception const& ex)                                                                               \
+        {                                                                                                              \
+            std::clog << ex.what() << "\n";                                                                            \
+            testing::run_cleanup();                                                                                    \
+            return -1;                                                                                                 \
+        }                                                                                                              \
+    }
+
+struct big_number_fmt
+{
+    int w;
+    double v;
+    const char* u;
+
+    big_number_fmt(int width, double value, int base = 1000)
+        : w(width)
+        , v(value)
+        , u("")
+    {
+        static const char* suffixes = "\0\0k\0M\0G\0T\0P\0E\0Z\0Y\0\0";
+        u = suffixes;
+
+        while (v > 1 && std::log10(std::round(v)) >= width && u[2])
+        {
+            v /= base;
+            u += 2;
+        }
+
+        // adjust width for proper alignment without suffix
+        w += (u == suffixes);
+    }
+};
+
+template<typename T>
+int run(T const& test_runner, std::string const& name)
+{
+    try
+    {
+        if (!test_runner.validate())
+        {
+            std::clog << "test did not validate: " << name << "\n";
+            return 1;
+        }
+        // run test once before timing
+        // if it returns false then we'll abort timing
+        if (!test_runner())
+        {
+            return 2;
+        }
+
+        std::chrono::high_resolution_clock::time_point start;
+        std::chrono::high_resolution_clock::duration elapsed;
+        auto opt_min_duration = test_runner.params().template get<double>("min-duration", 0.0);
+        std::chrono::duration<double> min_seconds(*opt_min_duration);
+        auto min_duration = std::chrono::duration_cast<decltype(elapsed)>(min_seconds);
+        auto num_iters = test_runner.iterations();
+        auto num_threads = test_runner.threads();
+        auto total_iters = 0;
+
+        if (num_threads > 0)
+        {
+            std::mutex mtx_ready;
+            std::unique_lock<std::mutex> lock_ready(mtx_ready);
+
+            auto stub = [&](T const& test_copy) {
+                // workers will wait on this mutex until the main thread
+                // constructs all of them and starts measuring time
+                std::unique_lock<std::mutex> my_lock(mtx_ready);
+                my_lock.unlock();
+                test_copy();
+            };
+
+            std::vector<std::thread> tg;
+            tg.reserve(num_threads);
+            for (auto i = num_threads; i-- > 0;)
+            {
+                tg.emplace_back(stub, test_runner);
+            }
+            start = std::chrono::high_resolution_clock::now();
+            lock_ready.unlock();
+            // wait for all workers to finish
+            for (auto& t : tg)
+            {
+                if (t.joinable())
+                    t.join();
+            }
+            elapsed = std::chrono::high_resolution_clock::now() - start;
+            // this is actually per-thread count, not total, but I think
+            // reporting average 'iters/thread/second' is more useful
+            // than 'iters/second' multiplied by the number of threads
+            total_iters += num_iters;
+        }
+        else
+        {
+            start = std::chrono::high_resolution_clock::now();
+            do
+            {
+                test_runner();
+                elapsed = std::chrono::high_resolution_clock::now() - start;
+                total_iters += num_iters;
+            } while (elapsed < min_duration);
+        }
+
+        char msg[200];
+        double dur_total = milliseconds<double>(elapsed).count();
+        auto elapsed_nonzero = std::max(elapsed, decltype(elapsed){1});
+        big_number_fmt itersf(4, total_iters);
+        big_number_fmt ips(5, total_iters / seconds<double>(elapsed_nonzero).count());
+
+        std::clog << std::left << std::setw(43) << name;
+        std::clog << std::resetiosflags(std::ios::adjustfield);
+        if (num_threads > 0)
+        {
+            std::clog << ' ' << std::setw(3) << num_threads << " worker" << (num_threads > 1 ? "s" : " ");
+        }
+        else
+        {
+            std::clog << " main thread";
+        }
+        std::snprintf(msg,
+                      sizeof(msg),
+                      " %*.0f%s iters %6.0f milliseconds %*.0f%s i/t/s\n",
+                      itersf.w,
+                      itersf.v,
+                      itersf.u,
+                      dur_total,
+                      ips.w,
+                      ips.v,
+                      ips.u);
+        std::clog << msg;
+        return 0;
+    }
+    catch (std::exception const& ex)
+    {
+        std::clog << "test runner did not complete: " << ex.what() << "\n";
+        return 4;
+    }
+}
+
+struct sequencer
+{
+    sequencer(int argc, char** argv)
+        : exit_code_(0)
+    {
+        benchmark::handle_args(argc, argv, params_);
+    }
+
+    int done() const { return exit_code_; }
+
+    template<typename Test, typename... Args>
+    sequencer& run(std::string const& name, Args&&... args)
+    {
+        // Test instance lifetime is confined to this function
+        Test test_runner(params_, std::forward<Args>(args)...);
+        // any failing test run will make exit code non-zero
+        exit_code_ |= benchmark::run(test_runner, name);
+        return *this; // allow chaining calls
+    }
+
+  protected:
+    mapnik::parameters params_;
+    int exit_code_;
+};
+
+} // namespace benchmark
+
+#endif // MAPNIK_BENCH_FRAMEWORK_HPP

benchmark/include/compare_images.hpp

@@ -0,0 +1,35 @@
+#ifndef MAPNIK_COMPARE_IMAGES_HPP
+#define MAPNIK_COMPARE_IMAGES_HPP
+
+#include <mapnik/image.hpp>
+#include <mapnik/image_util.hpp>
+#include <mapnik/image_reader.hpp>
+
+namespace benchmark {
+
+bool compare_images(std::string const& src_fn, std::string const& dest_fn)
+{
+    std::unique_ptr<mapnik::image_reader> reader1(mapnik::get_image_reader(dest_fn, "png"));
+    if (!reader1.get())
+    {
+        throw mapnik::image_reader_exception("Failed to load: " + dest_fn);
+    }
+
+    std::unique_ptr<mapnik::image_reader> reader2(mapnik::get_image_reader(src_fn, "png"));
+    if (!reader2.get())
+    {
+        throw mapnik::image_reader_exception("Failed to load: " + src_fn);
+    }
+
+    const mapnik::image_any desc_any = reader1->read(0, 0, reader1->width(), reader1->height());
+    const mapnik::image_any src_any = reader2->read(0, 0, reader2->width(), reader2->height());
+
+    mapnik::image_rgba8 const& dest = mapnik::util::get<mapnik::image_rgba8>(desc_any);
+    mapnik::image_rgba8 const& src = mapnik::util::get<mapnik::image_rgba8>(src_any);
+
+    return compare(dest, src, 0, true) == 0;
+}
+
+} // namespace benchmark
+
+#endif // MAPNIK_COMPARE_IMAGES_HPP

benchmark/run

@@ -6,10 +6,16 @@ source ./localize.sh
 
 BASE=./benchmark/out
 function run {
-    ${BASE}/$1 --threads 0 --iterations $3;
-    ${BASE}/$1 --threads $2 --iterations $(expr $3 / $2);
+    local runner="$BASE/$1 --log=none"
+    local threads="$2"
+    local iters="$3"
+    shift 3
+    $runner --threads 0 --iterations $iters "$@"
+    if test $threads -gt 0; then
+        $runner --threads $threads --iterations $((iters/threads)) "$@"
+    fi
 }
-
+run test_getline 30 10000000
 #run test_array_allocation 20 100000
 #run test_png_encoding1 10 1000
 #run test_png_encoding2 10 50
@@ -18,11 +24,14 @@ function run {
 #run test_polygon_clipping 10 1000
 #run test_polygon_clipping_rendering 10 100
 run test_proj_transform1 10 100
-run test_expression_parse 10 1000
+run test_expression_parse 10 10000
 run test_face_ptr_creation 10 1000
 run test_font_registration 10 100
 run test_offset_converter 10 1000
+#run normalize_angle 0 1000000 --min-duration=0.2
 
+# commented since this is really slow on travis
+: '
 ./benchmark/out/test_rendering \
   --name "text rendering" \
   --map benchmark/data/roads.xml \
@@ -31,6 +40,7 @@ run test_offset_converter 10 1000
   --height 600 \
   --iterations 20 \
   --threads 10
+'
 
 ./benchmark/out/test_rendering \
   --name "gdal tiff rendering" \

benchmark/run_benchmarks

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+BASE=.
+function run {
+    local runner="$BASE/$1 --log=none"
+    local threads="$2"
+    local iters="$3"
+    shift 3
+    $runner --threads 0 --iterations $iters "$@"
+    if test $threads -gt 0; then
+        $runner --threads $threads --iterations $((iters/threads)) "$@"
+    fi
+}
+run test_getline 30 10000000
+#run test_array_allocation 20 100000
+#run test_png_encoding1 10 1000
+#run test_png_encoding2 10 50
+#run test_to_string1 10 100000
+#run test_to_string2 10 100000
+#run test_polygon_clipping 10 1000
+#run test_polygon_clipping_rendering 10 100
+run test_proj_transform1 10 100
+run test_expression_parse 10 10000
+run test_face_ptr_creation 10 1000
+run test_font_registration 10 100
+run test_offset_converter 10 1000
+#run normalize_angle 0 1000000 --min-duration=0.2
+
+# commented since this is really slow on travis
+: '
+$BASE/test_rendering \
+  --name "text rendering" \
+  --map benchmark/data/roads.xml \
+  --extent 1477001.12245,6890242.37746,1480004.49012,6892244.62256 \
+  --width 600 \
+  --height 600 \
+  --iterations 20 \
+  --threads 10
+'
+
+$BASE/test_rendering \
+  --name "gdal tiff rendering" \
+  --map benchmark/data/gdal-wgs.xml  \
+  --extent -180.0,-120.0,180.0,120.0 \
+  --width 600 \
+  --height 600 \
+  --iterations 20 \
+  --threads 10
+
+$BASE/test_rendering \
+  --name "raster tiff rendering" \
+  --map benchmark/data/raster-wgs.xml  \
+  --extent -180.0,-120.0,180.0,120.0 \
+  --width 600 \
+  --height 600 \
+  --iterations 20 \
+  --threads 10
+
+$BASE/test_quad_tree \
+  --iterations 10000 \
+  --threads 1
+
+$BASE/test_quad_tree \
+  --iterations 1000 \
+  --threads 10

benchmark/src/normalize_angle.cpp

@@ -0,0 +1,72 @@
+#include "bench_framework.hpp"
+
+#include <mapnik/util/math.hpp>
+
+template<typename T>
+struct bench_func : benchmark::test_case
+{
+    T (*const func_)(T);
+    T const value_;
+
+    bench_func(mapnik::parameters const& params, T (*func)(T), T value)
+        : test_case(params)
+        , func_(func)
+        , value_(value)
+    {}
+
+    bool validate() const { return true; }
+
+    bool operator()() const
+    {
+        for (auto i = this->iterations_; i-- > 0;)
+        {
+            func_(value_);
+        }
+        return true;
+    }
+};
+
+#define BENCH_FUNC1(func, value) run<bench_func<double>>(#func "(" #value ")", func, value)
+
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    return benchmark::sequencer(argc, argv)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +3)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +6)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +9)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +12)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +15)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +20)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +30)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +40)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +50)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +70)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +90)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +110)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +130)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +157)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +209)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +314)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +628)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, +942)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -3)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -6)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -9)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -12)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -15)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -20)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -30)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -40)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -50)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -70)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -90)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -110)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -130)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -157)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -209)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -314)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -628)
+      .BENCH_FUNC1(mapnik::util::normalize_angle, -942)
+      .done();
+}

benchmark/src/test_array_allocation.cpp

@@ -0,0 +1,370 @@
+#include "bench_framework.hpp"
+#include <cstring>
+#include <cstdlib>
+#include <deque>
+#include <stdexcept>
+#include <array>
+#include <valarray>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 105400
+#include <boost/container/static_vector.hpp>
+#endif
+
+// http://stackoverflow.com/questions/17347254/why-is-allocation-and-deallocation-of-stdvector-slower-than-dynamic-array-on-m
+
+#define FULL_ZERO_CHECK
+
+inline void ensure_zero(uint8_t* data, uint32_t size)
+{
+#ifdef FULL_ZERO_CHECK
+    for (std::size_t i = 0; i < size; ++i)
+    {
+        if (data[i] != 0)
+        {
+            throw std::runtime_error("found non zero value");
+        }
+    }
+#else
+    if (data[0] != 0)
+    {
+        throw std::runtime_error("found non zero value");
+    }
+#endif
+}
+
+class test1 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test1(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            // NOTE: sizeof(uint8_t) == 1
+            uint8_t* data = (uint8_t*)malloc(sizeof(uint8_t) * size_);
+            memcpy(data, &array_[0], size_);
+            ensure_zero(data, size_);
+            free(data);
+        }
+        return true;
+    }
+};
+
+class test1b : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test1b(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            // NOTE: sizeof(uint8_t) == 1
+            uint8_t* data = (uint8_t*)malloc(sizeof(uint8_t) * size_);
+            memset(data, 0, sizeof(uint8_t) * size_);
+            ensure_zero(data, size_);
+            free(data);
+        }
+        return true;
+    }
+};
+
+class test1c : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test1c(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            uint8_t* data = static_cast<uint8_t*>(::operator new(sizeof(uint8_t) * size_));
+            std::fill(data, data + size_, 0);
+            ensure_zero(data, size_);
+            ::operator delete(data);
+        }
+        return true;
+    }
+};
+
+class test2 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test2(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            uint8_t* data = static_cast<uint8_t*>(::operator new(sizeof(uint8_t) * size_));
+            memcpy(data, &array_[0], size_);
+            ensure_zero(data, size_);
+            ::operator delete(data), data = 0;
+        }
+        return true;
+    }
+};
+
+class test3 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test3(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::vector<uint8_t> data(size_);
+            ensure_zero(&data[0], data.size());
+        }
+        return true;
+    }
+};
+
+class test3b : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test3b(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::vector<uint8_t> data(0);
+            data.resize(size_, 0);
+            ensure_zero(&data[0], data.size());
+        }
+        return true;
+    }
+};
+
+class test3c : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test3c(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::vector<uint8_t> data(0);
+            data.assign(size_, 0);
+            ensure_zero(&data[0], data.size());
+        }
+        return true;
+    }
+};
+
+class test3d : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test3d(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::deque<uint8_t> data(size_);
+            for (std::size_t i = 0; i < size_; ++i)
+            {
+                if (data[i] != 0)
+                {
+                    throw std::runtime_error("found non zero value");
+                }
+            }
+        }
+        return true;
+    }
+};
+
+class test4 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test4(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            uint8_t* data = (uint8_t*)calloc(size_, sizeof(uint8_t));
+            ensure_zero(data, size_);
+            free(data);
+        }
+        return true;
+    }
+};
+
+class test5 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test5(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::string data(array_.begin(), array_.end());
+            ensure_zero((uint8_t*)&data[0], size_);
+        }
+        return true;
+    }
+};
+
+class test5b : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<char> array_;
+    test5b(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::string data(&array_[0], array_.size());
+            ensure_zero((uint8_t*)&data[0], size_);
+        }
+        return true;
+    }
+};
+
+// C++14 dynarray<T>
+// http://isocpp.org/blog/2013/04/trip-report-iso-c-spring-2013-meeting
+// http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130909/088700.html
+// http://stackoverflow.com/questions/17303902/any-alternative-to-stddynarray-presently-available
+
+class test6 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test6(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            std::valarray<uint8_t> data(static_cast<uint8_t>(0), static_cast<size_t>(size_));
+            ensure_zero(&data[0], size_);
+        }
+        return true;
+    }
+};
+
+#if BOOST_VERSION >= 105400
+// http://i42.co.uk/stuff/vecarray.htm
+// http://www.boost.org/doc/libs/1_54_0/doc/html/boost/container/static_vector.html
+
+class test7 : public benchmark::test_case
+{
+  public:
+    uint32_t size_;
+    std::vector<uint8_t> array_;
+    test7(mapnik::parameters const& params)
+        : test_case(params)
+        , size_(*params.get<mapnik::value_integer>("size", 256 * 256))
+        , array_(size_, 0)
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            boost::container::static_vector<uint8_t, 256 * 256> data(size_, 0);
+            ensure_zero(&data[0], size_);
+        }
+        return true;
+    }
+};
+#endif
+
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    return benchmark::sequencer(argc, argv)
+      .run<test4>("calloc")
+      .run<test1>("malloc/memcpy")
+      .run<test1b>("malloc/memset")
+      .run<test1c>("operator new/std::fill")
+      .run<test2>("operator new/memcpy")
+      .run<test3>("vector(N)")
+      .run<test3b>("vector/resize")
+      .run<test3c>("vector/assign")
+      .run<test3d>("deque(N)")
+      .run<test5>("std::string range")
+      .run<test5b>("std::string &[0]")
+      .run<test6>("valarray")
+#if BOOST_VERSION >= 105400
+      .run<test7>("static_vector")
+#endif
+      .done();
+}

benchmark/src/test_expression_parse.cpp

@@ -1,16 +1,18 @@
 #include "bench_framework.hpp"
 #include <mapnik/unicode.hpp>
+#include <mapnik/attribute.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
-#include <mapnik/expression_grammar.hpp>
 
 class test : public benchmark::test_case
 {
     std::string expr_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       expr_("((([mapnik::geometry_type]=2) and ([oneway]=1)) and ([class]='path'))") {}
+        : test_case(params)
+        , expr_("((([mapnik::geometry_type]=2) and ([oneway]=1)) and ([class]='path'))")
+    {}
     bool validate() const
     {
         mapnik::expression_ptr expr = mapnik::parse_expression(expr_);
@@ -24,18 +26,19 @@ public:
     }
     bool operator()() const
     {
-         for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             mapnik::expression_ptr expr = mapnik::parse_expression(expr_);
         }
         return true;
     }
 };
 
-
 int main(int argc, char** argv)
 {
+    mapnik::setup();
     mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
+    benchmark::handle_args(argc, argv, params);
     test test_runner(params);
-    run(test_runner,"expr parsing");
+    return run(test_runner, "expr parsing");
 }

benchmark/src/test_face_ptr_creation.cpp

@@ -4,9 +4,10 @@
 
 class test : public benchmark::test_case
 {
-public:
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {}
+        : test_case(params)
+    {}
     bool validate() const
     {
         std::size_t count = 0;
@@ -22,14 +23,15 @@ public:
                                                                       font_cache,
                                                                       mapnik::freetype_engine::get_mapping(),
                                                                       mapnik::freetype_engine::get_cache());
-            if (f) ++count;
+            if (f)
+                ++count;
         }
         return count == expected_count;
     }
     bool operator()() const
     {
         std::size_t expected_count = mapnik::freetype_engine::face_names().size();
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
             std::size_t count = 0;
             mapnik::freetype_engine::font_file_mapping_type font_file_mapping;
@@ -43,9 +45,11 @@ public:
                                                                           font_cache,
                                                                           mapnik::freetype_engine::get_mapping(),
                                                                           mapnik::freetype_engine::get_cache());
-                if (f) ++count;
+                if (f)
+                    ++count;
             }
-            if (count != expected_count) {
+            if (count != expected_count)
+            {
                 std::clog << "warning: face creation not working as expected\n";
             }
         }
@@ -55,15 +59,16 @@ public:
 
 int main(int argc, char** argv)
 {
+    mapnik::setup();
     mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
+    benchmark::handle_args(argc, argv, params);
     bool success = mapnik::freetype_engine::register_fonts("./fonts", true);
-    if (!success) {
+    if (!success)
+    {
         std::clog << "warning, did not register any new fonts!\n";
         return -1;
     }
     std::size_t face_count = mapnik::freetype_engine::face_names().size();
     test test_runner(params);
-    return run(test_runner,(boost::format("font_engine: creating %ld faces") % (face_count)).str());
+    return run(test_runner, (boost::format("font_engine: creating %ld faces") % (face_count)).str());
 }
-

benchmark/src/test_font_registration.cpp

@@ -1,21 +1,18 @@
 #include "bench_framework.hpp"
 #include <mapnik/font_engine_freetype.hpp>
 #include <boost/format.hpp>
-#include <boost/foreach.hpp>
 
 class test : public benchmark::test_case
 {
-public:
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {}
-    bool validate() const
-    {
-        return mapnik::freetype_engine::register_fonts("./fonts", true);
-    }
+        : test_case(params)
+    {}
+    bool validate() const { return mapnik::freetype_engine::register_fonts("./fonts", true); }
     bool operator()() const
     {
         unsigned long count = 0;
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
             mapnik::freetype_engine::register_fonts("./fonts", true);
             count++;
@@ -24,4 +21,4 @@ public:
     }
 };
 
-BENCHMARK(test,"font registration")
+BENCHMARK(test, "font registration")

benchmark/src/test_getline.cpp

@@ -0,0 +1,125 @@
+#include "bench_framework.hpp"
+#include "../plugins/input/csv/csv_getline.hpp"
+
+class test : public benchmark::test_case
+{
+  public:
+    std::string line_data_;
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , line_data_("this is one line\nand this is a second line\nand a third line")
+    {
+        auto line_data = params.get<std::string>("line");
+        if (line_data)
+        {
+            line_data_ = *line_data;
+        }
+    }
+
+    bool validate() const
+    {
+        std::string first = line_data_.substr(line_data_.find_first_not_of('\n'));
+        char newline = '\n';
+        std::string csv_line;
+        std::stringstream s;
+        s << line_data_;
+        std::getline(s, csv_line, newline);
+        if (csv_line != first)
+        {
+            return true;
+        }
+        else
+        {
+            std::clog << "Error: the parsed line (" << csv_line << ") should be a subset of the original line ("
+                      << line_data_ << ") (ensure you pass a line with a \\n)\n";
+        }
+        return true;
+    }
+    bool operator()() const
+    {
+        char newline = '\n';
+        std::string csv_line;
+        std::stringstream s;
+        s << line_data_;
+        for (unsigned i = 0; i < iterations_; ++i)
+        {
+            std::getline(s, csv_line, newline);
+        }
+        return true;
+    }
+};
+
+class test2 : public benchmark::test_case
+{
+  public:
+    std::string line_data_;
+    test2(mapnik::parameters const& params)
+        : test_case(params)
+        , line_data_("this is one line\nand this is a second line\nand a third line")
+    {
+        auto line_data = params.get<std::string>("line");
+        if (line_data)
+        {
+            line_data_ = *line_data;
+        }
+    }
+
+    bool validate() const
+    {
+        std::string first = line_data_.substr(line_data_.find_first_not_of('\n'));
+        char newline = '\n';
+        char quote = '"';
+        std::string csv_line;
+        std::stringstream s;
+        s << line_data_;
+        csv_utils::getline_csv(s, csv_line, newline, quote);
+        if (csv_line != first)
+        {
+            return true;
+        }
+        else
+        {
+            std::clog << "Error: the parsed line (" << csv_line << ") should be a subset of the original line ("
+                      << line_data_ << ") (ensure you pass a line with a \\n)\n";
+        }
+        return true;
+    }
+    bool operator()() const
+    {
+        char newline = '\n';
+        char quote = '"';
+        std::string csv_line;
+        std::stringstream s;
+        s << line_data_;
+        for (unsigned i = 0; i < iterations_; ++i)
+        {
+            csv_utils::getline_csv(s, csv_line, newline, quote);
+        }
+        return true;
+    }
+};
+
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    int return_value = 0;
+    try
+    {
+        mapnik::parameters params;
+        benchmark::handle_args(argc, argv, params);
+        {
+            test test_runner(params);
+            return_value = return_value | run(test_runner, "std::getline");
+        }
+        {
+            test2 test_runner2(params);
+            return_value = return_value | run(test_runner2, "csv_utils::getline_csv");
+        }
+    }
+    catch (std::exception const& ex)
+    {
+        std::clog << ex.what() << "\n";
+        return -1;
+    }
+    return return_value;
+}

benchmark/src/test_marker_cache.cpp

@@ -0,0 +1,40 @@
+#include "bench_framework.hpp"
+#include <mapnik/marker_cache.hpp>
+
+class test : public benchmark::test_case
+{
+    std::vector<std::string> images_;
+
+  public:
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , images_{"./test/data/images/dummy.jpg",
+                  "./test/data/images/dummy.jpeg",
+                  "./test/data/images/dummy.png",
+                  "./test/data/images/dummy.tif",
+                  "./test/data/images/dummy.tiff",
+                  //"./test/data/images/landusepattern.jpeg", // will fail since it is a png
+                  //"./test/data/images/xcode-CgBI.png", // will fail since its an invalid png
+                  "./test/data/svg/octocat.svg",
+                  "./test/data/svg/place-of-worship-24.svg",
+                  "./test/data/svg/point_sm.svg",
+                  "./test/data/svg/point.svg",
+                  "./test/data/svg/airfield-12.svg"}
+    {}
+    bool validate() const { return true; }
+    bool operator()() const
+    {
+        unsigned count = 0;
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            for (auto filename : images_)
+            {
+                auto marker = mapnik::marker_cache::instance().find(filename, true);
+            }
+            ++count;
+        }
+        return (count == iterations_);
+    }
+};
+
+BENCHMARK(test, "marker cache")

benchmark/src/test_noop_rendering.cpp

@@ -14,40 +14,38 @@
 
 class test : public benchmark::test_case
 {
-public:
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {}
+        : test_case(params)
+    {}
 
-    bool validate() const
-    {
-        return true;
-    }
+    bool validate() const { return true; }
     bool operator()() const
     {
-        mapnik::Map m(256,256,"+init=epsg:3857");
+        mapnik::Map m(256, 256, "epsg:3857");
 
         mapnik::parameters params;
-        params["type"]="memory";
+        params["type"] = "memory";
         auto ds = std::make_shared<mapnik::memory_datasource>(params);
         // add whitespace to trigger phony "reprojection"
-        mapnik::layer lay("layer",m.srs() + " ");
+        mapnik::layer lay("layer", m.srs() + " ");
         lay.set_datasource(ds);
         lay.add_style("style");
         m.add_layer(lay);
         // dummy style to ensure that layer is processed
-        m.insert_style("style",mapnik::feature_type_style());
+        m.insert_style("style", mapnik::feature_type_style());
         // dummy bbox, but "valid" because minx and miny are less
         // with an invalid bbox then layer.visible() returns false
         // and the initial rendering setup is not run
-        m.zoom_to_box(mapnik::box2d<double>(-1,-1,0,0));
-        for (unsigned i=0;i<iterations_;++i)
+        m.zoom_to_box(mapnik::box2d<double>(-1, -1, 0, 0));
+        for (unsigned i = 0; i < iterations_; ++i)
         {
-            mapnik::image_rgba8 im(256,256);
-            mapnik::agg_renderer<mapnik::image_rgba8> ren(m,im);
+            mapnik::image_rgba8 im(256, 256);
+            mapnik::agg_renderer<mapnik::image_rgba8> ren(m, im);
             ren.apply();
         }
         return true;
     }
 };
 
-BENCHMARK(test,"rendering with reprojection")
+BENCHMARK(test, "rendering with reprojection")

benchmark/src/test_numeric_cast_vs_static_cast.cpp

@@ -9,23 +9,25 @@ class test_static : public benchmark::test_case
 {
     double step_;
     std::uint8_t start_;
-public:
+
+  public:
     test_static(mapnik::parameters const& params)
-     : test_case(params),
-       step_(STEP_NUM),
-       start_(START_NUM) {}
-    bool validate() const
-    {
-        return true;
-    }
+        : test_case(params)
+        , step_(STEP_NUM)
+        , start_(START_NUM)
+    {}
+    bool validate() const { return true; }
     bool operator()() const
     {
         double value_ = 0.0;
         std::uint8_t x;
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             double c = static_cast<double>(start_) * value_;
-            if (c >= 256.0) c = 255.0;
-            if (c < 0.0) c = 0.0;
+            if (c >= 256.0)
+                c = 255.0;
+            if (c < 0.0)
+                c = 0.0;
             x = static_cast<std::uint8_t>(c);
             value_ += step_;
         }
@@ -33,35 +35,36 @@ public:
     }
 };
 
-using boost::numeric::positive_overflow;
 using boost::numeric::negative_overflow;
+using boost::numeric::positive_overflow;
 
 class test_numeric : public benchmark::test_case
 {
     double step_;
     std::uint8_t start_;
-public:
+
+  public:
     test_numeric(mapnik::parameters const& params)
-     : test_case(params),
-       step_(STEP_NUM),
-       start_(START_NUM) {}
-    bool validate() const
-    {
-        return true;
-    }
+        : test_case(params)
+        , step_(STEP_NUM)
+        , start_(START_NUM)
+    {}
+    bool validate() const { return true; }
     bool operator()() const
     {
         double value_ = 0.0;
         std::uint8_t x;
-        for (std::size_t i=0;i<iterations_;++i) {
-            try {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            try
+            {
                 x = boost::numeric_cast<std::uint8_t>(start_ * value_);
             }
-            catch(negative_overflow&)
+            catch (negative_overflow&)
             {
                 x = std::numeric_limits<std::uint8_t>::min();
             }
-            catch(positive_overflow&)
+            catch (positive_overflow&)
             {
                 x = std::numeric_limits<std::uint8_t>::max();
             }
@@ -73,15 +76,6 @@ public:
 
 int main(int argc, char** argv)
 {
-    mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
-    {
-        test_static test_runner(params);
-        run(test_runner,"static_cast");
-    }
-    {
-        test_numeric test_runner(params);
-        run(test_runner,"numeric_cast");
-    }
-    return 0;
+    mapnik::setup();
+    return benchmark::sequencer(argc, argv).run<test_static>("static_cast").run<test_numeric>("numeric_cast").done();
 }

benchmark/src/test_offset_converter.cpp

@@ -14,31 +14,36 @@ struct fake_path
     cont_type::iterator itr_;
 
     fake_path(std::initializer_list<double> l)
-        : fake_path(l.begin(), l.size()) {
-    }
+        : fake_path(l.begin(), l.size())
+    {}
 
-    fake_path(std::vector<double> const &v)
-        : fake_path(v.begin(), v.size()) {
-    }
+    fake_path(std::vector<double> const& v)
+        : fake_path(v.begin(), v.size())
+    {}
 
-    template <typename Itr>
-    fake_path(Itr itr, size_t sz) {
+    template<typename Itr>
+    fake_path(Itr itr, size_t sz)
+    {
         size_t num_coords = sz >> 1;
         vertices_.reserve(num_coords);
 
-        for (size_t i = 0; i < num_coords; ++i) {
+        for (size_t i = 0; i < num_coords; ++i)
+        {
             double x = *itr++;
             double y = *itr++;
             unsigned cmd = (i == 0) ? mapnik::SEG_MOVETO : mapnik::SEG_LINETO;
             vertices_.push_back(std::make_tuple(x, y, cmd));
-            if (i == num_coords - 1) cmd = mapnik::SEG_END;
+            if (i == num_coords - 1)
+                cmd = mapnik::SEG_END;
             vertices_.push_back(std::make_tuple(x, y, cmd));
         }
         itr_ = vertices_.begin();
     }
 
-    unsigned vertex(double *x, double *y) {
-        if (itr_ == vertices_.end()) {
+    unsigned vertex(double* x, double* y)
+    {
+        if (itr_ == vertices_.end())
+        {
             return mapnik::SEG_END;
         }
         *x = std::get<0>(*itr_);
@@ -48,33 +53,30 @@ struct fake_path
         return cmd;
     }
 
-    void rewind(unsigned) {
-        itr_ = vertices_.begin();
-    }
+    void rewind(unsigned) { itr_ = vertices_.begin(); }
 };
 
 class test_offset : public benchmark::test_case
 {
-public:
+  public:
     test_offset(mapnik::parameters const& params)
-     : test_case(params) {}
-    bool validate() const
-    {
-        return true;
-    }
+        : test_case(params)
+    {}
+    bool validate() const { return true; }
     bool operator()() const
     {
         std::vector<double> path;
         int mysize = 2500;
         int x1 = 0;
-        path.reserve(mysize*2);
-        for( int i = 0; i < mysize; i++ )
+        path.reserve(mysize * 2);
+        for (int i = 0; i < mysize; i++)
         {
-            path.push_back( i );
-            path.push_back( 0 );
+            path.push_back(i);
+            path.push_back(0);
         }
         fake_path fpath(path);
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             mapnik::offset_converter<fake_path> off_path(fpath);
             off_path.set_offset(10);
             unsigned cmd;
@@ -88,14 +90,15 @@ public:
     }
 };
 
-
 int main(int argc, char** argv)
 {
+    mapnik::setup();
     mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
+    benchmark::handle_args(argc, argv, params);
+    int return_value = 0;
     {
         test_offset test_runner(params);
-        run(test_runner,"offset_test");
+        return_value = run(test_runner, "offset_test");
     }
-    return 0;
+    return return_value;
 }

benchmark/src/test_png_encoding1.cpp

@@ -4,23 +4,23 @@
 class test : public benchmark::test_case
 {
     mapnik::image_rgba8 im_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       im_(256,256) {}
-    bool validate() const
-    {
-        return true;
-    }
+        : test_case(params)
+        , im_(256, 256)
+    {}
+    bool validate() const { return true; }
     bool operator()() const
     {
         std::string out;
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             out.clear();
-            out = mapnik::save_to_string(im_,"png8:m=h:z=1");
-        }
+            out = mapnik::save_to_string(im_, "png8:m=h:z=1");
         }
         return true;
+    }
 };
 
-BENCHMARK(test,"encoding blank png")
+BENCHMARK(test, "encoding blank png")

benchmark/src/test_png_encoding2.cpp

@@ -1,37 +1,41 @@
 #include "bench_framework.hpp"
 #include "compare_images.hpp"
+#include <memory>
 
 class test : public benchmark::test_case
 {
-    std::shared_ptr<image_rgba8> im_;
-public:
+    std::shared_ptr<mapnik::image_rgba8> im_;
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {
+        : test_case(params)
+    {
         std::string filename("./benchmark/data/multicolor.png");
-        std::unique_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(filename,"png"));
+        std::unique_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(filename, "png"));
         if (!reader.get())
         {
             throw mapnik::image_reader_exception("Failed to load: " + filename);
         }
-        im_ = std::make_shared<image_rgba8>(reader->width(),reader->height());
-        reader->read(0,0,*im_);
+        im_ = std::make_shared<mapnik::image_rgba8>(reader->width(), reader->height());
+        reader->read(0, 0, *im_);
     }
     bool validate() const
     {
         std::string expected("./benchmark/data/multicolor-hextree-expected.png");
         std::string actual("./benchmark/data/multicolor-hextree-actual.png");
-        mapnik::save_to_file(*im_,actual, "png8:m=h:z=1");
-        return benchmark::compare_images(actual,expected);
+        mapnik::save_to_file(*im_, actual, "png8:m=h:z=1");
+        return benchmark::compare_images(actual, expected);
     }
     bool operator()() const
     {
         std::string out;
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             out.clear();
-            out = mapnik::save_to_string(*im_,"png8:m=h:z=1");
-        }
+            out = mapnik::save_to_string(*im_, "png8:m=h:z=1");
         }
         return true;
+    }
 };
 
-BENCHMARK(test,"encoding multicolor png")
+BENCHMARK(test, "encoding multicolor png")

benchmark/src/test_polygon_clipping.cpp

@@ -10,10 +10,10 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
-#include <mapnik/geometry_envelope.hpp>
-#include <mapnik/geometry_correct.hpp>
-#include <mapnik/geometry_is_empty.hpp>
+#include <mapnik/geometry/boost_adapters.hpp>
+#include <mapnik/geometry/envelope.hpp>
+#include <mapnik/geometry/correct.hpp>
+#include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/color.hpp>
 // boost geometry
@@ -39,30 +39,31 @@ void render(mapnik::geometry::multi_polygon<double> const& geom,
             mapnik::box2d<double> const& extent,
             std::string const& name)
 {
-    using path_type = mapnik::transform_path_adapter<mapnik::view_transform,mapnik::geometry::polygon_vertex_adapter<double>>;
+    using path_type =
+      mapnik::transform_path_adapter<mapnik::view_transform, mapnik::geometry::polygon_vertex_adapter<double>>;
     using ren_base = agg::renderer_base<agg::pixfmt_rgba32_plain>;
     using renderer = agg::renderer_scanline_aa_solid<ren_base>;
-    mapnik::image_rgba8 im(256,256);
+    mapnik::image_rgba8 im(256, 256);
     mapnik::fill(im, mapnik::color("white"));
-    mapnik::box2d<double> padded_extent(155,134,665,466);//extent;
+    mapnik::box2d<double> padded_extent(155, 134, 665, 466); // extent;
     padded_extent.pad(10);
-    mapnik::view_transform tr(im.width(),im.height(),padded_extent,0,0);
-    agg::rendering_buffer buf(im.bytes(),im.width(),im.height(), im.row_size());
+    mapnik::view_transform tr(im.width(), im.height(), padded_extent, 0, 0);
+    agg::rendering_buffer buf(im.bytes(), im.width(), im.height(), im.row_size());
     agg::pixfmt_rgba32_plain pixf(buf);
     ren_base renb(pixf);
     renderer ren(renb);
-    mapnik::proj_transform prj_trans(mapnik::projection("+init=epsg:4326"),mapnik::projection("+init=epsg:4326"));
-    ren.color(agg::rgba8(127,127,127,255));
+    mapnik::proj_transform prj_trans(mapnik::projection("epsg:4326"), mapnik::projection("epsg:4326"));
+    ren.color(agg::rgba8(127, 127, 127, 255));
     agg::rasterizer_scanline_aa<> ras;
     for (auto const& poly : geom)
     {
         mapnik::geometry::polygon_vertex_adapter<double> va(poly);
-        path_type path(tr,va,prj_trans);
+        path_type path(tr, va, prj_trans);
         ras.add_path(path);
     }
     agg::scanline_u8 sl;
     agg::render_scanlines(ras, sl, ren);
-    mapnik::save_to_file(im,name);
+    mapnik::save_to_file(im, name);
 }
 
 class test1 : public benchmark::test_case
@@ -70,15 +71,15 @@ class test1 : public benchmark::test_case
     std::string wkt_in_;
     mapnik::box2d<double> extent_;
     std::string expected_;
-public:
+
+  public:
     using conv_clip = agg::conv_clip_polygon<mapnik::geometry::polygon_vertex_adapter<double>>;
-    test1(mapnik::parameters const& params,
-          std::string const& wkt_in,
-          mapnik::box2d<double> const& extent)
-     : test_case(params),
-       wkt_in_(wkt_in),
-       extent_(extent),
-       expected_("./benchmark/data/polygon_clipping_agg") {}
+    test1(mapnik::parameters const& params, std::string const& wkt_in, mapnik::box2d<double> const& extent)
+        : test_case(params)
+        , wkt_in_(wkt_in)
+        , extent_(extent)
+        , expected_("./benchmark/data/polygon_clipping_agg")
+    {}
     bool validate() const
     {
         mapnik::geometry::geometry<double> geom;
@@ -99,14 +100,8 @@ public:
         mapnik::geometry::polygon<double> const& poly = mapnik::util::get<mapnik::geometry::polygon<double>>(geom);
         mapnik::geometry::polygon_vertex_adapter<double> va(poly);
 
-
         conv_clip clipped(va);
-        clipped.clip_box(
-                    extent_.minx(),
-                    extent_.miny(),
-                    extent_.maxx(),
-                    extent_.maxy());
-
+        clipped.clip_box(extent_.minx(), extent_.miny(), extent_.maxx(), extent_.maxy());
 
         clipped.rewind(0);
         mapnik::geometry::polygon<double> poly2;
@@ -118,47 +113,49 @@ public:
         {
             if (cmd == mapnik::SEG_MOVETO)
             {
-                x0 = x; y0 = y;
+                x0 = x;
+                y0 = y;
             }
 
             if (cmd == mapnik::SEG_CLOSE)
             {
-                ring.add_coord(x0, y0);
+                ring.emplace_back(x0, y0);
                 break;
             }
-            ring.add_coord(x,y);
+            ring.emplace_back(x, y);
         }
-        poly2.set_exterior_ring(std::move(ring));
+        poly2.push_back(std::move(ring));
         // interior rings
         ring.clear();
         while ((cmd = clipped.vertex(&x, &y)) != mapnik::SEG_END)
         {
             if (cmd == mapnik::SEG_MOVETO)
             {
-                x0 = x; y0 = y;
+                x0 = x;
+                y0 = y;
             }
             else if (cmd == mapnik::SEG_CLOSE)
             {
-                ring.add_coord(x0,y0);
-                poly2.add_hole(std::move(ring));
+                ring.emplace_back(x0, y0);
+                poly2.push_back(std::move(ring));
                 ring.clear();
                 continue;
             }
-            ring.add_coord(x,y);
+            ring.emplace_back(x, y);
         }
 
-        std::string expect = expected_+".png";
-        std::string actual = expected_+"_actual.png";
+        std::string expect = expected_ + ".png";
+        std::string actual = expected_ + "_actual.png";
         mapnik::geometry::multi_polygon<double> mp;
         mp.emplace_back(poly2);
         auto env = mapnik::geometry::envelope(mp);
         if (!mapnik::util::exists(expect) || (std::getenv("UPDATE") != nullptr))
         {
             std::clog << "generating expected image: " << expect << "\n";
-            render(mp,env,expect);
+            render(mp, env, expect);
         }
-        render(mp,env,actual);
-        return benchmark::compare_images(actual,expect);
+        render(mp, env, actual);
+        return benchmark::compare_images(actual, expect);
     }
     bool operator()() const
     {
@@ -178,29 +175,28 @@ public:
             return false;
         }
         bool valid = true;
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
             unsigned count = 0;
             mapnik::geometry::polygon<double> const& poly = mapnik::util::get<mapnik::geometry::polygon<double>>(geom);
             mapnik::geometry::polygon_vertex_adapter<double> va(poly);
             conv_clip clipped(va);
-            clipped.clip_box(
-                        extent_.minx(),
-                        extent_.miny(),
-                        extent_.maxx(),
-                        extent_.maxy());
+            clipped.clip_box(extent_.minx(), extent_.miny(), extent_.maxx(), extent_.maxy());
             unsigned cmd;
-            double x,y;
+            double x, y;
             // NOTE: this rewind is critical otherwise
             // agg_conv_adapter_vpgen will give garbage
             // values for the first vertex
             clipped.rewind(0);
-            while ((cmd = clipped.vertex(&x, &y)) != mapnik::SEG_END) {
+            while ((cmd = clipped.vertex(&x, &y)) != mapnik::SEG_END)
+            {
                 count++;
             }
             unsigned expected_count = 30;
-            if (count != expected_count) {
-                std::clog << "test1: clipping failed: processed " << count << " verticies but expected " << expected_count << "\n";
+            if (count != expected_count)
+            {
+                std::clog << "test1: clipping failed: processed " << count << " verticies but expected "
+                          << expected_count << "\n";
                 valid = false;
             }
         }
@@ -208,20 +204,19 @@ public:
     }
 };
 
-
 class test3 : public benchmark::test_case
 {
     std::string wkt_in_;
     mapnik::box2d<double> extent_;
     std::string expected_;
-public:
-    test3(mapnik::parameters const& params,
-          std::string const& wkt_in,
-          mapnik::box2d<double> const& extent)
-     : test_case(params),
-       wkt_in_(wkt_in),
-       extent_(extent),
-       expected_("./benchmark/data/polygon_clipping_boost") {}
+
+  public:
+    test3(mapnik::parameters const& params, std::string const& wkt_in, mapnik::box2d<double> const& extent)
+        : test_case(params)
+        , wkt_in_(wkt_in)
+        , extent_(extent)
+        , expected_("./benchmark/data/polygon_clipping_boost")
+    {}
     bool validate() const
     {
         mapnik::geometry::geometry<double> geom;
@@ -234,30 +229,30 @@ public:
             std::clog << "empty geom!\n";
             return false;
         }
-        if (!geom.is<mapnik::geometry::polygon<double> >())
+        if (!geom.is<mapnik::geometry::polygon<double>>())
         {
             std::clog << "not a polygon!\n";
             return false;
         }
-        mapnik::geometry::polygon<double> & poly = mapnik::util::get<mapnik::geometry::polygon<double> >(geom);
+        mapnik::geometry::polygon<double>& poly = mapnik::util::get<mapnik::geometry::polygon<double>>(geom);
         mapnik::geometry::correct(poly);
 
         mapnik::geometry::linear_ring<double> bbox;
-        bbox.add_coord(extent_.minx(), extent_.miny());
-        bbox.add_coord(extent_.minx(), extent_.maxy());
-        bbox.add_coord(extent_.maxx(), extent_.maxy());
-        bbox.add_coord(extent_.maxx(), extent_.miny());
-        bbox.add_coord(extent_.minx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.maxy());
+        bbox.emplace_back(extent_.maxx(), extent_.maxy());
+        bbox.emplace_back(extent_.maxx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.miny());
 
-        std::deque<mapnik::geometry::polygon<double> > result;
+        std::deque<mapnik::geometry::polygon<double>> result;
         boost::geometry::intersection(bbox, poly, result);
 
-        std::string expect = expected_+".png";
-        std::string actual = expected_+"_actual.png";
+        std::string expect = expected_ + ".png";
+        std::string actual = expected_ + "_actual.png";
         mapnik::geometry::multi_polygon<double> mp;
-        for (auto const& _geom: result)
+        for (auto const& _geom : result)
         {
-            //std::clog << boost::geometry::dsv(geom) << "\n";
+            // std::clog << boost::geometry::dsv(geom) << "\n";
             mp.emplace_back(_geom);
         }
         mapnik::geometry::geometry<double> geom2(mp);
@@ -265,10 +260,10 @@ public:
         if (!mapnik::util::exists(expect) || (std::getenv("UPDATE") != nullptr))
         {
             std::clog << "generating expected image: " << expect << "\n";
-            render(mp,env,expect);
+            render(mp, env, expect);
         }
-        render(mp,env,actual);
-        return benchmark::compare_images(actual,expect);
+        render(mp, env, actual);
+        return benchmark::compare_images(actual, expect);
     }
     bool operator()() const
     {
@@ -282,38 +277,41 @@ public:
             std::clog << "empty geom!\n";
             return false;
         }
-        if (!geom.is<mapnik::geometry::polygon<double> >())
+        if (!geom.is<mapnik::geometry::polygon<double>>())
         {
             std::clog << "not a polygon!\n";
             return false;
         }
-        mapnik::geometry::polygon<double> & poly = mapnik::util::get<mapnik::geometry::polygon<double> >(geom);
+        mapnik::geometry::polygon<double>& poly = mapnik::util::get<mapnik::geometry::polygon<double>>(geom);
         mapnik::geometry::correct(poly);
 
         mapnik::geometry::linear_ring<double> bbox;
-        bbox.add_coord(extent_.minx(), extent_.miny());
-        bbox.add_coord(extent_.minx(), extent_.maxy());
-        bbox.add_coord(extent_.maxx(), extent_.maxy());
-        bbox.add_coord(extent_.maxx(), extent_.miny());
-        bbox.add_coord(extent_.minx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.maxy());
+        bbox.emplace_back(extent_.maxx(), extent_.maxy());
+        bbox.emplace_back(extent_.maxx(), extent_.miny());
+        bbox.emplace_back(extent_.minx(), extent_.miny());
 
         bool valid = true;
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
-            std::deque<mapnik::geometry::polygon<double> > result;
+            std::deque<mapnik::geometry::polygon<double>> result;
             boost::geometry::intersection(bbox, poly, result);
             unsigned count = 0;
             for (auto const& _geom : result)
             {
                 mapnik::geometry::polygon_vertex_adapter<double> va(_geom);
                 unsigned cmd;
-                double x,y;
-                while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END) {
+                double x, y;
+                while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END)
+                {
                     ++count;
                 }
                 unsigned expected_count = 29;
-                if (count != expected_count) {
-                    std::clog << "test3: clipping failed: processed " << count << " verticies but expected " << expected_count << "\n";
+                if (count != expected_count)
+                {
+                    std::clog << "test3: clipping failed: processed " << count << " verticies but expected "
+                              << expected_count << "\n";
                     valid = false;
                 }
             }
@@ -500,8 +498,8 @@ public:
                 }
                 unsigned expected_count = 29;
                 if (count != expected_count) {
-                    std::clog << "test3: clipping failed: processed " << count << " verticies but expected " << expected_count << "\n";
-                    valid = false;
+                    std::clog << "test3: clipping failed: processed " << count << " verticies but expected " <<
+expected_count << "\n"; valid = false;
                 }
             }
         }
@@ -512,15 +510,19 @@ public:
 
 int main(int argc, char** argv)
 {
+    mapnik::setup();
     mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
+    benchmark::handle_args(argc, argv, params);
 
     // polygon/rect clipping
-    // IN : POLYGON ((155 203, 233 454, 315 340, 421 446, 463 324, 559 466, 665 253, 528 178, 394 229, 329 138, 212 134, 183 228, 200 264, 155 203),(313 190, 440 256, 470 248, 510 305, 533 237, 613 263, 553 397, 455 262, 405 378, 343 287, 249 334, 229 191, 313 190))
-    // RECT : POLYGON ((181 106, 181 470, 631 470, 631 106, 181 106))
-    // OUT (expected)
-    // POLYGON ((181 286.6666666666667, 233 454, 315 340, 421 446, 463 324, 559 466, 631 321.3207547169811, 631 234.38686131386862, 528 178, 394 229, 329 138, 212 134, 183 228, 200 264, 181 238.24444444444444, 181 286.6666666666667),(313 190, 440 256, 470 248, 510 305, 533 237, 613 263, 553 397, 455 262, 405 378, 343 287, 249 334, 229 191, 313 190))
-
+    // IN : POLYGON ((155 203, 233 454, 315 340, 421 446, 463 324, 559 466, 665 253, 528 178, 394 229, 329 138, 212 134,
+    // 183 228, 200 264, 155 203),(313 190, 440 256, 470 248, 510 305, 533 237, 613 263, 553 397, 455 262, 405 378, 343
+    // 287, 249 334, 229 191, 313 190)) RECT : POLYGON ((181 106, 181 470, 631 470, 631 106, 181 106)) OUT (expected)
+    // POLYGON ((181 286.6666666666667, 233 454, 315 340, 421 446, 463 324, 559 466, 631 321.3207547169811, 631
+    // 234.38686131386862, 528 178, 394 229, 329 138, 212 134, 183 228, 200 264, 181 238.24444444444444, 181
+    // 286.6666666666667),(313 190, 440 256, 470 248, 510 305, 533 237, 613 263, 553 397, 455 262, 405 378, 343 287, 249
+    // 334, 229 191, 313 190))
+#if 0
     mapnik::box2d<double> clipping_box(181,106,631,470);
     std::string filename_("./benchmark/data/polygon.wkt");
     std::ifstream in(filename_.c_str(),std::ios_base::in | std::ios_base::binary);
@@ -528,19 +530,21 @@ int main(int argc, char** argv)
         throw std::runtime_error("could not open: '" + filename_ + "'");
     std::string wkt_in( (std::istreambuf_iterator<char>(in) ),
                (std::istreambuf_iterator<char>()) );
+    int return_value = 0;
     {
         test1 test_runner(params,wkt_in,clipping_box);
-        run(test_runner,"clipping polygon with agg");
+        return_value = return_value | run(test_runner,"clipping polygon with agg");
     }
     {
         test3 test_runner(params,wkt_in,clipping_box);
-        run(test_runner,"clipping polygon with boost");
+        return_value = return_value | run(test_runner,"clipping polygon with boost");
     }
     /*
     {
         test4 test_runner(params,wkt_in,clipping_box);
-        run(test_runner,"clipping polygon with clipper_tree");
+        return_value = return_value | run(test_runner,"clipping polygon with clipper_tree");
     }
     */
-    return 0;
+#endif
+    return 0; // return_value;
 }

benchmark/src/test_polygon_clipping_rendering.cpp

@@ -0,0 +1,59 @@
+#include "bench_framework.hpp"
+#include <mapnik/map.hpp>
+#include <mapnik/load_map.hpp>
+#include <mapnik/agg_renderer.hpp>
+#include <mapnik/datasource_cache.hpp>
+
+class test : public benchmark::test_case
+{
+    std::string xml_;
+    mapnik::box2d<double> extent_;
+
+  public:
+    test(mapnik::parameters const& params, std::string const& xml, mapnik::box2d<double> const& extent)
+        : test_case(params)
+        , xml_(xml)
+        , extent_(extent)
+    {}
+    bool validate() const
+    {
+        mapnik::Map m(256, 256);
+        mapnik::load_map(m, xml_);
+        m.zoom_to_box(extent_);
+        mapnik::image_rgba8 im(m.width(), m.height());
+        mapnik::agg_renderer<mapnik::image_rgba8> ren(m, im);
+        ren.apply();
+        // mapnik::save_to_file(im.data(),"test.png");
+        return true;
+    }
+    bool operator()() const
+    {
+        mapnik::Map m(256, 256);
+        mapnik::load_map(m, xml_);
+        m.zoom_to_box(extent_);
+        for (unsigned i = 0; i < iterations_; ++i)
+        {
+            mapnik::image_rgba8 im(m.width(), m.height());
+            mapnik::agg_renderer<mapnik::image_rgba8> ren(m, im);
+            ren.apply();
+        }
+        return true;
+    }
+};
+
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    mapnik::parameters params;
+    benchmark::handle_args(argc, argv, params);
+    mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
+    mapnik::box2d<double> z1(-20037508.3428, -8317435.0606, 20037508.3428, 18399242.7298);
+    // bbox for 16/10491/22911.png
+    mapnik::box2d<double> z16(-13622912.929097254, 6026906.8062295765, -13621689.93664469, 6028129.79868214);
+    return benchmark::sequencer(argc, argv)
+      .run<test>("polygon clip render z1", "benchmark/data/polygon_rendering_clip.xml", z1)
+      .run<test>("polygon noclip render z1", "benchmark/data/polygon_rendering_no_clip.xml", z1)
+      .run<test>("polygon clip render z16", "benchmark/data/polygon_rendering_clip.xml", z16)
+      .run<test>("polygon noclip render z16", "benchmark/data/polygon_rendering_no_clip.xml", z16)
+      .done();
+}

benchmark/src/test_proj_transform1.cpp

@@ -0,0 +1,77 @@
+#include "bench_framework.hpp"
+#include <mapnik/geometry/box2d.hpp>
+#include <mapnik/projection.hpp>
+#include <mapnik/proj_transform.hpp>
+
+class test : public benchmark::test_case
+{
+    std::string src_;
+    std::string dest_;
+    mapnik::box2d<double> from_;
+    mapnik::box2d<double> to_;
+    bool defer_proj_init_;
+
+  public:
+    test(mapnik::parameters const& params,
+         std::string const& src,
+         std::string const& dest,
+         mapnik::box2d<double> const& from,
+         mapnik::box2d<double> const& to,
+         bool defer_proj)
+        : test_case(params)
+        , src_(src)
+        , dest_(dest)
+        , from_(from)
+        , to_(to)
+        , defer_proj_init_(defer_proj)
+    {}
+    bool validate() const
+    {
+        mapnik::projection src(src_, defer_proj_init_);
+        mapnik::projection dest(dest_, defer_proj_init_);
+        mapnik::proj_transform tr(src, dest);
+        mapnik::box2d<double> bbox = from_;
+        if (!tr.forward(bbox))
+            return false;
+        return ((std::fabs(bbox.minx() - to_.minx()) < .5) && (std::fabs(bbox.maxx() - to_.maxx()) < .5) &&
+                (std::fabs(bbox.miny() - to_.miny()) < .5) && (std::fabs(bbox.maxy() - to_.maxy()) < .5));
+    }
+    bool operator()() const
+    {
+        mapnik::projection src(src_, defer_proj_init_);
+        mapnik::projection dest(dest_, defer_proj_init_);
+        mapnik::proj_transform tr(src, dest);
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            for (int j = -180; j < 180; j = j + 5)
+            {
+                for (int k = -85; k < 85; k = k + 5)
+                {
+                    mapnik::box2d<double> box(j, k, j, k);
+                    if (!tr.forward(box))
+                        throw std::runtime_error("could not transform coords");
+                }
+            }
+        }
+        return true;
+    }
+};
+
+// echo -180 -60 | cs2cs -f "%.10f" epsg:4326 +to epsg:3857
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    mapnik::box2d<double> from(-180, -80, 180, 80);
+    mapnik::box2d<double> to(-20037508.3427892476, -15538711.0963092316, 20037508.3427892476, 15538711.0963092316);
+    std::string from_str("epsg:4326");
+    std::string to_str("epsg:3857");
+    std::string from_str2("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
+    std::string to_str2("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m "
+                        "+nadgrids=@null +wktext +no_defs +over");
+    return benchmark::sequencer(argc, argv)
+      .run<test>("lonlat->merc epsg (internal)", from_str, to_str, from, to, true)
+      .run<test>("lonlat->merc literal (libproj)", from_str2, to_str2, from, to, true)
+      .run<test>("merc->lonlat epsg (internal)", to_str, from_str, to, from, true)
+      .run<test>("merc->lonlat literal (libproj)", to_str2, from_str2, to, from, true)
+      .done();
+}

benchmark/src/test_quad_tree.cpp

@@ -6,43 +6,41 @@ using quad_tree_type = mapnik::quad_tree<std::size_t>;
 
 class test : public benchmark::test_case
 {
-public:
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {}
+        : test_case(params)
+    {}
 
-    bool validate() const
-    {
-        return true;
-    }
+    bool validate() const { return true; }
 
     bool operator()() const
     {
         std::random_device rd;
         std::default_random_engine engine(rd());
         std::uniform_int_distribution<int> uniform_dist(0, 2048);
-        quad_tree_type tree(mapnik::box2d<double>(0,0,2048,2048));
-        //populate
+        quad_tree_type tree(mapnik::box2d<double>(0, 0, 2048, 2048));
+        // populate
         for (size_t i = 0; i < iterations_; ++i)
         {
             int cx = uniform_dist(engine);
             int cy = uniform_dist(engine);
             int sx = 0.2 * uniform_dist(engine);
             int sy = 0.2 * uniform_dist(engine);
-            mapnik::box2d<double> box(cx - sx,cy - sy, cx + sx, cy + sy);
+            mapnik::box2d<double> box(cx - sx, cy - sy, cx + sx, cy + sy);
             tree.insert(i, box);
         }
         // bounding box query
-        std::size_t count=0;
+        std::size_t count = 0;
         for (size_t i = 0; i < iterations_; ++i)
         {
             int cx = uniform_dist(engine);
             int cy = uniform_dist(engine);
             int sx = 0.4 * uniform_dist(engine);
             int sy = 0.4 * uniform_dist(engine);
-            mapnik::box2d<double> box(cx - sx,cy - sy, cx + sx, cy + sy);
+            mapnik::box2d<double> box(cx - sx, cy - sy, cx + sx, cy + sy);
             auto itr = tree.query_in_box(box);
             auto end = tree.query_end();
-            for ( ;itr != end; ++itr)
+            for (; itr != end; ++itr)
             {
                 ++count;
             }
@@ -51,4 +49,4 @@ public:
     }
 };
 
-BENCHMARK(test,"quad_tree creation")
+BENCHMARK(test, "quad_tree creation")

benchmark/src/test_rendering.cpp

@@ -15,24 +15,25 @@ class test : public benchmark::test_case
     mapnik::value_integer height_;
     double scale_factor_;
     std::string preview_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       xml_(),
-       extent_(),
-       width_(*params.get<mapnik::value_integer>("width",256)),
-       height_(*params.get<mapnik::value_integer>("height",256)),
-       scale_factor_(*params.get<mapnik::value_double>("scale_factor",1.0)),
-       preview_(*params.get<std::string>("preview",""))
+        : test_case(params)
+        , xml_()
+        , extent_()
+        , width_(*params.get<mapnik::value_integer>("width", 256))
+        , height_(*params.get<mapnik::value_integer>("height", 256))
+        , scale_factor_(*params.get<mapnik::value_double>("scale_factor", 1.0))
+        , preview_(*params.get<std::string>("preview", ""))
     {
-        boost::optional<std::string> map = params.get<std::string>("map");
+        const auto map = params.get<std::string>("map");
         if (!map)
         {
-            throw std::runtime_error("please provide a --map=<path to xml> arg");
+            throw std::runtime_error("please provide a --map <path to xml> arg");
         }
         xml_ = *map;
 
-        boost::optional<std::string> ext = params.get<std::string>("extent");
+        const auto ext = params.get<std::string>("extent");
         if (ext && !ext->empty())
         {
             if (!extent_.from_string(*ext))
@@ -43,66 +44,74 @@ public:
         {
             throw std::runtime_error("please provide a --extent=<minx,miny,maxx,maxy> arg");
         }*/
-
     }
     bool validate() const
     {
-        mapnik::Map m(width_,height_);
-        mapnik::load_map(m,xml_,true);
-        if (extent_.valid()) {
+        mapnik::Map m(width_, height_);
+        mapnik::load_map(m, xml_, true);
+        if (extent_.valid())
+        {
             m.zoom_to_box(extent_);
-        } else {
+        }
+        else
+        {
             m.zoom_all();
         }
-        mapnik::image_rgba8 im(m.width(),m.height());
-        mapnik::agg_renderer<mapnik::image_rgba8> ren(m,im,scale_factor_);
+        mapnik::image_rgba8 im(m.width(), m.height());
+        mapnik::agg_renderer<mapnik::image_rgba8> ren(m, im, scale_factor_);
         ren.apply();
-        if (!preview_.empty()) {
+        if (!preview_.empty())
+        {
             std::clog << "preview available at " << preview_ << "\n";
-            mapnik::save_to_file(im,preview_);
+            mapnik::save_to_file(im, preview_);
         }
         return true;
     }
     bool operator()() const
     {
-        if (!preview_.empty()) {
+        if (!preview_.empty())
+        {
             return false;
         }
-        mapnik::Map m(width_,height_);
-        mapnik::load_map(m,xml_);
-        if (extent_.valid()) {
+        mapnik::Map m(width_, height_);
+        mapnik::load_map(m, xml_);
+        if (extent_.valid())
+        {
             m.zoom_to_box(extent_);
-        } else {
+        }
+        else
+        {
             m.zoom_all();
         }
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
-            mapnik::image_rgba8 im(m.width(),m.height());
-            mapnik::agg_renderer<mapnik::image_rgba8> ren(m,im,scale_factor_);
+            mapnik::image_rgba8 im(m.width(), m.height());
+            mapnik::agg_renderer<mapnik::image_rgba8> ren(m, im, scale_factor_);
             ren.apply();
         }
         return true;
     }
 };
 
-
 int main(int argc, char** argv)
 {
+    mapnik::setup();
+    int return_value = 0;
     try
     {
         mapnik::parameters params;
-        benchmark::handle_args(argc,argv,params);
-        boost::optional<std::string> name = params.get<std::string>("name");
+        benchmark::handle_args(argc, argv, params);
+        const auto name = params.get<std::string>("name");
         if (!name)
         {
             std::clog << "please provide a name for this test\n";
             return -1;
         }
-        mapnik::freetype_engine::register_fonts("./fonts/",true);
+        mapnik::freetype_engine::register_fonts("./fonts/", true);
         mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
         {
             test test_runner(params);
-            run(test_runner,*name);        
+            return_value = run(test_runner, *name);
         }
     }
     catch (std::exception const& ex)
@@ -110,5 +119,5 @@ int main(int argc, char** argv)
         std::clog << ex.what() << "\n";
         return -1;
     }
-    return 0;
+    return return_value;
 }

benchmark/src/test_rendering_shared_map.cpp

@@ -12,14 +12,15 @@
 #include <mapnik/datasource_cache.hpp>
 #include <stdexcept>
 
-template <typename Renderer> void process_layers(Renderer & ren,
+template<typename Renderer>
+void process_layers(Renderer& ren,
                     mapnik::request const& m_req,
                     mapnik::projection const& map_proj,
                     std::vector<mapnik::layer> const& layers,
                     double scale_denom)
 {
     unsigned layers_size = layers.size();
-    for (unsigned i=0; i < layers_size; ++i)
+    for (unsigned i = 0; i < layers_size; ++i)
     {
         mapnik::layer const& lyr = layers[i];
         if (lyr.visible(scale_denom))
@@ -50,27 +51,28 @@ class test : public benchmark::test_case
     double scale_factor_;
     std::string preview_;
     mutable mapnik::image_rgba8 im_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       xml_(),
-       extent_(),
-       width_(*params.get<mapnik::value_integer>("width",256)),
-       height_(*params.get<mapnik::value_integer>("height",256)),
-       m_(new mapnik::Map(width_,height_)),
-       scale_factor_(*params.get<mapnik::value_double>("scale_factor",2.0)),
-       preview_(*params.get<std::string>("preview","")),
-       im_(m_->width(),m_->height())
+        : test_case(params)
+        , xml_()
+        , extent_()
+        , width_(*params.get<mapnik::value_integer>("width", 256))
+        , height_(*params.get<mapnik::value_integer>("height", 256))
+        , m_(new mapnik::Map(width_, height_))
+        , scale_factor_(*params.get<mapnik::value_double>("scale_factor", 2.0))
+        , preview_(*params.get<std::string>("preview", ""))
+        , im_(m_->width(), m_->height())
     {
-        boost::optional<std::string> map = params.get<std::string>("map");
+        const auto map = params.get<std::string>("map");
         if (!map)
         {
             throw std::runtime_error("please provide a --map=<path to xml> arg");
         }
         xml_ = *map;
 
-        boost::optional<std::string> ext = params.get<std::string>("extent");
-        mapnik::load_map(*m_,xml_,true);
+        auto ext = params.get<std::string>("extent");
+        mapnik::load_map(*m_, xml_, true);
         if (ext && !ext->empty())
         {
             if (!extent_.from_string(*ext))
@@ -87,42 +89,44 @@ public:
 
     bool validate() const
     {
-        mapnik::request m_req(width_,height_,extent_);
+        mapnik::request m_req(width_, height_, extent_);
         mapnik::attributes variables;
         m_req.set_buffer_size(m_->buffer_size());
-        mapnik::projection map_proj(m_->srs(),true);
-        double scale_denom = mapnik::scale_denominator(m_req.scale(),map_proj.is_geographic());
+        mapnik::projection map_proj(m_->srs(), true);
+        double scale_denom = mapnik::scale_denominator(m_req.scale(), map_proj.is_geographic());
         scale_denom *= scale_factor_;
-        mapnik::agg_renderer<mapnik::image_rgba8> ren(*m_,m_req,variables,im_,scale_factor_);
+        mapnik::agg_renderer<mapnik::image_rgba8> ren(*m_, m_req, variables, im_, scale_factor_);
         ren.start_map_processing(*m_);
         std::vector<mapnik::layer> const& layers = m_->layers();
-        process_layers(ren,m_req,map_proj,layers,scale_denom);
+        process_layers(ren, m_req, map_proj, layers, scale_denom);
         ren.end_map_processing(*m_);
-        if (!preview_.empty()) {
+        if (!preview_.empty())
+        {
             std::clog << "preview available at " << preview_ << "\n";
-            mapnik::save_to_file(im_,preview_);
+            mapnik::save_to_file(im_, preview_);
         }
         return true;
     }
 
     bool operator()() const
     {
-        if (!preview_.empty()) {
+        if (!preview_.empty())
+        {
             return false;
         }
-        for (unsigned i=0;i<iterations_;++i)
+        for (unsigned i = 0; i < iterations_; ++i)
         {
-            mapnik::request m_req(width_,height_,extent_);
-            mapnik::image_rgba8 im(m_->width(),m_->height());
+            mapnik::request m_req(width_, height_, extent_);
+            mapnik::image_rgba8 im(m_->width(), m_->height());
             mapnik::attributes variables;
             m_req.set_buffer_size(m_->buffer_size());
-            mapnik::projection map_proj(m_->srs(),true);
-            double scale_denom = mapnik::scale_denominator(m_req.scale(),map_proj.is_geographic());
+            mapnik::projection map_proj(m_->srs(), true);
+            double scale_denom = mapnik::scale_denominator(m_req.scale(), map_proj.is_geographic());
             scale_denom *= scale_factor_;
-            mapnik::agg_renderer<mapnik::image_rgba8> ren(*m_,m_req,variables,im,scale_factor_);
+            mapnik::agg_renderer<mapnik::image_rgba8> ren(*m_, m_req, variables, im, scale_factor_);
             ren.start_map_processing(*m_);
             std::vector<mapnik::layer> const& layers = m_->layers();
-            process_layers(ren,m_req,map_proj,layers,scale_denom);
+            process_layers(ren, m_req, map_proj, layers, scale_denom);
             ren.end_map_processing(*m_);
             bool diff = false;
             mapnik::image_rgba8 const& dest = im;
@@ -133,33 +137,36 @@ public:
                 const unsigned int* row_to = dest.get_row(y);
                 for (unsigned int x = 0; x < width_; ++x)
                 {
-                   if (row_from[x] != row_to[x]) diff = true;
+                    if (row_from[x] != row_to[x])
+                        diff = true;
                 }
             }
-            if (diff) throw std::runtime_error("images differ");
+            if (diff)
+                throw std::runtime_error("images differ");
         }
         return true;
     }
 };
 
-
 int main(int argc, char** argv)
 {
+    mapnik::setup();
+    int return_value = 0;
     try
     {
         mapnik::parameters params;
-        benchmark::handle_args(argc,argv,params);
-        boost::optional<std::string> name = params.get<std::string>("name");
+        benchmark::handle_args(argc, argv, params);
+        const auto name = params.get<std::string>("name");
         if (!name)
         {
             std::clog << "please provide a name for this test\n";
             return -1;
         }
-        mapnik::freetype_engine::register_fonts("./fonts/",true);
+        mapnik::freetype_engine::register_fonts("./fonts/", true);
         mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
         {
             test test_runner(params);
-            run(test_runner,*name);
+            return_value = run(test_runner, *name);
         }
     }
     catch (std::exception const& ex)
@@ -167,5 +174,5 @@ int main(int argc, char** argv)
         std::clog << ex.what() << "\n";
         return -1;
     }
-    return 0;
+    return return_value;
 }

benchmark/src/test_to_bool.cpp

@@ -0,0 +1,34 @@
+#include "bench_framework.hpp"
+#include <mapnik/util/conversions.hpp>
+
+class test : public benchmark::test_case
+{
+    std::string value_;
+
+  public:
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , value_("true")
+    {}
+    bool validate() const
+    {
+        bool result = false;
+        mapnik::util::string2bool(value_.data(), value_.data() + value_.size(), result);
+        if (!result)
+            return result;
+        mapnik::util::string2bool(value_, result);
+        return (result == true);
+    }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            bool result = false;
+            mapnik::util::string2bool(value_, result);
+            mapnik::util::string2bool(value_.data(), value_.data() + value_.size(), result);
+        }
+        return true;
+    }
+};
+
+BENCHMARK(test, "string->bool")

benchmark/src/test_to_double.cpp

@@ -0,0 +1,39 @@
+#include "bench_framework.hpp"
+#include <mapnik/util/conversions.hpp>
+
+class test : public benchmark::test_case
+{
+    std::string value_;
+
+  public:
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , value_("1.23456789")
+    {}
+    bool validate() const
+    {
+        double result = 0;
+        if (!mapnik::util::string2double(value_.data(), value_.data() + value_.size(), result))
+            return false;
+        if (result != 1.23456789)
+            return false;
+        result = 0;
+        if (!mapnik::util::string2double(value_, result))
+            return false;
+        if (result != 1.23456789)
+            return false;
+        return true;
+    }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            double result = 0;
+            mapnik::util::string2double(value_, result);
+            mapnik::util::string2double(value_.data(), value_.data() + value_.size(), result);
+        }
+        return true;
+    }
+};
+
+BENCHMARK(test, "string->double")

benchmark/src/test_to_int.cpp

@@ -0,0 +1,39 @@
+#include "bench_framework.hpp"
+#include <mapnik/util/conversions.hpp>
+
+class test : public benchmark::test_case
+{
+    std::string value_;
+
+  public:
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , value_("123456789")
+    {}
+    bool validate() const
+    {
+        mapnik::value_integer result = 0;
+        if (!mapnik::util::string2int(value_.data(), value_.data() + value_.size(), result))
+            return false;
+        if (result != 123456789)
+            return false;
+        result = 0;
+        if (!mapnik::util::string2int(value_, result))
+            return false;
+        if (result != 123456789)
+            return false;
+        return true;
+    }
+    bool operator()() const
+    {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            mapnik::value_integer result = 0;
+            mapnik::util::string2int(value_, result);
+            mapnik::util::string2int(value_.data(), value_.data() + value_.size(), result);
+        }
+        return true;
+    }
+};
+
+BENCHMARK(test, "string->int")

benchmark/src/test_to_string1.cpp

@@ -4,25 +4,28 @@
 class test : public benchmark::test_case
 {
     double value_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       value_(-0.1234) {}
+        : test_case(params)
+        , value_(-0.1234)
+    {}
     bool validate() const
     {
         std::string s;
-        mapnik::util::to_string(s,value_);
+        mapnik::util::to_string(s, value_);
         return (s == "-0.1234");
     }
     bool operator()() const
     {
         std::string out;
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             out.clear();
-            mapnik::util::to_string(out,value_);
+            mapnik::util::to_string(out, value_);
         }
         return true;
     }
 };
 
-BENCHMARK(test,"to_string double->string")
+BENCHMARK(test, "to_string double->string")

benchmark/src/test_to_string2.cpp

@@ -4,10 +4,12 @@
 class test : public benchmark::test_case
 {
     double value_;
-public:
+
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params),
-       value_(-0.1234) {}
+        : test_case(params)
+        , value_(-0.1234)
+    {}
     bool validate() const
     {
         std::ostringstream s;
@@ -17,7 +19,8 @@ public:
     bool operator()() const
     {
         std::string out;
-        for (std::size_t i=0;i<iterations_;++i) {
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
             std::ostringstream s;
             s << value_;
             out = s.str();
@@ -26,4 +29,4 @@ public:
     }
 };
 
-BENCHMARK(test,"ostringstream double->string")
+BENCHMARK(test, "ostringstream double->string")

benchmark/src/test_utf_encoding.cpp

@@ -0,0 +1,124 @@
+#include "bench_framework.hpp"
+#include <mapnik/unicode.hpp>
+#include <mapnik/util/from_u8string.hpp>
+#include <mapnik/value.hpp>
+#include <boost/locale.hpp>
+#ifndef __linux__
+#include <codecvt>
+#endif
+
+using mapnik::util::from_u8string;
+
+#ifndef __linux__
+class test : public benchmark::test_case
+{
+    std::string utf8_;
+
+  public:
+    test(mapnik::parameters const& params)
+        : test_case(params)
+        , utf8_(from_u8string(u8"שלום"))
+    {}
+    bool validate() const
+    {
+        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utf32conv;
+        std::u32string utf32 = utf32conv.from_bytes(utf8_);
+        if (utf32.size() != 4)
+            return false;
+        if (utf32[0] != 0x5e9 && utf32[1] != 0x5dc && utf32[2] != 0x5d5 && utf32[3] != 0x5dd)
+            return false;
+        return true;
+    }
+    bool operator()() const
+    {
+        std::u32string utf32;
+        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utf32conv;
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            utf32 = utf32conv.from_bytes(utf8_);
+        }
+        return true;
+    }
+};
+
+#endif
+
+class test2 : public benchmark::test_case
+{
+    std::string utf8_;
+
+  public:
+    test2(mapnik::parameters const& params)
+        : test_case(params)
+        , utf8_(from_u8string(u8"שלום"))
+    {}
+    bool validate() const
+    {
+        std::u32string utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
+        if (utf32.size() != 4)
+            return false;
+        if (utf32[0] != 0x5e9 && utf32[1] != 0x5dc && utf32[2] != 0x5d5 && utf32[3] != 0x5dd)
+            return false;
+        return true;
+    }
+    bool operator()() const
+    {
+        std::u32string utf32;
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
+        }
+        return true;
+    }
+};
+
+class test3 : public benchmark::test_case
+{
+    std::string utf8_;
+
+  public:
+    test3(mapnik::parameters const& params)
+        : test_case(params)
+        , utf8_(from_u8string(u8"שלום"))
+    {}
+    bool validate() const
+    {
+        mapnik::transcoder tr_("utf-8");
+        mapnik::value_unicode_string utf32 = tr_.transcode(utf8_.data(), utf8_.size());
+        // std::u32string utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
+        if (utf32.length() != 4)
+            return false;
+        if (utf32[0] != 0x5e9 && utf32[1] != 0x5dc && utf32[2] != 0x5d5 && utf32[3] != 0x5dd)
+            return false;
+        return true;
+    }
+    bool operator()() const
+    {
+        mapnik::transcoder tr_("utf-8");
+        mapnik::value_unicode_string utf32;
+        for (std::size_t i = 0; i < iterations_; ++i)
+        {
+            utf32 = tr_.transcode(utf8_.data(), utf8_.size());
+        }
+        return true;
+    }
+};
+
+int main(int argc, char** argv)
+{
+    mapnik::setup();
+    mapnik::parameters params;
+    benchmark::handle_args(argc, argv, params);
+    int return_value = 0;
+#ifndef __linux__
+    test test_runner(params);
+    return_value = return_value | run(test_runner, "utf encode std::codecvt");
+#else
+    std::clog << "skipping 'utf encode std::codecvt' test since <codecvt> is not supported on __linux__\n";
+#endif
+    test2 test_runner2(params);
+    return_value = return_value | run(test_runner2, "utf encode boost::locale");
+    test3 test_runner3(params);
+    return_value = return_value | run(test_runner3, "utf encode ICU");
+    return return_value;
+}

benchmark/template.cpp

@@ -2,16 +2,12 @@
 
 class test : public benchmark::test_case
 {
-public:
+  public:
     test(mapnik::parameters const& params)
-     : test_case(params) {}
-    bool validate() const
-    {
-        return true;
-    }
-    void operator()() const
-    {
-    }
+        : test_case(params)
+    {}
+    bool validate() const { return true; }
+    void operator()() const {}
 };
 
-BENCHMARK(test,"test name")
+BENCHMARK(test, "test name")

benchmark/test_array_allocation.cpp

@@ -1,446 +0,0 @@
-#include "bench_framework.hpp"
-#include <cstring>
-#include <cstdlib>
-#include <deque>
-#include <stdexcept>
-#include <array>
-#include <valarray>
-#include <boost/version.hpp>
-#if BOOST_VERSION >= 105400
-#include <boost/container/static_vector.hpp>
-#endif
-
-// http://stackoverflow.com/questions/17347254/why-is-allocation-and-deallocation-of-stdvector-slower-than-dynamic-array-on-m
-
-#define FULL_ZERO_CHECK
-
-inline void ensure_zero(uint8_t * data, uint32_t size) {
-#ifdef FULL_ZERO_CHECK
-    for (std::size_t i=0;i<size;++i) {
-        if (data[i] != 0) {
-            throw std::runtime_error("found non zero value");
-        }
-    }
-#else
-    if (data[0] != 0) {
-        throw std::runtime_error("found non zero value");
-    }
-#endif
-}
-
-class test1 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test1(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             // NOTE: sizeof(uint8_t) == 1
-             uint8_t *data = (uint8_t *)malloc(sizeof(uint8_t)*size_);
-             memcpy(data, &array_[0], size_);
-             ensure_zero(data,size_);
-             free(data);
-         }
-         return true;
-    }
-};
-
-class test1b : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test1b(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             // NOTE: sizeof(uint8_t) == 1
-             uint8_t *data = (uint8_t *)malloc(sizeof(uint8_t)*size_);
-             memset(data, 0, sizeof(uint8_t)*size_);
-             ensure_zero(data,size_);
-             free(data);
-         }
-         return true;
-    }
-};
-
-class test1c : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test1c(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             uint8_t *data = static_cast<uint8_t *>(::operator new(sizeof(uint8_t) * size_));
-             std::fill(data,data + size_,0);
-             ensure_zero(data,size_);
-             ::operator delete(data);
-         }
-         return true;
-    }
-};
-
-
-class test2 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test2(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             uint8_t * data = static_cast<uint8_t*>(::operator new(sizeof(uint8_t)*size_));
-             memcpy(data, &array_[0], size_);
-             ensure_zero(data,size_);
-             ::operator delete(data),data=0;
-         }
-         return true;
-    }
-};
-
-class test3 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test3(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::vector<uint8_t> data(size_);
-             ensure_zero(&data[0],data.size());
-         }
-         return true;
-    }
-};
-
-
-class test3b : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test3b(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::vector<uint8_t> data(0);
-             data.resize(size_,0);
-             ensure_zero(&data[0],data.size());
-         }
-         return true;
-    }
-};
-
-
-class test3c : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test3c(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::vector<uint8_t> data(0);
-             data.assign(size_,0);
-             ensure_zero(&data[0],data.size());
-         }
-         return true;
-    }
-};
-
-class test3d : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test3d(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::deque<uint8_t> data(size_);
-             for (std::size_t i=0;i<size_;++i) {
-                 if (data[i] != 0) {
-                     throw std::runtime_error("found non zero value");
-                 }
-             }
-         }
-         return true;
-    }
-};
-
-class test3d : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test3d(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::deque<uint8_t> data(size_);
-             for (std::size_t i=0;i<size_;++i) {
-                 if (data[i] != 0) {
-                     throw std::runtime_error("found non zero value");
-                 }
-             }
-         }
-         return true;
-    }
-};
-
-class test4 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test4(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             uint8_t *data = (uint8_t *)calloc(size_,sizeof(uint8_t));
-             ensure_zero(data,size_);
-             free(data);
-         }
-         return true;
-    }
-};
-
-class test5 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test5(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::string data(array_.begin(),array_.end());
-             ensure_zero((uint8_t *)&data[0],size_);
-         }
-         return true;
-    }
-};
-
-class test5b : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<char> array_;
-    test5b(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::string data(&array_[0],array_.size());
-             ensure_zero((uint8_t *)&data[0],size_);
-         }
-         return true;
-    }
-};
-
-// C++14 dynarray<T>
-// http://isocpp.org/blog/2013/04/trip-report-iso-c-spring-2013-meeting
-// http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130909/088700.html
-// http://stackoverflow.com/questions/17303902/any-alternative-to-stddynarray-presently-available
-
-class test6 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test6(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             std::valarray<uint8_t> data(static_cast<uint8_t>(0),static_cast<size_t>(size_));
-             ensure_zero(&data[0],size_);
-         }
-         return true;
-    }
-};
-
-#if BOOST_VERSION >= 105400
-// http://i42.co.uk/stuff/vecarray.htm
-// http://www.boost.org/doc/libs/1_54_0/doc/html/boost/container/static_vector.html
-
-class test7 : public benchmark::test_case
-{
-public:
-    uint32_t size_;
-    std::vector<uint8_t> array_;
-    test7(mapnik::parameters const& params)
-     : test_case(params),
-       size_(*params.get<mapnik::value_integer>("size",256*256)),
-       array_(size_,0) { }
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-         for (std::size_t i=0;i<iterations_;++i) {
-             boost::container::static_vector<uint8_t,256*256> data(size_,0);
-             ensure_zero(&data[0],size_);
-         }
-         return true;
-    }
-};
-#endif
-
-int main(int argc, char** argv)
-{
-    mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
-    {
-        test4 test_runner4(params);
-        run(test_runner4,"calloc");
-    }
-    {
-        test1 test_runner(params);
-        run(test_runner,"malloc/memcpy");
-    }
-    {
-        test1b test_runner(params);
-        run(test_runner,"malloc/memset");
-    }
-    {
-        test1c test_runner(params);
-        run(test_runner,"operator new/std::fill");
-    }
-    {
-        test2 test_runner(params);
-        run(test_runner,"operator new/memcpy");
-    }
-    {
-        test3 test_runner(params);
-        run(test_runner,"vector(N)");
-    }
-    {
-        test3b test_runner(params);
-        run(test_runner,"vector/resize");
-    }
-    {
-        test3c test_runner(params);
-        run(test_runner,"vector/assign");
-    }
-    {
-        test3d test_runner(params);
-        run(test_runner,"deque(N)");
-    }
-    {
-        test5 test_runner(params);
-        run(test_runner,"std::string range");
-    }
-    {
-        test5b test_runner(params);
-        run(test_runner,"std::string &[0]");
-    }
-    {
-        test6 test_runner(params);
-        run(test_runner,"valarray");
-    }
-#if BOOST_VERSION >= 105400
-    {
-        test7 test_runner(params);
-        run(test_runner,"static_vector");
-    }
-#endif
-    return 0;
-}

benchmark/test_marker_cache.cpp

@@ -1,42 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/marker_cache.hpp>
-
-class test : public benchmark::test_case
-{
-    std::vector<std::string> images_;
-public:
-    test(mapnik::parameters const& params)
-     : test_case(params),
-       images_{
-          "./test/data/images/dummy.jpg",
-          "./test/data/images/dummy.jpeg",
-          "./test/data/images/dummy.png",
-          "./test/data/images/dummy.tif",
-          "./test/data/images/dummy.tiff",
-          //"./test/data/images/landusepattern.jpeg", // will fail since it is a png
-          //"./test/data/images/xcode-CgBI.png", // will fail since its an invalid png
-          "./test/data/svg/octocat.svg",
-          "./test/data/svg/place-of-worship-24.svg",
-          "./test/data/svg/point_sm.svg",
-          "./test/data/svg/point.svg",
-          "./test/data/svg/airfield-12.svg"
-       } {}
-    bool validate() const
-    {
-        return true;
-    }
-    bool operator()() const
-    {
-        unsigned count = 0;
-        for (std::size_t i=0;i<iterations_;++i) {
-            for (auto filename : images_)
-            {
-                auto marker = mapnik::marker_cache::instance().find(filename,true);
-            }
-            ++count;
-        }
-        return (count == iterations_);
-    }
-};
-
-BENCHMARK(test,"marker cache")

benchmark/test_polygon_clipping_rendering.cpp

@@ -1,79 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/map.hpp>
-#include <mapnik/load_map.hpp>
-#include <mapnik/agg_renderer.hpp>
-#include <mapnik/datasource_cache.hpp>
-
-class test : public benchmark::test_case
-{
-    std::string xml_;
-    mapnik::box2d<double> extent_;
-public:
-    test(mapnik::parameters const& params,
-         std::string const& xml,
-         mapnik::box2d<double> const& extent)
-     : test_case(params),
-       xml_(xml),
-       extent_(extent)
-      {}
-    bool validate() const
-    {
-        mapnik::Map m(256,256);
-        mapnik::load_map(m,xml_);
-        m.zoom_to_box(extent_);
-        mapnik::image_rgba8 im(m.width(),m.height());
-        mapnik::agg_renderer<mapnik::image_rgba8> ren(m,im);
-        ren.apply();
-        //mapnik::save_to_file(im.data(),"test.png");
-        return true;
-    }
-    bool operator()() const
-    {
-        mapnik::Map m(256,256);
-        mapnik::load_map(m,xml_);
-        m.zoom_to_box(extent_);
-        for (unsigned i=0;i<iterations_;++i)
-        {
-            mapnik::image_rgba8 im(m.width(),m.height());
-            mapnik::agg_renderer<mapnik::image_rgba8> ren(m,im);
-            ren.apply();
-        }
-        return true;
-    }
-};
-
-
-int main(int argc, char** argv)
-{
-    mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
-    mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
-    mapnik::box2d<double> z1(-20037508.3428,-8317435.0606,20037508.3428,18399242.7298);
-    // bbox for 16/10491/22911.png
-    mapnik::box2d<double> z16(-13622912.929097254,6026906.8062295765,-13621689.93664469,6028129.79868214);
-    {
-        test test_runner(params,
-                          "benchmark/data/polygon_rendering_clip.xml",
-                          z1);
-        run(test_runner,"polygon clip render z1");        
-    }
-    {
-        test test_runner(params,
-                          "benchmark/data/polygon_rendering_no_clip.xml",
-                          z1);
-        run(test_runner,"polygon noclip render z1");        
-    }
-    {
-        test test_runner(params,
-                          "benchmark/data/polygon_rendering_clip.xml",
-                          z16);
-        run(test_runner,"polygon clip render z16");        
-    }
-    {
-        test test_runner(params,
-                          "benchmark/data/polygon_rendering_no_clip.xml",
-                          z16);
-        run(test_runner,"polygon noclip render z16");        
-    }
-    return 0;
-}

benchmark/test_proj_transform1.cpp

@@ -1,98 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/box2d.hpp>
-#include <mapnik/projection.hpp>
-#include <mapnik/proj_transform.hpp>
-
-class test : public benchmark::test_case
-{
-    std::string src_;
-    std::string dest_;
-    mapnik::box2d<double> from_;
-    mapnik::box2d<double> to_;
-    bool defer_proj4_init_;
-public:
-    test(mapnik::parameters const& params,
-         std::string const& src,
-         std::string const& dest,
-         mapnik::box2d<double> const& from,
-         mapnik::box2d<double> const& to,
-         bool defer_proj)
-     : test_case(params),
-       src_(src),
-       dest_(dest),
-       from_(from),
-       to_(to),
-       defer_proj4_init_(defer_proj) {}
-    bool validate() const
-    {
-        mapnik::projection src(src_,defer_proj4_init_);
-        mapnik::projection dest(dest_,defer_proj4_init_);
-        mapnik::proj_transform tr(src,dest);
-        mapnik::box2d<double> bbox = from_;
-        if (!tr.forward(bbox)) return false;
-        return ((std::fabs(bbox.minx() - to_.minx()) < .5) &&
-                (std::fabs(bbox.maxx() - to_.maxx()) < .5) &&
-                (std::fabs(bbox.miny() - to_.miny()) < .5) &&
-                (std::fabs(bbox.maxy() - to_.maxy()) < .5)
-               );
-    }
-    bool operator()() const
-    {
-        for (std::size_t i=0;i<iterations_;++i)
-        {
-            for (int j=-180;j<180;j=j+5)
-            {
-                for (int k=-85;k<85;k=k+5)
-                {
-                    mapnik::projection src(src_,defer_proj4_init_);
-                    mapnik::projection dest(dest_,defer_proj4_init_);
-                    mapnik::proj_transform tr(src,dest);
-                    mapnik::box2d<double> box(j,k,j,k);
-                    if (!tr.forward(box)) throw std::runtime_error("could not transform coords");
-                }
-            }
-        }
-        return true;
-    }
-};
-
-// echo -180 -60 | cs2cs -f "%.10f" +init=epsg:4326 +to +init=epsg:3857
-int main(int argc, char** argv)
-{
-    mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
-    mapnik::box2d<double> from(-180,-80,180,80);
-    mapnik::box2d<double> to(-20037508.3427892476,-15538711.0963092316,20037508.3427892476,15538711.0963092316);
-    std::string from_str("+init=epsg:4326");
-    std::string to_str("+init=epsg:3857");
-    std::string from_str2("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
-    std::string to_str2("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over");
-    test test_runner(params,
-                     from_str,
-                     to_str,
-                     from,
-                     to,
-                     true);
-    run(test_runner,"lonlat->merc epsg");
-    test test_runner2(params,
-                     from_str2,
-                     to_str2,
-                     from,
-                     to,
-                     true);
-    run(test_runner2,"lonlat->merc literal");
-    test test_runner3(params,
-                     to_str,
-                     from_str,
-                     to,
-                     from,
-                     true);
-    run(test_runner3,"merc->lonlat epsg");
-    test test_runner4(params,
-                     to_str2,
-                     from_str2,
-                     to,
-                     from,
-                     true);
-    return run(test_runner4,"merc->lonlat literal");
-}

benchmark/test_to_bool.cpp

@@ -1,30 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/util/conversions.hpp>
-
-class test : public benchmark::test_case
-{
-    std::string value_;
-public:
-    test(mapnik::parameters const& params)
-     : test_case(params),
-       value_("true") {}
-    bool validate() const
-    {
-        bool result = false;
-        mapnik::util::string2bool(value_.data(),value_.data()+value_.size(),result);
-        if (!result) return result;
-        mapnik::util::string2bool(value_,result);
-        return (result == true);
-    }
-    bool operator()() const
-    {
-        for (std::size_t i=0;i<iterations_;++i) {
-            bool result = false;
-            mapnik::util::string2bool(value_,result);
-            mapnik::util::string2bool(value_.data(),value_.data()+value_.size(),result);
-        }
-        return true;
-    }
-};
-
-BENCHMARK(test,"string->bool")

benchmark/test_to_double.cpp

@@ -1,32 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/util/conversions.hpp>
-
-class test : public benchmark::test_case
-{
-    std::string value_;
-public:
-    test(mapnik::parameters const& params)
-     : test_case(params),
-       value_("1.23456789") {}
-    bool validate() const
-    {
-        double result = 0;
-        if (!mapnik::util::string2double(value_.data(),value_.data()+value_.size(),result)) return false;
-        if (result != 1.23456789) return false;
-        result = 0;
-        if (!mapnik::util::string2double(value_,result)) return false;
-        if (result != 1.23456789) return false;
-        return true;
-    }
-    bool operator()() const
-    {
-        for (std::size_t i=0;i<iterations_;++i) {
-            double result = 0;
-            mapnik::util::string2double(value_,result);
-            mapnik::util::string2double(value_.data(),value_.data()+value_.size(),result);
-        }
-        return true;
-    }
-};
-
-BENCHMARK(test,"string->double")

benchmark/test_to_int.cpp

@@ -1,32 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/util/conversions.hpp>
-
-class test : public benchmark::test_case
-{
-    std::string value_;
-public:
-    test(mapnik::parameters const& params)
-     : test_case(params),
-       value_("123456789") {}
-    bool validate() const
-    {
-        mapnik::value_integer result = 0;
-        if (!mapnik::util::string2int(value_.data(),value_.data()+value_.size(),result)) return false;
-        if (result != 123456789) return false;
-        result = 0;
-        if (!mapnik::util::string2int(value_,result)) return false;
-        if (result != 123456789) return false;
-        return true;
-    }
-    bool operator()() const
-    {
-        for (std::size_t i=0;i<iterations_;++i) {
-            mapnik::value_integer result = 0;
-            mapnik::util::string2int(value_,result);
-            mapnik::util::string2int(value_.data(),value_.data()+value_.size(),result);
-        }
-        return true;
-    }
-};
-
-BENCHMARK(test,"string->int")

benchmark/test_utf_encoding.cpp

@@ -1,110 +0,0 @@
-#include "bench_framework.hpp"
-#include <mapnik/unicode.hpp>
-#include <mapnik/value.hpp>
-#include <boost/locale.hpp>
-#ifndef __linux__
-#include <codecvt>
-
-class test : public benchmark::test_case
-{
-    std::string utf8_;
-public:
-    test(mapnik::parameters const& params)
-     : test_case(params),
-       utf8_(u8"שלום") {}
-    bool validate() const
-    {
-        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utf32conv;
-        std::u32string utf32 = utf32conv.from_bytes(utf8_);
-        if (utf32.size() != 4) return false;
-        if (utf32[0] != 0x5e9 &&
-            utf32[1] != 0x5dc &&
-            utf32[2] != 0x5d5 &&
-            utf32[3] != 0x5dd) return false;
-        return true;
-    }
-    bool operator()() const
-    {
-        std::u32string utf32;
-        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utf32conv;
-        for (std::size_t i=0;i<iterations_;++i) {
-             utf32 = utf32conv.from_bytes(utf8_);
-        }
-        return true;
-    }
-};
-
-#endif
-
-class test2 : public benchmark::test_case
-{
-    std::string utf8_;
-public:
-    test2(mapnik::parameters const& params)
-     : test_case(params),
-       utf8_(u8"שלום") {}
-    bool validate() const
-    {
-        std::u32string utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
-        if (utf32.size() != 4) return false;
-        if (utf32[0] != 0x5e9 &&
-            utf32[1] != 0x5dc &&
-            utf32[2] != 0x5d5 &&
-            utf32[3] != 0x5dd) return false;
-        return true;
-    }
-    bool operator()() const
-    {
-         std::u32string utf32;
-         for (std::size_t i=0;i<iterations_;++i) {
-             utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
-         }
-        return true;
-    }
-};
-
-class test3 : public benchmark::test_case
-{
-    std::string utf8_;
-public:
-    test3(mapnik::parameters const& params)
-     : test_case(params),
-       utf8_(u8"שלום") {}
-    bool validate() const
-    {
-        mapnik::transcoder tr_("utf-8");
-        mapnik::value_unicode_string utf32 = tr_.transcode(utf8_.data(),utf8_.size());
-        //std::u32string utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
-        if (utf32.length() != 4) return false;
-        if (utf32[0] != 0x5e9 &&
-            utf32[1] != 0x5dc &&
-            utf32[2] != 0x5d5 &&
-            utf32[3] != 0x5dd) return false;
-        return true;
-    }
-    bool operator()() const
-    {
-        mapnik::transcoder tr_("utf-8");
-        mapnik::value_unicode_string utf32;
-        for (std::size_t i=0;i<iterations_;++i) {
-            utf32 = tr_.transcode(utf8_.data(),utf8_.size());
-        }
-        return true;
-    }
-};
-
-int main(int argc, char** argv)
-{
-    mapnik::parameters params;
-    benchmark::handle_args(argc,argv,params);
-#ifndef __linux__
-    test test_runner(params);
-    run(test_runner,"utf encode std::codecvt");
-#else
-    std::clog << "skipping 'utf encode std::codecvt' test since <codecvt> is not supported on __linux__\n";
-#endif
-    test2 test_runner2(params);
-    run(test_runner2,"utf encode boost::locale");
-    test3 test_runner3(params);
-    return run(test_runner3,"utf encode ICU");
-}

benchmark/utils/random_image.py

@@ -3,8 +3,8 @@ import random
 
 im = mapnik.Image(256,256)
 
-for x in xrange(0,im.width()):
-    for y in xrange(0,im.height()):
+for x in range(im.width()):
+    for y in range(im.height()):
         r = int(random.random() * 255)
         g = random.random() * 255
         b = random.random() * 255

bootstrap.sh

@@ -1,151 +0,0 @@
-#!/usr/bin/env bash
-
-#set -eu
-
-: '
-
-todo
-
-- docs for base setup: sudo apt-get -y install zlib1g-dev make git
-- shrink icu data
-'
-
-function setup_mason() {
-    if [[ ! -d ./.mason ]]; then
-        git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
-    else
-        echo "Updating to latest mason"
-        (cd ./.mason && git pull)
-    fi
-    export MASON_DIR=$(pwd)/.mason
-    export PATH=$(pwd)/.mason:$PATH
-    export CXX=${CXX:-clang++}
-    export CC=${CC:-clang}
-}
-
-if [[ $(uname -s) == 'Darwin' ]]; then
-    FIND_PATTERN="\/Users\/travis\/build\/mapbox\/mason"
-else
-    FIND_PATTERN="\/home\/travis\/build\/mapbox\/mason"
-fi
-
-REPLACE="$(pwd)"
-REPLACE=${REPLACE////\\/}
-
-function install() {
-    MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
-    if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/${2} ]]; then
-        mason install $1 $2
-        mason link $1 $2
-        if [[ $3 ]]; then
-            LA_FILE=$(${MASON_DIR:-~/.mason}/mason prefix $1 $2)/lib/$3.la
-            if [[ -f ${LA_FILE} ]]; then
-               perl -i -p -e "s/${FIND_PATTERN}/${REPLACE}/g;" ${LA_FILE}
-            else
-                echo "$LA_FILE not found"
-            fi
-        fi
-    fi
-}
-
-function install_mason_deps() {
-    install gdal 1.11.2 libgdal &
-    install boost 1.57.0 &
-    install boost_libsystem 1.57.0 &
-    install boost_libthread 1.57.0 &
-    install boost_libfilesystem 1.57.0 &
-    install boost_libprogram_options 1.57.0 &
-    install boost_libregex 1.57.0 &
-    install boost_libpython 1.57.0 &
-    install freetype 2.5.5 libfreetype &
-    install harfbuzz 0.9.40 libharfbuzz &
-    install jpeg_turbo 1.4.0 libjpeg &
-    install libpng 1.6.17 libpng &
-    install webp 0.4.2 libwebp &
-    install icu 54.1 &
-    install proj 4.8.0 libproj &
-    install libtiff 4.0.4beta libtiff &
-    install libpq 9.4.0 &
-    install sqlite 3.8.8.1 libsqlite3 &
-    install expat 2.1.0 libexpat &
-    install pixman 0.32.6 libpixman-1 &
-    install cairo 1.12.18 libcairo &
-    wait
-}
-
-MASON_LINKED_ABS=$(pwd)/mason_packages/.link
-MASON_LINKED_REL=./mason_packages/.link
-export C_INCLUDE_PATH="${MASON_LINKED_ABS}/include"
-export CPLUS_INCLUDE_PATH="${MASON_LINKED_ABS}/include"
-export LIBRARY_PATH="${MASON_LINKED_ABS}/lib"
-
-function make_config() {
-    if [[ $(uname -s) == 'Darwin' ]]; then
-        local PATH_REPLACE="/Users/travis/build/mapbox/mason/mason_packages:./mason_packages"
-    else
-        local PATH_REPLACE="/home/travis/build/mapbox/mason/mason_packages:./mason_packages"
-    fi
-
-    echo "
-CXX = '$CXX'
-CC = '$CC'
-CUSTOM_CXXFLAGS = '-fvisibility=hidden -fvisibility-inlines-hidden -DU_CHARSET_IS_UTF8=1'
-RUNTIME_LINK = 'static'
-INPUT_PLUGINS = 'all'
-PATH = '${MASON_LINKED_REL}/bin'
-PKG_CONFIG_PATH = '${MASON_LINKED_REL}/lib/pkgconfig'
-PATH_REMOVE = '/usr:/usr/local'
-PATH_REPLACE = '${PATH_REPLACE}'
-BOOST_INCLUDES = '${MASON_LINKED_REL}/include'
-BOOST_LIBS = '${MASON_LINKED_REL}/lib'
-ICU_INCLUDES = '${MASON_LINKED_REL}/include'
-ICU_LIBS = '${MASON_LINKED_REL}/lib'
-HB_INCLUDES = '${MASON_LINKED_REL}/include'
-HB_LIBS = '${MASON_LINKED_REL}/lib'
-PNG_INCLUDES = '${MASON_LINKED_REL}/include/libpng16'
-PNG_LIBS = '${MASON_LINKED_REL}/lib'
-JPEG_INCLUDES = '${MASON_LINKED_REL}/include'
-JPEG_LIBS = '${MASON_LINKED_REL}/lib'
-TIFF_INCLUDES = '${MASON_LINKED_REL}/include'
-TIFF_LIBS = '${MASON_LINKED_REL}/lib'
-WEBP_INCLUDES = '${MASON_LINKED_REL}/include'
-WEBP_LIBS = '${MASON_LINKED_REL}/lib'
-PROJ_INCLUDES = '${MASON_LINKED_REL}/include'
-PROJ_LIBS = '${MASON_LINKED_REL}/lib'
-PG_INCLUDES = '${MASON_LINKED_REL}/include'
-PG_LIBS = '${MASON_LINKED_REL}/lib'
-FREETYPE_INCLUDES = '${MASON_LINKED_REL}/include/freetype2'
-FREETYPE_LIBS = '${MASON_LINKED_REL}/lib'
-SVG_RENDERER = True
-CAIRO_INCLUDES = '${MASON_LINKED_REL}/include'
-CAIRO_LIBS = '${MASON_LINKED_REL}/lib'
-SQLITE_INCLUDES = '${MASON_LINKED_REL}/include'
-SQLITE_LIBS = '${MASON_LINKED_REL}/lib'
-BENCHMARK = True
-CPP_TESTS = True
-PGSQL2SQLITE = True
-XMLPARSER = 'ptree'
-SVG2PNG = True
-SAMPLE_INPUT_PLUGINS = True
-" > ./config.py
-}
-
-# NOTE: the `mapnik-settings.env` is used by test/run (which is run by `make test`)
-function setup_runtime_settings() {
-    echo "export PROJ_LIB=${MASON_LINKED_ABS}/share/proj" > mapnik-settings.env
-    echo "export ICU_DATA=${MASON_LINKED_ABS}/share/icu/54.1" >> mapnik-settings.env
-    echo "export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal" >> mapnik-settings.env
-    source mapnik-settings.env
-}
-
-function main() {
-    setup_mason
-    install_mason_deps
-    make_config
-    setup_runtime_settings
-    echo "Ready, now run:"
-    echo ""
-    echo "    ./configure && make"
-}
-
-main

cmake/CheckBoostRegexIcu.cmake

@@ -0,0 +1,23 @@
+include(CheckCXXSourceRuns)
+
+function(check_boost_regex)
+    set(CMAKE_REQUIRED_LIBRARIES ICU::uc ICU::data ICU::i18n Boost::headers Boost::regex)
+    check_cxx_source_runs([[
+    #include <boost/regex/icu.hpp>
+    #include <unicode/unistr.h>
+    int main()
+    {
+        U_NAMESPACE_QUALIFIER UnicodeString ustr;
+        try {
+            boost::u32regex pattern = boost::make_u32regex(ustr);
+        }
+        // an exception is fine, still indicates support is
+        // likely compiled into regex
+        catch (...) {
+            return 0;
+        }
+        return 0;
+    }
+    ]] BOOST_REGEX_HAS_ICU)
+    set(BOOST_REGEX_HAS_ICU ${BOOST_REGEX_HAS_ICU} PARENT_SCOPE)
+endfunction(check_boost_regex)

cmake/GetVersion.cmake

@@ -0,0 +1,14 @@
+macro(get_mapnik_version)
+    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/mapnik/version.hpp VERSION_FILE)
+
+    string(REGEX MATCH "MAPNIK_MAJOR_VERSION ([0-9]*)" _ ${VERSION_FILE})
+    set(MAPNIK_MAJOR_VERSION ${CMAKE_MATCH_1})
+
+    string(REGEX MATCH "MAPNIK_MINOR_VERSION ([0-9]*)" _ ${VERSION_FILE})
+    set(MAPNIK_MINOR_VERSION ${CMAKE_MATCH_1})
+
+    string(REGEX MATCH "MAPNIK_PATCH_VERSION ([0-9]*)" _ ${VERSION_FILE})
+    set(MAPNIK_PATCH_VERSION ${CMAKE_MATCH_1})
+
+    set(MAPNIK_VERSION ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}.${MAPNIK_PATCH_VERSION})
+endmacro()

cmake/MapnikExport.cmake

@@ -0,0 +1,68 @@
+include(CMakePackageConfigHelpers)
+
+### exports mapnik cmake config files (mapnikConfigVersion and mapnikConfig)
+function(mapnik_export_cmake_config)
+    # export mapnik configuration
+    write_basic_package_version_file(
+        "${CMAKE_CURRENT_BINARY_DIR}/mapnikConfigVersion.cmake"
+        VERSION ${MAPNIK_VERSION}
+        COMPATIBILITY ExactVersion
+    )
+    get_property(MAPNIK_UTILITIES GLOBAL PROPERTY MAPNIK_UTILITIES)
+
+    # generate all find_dependency and pkg_config calls
+    set(mapnik_find_deps)
+    foreach(dep IN LISTS mapnik_deps)
+        set(ver_comment "# ${dep} used with version ${mapnik_${dep}_version}")
+        set(mapnik_find_deps "${mapnik_find_deps}\n${ver_comment}\n")
+        if(mapnik_${dep}_find_args)
+            list(REMOVE_DUPLICATES mapnik_${dep}_find_args)
+            list(JOIN mapnik_${dep}_find_args " " m_args_joined)
+            set(mapnik_find_deps "${mapnik_find_deps}find_dependency(${dep} ${m_args_joined})")
+        else()
+            list(JOIN mapnik_${dep}_pkg_args " " m_args_joined)
+            set(mapnik_find_deps "${mapnik_find_deps}pkg_check_modules(${dep} ${m_args_joined})")
+        endif()
+    endforeach()
+
+    configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/mapnikConfig.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/mapnikConfig.cmake"
+        INSTALL_DESTINATION ${MAPNIK_CMAKE_DIR}
+        PATH_VARS MAPNIK_INCLUDE_DIR PLUGINS_INSTALL_DIR FONTS_INSTALL_DIR mapnik_find_deps MAPNIK_UTILITIES
+        NO_CHECK_REQUIRED_COMPONENTS_MACRO
+    )
+    install(
+        FILES
+            "${CMAKE_CURRENT_BINARY_DIR}/mapnikConfig.cmake"
+            "${CMAKE_CURRENT_BINARY_DIR}/mapnikConfigVersion.cmake"
+        DESTINATION ${MAPNIK_CMAKE_DIR}
+    )
+endfunction()
+
+
+mapnik_export_cmake_config()
+
+install(EXPORT MapnikTargets
+    DESTINATION ${MAPNIK_CMAKE_DIR}
+    FILE mapnikTargets.cmake
+    NAMESPACE mapnik::
+)
+
+### install plugin cmake config files ###
+# Create configuration dependend files for the plugin install dirs.
+# some package managers are using different paths per configuration.
+string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type)
+string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type_l)
+set(m_mapnik_plugin_file_name mapnikPlugins-${_build_type})
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${m_mapnik_plugin_file_name}.cmake.in" "set(MAPNIK_PLUGINS_DIR_${_build_type_l} \"@PACKAGE_PLUGINS_INSTALL_DIR@\" CACHE STRING \"\")\n")
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/${m_mapnik_plugin_file_name}.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/${m_mapnik_plugin_file_name}.cmake"
+  PATH_VARS PLUGINS_INSTALL_DIR
+  INSTALL_DESTINATION ${MAPNIK_CMAKE_DIR}
+)
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${m_mapnik_plugin_file_name}.cmake"
+  DESTINATION ${MAPNIK_CMAKE_DIR}
+)

cmake/MapnikExportPkgConfig.cmake

@@ -0,0 +1,92 @@
+function(create_pkg_config_file _target _lib_name _description)
+    string(CONFIGURE [[
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
+
+Name: @_lib_name@
+Description: @_description@
+Version: @MAPNIK_VERSION@
+Libs: -L"${libdir}" -l$<TARGET_FILE_BASE_NAME:@_target@>$<TARGET_PROPERTY:@_target@,$<CONFIG>_POSTFIX>
+Cflags: -I"${includedir}" -I"${includedir}/mapnik" ]]
+    _contents @ONLY)
+
+    file(GENERATE
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-$<CONFIG>.pc
+        CONTENT "${_contents}"
+    )
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-$<CONFIG>.pc
+        DESTINATION ${MAPNIK_PKGCONF_DIR}
+        RENAME ${_lib_name}.pc
+    )
+endfunction()
+
+function(create_pkg_config_file_mapnik _lib_name _description)
+    get_target_property(m_compile_defs core INTERFACE_COMPILE_DEFINITIONS)
+    string(JOIN " -D" m_str_compile_defs ${m_compile_defs})
+    if(m_str_compile_defs)
+        set(m_str_compile_defs "-D${m_str_compile_defs}")
+    endif()
+
+    set(m_requires
+        libmapnikwkt
+        libmapnikjson
+        icu-uc
+        icu-i18n
+        harfbuzz
+        freetype2
+    )
+    if(USE_LIBXML2)
+        list(APPEND m_requires libxml-2.0)
+    endif()
+    if(USE_PNG)
+        list(APPEND m_requires libpng)
+    endif()
+    if(USE_JPEG)
+        list(APPEND m_requires libjpeg)
+    endif()
+    if(USE_TIFF)
+        list(APPEND m_requires libtiff-4)
+    endif()
+    if(USE_WEBP)
+        list(APPEND m_requires libwebp)
+    endif()
+    if(USE_CAIRO)
+        list(APPEND m_requires cairo)
+    endif()
+    if(USE_PROJ)
+        list(APPEND m_requires "proj >= ${PROJ_MIN_VERSION}")
+    endif()
+    string(JOIN " " m_requires ${m_requires})
+    string(CONFIGURE [[
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
+fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
+plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@
+
+Name: @_lib_name@
+Description: @_description@
+Version: @MAPNIK_VERSION@
+Requires: @m_requires@
+Libs: -L"${libdir}" -l$<TARGET_FILE_BASE_NAME:mapnik>$<TARGET_PROPERTY:mapnik,$<CONFIG>_POSTFIX>
+Cflags: -I"${includedir}" -I"${includedir}/mapnik" -I"${includedir}/mapnik/agg" @m_str_compile_defs@]]
+    _contents @ONLY)
+    file(GENERATE
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-$<CONFIG>.pc
+        CONTENT "${_contents}"
+    )
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-$<CONFIG>.pc
+        DESTINATION ${MAPNIK_PKGCONF_DIR}
+        RENAME ${_lib_name}.pc
+    )
+endfunction()
+
+
+create_pkg_config_file(wkt libmapnikwkt "wkt library")
+create_pkg_config_file(json libmapnikjson "json library")
+create_pkg_config_file_mapnik("libmapnik" "mapnik library")

cmake/MapnikFindPackage.cmake

@@ -0,0 +1,64 @@
+function(mapnik_set_dep_version dep var)
+    string(TOUPPER ${dep} m_package_name_upc)
+    set(m_package_name ${dep})
+    if(${m_package_name}_VERSION_STRING)
+        set(${var} ${${m_package_name}_VERSION_STRING} PARENT_SCOPE)
+    elseif(${m_package_name}_VERSION)
+        set(${var} ${${m_package_name}_VERSION} PARENT_SCOPE)
+    elseif(${m_package_name_upc}_VERSION_STRING)
+        set(${var} ${${m_package_name_upc}_VERSION_STRING} PARENT_SCOPE)
+    elseif(${m_package_name_upc}_VERSION)
+        set(${var} ${${m_package_name_upc}_VERSION} PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(mapnik_print_package_info dep)
+    message(STATUS "Using ${dep} version: ${mapnik_${dep}_version}")
+endfunction()
+
+macro(mapnik_find_package dep)
+    find_package(${dep} ${ARGN})
+    if(${dep}_FOUND)
+        list(APPEND mapnik_deps ${dep})
+
+        if(mapnik_${dep}_find_args)
+            list(APPEND mapnik_${dep}_find_args ${ARGN})
+        else()
+            set(mapnik_${dep}_find_args ${ARGN})
+        endif()
+        mapnik_set_dep_version(${dep} mapnik_${dep}_version)
+
+        mapnik_print_package_info(${dep})
+    else()
+        message(STATUS "not found: ${dep}")
+    endif()
+endmacro()
+
+macro(mapnik_pkg_check_modules dep)
+    pkg_check_modules(${dep} ${ARGN})
+    if(${dep}_FOUND)
+        list(APPEND mapnik_deps ${dep})
+
+        set(mapnik_${dep}_pkg_args ${ARGN})
+        mapnik_set_dep_version(${dep} mapnik_${dep}_version)
+
+        mapnik_print_package_info(${dep})
+    else()
+        message(STATUS "not found: ${dep}")
+    endif()
+endmacro()
+
+macro(mapnik_find_threads)
+    find_package(Threads REQUIRED)
+    if(CMAKE_THREAD_LIBS_INIT)
+        message(STATUS "Using Threads (system libraries)")
+    elseif(CMAKE_USE_WIN32_THREADS_INIT)
+        message(STATUS "Using Threads (win32 threads)")
+    elseif(CMAKE_USE_PTHREADS_INIT)
+        message(STATUS "Using Threads (pthread)")
+    elseif(CMAKE_HP_PTHREADS_INIT)
+        message(STATUS "Using Threads (HP thread)")
+    else()
+        message(STATUS "Using Threads (unknown backend)")
+    endif()
+endmacro()

cmake/MapnikInstall.cmake

@@ -0,0 +1,98 @@
+#
+# Install library targets that consuming users need.
+#
+function(mapnik_install _target)
+    install(TARGETS ${_target}
+        EXPORT MapnikTargets
+        INCLUDES DESTINATION ${MAPNIK_INCLUDE_DIR}
+        RUNTIME DESTINATION ${MAPNIK_BIN_DIR}
+            COMPONENT MapnikRuntime
+        LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
+            COMPONENT MapnikRuntime
+            NAMELINK_COMPONENT MapnikDevelopment
+        ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}
+            COMPONENT MapnikDevelopment
+    )
+    get_target_property(TARGET_TYPE "${_target}" TYPE)
+    if (TARGET_TYPE STREQUAL "SHARED_LIBRARY")
+        set_property(GLOBAL APPEND PROPERTY TARGETS ${_target})
+    endif()
+endfunction()
+
+#
+# Install plugins
+#
+function(mapnik_install_plugin _target)
+    if(NOT BUILD_SHARED_PLUGINS)
+        return()
+    endif()
+    install(TARGETS ${_target}
+        RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR}
+            COMPONENT MapnikPluginRuntime
+        LIBRARY DESTINATION ${PLUGINS_INSTALL_DIR}
+            COMPONENT MapnikPluginRuntime
+            NAMELINK_COMPONENT MapnikPluginDevelopment
+        ARCHIVE DESTINATION ${PLUGINS_INSTALL_DIR}
+            COMPONENT MapnikPluginDevelopment
+    )
+    set_property(GLOBAL APPEND PROPERTY PLUGINS ${_target})
+endfunction()
+
+#
+# Install executables. These are available via COMPONENTS in find_package
+#
+function(mapnik_install_utility _target)
+    set(_target_name "mapnikUtilityTargets_${_target}")
+    install(TARGETS ${_target}
+        EXPORT ${_target_name}
+        INCLUDES DESTINATION ${MAPNIK_INCLUDE_DIR}
+        RUNTIME DESTINATION ${MAPNIK_BIN_DIR}
+            COMPONENT MapnikRuntime
+        LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
+            COMPONENT MapnikRuntime
+            NAMELINK_COMPONENT MapnikDevelopment
+        ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}
+            COMPONENT MapnikDevelopment
+    )
+    install(EXPORT ${_target_name}
+        FILE ${_target_name}.cmake
+        NAMESPACE mapnik::
+        DESTINATION ${MAPNIK_CMAKE_DIR}
+    )
+    set_property(GLOBAL APPEND PROPERTY MAPNIK_UTILITIES ${_target})
+endfunction()
+
+function(mapnik_install_targets)
+    if(INSTALL_DEPENDENCIES AND WIN32)
+        # https://cmake.org/cmake/help/latest/policy/CMP0087.html
+        cmake_policy(SET CMP0087 NEW)
+        get_property(_installed_utilities GLOBAL PROPERTY MAPNIK_UTILITIES)
+        get_property(_installed_targets GLOBAL PROPERTY TARGETS)
+        get_property(_installed_plugins GLOBAL PROPERTY PLUGINS)
+        set(_internal_executables "")
+        set(_internal_libraries "")
+
+        foreach(_target IN LISTS _installed_utilities)
+            list(APPEND _internal_executables "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>")
+        endforeach()
+        foreach(_target IN LISTS _installed_targets)
+            list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${MAPNIK_BIN_DIR}/$<TARGET_FILE_NAME:${_target}>")
+        endforeach()
+        foreach(_target IN LISTS _installed_plugins)
+            list(APPEND _internal_libraries "\${CMAKE_INSTALL_PREFIX}/${PLUGINS_INSTALL_DIR}/$<TARGET_FILE_NAME:${_target}>")
+        endforeach()
+        # all other executables get auto detected and fixed.
+        if(_internal_executables)
+            list(GET _internal_executables 0 _internal_executables)
+        endif()
+
+        INSTALL(CODE "
+            message(STATUS \"internal_executables: ${_internal_executables}\")
+            message(STATUS \"internal_libraries: ${_internal_libraries}\")
+            message(STATUS \"ADDITIONAL_LIBARIES_PATHS: ${ADDITIONAL_LIBARIES_PATHS}\")
+
+            include(BundleUtilities)
+            fixup_bundle(\"${_internal_executables}\" \"${_internal_libraries}\" \"${ADDITIONAL_LIBARIES_PATHS}\")
+        " COMPONENT MapnikRuntime)
+    endif()
+endfunction()

cmake/MapnikMinimumVersions.cmake

@@ -0,0 +1,3 @@
+set(BOOST_MIN_VERSION 1.73)
+set(HARFBUZZ_MIN_VERSION 0.9.34)
+set(PROJ_MIN_VERSION 7.2.0)

cmake/MapnikOption.cmake

@@ -0,0 +1,4 @@
+macro(mapnik_option option_name option_description option_default_value)
+    option(${option_name} "${option_description}" ${option_default_value})
+    add_feature_info(${option_name} ${option_name} "${option_description}")
+endmacro()

cmake/clang-format.cmake

@@ -0,0 +1,16 @@
+function(format_dir dir)
+    file(GLOB_RECURSE sources
+        "${dir}/*.cpp"
+        "${dir}/*.hpp"
+    )
+    execute_process(COMMAND clang-format -style=file -i ${sources})
+endfunction()
+
+
+format_dir(benchmark)
+format_dir(demo)
+format_dir(include)
+format_dir(plugins)
+format_dir(src)
+format_dir(test)
+format_dir(utils)

cmake/mapnikConfig.cmake.in

@@ -0,0 +1,52 @@
+@PACKAGE_INIT@
+
+set_and_check(MAPNIK_INCLUDE_DIR "@PACKAGE_MAPNIK_INCLUDE_DIR@" CACHE STRING "")
+set_and_check(MAPNIK_FONTS_DIR "@PACKAGE_FONTS_INSTALL_DIR@" CACHE STRING "")
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/Modules/")
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Threads REQUIRED)
+@mapnik_find_deps@
+
+include("${CMAKE_CURRENT_LIST_DIR}/mapnikTargets.cmake")
+
+set(_supported_components @MAPNIK_UTILITIES@)
+foreach(_comp ${mapnik_FIND_COMPONENTS})
+  if (NOT _comp IN_LIST _supported_components)
+    set(mapnik_FOUND False)
+    set(mapnik_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/mapnikUtilityTargets_${_comp}.cmake")
+endforeach()
+
+
+get_filename_component(_plugin_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(GLOB CONFIG_FILES "${_plugin_dir}/mapnikPlugins-*.cmake")
+foreach(f ${CONFIG_FILES})
+  include(${f})
+endforeach()
+
+function(mapnik_find_plugin_dir PLUGIN_DIR)
+    string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type_l)
+    set(_plugin_dir "${MAPNIK_PLUGINS_DIR_${_build_type_l}}")
+    # only release has more then one configuration
+    if(NOT _plugin_dir)
+        set(_all_rel_cfgs RELEASE RELWITHDEBINFO MINSIZEREL)
+        list(FIND _all_rel_cfgs ${_build_type_l} _is_rel_cfg)
+        # check if the current configuration is a known release configuration
+        if(${_is_rel_cfg} GREATER_EQUAL 0)
+            foreach(_rel_cfg IN LISTS _all_rel_cfgs)
+                set(_plugin_dir "${MAPNIK_PLUGINS_DIR_${_rel_cfg}}")
+                if(_plugin_dir)
+                    break()
+                endif()
+            endforeach()
+        endif()
+    endif()
+    if(NOT _plugin_dir)
+        message(WARNING "Could not find a plugin install dir for configuration ${_build_type_l}")
+    endif()
+    set(${PLUGIN_DIR} ${_plugin_dir} PARENT_SCOPE)
+endfunction()

cmake/pack.cmake

@@ -0,0 +1,18 @@
+include(InstallRequiredSystemLibraries)
+set(CPACK_PACKAGE_NAME "mapnik")
+set(CPACK_PACKAGE_CONTACT "ubuntu-mathis@outlook.com")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://mapnik.org")
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
+set(CPACK_SOURCE_GENERATOR "TGZ")
+set(CPACK_GENERATOR "DEB;TGZ")
+set(CPACK_SOURCE_IGNORE_FILES
+  \\.git/
+  build/
+  ".*~$"
+  out/
+  \\.vs/
+  \\.vscode/
+)
+set(CPACK_VERBATIM_VARIABLES YES)
+
+include(CPack)

codecov.yml

@@ -0,0 +1,10 @@
+ignore:
+  - "mason_packages"
+  - "benchmark"
+  - "deps"
+  - ".sconf_temp"
+  - "scons"
+  - "test"
+  - "demo"
+  - "docs"
+  - "fonts"

configure

@@ -1,5 +1,32 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
-PYTHON=${PYTHON:-python}
+set -eu
 
-$PYTHON scons/scons.py --implicit-deps-changed configure "$@"
+: ${PYTHON:=python}
+
+# Only some shells (Bash and Z shell) support arrays. Therefore,
+# the following code provides an alternative for users calling the script
+# with shells other than Bash or Z shell (e.g. Debian users using Dash).
+THE_SHELL=$(basename $SHELL)
+if [ "$THE_SHELL" != "bash" ] && [ "$THE_SHELL" != "zsh" ]; then
+    if [ -f mapnik-settings.env ]; then
+        echo "WARNING: Reading from mapnik-settings.env is supported with Bash or Z shell only."
+    fi
+    $PYTHON scons/scons.py --implicit-deps-changed configure "$@"
+    exit 0
+fi
+
+# mapnik-settings.env is an optional file to store
+# environment variables that should be used before
+# running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA
+# These do not normally need to be set except when
+# building against binary versions of dependencies like
+# done via bootstrap.sh
+
+if [ -f mapnik-settings.env ]; then
+    echo "Inheriting from mapnik-settings.env"
+    . ./mapnik-settings.env
+    VARS=( $(cat mapnik-settings.env) )
+fi
+
+$PYTHON scons/scons.py --implicit-deps-changed configure ${VARS[*]:-} "$@"

demo/CMakeLists.txt

@@ -0,0 +1,7 @@
+if(BUILD_DEMO_VIEWER)
+    add_subdirectory(viewer)
+endif()
+
+if(BUILD_DEMO_CPP)
+    add_subdirectory(c++)
+endif()

demo/c++/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_executable(mapnik-demo rundemo.cpp)
+target_link_libraries(mapnik-demo PRIVATE
+    mapnik::agg
+    mapnik::mapnik
+    ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
+)

demo/c++/build.py

@@ -41,7 +41,7 @@ if env['HAS_CAIRO']:
     demo_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
 
 libraries = [env['MAPNIK_NAME']]
-libraries.extend(copy(env['LIBMAPNIK_LIBS']))
+libraries.extend([copy(env['LIBMAPNIK_LIBS']), 'sqlite3', 'pthread'])
 rundemo = demo_env.Program('rundemo', source, LIBS=libraries)
 
 Depends(rundemo, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))

demo/c++/rundemo.cpp

@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2024 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@
  *
  *****************************************************************************/
 
+#include <mapnik/mapnik.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/layer.hpp>
 #include <mapnik/rule.hpp>
@@ -45,19 +46,21 @@
 
 #include <iostream>
 
-
-int main ( int, char** )
+int main(int, char**)
 {
     using namespace mapnik;
-    const std::string srs_lcc="+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs";
-    const std::string srs_merc="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over";
-
-    try {
+    const std::string srs_lcc =
+      "+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 +datum=NAD83 +units=m +no_defs";
+    const std::string srs_merc = "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 "
+                                 "+units=m +nadgrids=@null +wktext +no_defs +over";
+    mapnik::setup();
+    try
+    {
         std::cout << " running demo ... \n";
         datasource_cache::instance().register_datasources("plugins/input/");
-        freetype_engine::register_font("fonts/dejavu-fonts-ttf-2.34/ttf/DejaVuSans.ttf");
+        freetype_engine::register_font("fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSans.ttf");
 
-        Map m(800,600);
+        Map m(800, 600);
         m.set_background(parse_color("white"));
         m.set_srs(srs_merc);
         // create styles
@@ -93,13 +96,13 @@ int main ( int, char** )
             rule r;
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(0,0,0));
-                put(line_sym,keys::stroke_width,1.0);
+                put(line_sym, keys::stroke, color(0, 0, 0));
+                put(line_sym, keys::stroke_width, 1.0);
                 dash_array dash;
-                dash.emplace_back(8,4);
-                dash.emplace_back(2,2);
-                dash.emplace_back(2,2);
-                put(line_sym,keys::stroke_dasharray,dash);
+                dash.emplace_back(8, 4);
+                dash.emplace_back(2, 2);
+                dash.emplace_back(2, 2);
+                put(line_sym, keys::stroke_dasharray, dash);
                 r.append(std::move(line_sym));
             }
             provlines_style.add_rule(std::move(r));
@@ -127,10 +130,10 @@ int main ( int, char** )
             r.set_filter(parse_expression("[CLASS] = 3 or [CLASS] = 4"));
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(171,158,137));
-                put(line_sym,keys::stroke_width,2.0);
-                put(line_sym,keys::stroke_linecap,ROUND_CAP);
-                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
+                put(line_sym, keys::stroke, color(171, 158, 137));
+                put(line_sym, keys::stroke_width, 2.0);
+                put(line_sym, keys::stroke_linecap, line_cap_enum::ROUND_CAP);
+                put(line_sym, keys::stroke_linejoin, line_join_enum::ROUND_JOIN);
                 r.append(std::move(line_sym));
             }
             roads34_style.add_rule(std::move(r));
@@ -144,10 +147,10 @@ int main ( int, char** )
             r.set_filter(parse_expression("[CLASS] = 2"));
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(171,158,137));
-                put(line_sym,keys::stroke_width,4.0);
-                put(line_sym,keys::stroke_linecap,ROUND_CAP);
-                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
+                put(line_sym, keys::stroke, color(171, 158, 137));
+                put(line_sym, keys::stroke_width, 4.0);
+                put(line_sym, keys::stroke_linecap, line_cap_enum::ROUND_CAP);
+                put(line_sym, keys::stroke_linejoin, line_join_enum::ROUND_JOIN);
                 r.append(std::move(line_sym));
             }
             roads2_style_1.add_rule(std::move(r));
@@ -160,10 +163,10 @@ int main ( int, char** )
             r.set_filter(parse_expression("[CLASS] = 2"));
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(255,250,115));
-                put(line_sym,keys::stroke_width,2.0);
-                put(line_sym,keys::stroke_linecap,ROUND_CAP);
-                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
+                put(line_sym, keys::stroke, color(255, 250, 115));
+                put(line_sym, keys::stroke_width, 2.0);
+                put(line_sym, keys::stroke_linecap, line_cap_enum::ROUND_CAP);
+                put(line_sym, keys::stroke_linejoin, line_join_enum::ROUND_JOIN);
                 r.append(std::move(line_sym));
             }
             roads2_style_2.add_rule(std::move(r));
@@ -177,10 +180,10 @@ int main ( int, char** )
             r.set_filter(parse_expression("[CLASS] = 1"));
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(188,149,28));
-                put(line_sym,keys::stroke_width,7.0);
-                put(line_sym,keys::stroke_linecap,ROUND_CAP);
-                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
+                put(line_sym, keys::stroke, color(188, 149, 28));
+                put(line_sym, keys::stroke_width, 7.0);
+                put(line_sym, keys::stroke_linecap, line_cap_enum::ROUND_CAP);
+                put(line_sym, keys::stroke_linejoin, line_join_enum::ROUND_JOIN);
                 r.append(std::move(line_sym));
             }
             roads1_style_1.add_rule(std::move(r));
@@ -193,10 +196,10 @@ int main ( int, char** )
             r.set_filter(parse_expression("[CLASS] = 1"));
             {
                 line_symbolizer line_sym;
-                put(line_sym,keys::stroke,color(242,191,36));
-                put(line_sym,keys::stroke_width,5.0);
-                put(line_sym,keys::stroke_linecap,ROUND_CAP);
-                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
+                put(line_sym, keys::stroke, color(242, 191, 36));
+                put(line_sym, keys::stroke_width, 5.0);
+                put(line_sym, keys::stroke_linecap, line_cap_enum::ROUND_CAP);
+                put(line_sym, keys::stroke_linejoin, line_join_enum::ROUND_JOIN);
                 r.append(std::move(line_sym));
             }
             roads1_style_2.add_rule(std::move(r));
@@ -212,10 +215,11 @@ int main ( int, char** )
                 text_placements_ptr placement_finder = std::make_shared<text_placements_dummy>();
                 placement_finder->defaults.format_defaults.face_name = "DejaVu Sans Book";
                 placement_finder->defaults.format_defaults.text_size = 10.0;
-                placement_finder->defaults.format_defaults.fill = color(0,0,0);
-                placement_finder->defaults.format_defaults.halo_fill = color(255,255,200);
+                placement_finder->defaults.format_defaults.fill = color(0, 0, 0);
+                placement_finder->defaults.format_defaults.halo_fill = color(255, 255, 200);
                 placement_finder->defaults.format_defaults.halo_radius = 1.0;
-                placement_finder->defaults.set_format_tree(std::make_shared<mapnik::formatting::text_node>(parse_expression("[GEONAME]")));
+                placement_finder->defaults.set_format_tree(
+                  std::make_shared<mapnik::formatting::text_node>(parse_expression("[GEONAME]")));
                 put<text_placements_ptr>(text_sym, keys::text_placements_, placement_finder);
                 r.append(std::move(text_sym));
             }
@@ -228,9 +232,9 @@ int main ( int, char** )
         // Provincial  polygons
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/boundaries";
-            p["encoding"]="latin1";
+            p["type"] = "shape";
+            p["file"] = "demo/data/boundaries";
+            p["encoding"] = "utf8";
 
             layer lyr("Provinces");
             lyr.set_datasource(datasource_cache::instance().create(p));
@@ -242,8 +246,8 @@ int main ( int, char** )
         // Drainage
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/qcdrainage";
+            p["type"] = "shape";
+            p["file"] = "demo/data/qcdrainage";
             layer lyr("Quebec Hydrography");
             lyr.set_datasource(datasource_cache::instance().create(p));
             lyr.set_srs(srs_lcc);
@@ -253,8 +257,8 @@ int main ( int, char** )
 
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/ontdrainage";
+            p["type"] = "shape";
+            p["file"] = "demo/data/ontdrainage";
             layer lyr("Ontario Hydrography");
             lyr.set_datasource(datasource_cache::instance().create(p));
             lyr.set_srs(srs_lcc);
@@ -265,8 +269,8 @@ int main ( int, char** )
         // Provincial boundaries
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/boundaries_l";
+            p["type"] = "shape";
+            p["file"] = "demo/data/boundaries_l";
             layer lyr("Provincial borders");
             lyr.set_srs(srs_lcc);
             lyr.set_datasource(datasource_cache::instance().create(p));
@@ -277,8 +281,8 @@ int main ( int, char** )
         // Roads
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/roads";
+            p["type"] = "shape";
+            p["file"] = "demo/data/roads";
             layer lyr("Roads");
             lyr.set_srs(srs_lcc);
             lyr.set_datasource(datasource_cache::instance().create(p));
@@ -293,9 +297,9 @@ int main ( int, char** )
         // popplaces
         {
             parameters p;
-            p["type"]="shape";
-            p["file"]="demo/data/popplaces";
-            p["encoding"] = "latin1";
+            p["type"] = "shape";
+            p["file"] = "demo/data/popplaces";
+            p["encoding"] = "utf8";
             layer lyr("Populated Places");
             lyr.set_srs(srs_lcc);
             lyr.set_datasource(datasource_cache::instance().create(p));
@@ -303,28 +307,28 @@ int main ( int, char** )
             m.add_layer(lyr);
         }
 
-        m.zoom_to_box(box2d<double>(-8024477.28459,5445190.38849,-7381388.20071,5662941.44855));
+        m.zoom_to_box(box2d<double>(-8024477.28459, 5445190.38849, -7381388.20071, 5662941.44855));
 
-        image_rgba8 buf(m.width(),m.height());
-        agg_renderer<image_rgba8> ren(m,buf);
+        image_rgba8 buf(m.width(), m.height());
+        agg_renderer<image_rgba8> ren(m, buf);
         ren.apply();
         std::string msg("These maps have been rendered using AGG in the current directory:\n");
 #ifdef HAVE_JPEG
-        save_to_file(buf,"demo.jpg","jpeg");
+        save_to_file(buf, "demo.jpg", "jpeg");
         msg += "- demo.jpg\n";
 #endif
 #ifdef HAVE_PNG
-        save_to_file(buf,"demo.png","png");
-        save_to_file(buf,"demo256.png","png8");
+        save_to_file(buf, "demo.png", "png");
+        save_to_file(buf, "demo256.png", "png8");
         msg += "- demo.png\n";
         msg += "- demo256.png\n";
 #endif
 #ifdef HAVE_TIFF
-        save_to_file(buf,"demo.tif","tiff");
+        save_to_file(buf, "demo.tif", "tiff");
         msg += "- demo.tif\n";
 #endif
 #ifdef HAVE_WEBP
-        save_to_file(buf,"demo.webp","webp");
+        save_to_file(buf, "demo.webp", "webp");
         msg += "- demo.webp\n";
 #endif
         msg += "Have a look!\n";
@@ -332,8 +336,8 @@ int main ( int, char** )
 
 #if defined(HAVE_CAIRO)
         // save to pdf/svg files
-        save_to_cairo_file(m,"cairo-demo.pdf");
-        save_to_cairo_file(m,"cairo-demo.svg");
+        save_to_cairo_file(m, "cairo-demo.pdf");
+        save_to_cairo_file(m, "cairo-demo.svg");
 
         /* we could also do:
 
@@ -342,20 +346,20 @@ int main ( int, char** )
            but instead let's build up a surface for more flexibility
         */
 
-        cairo_surface_ptr image_surface(
-            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,m.width(),m.height()),
+        cairo_surface_ptr image_surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, m.width(), m.height()),
                                         cairo_surface_closer());
         double scale_factor = 1.0;
         cairo_ptr image_context(create_context(image_surface));
-        mapnik::cairo_renderer<cairo_ptr> png_render(m,image_context,scale_factor);
+        mapnik::cairo_renderer<cairo_ptr> png_render(m, image_context, scale_factor);
         png_render.apply();
         // we can now write to png with cairo functionality
         cairo_surface_write_to_png(&*image_surface, "cairo-demo.png");
         // but we can also benefit from quantization by converting
         // to a mapnik image object and then saving that
-        mapnik::image_rgba8 im_data(cairo_image_surface_get_width(&*image_surface), cairo_image_surface_get_height(&*image_surface));
+        mapnik::image_rgba8 im_data(cairo_image_surface_get_width(&*image_surface),
+                                    cairo_image_surface_get_height(&*image_surface));
         cairo_image_to_rgba8(im_data, image_surface);
-        save_to_file(im_data, "cairo-demo256.png","png8");
+        save_to_file(im_data, "cairo-demo256.png", "png8");
         cairo_surface_finish(&*image_surface);
 
         std::cout << "Three maps have been rendered using Cairo in the current directory:\n"
@@ -368,12 +372,12 @@ int main ( int, char** )
         // save map definition (data + style)
         save_map(m, "map.xml");
     }
-    catch ( std::exception const& ex )
+    catch (std::exception const& ex)
     {
         std::cerr << "### std::exception: " << ex.what() << std::endl;
         return EXIT_FAILURE;
     }
-    catch ( ... )
+    catch (...)
     {
         std::cerr << "### Unknown exception." << std::endl;
         return EXIT_FAILURE;

demo/data/boundaries.prj

@@ -1 +0,0 @@
-PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]

demo/data/boundaries_l.prj

@@ -1 +0,0 @@
-PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]

demo/data/ontdrainage.prj

@@ -1 +0,0 @@
-PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]

demo/data/popplaces.prj

@@ -1 +0,0 @@
-PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]

demo/data/qcdrainage.prj

@@ -1 +0,0 @@
-PROJCS["Atlas of Canada Lambert Conformal Conic",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-95.0],PARAMETER["Standard_Parallel_1",49.0],PARAMETER["Standard_Parallel_2",77.0],PARAMETER["Latitude_Of_Origin",49.0],UNIT["Meter",1.0]]