GeJSON - allow empty FeatureCollections (#4035 )

2019-03-25 15:19:44 +00:00
2527 changed files with 71093 additions and 507664 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -0,0 +1,81 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/mapnik/mapnik
+    parallelism: 1
+    shell: /bin/bash --login
+    environment:
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      XCODE_SCHEME: 'no'
+      XCODE_WORKSPACE: 'no'
+      JOBS: 8
+      CCACHE_TEMPDIR: /tmp/.ccache-temp
+      CCACHE_COMPRESS: 1
+      LLVM_VERSION: 3.9.1
+
+    # VM instead of a container) see https://circleci.com/docs/2.0/executor-types/
+    # To see the list of pre-built images that CircleCI provides for most common languages see
+    # https://circleci.com/docs/2.0/circleci-images/
+    docker:
+    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
+      command: /sbin/init
+    steps:
+    - checkout
+    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+    # In many cases you can simplify this from what is generated here.
+    # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
+    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+    # Checkout
+    #   This would typically go in either a build or a build-and-test job when using workflows
+    # This is based on your 1.0 configuration file or project settings
+    - run: git submodule update --init
+    # Dependencies
+    #   This would typically go in either a build or a build-and-test job when using workflows
+    # Restore the dependency cache
+    - restore_cache:
+        keys:
+        # This branch if available
+        - v1-dep-{{ .Branch }}-
+        # Default branch if not
+        - v1-dep-master-
+        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
+        - v1-dep-
+    # This is based on your 1.0 configuration file or project settings
+    - run: sudo rm -rf /var/cache/apt/archives && sudo ln -s ~/.apt-cache /var/cache/apt/archives && mkdir -p ~/.apt-cache/partial
+    - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+    # This is based on your 1.0 configuration file or project settings
+    - run: sudo apt-get update -y
+    - run: sudo apt-get install -y libstdc++-5-dev xutils-dev
+    # Save dependency cache
+    - save_cache:
+        key: v1-dep-{{ .Branch }}-{{ epoch }}
+        paths:
+        # This is a broad list of cache paths to include many possible development environments
+        # These cache paths were specified in the 1.0 config
+        - ~/.ccache
+        - ~/.apt-cache
+    # This is based on your 1.0 configuration file or project settings
+    - run: ./bootstrap.sh
+    - run: ./.mason/mason install clang++ ${LLVM_VERSION}
+    - run: ./.mason/mason link clang++ ${LLVM_VERSION}
+    - run: ./configure CC="$(pwd)/mason_packages/.link/bin/clang" CXX="$(pwd)/mason_packages/.link/bin/ccache $(pwd)/mason_packages/.link/bin/clang++ -Qunused-arguments"
+    - run: make
+    - run: nm src/libmapnik* | grep "GLIBCXX_3.4.2[0-9]" || true
+    # This is based on your 1.0 configuration file or project settings
+    - run: psql -c 'create database template_postgis;'
+    - run: psql -c 'create extension postgis;' -d template_postgis
+    # Test
+    #   This would typically be a build job when using workflows, possibly combined with build
+    # This is based on your 1.0 configuration file or project settings
+    - run: make test
+    # Teardown
+    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
+    # Save test results
+    - store_test_results:
+        path: /tmp/circleci-test-results
+    # Save artifacts
+    - store_artifacts:
+        path: /tmp/circleci-artifacts
+    - store_artifacts:
+        path: /tmp/circleci-test-results
--- a/.clang-format
+++ b/.clang-format
@ -1,94 +0,0 @@
-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
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1 @@
 *.svg text eol=lf
-scons/** linguist-vendored
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@ -1,85 +0,0 @@
-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
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@ -1,136 +0,0 @@
-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 }}
--- a/.github/workflows/release_linux.yml
+++ b/.github/workflows/release_linux.yml
@ -1,55 +0,0 @@
-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
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,4 @@
 .DS_Store
-.vscode
-.cache
 *.gcov
 *.gcda
 *.gcno
@ -58,8 +56,3 @@ demo/viewer/ui_layer_info.h
 test/standalone/*-bin
 test/unit/run
 test/visual/run
-# cmake 
-build
-.vs
-
-CMakeUserPresets.json
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,16 +0,0 @@
-# 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]
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,111 @@
+language: generic
+
+git:
+  depth: 10
+  submodules: false
+
+env:
+  global:
+   - CCACHE_TEMPDIR=/tmp/.ccache-temp
+   - CCACHE_COMPRESS=1
+   - PREFIX=/tmp/mapnik
+   - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
+
+cache:
+  directories:
+  - $HOME/.ccache
+
+dist: trusty
+sudo: false
+
+matrix:
+  include:
+    - os: linux
+      name: Linux gcc-6
+      env: >-
+          CXX="ccache g++-6"
+          CC="gcc-6"
+      addons:
+        postgresql: "9.5"
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test']
+          packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
+    - os: linux
+      name: Linux clang-3.9
+      env: >-
+          CXX="ccache clang++-3.9 -Qunused-arguments"
+          CC="clang-3.9"
+          ENABLE_GLIBC_WORKAROUND=true
+      before_install:
+        - export LINKFLAGS="-fuse-ld=gold-2.26"
+      addons:
+        postgresql: "9.5"
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'clang-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
+    - os: linux
+      name: Linux clang-3.9 + coverage
+      env: >-
+          CXX="ccache clang++-3.9 -Qunused-arguments"
+          CC="clang-3.9"
+          COVERAGE=true
+          QUIET=true
+      before_install:
+        - export LINKFLAGS="-fuse-ld=gold-2.26"
+        - export LLVM_COV="llvm-cov-3.9"
+      addons:
+        postgresql: "9.5"
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'clang-3.9', 'llvm-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ]
+    - os: osx
+      name: OSX clang
+      # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
+      osx_image: xcode7.3 # upgrades clang from 6 -> 7
+      env: >-
+          CXX="ccache clang++ -Qunused-arguments"
+
+install:
+ - source scripts/travis-common.sh
+ # workaround travis rvm bug
+ # http://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
+ - on 'osx' rvm get head || true
+ - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
+ - export COVERAGE=${COVERAGE:-false}
+ - export BENCH=${BENCH:-false}
+ - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
+ - on 'osx' rm -rf ${DATA_PATH}
+ - on 'osx' initdb ${DATA_PATH} -E utf8
+ - on 'osx' pg_ctl -w start -l postgres.log --pgdata ${DATA_PATH};
+ - on 'osx' cat postgres.log;
+ - on 'osx' createuser -s postgres
+ - psql -c 'create database template_postgis;' -U postgres
+ - psql -c 'create extension postgis;' -d template_postgis -U postgres
+ - enabled ${COVERAGE} curl -S -f https://codecov.io/bash -o codecov
+ - enabled ${COVERAGE} chmod +x codecov
+
+before_script:
+ - export JOBS=${JOBS:-4}
+ - export HEAVY_JOBS=${HEAVY_JOBS:-2}
+ - export SCONSFLAGS='--debug=time'
+ - source bootstrap.sh
+ - ccache --version
+ - ccache -p || true
+ - ccache --show-stats || true
+ - commit_message_parse
+
+script:
+ - git_submodule_update --init deps/
+ - configure BENCHMARK=${BENCH} ENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-false} QUIET=${QUIET:-false}
+ #- cat config.log => comment out to reduce log size limit on travis-ci
+ # we limit the `make` to 40 min
+ # to ensure that slow builds still upload their
+ # ccache results and therefore should be faster
+ # (and might work) for the next build
+ - DEADLINE=$(( $(date +%s) + 40 * 60 ))
+ - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline="$DEADLINE" make
+ - test_ok && git_submodule_update --init --depth=50 test/
+ - test_ok && make test
+ - test_ok && enabled ${COVERAGE} coverage
+ - test_ok && enabled ${BENCH} make bench
+ - ./scripts/check_glibcxx.sh
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,44 +6,12 @@ Developers: Please commit along with changes.

 For a complete change history, see the git log.

-## Mapnik 4.0.3

-Released October 30th, 2024
-
-(Packaged from [05389e3c7](https://github.com/mapnik/mapnik/commit/05389e3c7))
-
- Remove 'final' specifier from invalid_featureset implementation
-  (issues with dynamic_cast<> when building using Apple clang version 16.0.0 on darwin-arm64)
- Rename invalid_featureset to empty_featureset
- Upgrade to SCons v4.8.1
- Fix unit tests e.g  #endif statement (via @bgardner-noggin)
-
-## Mapnik 4.0.2
-
-Released August 21st, 2024
-
- CMake build - set `SOVERSION` to `${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}`
- Upgraded SCons build system to v4.8.0
-
-## Mapnik 4.0.1
-
- Use CMAKE_INSTALL_LIBDIR for libdir in pkg-config files
- Support gcc 14
- Improved accuracy of bounding box re-projections. Automatic spliting at (0, 0) and merging results.
- Fixes missing features when using WGS 84 / Arctic Polar Stereographic (`epsg:4326 <-> epsg:3995`)
- Added `area_of_use` method to `mapnik::projection`
-
-## Mapnik 4.0.0
+## UNRELEASED

 #### Notice

- Mapnik now requires C++17 compliant compiler (`-std=c++17`)
- Mapnik now supports CMake as a build system. See [#4191](https://github.com/mapnik/mapnik/pull/4191) and the [docs](https://github.com/mapnik/mapnik/blob/master/docs/cmake-usage.md) for more info.
-
-#### Breaking Changes
-
- Reworked datasource plugin system. Plugins now need to implement a class with the macros in `datasource_plugin.hpp` ([#4291](https://github.com/mapnik/mapnik/pull/4291))
- mapnik now has a global `mapnik::setup()` method which have to be called before any other functions of mapnik. Defined in `mapnik.hpp`. Currently there is a auto setup functionality. It can be disabled using the cmake option `DISABLE_MAPNIK_AUTOSETUP=ON`. Note: In order not to insert this change into every code base, it is currently still called during the dynamic initialisation time. However, if mapnik is compiled statically, this function must be called.  ([#4291](https://github.com/mapnik/mapnik/pull/4291))
+- Mapnik now requires C++14 compliant compiler (`-std=c++14`)

 #### Core

@ -59,18 +27,14 @@ Released August 21st, 2024
 - Slightly improved `sql_utils::table_from_sql` ([2587bb3](https://github.com/mapnik/mapnik/commit/2587bb3a1d8db397acfa8dcc2d332da3a8a9399f))
 - Added wrappers for proper quoting in SQL query construction: `sql_utils::identifier`, `sql_utils::literal` ([7b21713](https://github.com/mapnik/mapnik/commit/7b217133e2749b82c2638551045c4edbece15086))
 - Added two-argument `sql_utils::unquote`, `sql_utils::unquote_copy` that also collapse inner quotes ([a4e8ea2](https://github.com/mapnik/mapnik/commit/a4e8ea21be297d89bbf36ba594d6c661a7a9ac81))
- Fixed mapnik static build with static plugins ([#4291](https://github.com/mapnik/mapnik/pull/4291))
- Reworked mapnik::enumeration<...> ([#4372](https://github.com/mapnik/mapnik/pull/4372))

 #### Plugins

 - GDAL: fixed several issues with overviews ([#3912](https://github.com/mapnik/mapnik/issues/3912))
 - PostGIS: changed syntax for user `@variable` interpolation to `!@variable!` ([#3618](https://github.com/mapnik/mapnik/issues/3618))
+- PostGIS: using parameter `estimate_extent` now requires PostGIS >= 2.1.0 ([#3624](https://github.com/mapnik/mapnik/issues/3624))
 - PGraster: added variable interpolation like in PostGIS plugin ([#3618](https://github.com/mapnik/mapnik/issues/3618))
- PostGIS & PGraster: using parameter `estimate_extent` now requires PostGIS >= 2.1.0 ([#3624](https://github.com/mapnik/mapnik/issues/3624))
- PostGIS & PGraster: added parameter `application_name` [#3984](https://github.com/mapnik/mapnik/pull/3984)
- PostGIS & PGraster: substituted numeric `!tokens!` now always have decimal point ([#3942](https://github.com/mapnik/mapnik/pull/3942))
- PostGIS & PGraster: substituted `!bbox!` is now constructed with `ST_MakeEnvelope` ([#3319](https://github.com/mapnik/mapnik/pull/3319))
+- PGraster: using parameter `estimate_extent` now requires PostGIS >= 2.1.0 ([#3624](https://github.com/mapnik/mapnik/issues/3624))


 ## 3.0.20
--- a/CITATION.cff
+++ b/CITATION.cff
@ -1,34 +0,0 @@
-# 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,472 +0,0 @@
-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)
--- a/CMakePresets.json
+++ b/CMakePresets.json
@ -1,350 +0,0 @@
-{
-    "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"
-            ]
-        }
-    ]
-}
--- a/INSTALL.md
+++ b/INSTALL.md
@ -2,13 +2,6 @@

 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
@ -42,8 +35,8 @@ To use a Python interpreter that is not named `python` for your build, do
 something like the following instead:

 ```bash
-    $ PYTHON=python3 ./configure
-    $ make PYTHON=python3
+    $ PYTHON=python2 ./configure
+    $ make PYTHON=python2
 ```

 NOTE: the above will not work on windows, rather see https://github.com/mapnik/mapnik/wiki/WindowsInstallation
@ -71,15 +64,15 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT

 Build system dependencies are:

- * 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)
+ * 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)

 Mapnik Core depends on:

 * Boost
-    - \>= 1.73 is required
+    - >= 1.47 is required and >= 1.56 recommended
    - These libraries are used:
      - filesystem
      - system
@ -97,7 +90,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 >= 7.2.0 - PROJ projection library (Default enabled, if found)
+ * libproj - PROJ.4 projection library (Default enabled, if found)

 Additional optional dependencies:

@ -191,7 +184,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: https://tilemill-project.github.io/tilemill/docs/crashcourse/introduction/
+learning advanced map styling: http://mapbox.com/tilemill/docs/crashcourse/introduction/

 ### Programmers

--- a/3
+++ b/3
@ -28,8 +28,7 @@ src/json/libmapnik-json.a:
 		src/renderer_common/render_thunk_extractor.os \
 		src/json/libmapnik-json.a \
 		src/wkt/libmapnik-wkt.a \
-		src/css/css_grammar_x3.os \
-		src/css/css_color_grammar_x3.os \
+		src/css_color_grammar_x3.os \
 		src/expression_grammar_x3.os \
 		src/transform_expression_grammar_x3.os \
 		src/image_filter_grammar_x3.os \
--- a/README.md
+++ b/README.md
@ -8,7 +8,8 @@ _/      _/    _/_/_/  _/_/_/    _/    _/  _/  _/    _/
                    _/
 ```

-[![TravisCI](https://api.travis-ci.com/mapnik/mapnik.svg?branch=master)](http://travis-ci.com/mapnik/mapnik)
+[![CircleCI](https://circleci.com/gh/mapnik/mapnik/tree/master.svg?style=shield&circle-token=a6d83ccccf24d2ac90e73e96df1ca72171f3eb2f)](https://circleci.com/gh/mapnik/mapnik/tree/master)
+[![TravisCI](https://api.travis-ci.org/mapnik/mapnik.svg?branch=master)](http://travis-ci.org/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.
--- a/318
+++ b/318
@ -1,6 +1,6 @@
 # This file is part of Mapnik (c++ mapping toolkit)
 #
-# Copyright (C) 2024 Artem Pavlenko
+# Copyright (C) 2017 Artem Pavlenko
 #
 # Mapnik is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@ -16,13 +16,15 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

+from __future__ import print_function # support python2
+
 import os
 import sys
 import re
 import platform
 from glob import glob
 from copy import copy
-from subprocess import run, Popen, PIPE
+from subprocess import Popen, PIPE
 from SCons.SConf import SetCacheMode
 import pickle

@ -32,8 +34,19 @@ try:
 except:
    HAS_DISTUTILS = False

-from shlex import quote as shquote
-from subprocess import DEVNULL
+try:
+    # Python 3.3+
+    from shlex import quote as shquote
+except:
+    # Python 2.7
+    from pipes import quote as shquote
+
+try:
+    # Python 3.3+
+    from subprocess import DEVNULL
+except:
+    # Python 2.7
+    DEVNULL = open(os.devnull, 'w')

 LIBDIR_SCHEMA_DEFAULT='lib'
 severities = ['debug', 'warn', 'error', 'none']
@ -43,9 +56,8 @@ ICU_LIBS_DEFAULT='/usr/'

 DEFAULT_CC = "cc"
 DEFAULT_CXX = "c++"
-DEFAULT_CXX_STD = "17"
-DEFAULT_CXX_CXXFLAGS = " -DU_USING_ICU_NAMESPACE=0"
-DEFAULT_CXX_LINKFLAGS = ""
+DEFAULT_CXX14_CXXFLAGS = " -std=c++14 -DU_USING_ICU_NAMESPACE=0"
+DEFAULT_CXX14_LINKFLAGS = ""
 if sys.platform == 'darwin':
    # homebrew default
    ICU_INCLUDES_DEFAULT='/usr/local/opt/icu4c/include/'
@ -64,10 +76,9 @@ SCONS_CONFIGURE_CACHE = 'config.cache'
 SCONF_TEMP_DIR = '.sconf_temp'
 # auto-search directories for boost libs/headers
 BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',]
-BOOST_MIN_VERSION = '1.73'
+BOOST_MIN_VERSION = '1.61'
 #CAIRO_MIN_VERSION = '1.8.0'
-PROJ_MIN_VERSION = (7, 2, 0)
-PROJ_MIN_VERSION_STRING = "%s.%s.%s" % PROJ_MIN_VERSION
+
 HARFBUZZ_MIN_VERSION = (0, 9, 34)
 HARFBUZZ_MIN_VERSION_STRING = "%s.%s.%s" % HARFBUZZ_MIN_VERSION

@ -80,8 +91,7 @@ pretty_dep_names = {
    'gdal':'GDAL C++ library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: https://github.com/mapnik/mapnik/wiki/GDAL',
    'ogr':'OGR-enabled GDAL C++ Library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: https://github.com/mapnik/mapnik/wiki/OGR',
    'cairo':'Cairo C library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option',
-    'proj':'Proj C Projections library | configure with PROJ_LIBS & PROJ_INCLUDES | more info: http://trac.osgeo.org/proj/',
-    'proj-min-version':'libproj >=%s required' % PROJ_MIN_VERSION_STRING,
+    'proj':'Proj.4 C Projections library | configure with PROJ_LIBS & PROJ_INCLUDES | more info: http://trac.osgeo.org/proj/',
    'pg':'Postgres C Library required for PostGIS plugin | configure with pg_config program or configure with PG_LIBS & PG_INCLUDES | more info: https://github.com/mapnik/mapnik/wiki/PostGIS',
    'sqlite3':'SQLite3 C Library | configure with SQLITE_LIBS & SQLITE_INCLUDES | more info: https://github.com/mapnik/mapnik/wiki/SQLite',
    'jpeg':'JPEG C library | configure with JPEG_LIBS & JPEG_INCLUDES',
@ -105,7 +115,7 @@ pretty_dep_names = {
    'boost_regex_icu':'libboost_regex built with optional ICU unicode support is needed for unicode regex support in mapnik.',
    'sqlite_rtree':'The SQLite plugin requires libsqlite3 built with RTREE support (-DSQLITE_ENABLE_RTREE=1)',
    'pgsql2sqlite_rtree':'The pgsql2sqlite program requires libsqlite3 built with RTREE support (-DSQLITE_ENABLE_RTREE=1)',
-    'PROJ_LIB':'The directory where proj stores its data files. Must exist for proj to work correctly',
+    'PROJ_LIB':'The directory where proj4 stores its data files. Must exist for proj4 to work correctly',
    'GDAL_DATA':'The directory where GDAL stores its data files. Must exist for GDAL to work correctly',
    'ICU_DATA':'The directory where icu stores its data files. If ICU reports a path, it must exist. ICU can also be built without .dat files and in that case this path is empty'
    }
@ -131,8 +141,7 @@ PLUGINS = { # plugins with external dependencies

 def init_environment(env):
    env.Decider('MD5-timestamp')
-    env['ORIGIN'] = Literal('$ORIGIN')
-    env['ENV']['ORIGIN'] = '$ORIGIN'
+    env.SourceCode(".", None)
    if os.environ.get('RANLIB'):
        env['RANLIB'] = os.environ['RANLIB']
    if os.environ.get('AR'):
@ -328,9 +337,6 @@ def pretty_dep(dep):
        return '%s (%s)' % (dep,'more info see: https://github.com/mapnik/mapnik/wiki/Mapnik-Installation & http://www.boost.org')
    return dep

-def pretty_deps(indent, deps):
-    return indent + indent.join(pretty_dep(dep) for dep in deps)
-

 DEFAULT_PLUGINS = []
 for k,v in PLUGINS.items():
@ -344,7 +350,6 @@ opts = Variables()
 opts.AddVariables(
    # Compiler options
    ('CXX', 'The C++ compiler to use to compile mapnik', DEFAULT_CXX),
-    ('CXX_STD', 'The C++ compiler standard (string).', DEFAULT_CXX_STD),
    ('CC', 'The C compiler used for configure checks of C libs.', DEFAULT_CC),
    ('CUSTOM_CXXFLAGS', 'Custom C++ flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir>', ''),
    ('CUSTOM_DEFINES', 'Custom Compiler DEFINES, e.g. -DENABLE_THIS', ''),
@ -368,6 +373,7 @@ opts.AddVariables(
    BoolVariable('ENABLE_GLIBC_WORKAROUND', "Workaround known GLIBC symbol exports to allow building against libstdc++-4.8 without binaries needing throw_out_of_range_fmt", 'False'),
    # http://www.scons.org/wiki/GoFastButton
    # http://stackoverflow.com/questions/1318863/how-to-optimize-an-scons-script
+    BoolVariable('FAST', "Make SCons faster at the cost of less precise dependency tracking", 'False'),
    BoolVariable('PRIORITIZE_LINKING', 'Sort list of lib and inc directories to ensure preferential compiling and linking (useful when duplicate libs)', 'True'),
    ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),

@ -409,9 +415,9 @@ opts.AddVariables(
    BoolVariable('WEBP', 'Build Mapnik with WEBP read', 'True'),
    PathVariable('WEBP_INCLUDES', 'Search path for libwebp include files', '/usr/include', PathVariable.PathAccept),
    PathVariable('WEBP_LIBS','Search path for libwebp library files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
-    BoolVariable('PROJ', 'Build Mapnik with proj support to enable transformations between many different projections', 'True'),
-    PathVariable('PROJ_INCLUDES', 'Search path for libproj include files', '/usr/include', PathVariable.PathAccept),
-    PathVariable('PROJ_LIBS', 'Search path for libproj library files', '/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
+    BoolVariable('PROJ', 'Build Mapnik with proj4 support to enable transformations between many different projections', 'True'),
+    PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
+    PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept),
    ('PG_INCLUDES', 'Search path for libpq (postgres client) include files', ''),
    ('PG_LIBS', 'Search path for libpq (postgres client) library files', ''),
    ('FREETYPE_INCLUDES', 'Search path for Freetype include files', ''),
@ -467,9 +473,8 @@ opts.AddVariables(
    BoolVariable('MAPNIK_RENDER', 'Compile and install a utility to render a map to an image', 'True'),
    BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'),
    BoolVariable('BIGINT', 'Compile support for 64-bit integers in mapnik::value', 'True'),
-    BoolVariable('USE_BOOST_FILESYSTEM','Use boost::filesytem even if `std::filesystem` is available (since c++17)', 'False'),
    BoolVariable('QUIET', 'Reduce build verbosity', 'False'),
-)
+    )

 # variables to pickle after successful configure step
 # these include all scons core variables as well as custom
@ -477,7 +482,6 @@ opts.AddVariables(
 pickle_store = [# Scons internal variables
        'CC', # compiler user to check if c deps compile during configure
        'CXX', # C++ compiler to compile mapnik
-        'CXX_STD', # C++ standard e.g 17 (as in -std=c++17)
        'CFLAGS',
        'CPPDEFINES',
        'CPPFLAGS', # c preprocessor flags
@ -486,7 +490,6 @@ pickle_store = [# Scons internal variables
        'LIBPATH',
        'LIBS',
        'LINKFLAGS',
-        'RPATH',
        'CUSTOM_LDFLAGS', # user submitted
        'CUSTOM_DEFINES', # user submitted
        'CUSTOM_CXXFLAGS', # user submitted
@ -536,7 +539,6 @@ pickle_store = [# Scons internal variables
        'SQLITE_LINKFLAGS',
        'BOOST_LIB_VERSION_FROM_HEADER',
        'BIGINT',
-        'USE_BOOST_FILESYSTEM',
        'HOST',
        'QUERIED_GDAL_DATA',
        'QUERIED_ICU_DATA',
@ -758,7 +760,7 @@ def ogr_enabled(context):
    context.Message( 'Checking if gdal is ogr enabled... ')
    context.sconf.cached = False
    ret, out = config_command(env['GDAL_CONFIG'], '--ogr-enabled')
-    if ret:
+    if ret and out:
        ret = (out == 'yes')
    if not ret:
        if 'ogr' not in env['SKIPPED_DEPS']:
@ -908,58 +910,89 @@ int main() {


 def CheckGdalData(context, silent=False):
-    env = context.env
+
    if not silent:
        context.Message('Checking for GDAL data directory... ')
-    context.sconf.cached = False
-    ret, out = config_command(env['GDAL_CONFIG'], '--datadir')
+    ret, out = context.TryRun("""
+
+#include "cpl_config.h"
+#include <iostream>
+
+int main() {
+    std::cout << GDAL_PREFIX << "/share/gdal" << std::endl;
+    return 0;
+}
+
+""", '.cpp')
    value = out.strip()
    if silent:
        context.did_show_result=1
    if ret:
-        context.Result('%s returned %s' % (env['GDAL_CONFIG'], value))
+        context.Result('GDAL_PREFIX returned %s' % value)
    else:
        context.Result('Failed to detect (mapnik-config will have null value)')
    return value

-def proj_version(context):
-    context.Message('Checking for Proj version >=%s...' % PROJ_MIN_VERSION_STRING)
-    ret, out = context.TryRun("""
-#include "proj.h"
-#include <stdio.h>
-#define PROJ_VERSION_ATLEAST(major,minor,micro) \
-        ((major)*10000+(minor)*100+(micro) <= \
-         PROJ_VERSION_MAJOR*10000+PROJ_VERSION_MINOR*100+PROJ_VERSION_PATCH)
-int main()
-{
-    printf("%d;%d.%d.%d", PROJ_VERSION_ATLEAST{min-version}, PROJ_VERSION_MAJOR, PROJ_VERSION_MINOR, PROJ_VERSION_PATCH);
-    return 0;
-}
-""".replace("{min-version}", str(PROJ_MIN_VERSION)),'.c')
-    if not ret:
-        context.Result('error (could not get version from proj.h)')
-    else:
-        ok_str, found_version_str = out.strip().split(';', 1)
-        major,minor,patch = found_version_str.split('.')
-        ret = int(ok_str), int(major)*10000+int(minor)*100+int(patch)
-        if ret:
-            context.Result('yes (found Proj %s)' % found_version_str)
-        else:
-            context.Result('no (found Proj %s)' % found_version_str)
-    return ret
-
 def CheckProjData(context, silent=False):
+
    if not silent:
        context.Message('Checking for PROJ_LIB directory...')
-    result = run(['pkg-config', 'proj', '--variable=datadir'], stdout=PIPE)
-    value = result.stdout.decode('utf-8').strip()
+    ret, out = context.TryRun("""

+// This is narly, could eventually be replaced using https://github.com/OSGeo/proj.4/pull/551]
+#include <proj_api.h>
+#include <iostream>
+#include <cstring>
+
+static void my_proj4_logger(void * user_data, int /*level*/, const char * msg)
+{
+    std::string* posMsg = static_cast<std::string*>(user_data);
+    *posMsg += msg;
+}
+
+// https://github.com/OSGeo/gdal/blob/ddbf6d39aa4b005a77ca4f27c2d61a3214f336f8/gdal/alg/gdalapplyverticalshiftgrid.cpp#L616-L633
+
+std::string find_proj_path(const char * pszFilename) {
+    std::string osMsg;
+    std::string osFilename;
+    projCtx ctx = pj_ctx_alloc();
+    pj_ctx_set_app_data(ctx, &osMsg);
+    pj_ctx_set_debug(ctx, PJ_LOG_DEBUG_MAJOR);
+    pj_ctx_set_logger(ctx, my_proj4_logger);
+    PAFile f = pj_open_lib(ctx, pszFilename, "rb");
+    if( f )
+    {
+        pj_ctx_fclose(ctx, f);
+    }
+    size_t nPos = osMsg.find("fopen(");
+    if( nPos != std::string::npos )
+    {
+        osFilename = osMsg.substr(nPos + strlen("fopen("));
+        nPos = osFilename.find(")");
+        if( nPos != std::string::npos )
+            osFilename = osFilename.substr(0, nPos);
+    }
+    pj_ctx_free(ctx);
+    return osFilename;
+}
+
+
+int main() {
+    std::string result = find_proj_path(" ");
+    std::cout << result;
+    if (result.empty()) {
+        return -1;
+    }
+    return 0;
+}
+
+""", '.cpp')
+    value = out.strip()
    if silent:
        context.did_show_result=1
-    if os.path.exists(value):
-        context.Result('`pkg-config proj --variable=datadir` returned:\n%s ' % value)
+    if ret:
+        context.Result('pj_open_lib returned %s' % value)
    else:
-        value = None
        context.Result('Failed to detect (mapnik-config will have null value)')
    return value

@ -1119,7 +1152,6 @@ int main()
    return ret

 def boost_regex_has_icu(context):
-    context.env.Append(LIBS='icui18n')
    if env['RUNTIME_LINK'] == 'static':
        # re-order icu libs to ensure linux linker is happy
        for lib_name in ['icui18n',env['ICU_LIB_NAME'],'icudata']:
@ -1196,29 +1228,28 @@ int main()
    context.Result(ret)
    return ret

-__cplusplus = {'14':'201402L', '17':'201703L', '20':'202002L'}
-
-def supports_cxx_std (context, silent=False):
-    cplusplus_string = __cplusplus[env['CXX_STD']]
+def supports_cxx14(context,silent=False):
    if not silent:
-        context.Message('Checking if compiler (%s) supports -std=c++%s flag... ' % (context.env.get('CXX','CXX'), env['CXX_STD']))
+        context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX'))
    ret, out = context.TryRun("""

 int main()
 {
-#if __cplusplus >= %s
+#if __cplusplus >= 201402L
    return 0;
 #else
    return -1;
 #endif
 }

-""" % cplusplus_string ,'.cpp')
+""", '.cpp')
    if silent:
        context.did_show_result=1
    context.Result(ret)
    return ret

+
+
 conf_tests = { 'prioritize_paths'      : prioritize_paths,
               'CheckPKGConfig'        : CheckPKGConfig,
               'CheckPKG'              : CheckPKG,
@ -1226,7 +1257,6 @@ conf_tests = { 'prioritize_paths'      : prioritize_paths,
               'FindBoost'             : FindBoost,
               'CheckBoost'            : CheckBoost,
               'CheckIcuData'          : CheckIcuData,
-               'proj_version'          : proj_version,
               'CheckProjData'         : CheckProjData,
               'CheckGdalData'         : CheckGdalData,
               'CheckCairoHasFreetype' : CheckCairoHasFreetype,
@ -1241,7 +1271,7 @@ conf_tests = { 'prioritize_paths'      : prioritize_paths,
               'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support,
               'boost_regex_has_icu'   : boost_regex_has_icu,
               'sqlite_has_rtree'      : sqlite_has_rtree,
-               'supports_cxx_std'      : supports_cxx_std,
+               'supports_cxx14'        : supports_cxx14,
               'CheckBoostScopedEnum'  : CheckBoostScopedEnum,
               }

@ -1258,7 +1288,12 @@ def GetMapnikLibVersion():
    return version_string

 if not preconfigured:
+
    color_print(4,'Configuring build environment...')
+
+    if not env['FAST']:
+        SetCacheMode('force')
+
    if env['USE_CONFIG']:
        if not env['CONFIG'].endswith('.py'):
            color_print(1,'SCons CONFIG file specified is not a python file, will not be read...')
@ -1380,32 +1415,14 @@ if not preconfigured:

    # set any custom cxxflags and ldflags to come first
    if sys.platform == 'darwin' and not env['HOST']:
-        DEFAULT_CXX_CXXFLAGS += ' -stdlib=libc++'
-        DEFAULT_CXX_LINKFLAGS = ' -stdlib=libc++'
+        DEFAULT_CXX14_CXXFLAGS += ' -stdlib=libc++'
+        DEFAULT_CXX14_LINKFLAGS = ' -stdlib=libc++'
    env.Append(CPPDEFINES = env['CUSTOM_DEFINES'])
-    env.Append(CXXFLAGS = "-std=c++%s %s" % (env['CXX_STD'], DEFAULT_CXX_CXXFLAGS))
+    env.Append(CXXFLAGS = DEFAULT_CXX14_CXXFLAGS)
    env.Append(CXXFLAGS = env['CUSTOM_CXXFLAGS'])
    env.Append(CFLAGS = env['CUSTOM_CFLAGS'])
-    env.Append(LINKFLAGS = DEFAULT_CXX_LINKFLAGS)
-
-    custom_ldflags = env.ParseFlags(env['CUSTOM_LDFLAGS'])
-    env.Append(LINKFLAGS = custom_ldflags.pop('LINKFLAGS'),
-               LIBS = custom_ldflags.pop('LIBS'))
-    env.AppendUnique(FRAMEWORKS = custom_ldflags.pop('FRAMEWORKS'),
-                     LIBPATH = custom_ldflags.pop('LIBPATH'),
-                     RPATH = custom_ldflags.pop('RPATH'))
-    # ParseFlags puts everything it does not recognize into CCFLAGS,
-    # but let's assume the user knows better: add those to LINKFLAGS.
-    # In order to prevent duplication of flags which ParseFlags puts
-    # into both CCFLAGS and LINKFLAGS, call AppendUnique.
-    env.AppendUnique(LINKFLAGS = custom_ldflags.pop('CCFLAGS'))
-
-    invalid_ldflags = {k:v for k,v in custom_ldflags.items() if v}
-    if invalid_ldflags:
-        color_print(3, 'Warning: CUSTOM_LDFLAGS contained some flags that SCons recognized as not for linker.')
-        color_print(3, 'The following flags will be ignored:')
-        for key, value in invalid_ldflags.items():
-            color_print(3, '\t%s = %r' % (key, value))
+    env.Append(LINKFLAGS = DEFAULT_CXX14_LINKFLAGS)
+    env.Append(LINKFLAGS = env['CUSTOM_LDFLAGS'])

    ### platform specific bits

@ -1443,7 +1460,6 @@ if not preconfigured:
        [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
        ['harfbuzz', 'harfbuzz/hb.h',True,'C++']
    ]
-    OPTIONAL_LIBSHEADERS = []

    CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0')
    if env.get('FREETYPE_LIBS') or env.get('FREETYPE_INCLUDES'):
@ -1482,7 +1498,9 @@ if not preconfigured:
            except OSError as e:
                pass

-    if env['XMLPARSER'] == 'libxml2':
+    # libxml2 should be optional but is currently not
+    # https://github.com/mapnik/mapnik/issues/913
+    if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2':
        if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'):
            OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C'])
            if env.get('XML2_INCLUDES'):
@ -1491,21 +1509,6 @@ if not preconfigured:
            if env.get('XML2_LIBS'):
                lib_path = env['XML2_LIBS']
                env.AppendUnique(LIBPATH = fix_path(lib_path))
-        elif CHECK_PKG_CONFIG and conf.CheckPKG('libxml-2.0'):
-            # libxml2 2.9.10+ doesn't use xml2-config and uses pkg-config instead
-            cmd = 'pkg-config libxml-2.0 --libs --cflags'
-
-            temp_env = Environment(ENV=os.environ)
-            try:
-                temp_env.ParseConfig(cmd)
-                for inc in temp_env['CPPPATH']:
-                    env.AppendUnique(CPPPATH = fix_path(inc))
-                    env['HAS_LIBXML2'] = True
-                for lib in temp_env['LIBS']:
-                    env.AppendUnique(LIBPATH = fix_path(lib))
-                    env['HAS_LIBXML2'] = True
-            except OSError as e:
-                pass
        elif conf.parse_config('XML2_CONFIG',checks='--cflags'):
            env['HAS_LIBXML2'] = True
        else:
@ -1515,7 +1518,9 @@ if not preconfigured:
        if conf.CheckHasDlfcn():
            env.Append(CPPDEFINES = '-DMAPNIK_HAS_DLCFN')
        else:
-            env['SKIPPED_DEPS'].append('dlfcn')
+            env['SKIPPED_DEPS'].extend(['dlfcn'])
+
+    OPTIONAL_LIBSHEADERS = []

    if env['JPEG']:
        OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG'])
@ -1524,16 +1529,16 @@ if not preconfigured:
        env.AppendUnique(CPPPATH = fix_path(inc_path))
        env.AppendUnique(LIBPATH = fix_path(lib_path))
    else:
-        env['SKIPPED_DEPS'].append('jpeg')
+        env['SKIPPED_DEPS'].extend(['jpeg'])

    if env['PROJ']:
-        OPTIONAL_LIBSHEADERS.append(['proj', 'proj.h', False,'C','-DMAPNIK_USE_PROJ'])
+        OPTIONAL_LIBSHEADERS.append(['proj', 'proj_api.h', False,'C','-DMAPNIK_USE_PROJ4'])
        inc_path = env['%s_INCLUDES' % 'PROJ']
        lib_path = env['%s_LIBS' % 'PROJ']
        env.AppendUnique(CPPPATH = fix_path(inc_path))
        env.AppendUnique(LIBPATH = fix_path(lib_path))
    else:
-        env['SKIPPED_DEPS'].append('proj')
+        env['SKIPPED_DEPS'].extend(['proj'])

    if env['PNG']:
        OPTIONAL_LIBSHEADERS.append(['png', 'png.h', False,'C','-DHAVE_PNG'])
@ -1542,30 +1547,16 @@ if not preconfigured:
        env.AppendUnique(CPPPATH = fix_path(inc_path))
        env.AppendUnique(LIBPATH = fix_path(lib_path))
    else:
-        env['SKIPPED_DEPS'].append('png')
+        env['SKIPPED_DEPS'].extend(['png'])

    if env['WEBP']:
-        if env.get('WEBP_LIBS') or env.get('WEBP_INCLUDES'):
-            OPTIONAL_LIBSHEADERS.append(['webp', 'webp/decode.h', False,'C','-DHAVE_WEBP'])
-            inc_path = env['WEBP_INCLUDES']
-            lib_path = env['WEBP_LIBS']
-            env.AppendUnique(CPPPATH = fix_path(inc_path))
-            env.AppendUnique(LIBPATH = fix_path(lib_path))
-        else:
-            cmd = 'pkg-config libwebp --libs --cflags'
-            if env['RUNTIME_LINK'] == 'static':
-                cmd += ' --static'
-            temp_env = Environment(ENV=os.environ)
-            try:
-                temp_env.ParseConfig(cmd)
-                for lib in temp_env['LIBS']:
-                    env.AppendUnique(LIBPATH = fix_path(lib))
-                for inc in temp_env['CPPPATH']:
-                    env.AppendUnique(CPPPATH = fix_path(inc))
-            except OSError as e:
-                pass
+        OPTIONAL_LIBSHEADERS.append(['webp', 'webp/decode.h', False,'C','-DHAVE_WEBP'])
+        inc_path = env['%s_INCLUDES' % 'WEBP']
+        lib_path = env['%s_LIBS' % 'WEBP']
+        env.AppendUnique(CPPPATH = fix_path(inc_path))
+        env.AppendUnique(LIBPATH = fix_path(lib_path))
    else:
-        env['SKIPPED_DEPS'].append('webp')
+        env['SKIPPED_DEPS'].extend(['webp'])

    if env['TIFF']:
        OPTIONAL_LIBSHEADERS.append(['tiff', 'tiff.h', False,'C','-DHAVE_TIFF'])
@ -1574,16 +1565,15 @@ if not preconfigured:
        env.AppendUnique(CPPPATH = fix_path(inc_path))
        env.AppendUnique(LIBPATH = fix_path(lib_path))
    else:
-        env['SKIPPED_DEPS'].append('tiff')
+        env['SKIPPED_DEPS'].extend(['tiff'])

    # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
    if env['PRIORITIZE_LINKING']:
        conf.prioritize_paths(silent=True)

-    # test for CXX_STD support, which is required
-    if not env['HOST'] and not conf.supports_cxx_std():
-        color_print(1,"C++ compiler does not support C++%s standard (-std=c++%s), which is required."
-                      " Please upgrade your compiler" % (env['CXX_STD'], env['CXX_STD']))
+    # test for C++14 support, which is required
+    if not env['HOST'] and not conf.supports_cxx14():
+        color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler")
        Exit(1)

    if not env['HOST']:
@ -1610,12 +1600,6 @@ if not preconfigured:
    if env['BIGINT']:
        env.Append(CPPDEFINES = '-DBIGINT')

-    if int(env['CXX_STD']) < 17:
-        env['USE_BOOST_FILESYSTEM'] = True
-
-    if env['USE_BOOST_FILESYSTEM']:
-        env.Append(CPPDEFINES = '-DUSE_BOOST_FILESYSTEM')
-
    if env['THREADING'] == 'multi':
        thread_flag = thread_suffix
    else:
@ -1635,13 +1619,12 @@ if not preconfigured:

        # The other required boost headers.
        BOOST_LIBSHEADERS = [
+            ['system', 'boost/system/system_error.hpp', True],
+            ['filesystem', 'boost/filesystem/operations.hpp', True],
            ['regex', 'boost/regex.hpp', True],
            ['program_options', 'boost/program_options.hpp', False]
        ]

-        if env['USE_BOOST_FILESYSTEM']:
-            BOOST_LIBSHEADERS.append(['system', 'boost/system/system_error.hpp', True])
-            BOOST_LIBSHEADERS.append(['filesystem', 'boost/filesystem/operations.hpp', True])
        # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
        if env['PRIORITIZE_LINKING']:
            conf.prioritize_paths(silent=True)
@ -1700,13 +1683,6 @@ if not preconfigured:
                    else:
                        color_print(4, 'Could not find optional header or shared library for %s' % libname)
                        env['SKIPPED_DEPS'].append(libname)
-                elif libname == 'proj':
-                    result, version = conf.proj_version()
-                    if not result:
-                        env['SKIPPED_DEPS'].append('proj-min-version')
-                    else:
-                        env.Append(CPPDEFINES = define)
-                        env.Append(CPPDEFINES = "-DMAPNIK_PROJ_VERSION=%d" % version)
                else:
                    env.Append(CPPDEFINES = define)
            else:
@ -1889,7 +1865,9 @@ if not preconfigured:
                )
                env["CAIRO_ALL_LIBS"] = ['cairo']
                if env['RUNTIME_LINK'] == 'static':
-                    env["CAIRO_ALL_LIBS"].append('pixman-1')
+                    env["CAIRO_ALL_LIBS"].extend(
+                        ['pixman-1']
+                    )
                # todo - run actual checkLib?
                env['HAS_CAIRO'] = True
        else:
@ -1936,10 +1914,10 @@ if not preconfigured:

    if env['MISSING_DEPS']:
        # if required dependencies are missing, print warnings and then let SCons finish without building or saving local config
-        color_print(1,'\nExiting... the following required dependencies were not found:' + pretty_deps('\n   - ', env['MISSING_DEPS']))
+        color_print(1,'\nExiting... the following required dependencies were not found:\n   - %s' % '\n   - '.join([pretty_dep(dep) for dep in env['MISSING_DEPS']]))
        color_print(1,"\nSee '%s' for details on possible problems." % (fix_path(SCONS_LOCAL_LOG)))
        if env['SKIPPED_DEPS']:
-            color_print(4,'\nAlso, these OPTIONAL dependencies were not found:' + pretty_deps('\n   - ', env['SKIPPED_DEPS']))
+            color_print(4,'\nAlso, these OPTIONAL dependencies were not found:\n   - %s' % '\n   - '.join([pretty_dep(dep) for dep in env['SKIPPED_DEPS']]))
        color_print(4,"\nSet custom paths to these libraries and header files on the command-line or in a file called '%s'" % SCONS_LOCAL_CONFIG)
        color_print(4,"    ie. $ python scons/scons.py BOOST_INCLUDES=/usr/local/include BOOST_LIBS=/usr/local/lib")
        color_print(4, "\nOnce all required dependencies are found a local '%s' will be saved and then install:" % SCONS_LOCAL_CONFIG)
@ -1966,7 +1944,7 @@ if not preconfigured:
          color_print(4,"Did not use user config file, no custom path variables will be saved...")

        if env['SKIPPED_DEPS']:
-            color_print(4,'\nNote: will build without these OPTIONAL dependencies:' + pretty_deps('\n   - ', env['SKIPPED_DEPS']))
+            color_print(4,'\nNote: will build without these OPTIONAL dependencies:\n   - %s' % '\n   - '.join([pretty_dep(dep) for dep in env['SKIPPED_DEPS']]))
            print

        # fetch the mapnik version header in order to set the
@ -2014,13 +1992,13 @@ if not preconfigured:
        # Enable logging in debug mode (always) and release mode (when specified)
        if env['DEFAULT_LOG_SEVERITY']:
            if env['DEFAULT_LOG_SEVERITY'] not in severities:
-                severities_list = ', '.join("'%s'" % s for s in severities)
+                severities_list = ', '.join(["'%s'" % s for s in severities])
                color_print(1,"Cannot set default logger severity to '%s', available options are %s." % (env['DEFAULT_LOG_SEVERITY'], severities_list))
                Exit(1)
            else:
                log_severity = severities.index(env['DEFAULT_LOG_SEVERITY'])
        else:
-            severities_list = ', '.join("'%s'" % s for s in severities)
+            severities_list = ', '.join(["'%s'" % s for s in severities])
            color_print(1,"No logger severity specified, available options are %s." % severities_list)
            Exit(1)

@ -2162,6 +2140,13 @@ if not HELP_REQUESTED:

    Export('plugin_base')

+    if env['FAST']:
+        # caching is 'auto' by default in SCons
+        # But let's also cache implicit deps...
+        EnsureSConsVersion(0,98)
+        SetOption('implicit_cache', 1)
+        SetOption('max_drift', 1)
+
    # Build agg first, doesn't need anything special
    if env['RUNTIME_LINK'] == 'shared':
        SConscript('deps/agg/build.py')
@ -2176,6 +2161,9 @@ if not HELP_REQUESTED:
    # Install headers
    SConscript('include/build.py')

+    # Install auxiliary headers
+    SConscript('deps/mapnik/build.py')
+
    # Build the requested and able-to-be-compiled input plug-ins
    GDAL_BUILT = False
    OGR_BUILT = False
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,39 @@
+environment:
+  msvs_toolset: 14
+  FASTBUILD: 1
+  matrix:
+    - platform: x64
+      configuration: Release
+
+os: Visual Studio 2015
+
+#shallow_clone: true
+# limit clone to latest 5 commits
+clone_depth: 5
+
+services:
+  - postgresql94 #if changing this, also change PATH below
+
+install:
+  - SET PGUSER=postgres
+  - SET PGPASSWORD=Password12!
+  - SET PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH%
+
+build_script:
+  - scripts\build-appveyor.bat
+
+after_build:
+  - 7z a visual-test-results.zip C:\tmp\mapnik-visual-images\visual-test-results
+
+artifacts:
+  - path: mapnik-gyp\msbuild-summary.txt
+    name: msbuild-summary.txt
+  - path: mapnik-gyp\msbuild-errors.txt
+    name: msbuild-errors.txt
+  - path: mapnik-gyp\msbuild-warnings.txt
+    name: msbuild-warnings.txt
+  - path: visual-test-results.zip
+    name: visual-test-results.zip
+
+test: off
+deploy: off
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@ -1,52 +0,0 @@
-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
-)
--- a/benchmark/build.py
+++ b/benchmark/build.py
@ -9,7 +9,6 @@ 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')
--- a/benchmark/data/gdal-wgs.xml
+++ b/benchmark/data/gdal-wgs.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map[]>
 <Map
-  srs="epsg:4326"
+  srs="+init=epsg:4326"
  background-color="#dfd8c9">

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

 <Style name="style">
@ -10,7 +10,7 @@
  </Rule>
 </Style>
 <Layer name="layer"
-  srs="epsg:4326">
+  srs="+init=epsg:4326">
    <StyleName>style</StyleName>
    <Datasource>
       <Parameter name="file">./valid.geotiff.tif</Parameter>
--- a/benchmark/include/bench_framework.hpp
+++ b/benchmark/include/bench_framework.hpp
@ -2,7 +2,6 @@
 #define MAPNIK_BENCH_FRAMEWORK_HPP

 // mapnik
-#include <mapnik/mapnik.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/value/types.hpp>
@ -11,38 +10,47 @@

 // stl
 #include <chrono>
-#include <cmath>  // log10, round
+#include <cmath> // log10, round
 #include <cstdio> // snprintf
 #include <iomanip>
 #include <iostream>
+#include <set>
+#include <sstream>
 #include <thread>
-#include <mutex>
 #include <vector>

 namespace benchmark {

-template<typename T>
+template <typename T>
 using milliseconds = std::chrono::duration<T, std::milli>;

-template<typename T>
+template <typename T>
 using seconds = std::chrono::duration<T>;

 class test_case
 {
-  protected:
+protected:
    mapnik::parameters params_;
    std::size_t threads_;
    std::size_t iterations_;
-
-  public:
+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_; }
+       : 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;
 };
@ -50,25 +58,21 @@ class test_case
 // 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)
+inline int parse_args(int argc, char** argv, mapnik::parameters & params)
 {
-    for (int i = 1; i < argc; ++i)
-    {
+    for (int i = 1; i < argc; ++i) {
        const char* opt = argv[i];
-        if (opt[0] != '-')
-        {
+        if (opt[0] != '-') {
            // non-option argument, return its index
            return i;
        }
-        if (opt[1] != '-')
-        {
+        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')
-        {
+        if (opt[2] == '\0') {
            // option-list terminator '--'
            return i + 1;
        }
@ -76,18 +80,15 @@ inline int parse_args(int argc, char** argv, mapnik::parameters& params)
        // take option name without the leading '--'
        std::string key(opt + 2);
        size_t eq = key.find('=');
-        if (eq != std::string::npos)
-        {
+        if (eq != std::string::npos) {
            // one-argument form '--foo=bar'
            params[key.substr(0, eq)] = key.substr(eq + 1);
        }
-        else if (i + 1 < argc)
-        {
+        else if (i + 1 < argc) {
            // two-argument form '--foo' 'bar'
            params[key] = std::string(argv[++i]);
        }
-        else
-        {
+        else {
            // missing second argument
            std::clog << argv[0] << ": missing option '" << opt << "' value\n";
            return -i; // negative means ill-formed option #i
@ -98,8 +99,7 @@ inline int parse_args(int argc, char** argv, mapnik::parameters& params)

 inline void handle_common_args(mapnik::parameters const& params)
 {
-    if (auto severity = params.get<std::string>("log"))
-    {
+    if (auto severity = params.get<std::string>("log")) {
        if (*severity == "debug")
            mapnik::logger::set_severity(mapnik::logger::debug);
        else if (*severity == "warn")
@ -109,37 +109,37 @@ inline void handle_common_args(mapnik::parameters const& params)
        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";
+            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)
+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;                                                                                                 \
-        }                                                                                                              \
-    }
+#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;                                  \
+        }                                               \
+    }                                                   \

 struct big_number_fmt
 {
@ -148,9 +148,7 @@ struct big_number_fmt
    const char* u;

    big_number_fmt(int width, double value, int base = 1000)
-        : w(width)
-        , v(value)
-        , u("")
+        : w(width), v(value), u("")
    {
        static const char* suffixes = "\0\0k\0M\0G\0T\0P\0E\0Z\0Y\0\0";
        u = suffixes;
@ -166,7 +164,7 @@ struct big_number_fmt
    }
 };

-template<typename T>
+template <typename T>
 int run(T const& test_runner, std::string const& name)
 {
    try
@ -197,7 +195,8 @@ int run(T const& test_runner, std::string const& name)
            std::mutex mtx_ready;
            std::unique_lock<std::mutex> lock_ready(mtx_ready);

-            auto stub = [&](T const& test_copy) {
+            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);
@ -207,14 +206,14 @@ int run(T const& test_runner, std::string const& name)

            std::vector<std::thread> tg;
            tg.reserve(num_threads);
-            for (auto i = num_threads; i-- > 0;)
+            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)
+            for (auto & t : tg)
            {
                if (t.joinable())
                    t.join();
@ -228,8 +227,7 @@ int run(T const& test_runner, std::string const& name)
        else
        {
            start = std::chrono::high_resolution_clock::now();
-            do
-            {
+            do {
                test_runner();
                elapsed = std::chrono::high_resolution_clock::now() - start;
                total_iters += num_iters;
@ -244,24 +242,17 @@ int run(T const& test_runner, std::string const& name)

        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" : " ");
+        if (num_threads > 0) {
+            std::clog << ' ' << std::setw(3) << num_threads
+                << " worker" << (num_threads > 1 ? "s" : " ");
        }
-        else
-        {
+        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::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;
    }
@ -275,15 +266,18 @@ int run(T const& test_runner, std::string const& name)
 struct sequencer
 {
    sequencer(int argc, char** argv)
-        : exit_code_(0)
+      : exit_code_(0)
    {
        benchmark::handle_args(argc, argv, params_);
    }

-    int done() const { return exit_code_; }
+    int done() const
+    {
+        return exit_code_;
+    }

-    template<typename Test, typename... Args>
-    sequencer& run(std::string const& name, Args&&... args)
+    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)...);
@ -292,11 +286,11 @@ struct sequencer
        return *this; // allow chaining calls
    }

-  protected:
+protected:
    mapnik::parameters params_;
    int exit_code_;
 };

-} // namespace benchmark
+}

 #endif // MAPNIK_BENCH_FRAMEWORK_HPP
--- a/benchmark/include/compare_images.hpp
+++ b/benchmark/include/compare_images.hpp
@ -5,31 +5,32 @@
 #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())
+    bool compare_images(std::string const& src_fn,std::string const& dest_fn)
    {
-        throw mapnik::image_reader_exception("Failed to load: " + 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;
    }

-    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
--- a/benchmark/run_benchmarks
+++ b/benchmark/run_benchmarks
@ -1,65 +0,0 @@
-#!/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
--- a/benchmark/src/normalize_angle.cpp
+++ b/benchmark/src/normalize_angle.cpp
@ -2,23 +2,20 @@

 #include <mapnik/util/math.hpp>

-template<typename T>
+template <typename T>
 struct bench_func : benchmark::test_case
 {
-    T (*const func_)(T);
+    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)
-    {}
+        : test_case(params), func_(func), value_(value) {}

    bool validate() const { return true; }

-    bool operator()() const
+    bool operator() () const
    {
-        for (auto i = this->iterations_; i-- > 0;)
+        for (auto i = this->iterations_; i-- > 0; )
        {
            func_(value_);
        }
@ -26,47 +23,47 @@ struct bench_func : benchmark::test_case
    }
 };

-#define BENCH_FUNC1(func, value) run<bench_func<double>>(#func "(" #value ")", func, value)
+#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();
+        .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();
 }
--- a/benchmark/src/test_array_allocation.cpp
+++ b/benchmark/src/test_array_allocation.cpp
@ -14,19 +14,15 @@

 #define FULL_ZERO_CHECK

-inline void ensure_zero(uint8_t* data, uint32_t size)
-{
+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)
-        {
+    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)
-    {
+    if (data[0] != 0) {
        throw std::runtime_error("found non zero value");
    }
 #endif
@ -34,262 +30,274 @@ inline void ensure_zero(uint8_t* data, uint32_t size)

 class test1 : public benchmark::test_case
 {
-  public:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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
+     : test_case(params),
+       size_(*params.get<mapnik::value_integer>("size",256*256)),
+       array_(size_,0) { }
+    bool validate() const
    {
-        for (std::size_t i = 0; i < iterations_; ++i)
-        {
-            std::vector<uint8_t> data(size_);
-            ensure_zero(&data[0], data.size());
-        }
        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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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:
+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; }
+     : 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;
+         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;
    }
 };

@ -300,23 +308,24 @@ class test5b : public benchmark::test_case

 class test6 : public benchmark::test_case
 {
-  public:
+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; }
+     : 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;
+         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;
    }
 };

@ -326,45 +335,45 @@ class test6 : public benchmark::test_case

 class test7 : public benchmark::test_case
 {
-  public:
+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; }
+     : 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;
+         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")
+        .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")
+        .run<test7>("static_vector")
 #endif
-      .done();
+        .done();
 }
--- a/benchmark/src/test_expression_parse.cpp
+++ b/benchmark/src/test_expression_parse.cpp
@ -7,12 +7,10 @@
 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_);
@ -20,25 +18,24 @@ class test : public benchmark::test_case
        bool ret = (result == expr_);
        if (!ret)
        {
-            std::clog << result << " != " << expr_ << "\n";
+            std::clog << result  << " != " << expr_ << "\n";
        }
        return ret;
    }
    bool operator()() const
    {
-        for (std::size_t i = 0; i < iterations_; ++i)
-        {
-            mapnik::expression_ptr expr = mapnik::parse_expression(expr_);
-        }
-        return true;
+         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);
-    return run(test_runner, "expr parsing");
+    return run(test_runner,"expr parsing");
 }
--- a/benchmark/src/test_face_ptr_creation.cpp
+++ b/benchmark/src/test_face_ptr_creation.cpp
@ -4,10 +4,9 @@

 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;
@ -23,15 +22,14 @@ class test : public benchmark::test_case
                                                                      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;
@ -45,11 +43,9 @@ class test : public benchmark::test_case
                                                                          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";
            }
        }
@ -59,16 +55,15 @@ class test : public benchmark::test_case

 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)
-    {
-        std::clog << "warning, did not register any new fonts!\n";
-        return -1;
-    }
+    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());
 }
+
--- a/benchmark/src/test_font_registration.cpp
+++ b/benchmark/src/test_font_registration.cpp
@ -1,18 +1,21 @@
 #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++;
@ -21,4 +24,4 @@ class test : public benchmark::test_case
    }
 };

-BENCHMARK(test, "font registration")
+BENCHMARK(test,"font registration")
--- a/benchmark/src/test_getline.cpp
+++ b/benchmark/src/test_getline.cpp
@ -1,20 +1,22 @@
 #include "bench_framework.hpp"
 #include "../plugins/input/csv/csv_getline.hpp"

+
+
 class test : public benchmark::test_case
 {
-  public:
+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;
-        }
-    }
+     : test_case(params),
+       line_data_("this is one line\nand this is a second line\nand a third line")
+       {
+          boost::optional<std::string> line_data = params.get<std::string>("line");
+          if (line_data)
+          {
+              line_data_ = *line_data;
+          }
+       }

    bool validate() const
    {
@ -23,15 +25,14 @@ class test : public benchmark::test_case
        std::string csv_line;
        std::stringstream s;
        s << line_data_;
-        std::getline(s, csv_line, newline);
+        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";
+            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;
    }
@ -41,28 +42,29 @@ class test : public benchmark::test_case
        std::string csv_line;
        std::stringstream s;
        s << line_data_;
-        for (unsigned i = 0; i < iterations_; ++i)
+        for (unsigned i=0;i<iterations_;++i)
        {
-            std::getline(s, csv_line, newline);
+            std::getline(s,csv_line,newline);
        }
        return true;
    }
 };

+
 class test2 : public benchmark::test_case
 {
-  public:
+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;
-        }
-    }
+     : test_case(params),
+       line_data_("this is one line\nand this is a second line\nand a third line")
+       {
+          boost::optional<std::string> line_data = params.get<std::string>("line");
+          if (line_data)
+          {
+              line_data_ = *line_data;
+          }
+       }

    bool validate() const
    {
@ -72,15 +74,14 @@ class test2 : public benchmark::test_case
        std::string csv_line;
        std::stringstream s;
        s << line_data_;
-        csv_utils::getline_csv(s, csv_line, newline, quote);
+        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";
+            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;
    }
@ -91,9 +92,9 @@ class test2 : public benchmark::test_case
        std::string csv_line;
        std::stringstream s;
        s << line_data_;
-        for (unsigned i = 0; i < iterations_; ++i)
+        for (unsigned i=0;i<iterations_;++i)
        {
-            csv_utils::getline_csv(s, csv_line, newline, quote);
+            csv_utils::getline_csv(s,csv_line,newline,quote);
        }
        return true;
    }
@ -101,19 +102,18 @@ class test2 : public benchmark::test_case

 int main(int argc, char** argv)
 {
-    mapnik::setup();
    int return_value = 0;
    try
    {
        mapnik::parameters params;
-        benchmark::handle_args(argc, argv, params);
+        benchmark::handle_args(argc,argv,params);
        {
            test test_runner(params);
-            return_value = return_value | run(test_runner, "std::getline");
+            return_value = return_value | run(test_runner,"std::getline");
        }
        {
            test2 test_runner2(params);
-            return_value = return_value | run(test_runner2, "csv_utils::getline_csv");
+            return_value = return_value | run(test_runner2,"csv_utils::getline_csv");
        }
    }
    catch (std::exception const& ex)
--- a/benchmark/src/test_marker_cache.cpp
+++ b/benchmark/src/test_marker_cache.cpp
@ -4,32 +4,34 @@
 class test : public benchmark::test_case
 {
    std::vector<std::string> images_;
-
-  public:
+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; }
+     : 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 (std::size_t i=0;i<iterations_;++i) {
            for (auto filename : images_)
            {
-                auto marker = mapnik::marker_cache::instance().find(filename, true);
+                auto marker = mapnik::marker_cache::instance().find(filename,true);
            }
            ++count;
        }
@ -37,4 +39,4 @@ class test : public benchmark::test_case
    }
 };

-BENCHMARK(test, "marker cache")
+BENCHMARK(test,"marker cache")
--- a/benchmark/src/test_noop_rendering.cpp
+++ b/benchmark/src/test_noop_rendering.cpp
@ -11,41 +11,43 @@
 #include <mapnik/feature_type_style.hpp>

 #include <memory>
-
+    
 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, "epsg:3857");
+        mapnik::Map m(256,256,"+init=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")
--- a/benchmark/src/test_numeric_cast_vs_static_cast.cpp
+++ b/benchmark/src/test_numeric_cast_vs_static_cast.cpp
@ -9,25 +9,23 @@ 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_;
        }
@ -35,36 +33,35 @@ class test_static : public benchmark::test_case
    }
 };

-using boost::numeric::negative_overflow;
 using boost::numeric::positive_overflow;
+using boost::numeric::negative_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();
            }
@ -76,6 +73,8 @@ class test_numeric : public benchmark::test_case

 int main(int argc, char** argv)
 {
-    mapnik::setup();
-    return benchmark::sequencer(argc, argv).run<test_static>("static_cast").run<test_numeric>("numeric_cast").done();
+    return benchmark::sequencer(argc, argv)
+        .run<test_static>("static_cast")
+        .run<test_numeric>("numeric_cast")
+        .done();
 }
--- a/benchmark/src/test_offset_converter.cpp
+++ b/benchmark/src/test_offset_converter.cpp
@ -14,36 +14,31 @@ 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_);
@ -53,30 +48,33 @@ 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;
@ -90,15 +88,15 @@ class test_offset : public benchmark::test_case
    }
 };

+
 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);
-        return_value = run(test_runner, "offset_test");
+        return_value = run(test_runner,"offset_test");
    }
    return return_value;
 }
--- a/benchmark/src/test_png_encoding1.cpp
+++ b/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")
--- a/benchmark/src/test_png_encoding2.cpp
+++ b/benchmark/src/test_png_encoding2.cpp
@ -1,41 +1,37 @@
 #include "bench_framework.hpp"
 #include "compare_images.hpp"
-#include <memory>

 class test : public benchmark::test_case
 {
    std::shared_ptr<mapnik::image_rgba8> im_;
-
-  public:
+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<mapnik::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")
--- a/benchmark/src/test_polygon_clipping.cpp
+++ b/benchmark/src/test_polygon_clipping.cpp
@ -39,31 +39,30 @@ 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("epsg:4326"), mapnik::projection("epsg:4326"));
-    ren.color(agg::rgba8(127, 127, 127, 255));
+    mapnik::proj_transform prj_trans(mapnik::projection("+init=epsg:4326"),mapnik::projection("+init=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
@ -71,15 +70,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;
@ -100,8 +99,14 @@ class test1 : public benchmark::test_case
        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;
@ -113,8 +118,7 @@ class test1 : public benchmark::test_case
        {
            if (cmd == mapnik::SEG_MOVETO)
            {
-                x0 = x;
-                y0 = y;
+                x0 = x; y0 = y;
            }

            if (cmd == mapnik::SEG_CLOSE)
@ -122,7 +126,7 @@ class test1 : public benchmark::test_case
                ring.emplace_back(x0, y0);
                break;
            }
-            ring.emplace_back(x, y);
+            ring.emplace_back(x,y);
        }
        poly2.push_back(std::move(ring));
        // interior rings
@ -131,31 +135,30 @@ class test1 : public benchmark::test_case
        {
            if (cmd == mapnik::SEG_MOVETO)
            {
-                x0 = x;
-                y0 = y;
+                x0 = x; y0 = y;
            }
            else if (cmd == mapnik::SEG_CLOSE)
            {
-                ring.emplace_back(x0, y0);
+                ring.emplace_back(x0,y0);
                poly2.push_back(std::move(ring));
                ring.clear();
                continue;
            }
-            ring.emplace_back(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
    {
@ -175,28 +178,29 @@ class test1 : public benchmark::test_case
            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;
            }
        }
@ -204,19 +208,20 @@ class test1 : public benchmark::test_case
    }
 };

+
 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;
@ -229,12 +234,12 @@ class test3 : public benchmark::test_case
            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;
@ -244,15 +249,15 @@ class test3 : public benchmark::test_case
        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);
@ -260,10 +265,10 @@ class test3 : public benchmark::test_case
        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
    {
@ -277,12 +282,12 @@ class test3 : public benchmark::test_case
            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;
@ -293,25 +298,22 @@ class test3 : public benchmark::test_case
        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;
                }
            }
@ -498,8 +500,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;
                }
            }
        }
@ -510,18 +512,14 @@ expected_count << "\n"; valid = false;

 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");
@ -546,5 +544,5 @@ int main(int argc, char** argv)
    }
    */
 #endif
-    return 0; // return_value;
+    return 0;// return_value;
 }
--- a/benchmark/src/test_polygon_clipping_rendering.cpp
+++ b/benchmark/src/test_polygon_clipping_rendering.cpp
@ -8,52 +8,53 @@ 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)
-    {}
+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_);
+        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);
+        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");
+        //mapnik::save_to_file(im.data(),"test.png");
        return true;
    }
    bool operator()() const
    {
-        mapnik::Map m(256, 256);
-        mapnik::load_map(m, xml_);
+        mapnik::Map m(256,256);
+        mapnik::load_map(m,xml_);
        m.zoom_to_box(extent_);
-        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);
+            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);
+    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);
+    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);
+    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();
+        .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();
 }
--- a/benchmark/src/test_proj_transform1.cpp
+++ b/benchmark/src/test_proj_transform1.cpp
@ -9,47 +9,46 @@ class test : public benchmark::test_case
    std::string dest_;
    mapnik::box2d<double> from_;
    mapnik::box2d<double> to_;
-    bool defer_proj_init_;
-
-  public:
+    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_proj_init_(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_proj_init_);
-        mapnik::projection dest(dest_, defer_proj_init_);
-        mapnik::proj_transform tr(src, dest);
+        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));
+        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 (std::size_t i=0;i<iterations_;++i)
        {
-            for (int j = -180; j < 180; j = j + 5)
+            for (int j=-180;j<180;j=j+5)
            {
-                for (int k = -85; k < 85; k = k + 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");
+                    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");
                }
            }
        }
@ -57,21 +56,19 @@ class test : public benchmark::test_case
    }
 };

-// echo -180 -60 | cs2cs -f "%.10f" epsg:4326 +to epsg:3857
+// echo -180 -60 | cs2cs -f "%.10f" +init=epsg:4326 +to +init=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");
+    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");
+    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();
+        .run<test>("lonlat->merc epsg", from_str, to_str, from, to, true)
+        .run<test>("lonlat->merc literal", from_str2, to_str2, from, to, true)
+        .run<test>("merc->lonlat epsg", to_str, from_str, to, from, true)
+        .run<test>("merc->lonlat literal", to_str2, from_str2, to, from, true)
+        .done();
 }
--- a/benchmark/src/test_quad_tree.cpp
+++ b/benchmark/src/test_quad_tree.cpp
@ -6,41 +6,43 @@ 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;
            }
@ -49,4 +51,4 @@ class test : public benchmark::test_case
    }
 };

-BENCHMARK(test, "quad_tree creation")
+BENCHMARK(test,"quad_tree creation")
--- a/benchmark/src/test_rendering.cpp
+++ b/benchmark/src/test_rendering.cpp
@ -15,25 +15,24 @@ 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", ""))
-    {
-        const auto map = params.get<std::string>("map");
+     : 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");
        if (!map)
        {
            throw std::runtime_error("please provide a --map <path to xml> arg");
        }
        xml_ = *map;

-        const auto ext = params.get<std::string>("extent");
+        boost::optional<std::string> ext = params.get<std::string>("extent");
        if (ext && !ext->empty())
        {
            if (!extent_.from_string(*ext))
@ -44,74 +43,67 @@ class test : public benchmark::test_case
        {
            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);
-        const auto name = params.get<std::string>("name");
+        benchmark::handle_args(argc,argv,params);
+        boost::optional<std::string> 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);
-            return_value = run(test_runner, *name);
+            return_value = run(test_runner,*name);
        }
    }
    catch (std::exception const& ex)
--- a/benchmark/src/test_rendering_shared_map.cpp
+++ b/benchmark/src/test_rendering_shared_map.cpp
@ -12,15 +12,14 @@
 #include <mapnik/datasource_cache.hpp>
 #include <stdexcept>

-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)
+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))
@ -51,28 +50,27 @@ 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())
    {
-        const auto map = params.get<std::string>("map");
+        boost::optional<std::string> map = params.get<std::string>("map");
        if (!map)
        {
            throw std::runtime_error("please provide a --map=<path to xml> arg");
        }
        xml_ = *map;

-        auto ext = params.get<std::string>("extent");
-        mapnik::load_map(*m_, xml_, true);
+        boost::optional<std::string> ext = params.get<std::string>("extent");
+        mapnik::load_map(*m_,xml_,true);
        if (ext && !ext->empty())
        {
            if (!extent_.from_string(*ext))
@ -89,44 +87,42 @@ class test : public benchmark::test_case

    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;
@ -137,36 +133,34 @@ class test : public benchmark::test_case
                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);
-        const auto name = params.get<std::string>("name");
+        benchmark::handle_args(argc,argv,params);
+        boost::optional<std::string> 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);
-            return_value = run(test_runner, *name);
+            return_value = run(test_runner,*name);
        }
    }
    catch (std::exception const& ex)
--- a/benchmark/src/test_to_bool.cpp
+++ b/benchmark/src/test_to_bool.cpp
@ -4,31 +4,27 @@
 class test : public benchmark::test_case
 {
    std::string value_;
-
-  public:
+public:
    test(mapnik::parameters const& params)
-        : test_case(params)
-        , value_("true")
-    {}
+     : 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);
+        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)
-        {
+        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);
+            mapnik::util::string2bool(value_,result);
+            mapnik::util::string2bool(value_.data(),value_.data()+value_.size(),result);
        }
        return true;
    }
 };

-BENCHMARK(test, "string->bool")
+BENCHMARK(test,"string->bool")
--- a/benchmark/src/test_to_double.cpp
+++ b/benchmark/src/test_to_double.cpp
@ -4,36 +4,29 @@
 class test : public benchmark::test_case
 {
    std::string value_;
-
-  public:
+public:
    test(mapnik::parameters const& params)
-        : test_case(params)
-        , value_("1.23456789")
-    {}
+     : 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;
+        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;
+        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)
-        {
+        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);
+            mapnik::util::string2double(value_,result);
+            mapnik::util::string2double(value_.data(),value_.data()+value_.size(),result);
        }
        return true;
    }
 };

-BENCHMARK(test, "string->double")
+BENCHMARK(test,"string->double")
--- a/benchmark/src/test_to_int.cpp
+++ b/benchmark/src/test_to_int.cpp
@ -4,36 +4,29 @@
 class test : public benchmark::test_case
 {
    std::string value_;
-
-  public:
+public:
    test(mapnik::parameters const& params)
-        : test_case(params)
-        , value_("123456789")
-    {}
+     : 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;
+        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;
+        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)
-        {
+        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);
+            mapnik::util::string2int(value_,result);
+            mapnik::util::string2int(value_.data(),value_.data()+value_.size(),result);
        }
        return true;
    }
 };

-BENCHMARK(test, "string->int")
+BENCHMARK(test,"string->int")
--- a/benchmark/src/test_to_string1.cpp
+++ b/benchmark/src/test_to_string1.cpp
@ -4,28 +4,25 @@
 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")
--- a/benchmark/src/test_to_string2.cpp
+++ b/benchmark/src/test_to_string2.cpp
@ -4,12 +4,10 @@
 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;
@ -19,8 +17,7 @@ class test : public benchmark::test_case
    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();
@ -29,4 +26,4 @@ class test : public benchmark::test_case
    }
 };

-BENCHMARK(test, "ostringstream double->string")
+BENCHMARK(test,"ostringstream double->string")
--- a/benchmark/src/test_utf_encoding.cpp
+++ b/benchmark/src/test_utf_encoding.cpp
@ -1,41 +1,34 @@
 #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:
+public:
    test(mapnik::parameters const& params)
-        : test_case(params)
-        , utf8_(from_u8string(u8"שלום"))
-    {}
+     : 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;
+        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_);
+        for (std::size_t i=0;i<iterations_;++i) {
+             utf32 = utf32conv.from_bytes(utf8_);
        }
        return true;
    }
@ -46,28 +39,26 @@ class test : public benchmark::test_case
 class test2 : public benchmark::test_case
 {
    std::string utf8_;
-
-  public:
+public:
    test2(mapnik::parameters const& params)
-        : test_case(params)
-        , utf8_(from_u8string(u8"שלום"))
-    {}
+     : 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;
+        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_);
-        }
+         std::u32string utf32;
+         for (std::size_t i=0;i<iterations_;++i) {
+             utf32 = boost::locale::conv::utf_to_utf<char32_t>(utf8_);
+         }
        return true;
    }
 };
@ -75,30 +66,28 @@ class test2 : public benchmark::test_case
 class test3 : public benchmark::test_case
 {
    std::string utf8_;
-
-  public:
+public:
    test3(mapnik::parameters const& params)
-        : test_case(params)
-        , utf8_(from_u8string(u8"שלום"))
-    {}
+     : 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;
+        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());
+        for (std::size_t i=0;i<iterations_;++i) {
+            utf32 = tr_.transcode(utf8_.data(),utf8_.size());
        }
        return true;
    }
@ -106,19 +95,18 @@ class test3 : public benchmark::test_case

 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;
 #ifndef __linux__
    test test_runner(params);
-    return_value = return_value | run(test_runner, "utf encode std::codecvt");
+    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");
+    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_value = return_value | run(test_runner3,"utf encode ICU");
    return return_value;
 }
--- a/benchmark/template.cpp
+++ b/benchmark/template.cpp
@ -2,12 +2,16 @@

 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")
--- a/benchmark/utils/random_image.py
+++ b/benchmark/utils/random_image.py
@ -3,8 +3,8 @@ import random

 im = mapnik.Image(256,256)

-for x in range(im.width()):
-    for y in range(im.height()):
+for x in xrange(0,im.width()):
+    for y in xrange(0,im.height()):
        r = int(random.random() * 255)
        g = random.random() * 255
        b = random.random() * 255
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+
+: '
+
+todo
+
+- docs for base setup: sudo apt-get -y install zlib1g-dev make git
+- shrink icu data
+'
+
+MASON_VERSION="e4c1746"
+
+function setup_mason() {
+    if [[ ! -d ./.mason ]]; then
+        git clone https://github.com/mapbox/mason.git .mason || return
+    elif ! git -C .mason rev-parse -q --verify "$MASON_VERSION" >/dev/null; then
+        git -C .mason fetch --all || true # non-fatal
+    fi
+    git -C .mason checkout --detach "$MASON_VERSION" -- || return
+    case ":$PATH:" in
+        *":$PWD/.mason:"*) : already there ;;
+        *) export PATH="$PWD/.mason:$PATH" ;;
+    esac
+    export CXX=${CXX:-clang++}
+    export CC=${CC:-clang}
+}
+
+function install() {
+    MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
+    if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/${2} ]]; then
+        mason install $1 $2
+        if [[ ${3:-false} != false ]]; then
+            LA_FILE=$(mason prefix $1 $2)/lib/$3.la
+            if [[ -f ${LA_FILE} ]]; then
+                perl -i -p -e 's:\Q$ENV{HOME}/build/mapbox/mason\E:$ENV{PWD}:g' ${LA_FILE}
+            else
+                echo "$LA_FILE not found"
+            fi
+        fi
+    fi
+    # the rm here is to workaround https://github.com/mapbox/mason/issues/230
+    rm -f ./mason_packages/.link/mason.ini
+    mason link $1 $2
+}
+
+ICU_VERSION="57.1"
+BOOST_VERSION="1.65.1"
+
+function install_mason_deps() {
+    install ccache 3.3.1
+    install zlib 1.2.8
+    install jpeg_turbo 1.5.1 libjpeg
+    install libpng 1.6.28 libpng
+    install libtiff 4.0.7 libtiff
+    install libpq 9.6.2
+    install sqlite 3.17.0 libsqlite3
+    install expat 2.2.0 libexpat
+    install icu ${ICU_VERSION}
+    install proj 4.9.3 libproj
+    install pixman 0.34.0 libpixman-1
+    install cairo 1.14.8 libcairo
+    install webp 0.6.0 libwebp
+    install libgdal 2.1.3 libgdal
+    install boost ${BOOST_VERSION}
+    install boost_libsystem ${BOOST_VERSION}
+    install boost_libfilesystem ${BOOST_VERSION}
+    install boost_libprogram_options ${BOOST_VERSION}
+    install boost_libregex_icu57 ${BOOST_VERSION}
+    # technically boost thread and python are not a core dep, but installing
+    # here by default helps make python-mapnik builds easier
+    install boost_libthread ${BOOST_VERSION}
+    install boost_libpython ${BOOST_VERSION}
+    install freetype 2.7.1 libfreetype
+    install harfbuzz 1.4.4-ft libharfbuzz
+}
+
+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() {
+    echo "
+CXX = '$CXX'
+CC = '$CC'
+CUSTOM_CXXFLAGS = '-D_GLIBCXX_USE_CXX11_ABI=0'
+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 = '$HOME/build/mapbox/mason/mason_packages:./mason_packages'
+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
+"
+}
+
+# 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/${ICU_VERSION}" >> mapnik-settings.env
+    echo "export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal" >> mapnik-settings.env
+}
+
+# turn arguments of the form NAME=VALUE into exported variables;
+# any other arguments are reported and cause error return status
+function export_variables() {
+    local arg= ret=0
+    for arg
+    do
+        if [[ "$arg" =~ ^[[:alpha:]][_[:alnum:]]*= ]]
+        then
+            local -n var="${arg%%=*}"
+            export var="${arg#*=}"
+        else
+            printf >&2 "bootstrap.sh: invalid argument: %s\n" "$arg"
+            ret=1
+        fi
+    done
+    return $ret
+}
+
+function main() {
+    export_variables "$@" || return
+    # setup_mason must not run in subshell, because it sets default
+    # values of CC, CXX and adds mason to PATH, which we want to keep
+    # when sourced
+    setup_mason || return
+    (
+        # this is wrapped in subshell to allow sourcing this script
+        # without having the terminal closed on error
+        set -eu
+        set -o pipefail
+
+        install_mason_deps
+        make_config > ./config.py
+        setup_runtime_settings
+
+        printf "\n\e[1;32m%s\e[m\n" "bootstrap successful, now run:"
+        echo ""
+        echo "    ./configure && make"
+        echo ""
+    )
+}
+
+main "$@"
--- a/cmake/CheckBoostRegexIcu.cmake
+++ b/cmake/CheckBoostRegexIcu.cmake
@ -1,23 +0,0 @@
-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)
--- a/cmake/GetVersion.cmake
+++ b/cmake/GetVersion.cmake
@ -1,14 +0,0 @@
-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()
--- a/cmake/MapnikExport.cmake
+++ b/cmake/MapnikExport.cmake
@ -1,68 +0,0 @@
-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}
-)
--- a/cmake/MapnikExportPkgConfig.cmake
+++ b/cmake/MapnikExportPkgConfig.cmake
@ -1,92 +0,0 @@
-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")
--- a/cmake/MapnikFindPackage.cmake
+++ b/cmake/MapnikFindPackage.cmake
@ -1,64 +0,0 @@
-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()
--- a/cmake/MapnikInstall.cmake
+++ b/cmake/MapnikInstall.cmake
@ -1,98 +0,0 @@
-#
-# 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()
--- a/cmake/MapnikMinimumVersions.cmake
+++ b/cmake/MapnikMinimumVersions.cmake
@ -1,3 +0,0 @@
-set(BOOST_MIN_VERSION 1.73)
-set(HARFBUZZ_MIN_VERSION 0.9.34)
-set(PROJ_MIN_VERSION 7.2.0)
--- a/cmake/MapnikOption.cmake
+++ b/cmake/MapnikOption.cmake
@ -1,4 +0,0 @@
-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()
--- a/cmake/clang-format.cmake
+++ b/cmake/clang-format.cmake
@ -1,16 +0,0 @@
-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)
--- a/cmake/mapnikConfig.cmake.in
+++ b/cmake/mapnikConfig.cmake.in
@ -1,52 +0,0 @@
-@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()
--- a/cmake/pack.cmake
+++ b/cmake/pack.cmake
@ -1,18 +0,0 @@
-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)
--- a/18
+++ b/18
@ -1,32 +1,18 @@
-#! /usr/bin/env bash
+#! /bin/sh

 set -eu

 : ${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[*]:-} "$@"
+$PYTHON scons/scons.py --implicit-deps-changed configure "$@"
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@ -1,7 +0,0 @@
-if(BUILD_DEMO_VIEWER)
-    add_subdirectory(viewer)
-endif()
-
-if(BUILD_DEMO_CPP)
-    add_subdirectory(c++)
-endif()
--- a/demo/c++/CMakeLists.txt
+++ b/demo/c++/CMakeLists.txt
@ -1,6 +0,0 @@
-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?)
-)
--- a/demo/c++/build.py
+++ b/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']), 'sqlite3', 'pthread'])
+libraries.extend(copy(env['LIBMAPNIK_LIBS']))
 rundemo = demo_env.Program('rundemo', source, LIBS=libraries)

 Depends(rundemo, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
--- a/demo/c++/rundemo.cpp
+++ b/demo/c++/rundemo.cpp
@ -2,7 +2,7 @@
 *
 * This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 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,7 +20,6 @@
 *
 *****************************************************************************/

-#include <mapnik/mapnik.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/layer.hpp>
 #include <mapnik/rule.hpp>
@ -46,21 +45,19 @@

 #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";
-    mapnik::setup();
-    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";
+
+    try {
        std::cout << " running demo ... \n";
        datasource_cache::instance().register_datasources("plugins/input/");
        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
@ -96,13 +93,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));
@ -130,10 +127,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, line_cap_enum::ROUND_CAP);
-                put(line_sym, keys::stroke_linejoin, line_join_enum::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,ROUND_CAP);
+                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
                r.append(std::move(line_sym));
            }
            roads34_style.add_rule(std::move(r));
@ -147,10 +144,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, line_cap_enum::ROUND_CAP);
-                put(line_sym, keys::stroke_linejoin, line_join_enum::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,ROUND_CAP);
+                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
                r.append(std::move(line_sym));
            }
            roads2_style_1.add_rule(std::move(r));
@ -163,10 +160,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, line_cap_enum::ROUND_CAP);
-                put(line_sym, keys::stroke_linejoin, line_join_enum::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,ROUND_CAP);
+                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
                r.append(std::move(line_sym));
            }
            roads2_style_2.add_rule(std::move(r));
@ -180,10 +177,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, line_cap_enum::ROUND_CAP);
-                put(line_sym, keys::stroke_linejoin, line_join_enum::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,ROUND_CAP);
+                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
                r.append(std::move(line_sym));
            }
            roads1_style_1.add_rule(std::move(r));
@ -196,10 +193,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, line_cap_enum::ROUND_CAP);
-                put(line_sym, keys::stroke_linejoin, line_join_enum::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,ROUND_CAP);
+                put(line_sym,keys::stroke_linejoin,ROUND_JOIN);
                r.append(std::move(line_sym));
            }
            roads1_style_2.add_rule(std::move(r));
@ -215,11 +212,10 @@ 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));
            }
@ -232,9 +228,9 @@ int main(int, char**)
        // Provincial  polygons
        {
            parameters p;
-            p["type"] = "shape";
-            p["file"] = "demo/data/boundaries";
-            p["encoding"] = "utf8";
+            p["type"]="shape";
+            p["file"]="demo/data/boundaries";
+            p["encoding"]="utf8";

            layer lyr("Provinces");
            lyr.set_datasource(datasource_cache::instance().create(p));
@ -246,8 +242,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);
@ -257,8 +253,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);
@ -269,8 +265,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));
@ -281,8 +277,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));
@ -297,8 +293,8 @@ int main(int, char**)
        // popplaces
        {
            parameters p;
-            p["type"] = "shape";
-            p["file"] = "demo/data/popplaces";
+            p["type"]="shape";
+            p["file"]="demo/data/popplaces";
            p["encoding"] = "utf8";
            layer lyr("Populated Places");
            lyr.set_srs(srs_lcc);
@ -307,28 +303,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";
@ -336,8 +332,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:

@ -346,38 +342,38 @@ 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_closer());
+        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"
-                     "- cairo-demo.png\n"
-                     "- cairo-demo256.png\n"
-                     "- cairo-demo.pdf\n"
-                     "- cairo-demo.svg\n"
-                     "Have a look!\n";
+            "- cairo-demo.png\n"
+            "- cairo-demo256.png\n"
+            "- cairo-demo.pdf\n"
+            "- cairo-demo.svg\n"
+            "Have a look!\n";
 #endif
        // 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;
--- a/demo/viewer/CMakeLists.txt
+++ b/demo/viewer/CMakeLists.txt
@ -1,64 +0,0 @@
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
-
-set(PROJECT_SOURCES
-    about_dialog.cpp
-    info_dialog.cpp
-    layerdelegate.cpp
-    layerlistmodel.cpp
-    layerwidget.cpp
-    layer_info_dialog.cpp
-    main.cpp
-    mainwindow.cpp
-    mapwidget.cpp
-    styles_model.cpp
-    forms/about.ui
-    forms/info.ui
-    forms/layer_info.ui
-    mapnik_viewer.qrc
-)
-
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(mapnik-viewer
-        MANUAL_FINALIZATION
-        ${PROJECT_SOURCES}
-    )
-else()
-    if(ANDROID)
-        add_library(mapnik-viewer SHARED
-            ${PROJECT_SOURCES}
-        )
-    else()
-        add_executable(mapnik-viewer
-            ${PROJECT_SOURCES}
-        )
-    endif()
-endif()
-
-set_target_properties(mapnik-viewer PROPERTIES
-    AUTOUIC_SEARCH_PATHS forms
-    AUTORCC ON
-    AUTOUIC ON
-    AUTOMOC ON
-)
-
-target_link_libraries(mapnik-viewer PRIVATE
-    Qt${QT_VERSION_MAJOR}::Widgets
-    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?)
-)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini
-"[mapnik]
-plugins_dir=${PLUGINS_INSTALL_DIR}
-fonts/1/dir=${FONTS_INSTALL_DIR}
-fonts/size=1"
-)
-
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(mapnik-viewer)
-endif()
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/viewer.ini DESTINATION bin)
-mapnik_install_utility(mapnik-viewer)
--- a/demo/viewer/about_dialog.cpp
+++ b/demo/viewer/about_dialog.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,10 +17,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include "about_dialog.hpp"

-about_dialog::about_dialog(QWidget* parent)
-    : QDialog(parent)
+
+about_dialog::about_dialog(QWidget *parent)
+  : QDialog(parent)
 {
-    ui.setupUi(this);
+  ui.setupUi(this);
 }
--- a/demo/viewer/about_dialog.hpp
+++ b/demo/viewer/about_dialog.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
+
 #if !defined ABOUT_DIALOG_HPP
 #define ABOUT_DIALOG_HPP

@ -25,12 +27,12 @@

 class about_dialog : public QDialog
 {
-    Q_OBJECT
-  public:
-    about_dialog(QWidget* parent = 0);
-
-  private:
-    Ui::Dialog ui;
+  Q_OBJECT
+public:
+  about_dialog(QWidget * parent = 0);
+private:
+  Ui::Dialog ui;
 };

-#endif // ABOUT_DIALOG_HPP
+
+#endif //ABOUT_DIALOG_HPP
--- a/demo/viewer/info_dialog.cpp
+++ b/demo/viewer/info_dialog.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,22 +17,24 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include "info_dialog.hpp"

-info_dialog::info_dialog(QVector<QPair<QString, QString>> const& info, QWidget* parent)
-    : QDialog(parent)
-{
-    ui.setupUi(this);
-    ui.tableWidget->setHorizontalHeaderItem(0, new QTableWidgetItem("Name"));
-    ui.tableWidget->setHorizontalHeaderItem(1, new QTableWidgetItem("Value"));

-    ui.tableWidget->setRowCount(info.size());
-    ui.tableWidget->setColumnCount(2);
-    for (int i = 0; i < info.size(); ++i)
-    {
-        QTableWidgetItem* keyItem = new QTableWidgetItem(info[i].first);
-        QTableWidgetItem* valueItem = new QTableWidgetItem(info[i].second);
-        ui.tableWidget->setItem(i, 0, keyItem);
-        ui.tableWidget->setItem(i, 1, valueItem);
-    }
+info_dialog::info_dialog(QVector<QPair<QString,QString> > const& info, QWidget *parent)
+  : QDialog(parent)
+{
+  ui.setupUi(this);
+  ui.tableWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Name"));
+  ui.tableWidget->setHorizontalHeaderItem(1,new QTableWidgetItem("Value"));
+
+  ui.tableWidget->setRowCount(info.size());
+  ui.tableWidget->setColumnCount(2);
+  for (int i=0;i<info.size();++i)
+  {
+     QTableWidgetItem *keyItem = new QTableWidgetItem(info[i].first);
+     QTableWidgetItem *valueItem = new QTableWidgetItem(info[i].second);
+     ui.tableWidget->setItem(i,0,keyItem);
+     ui.tableWidget->setItem(i,1,valueItem);
+  }
 }
--- a/demo/viewer/info_dialog.hpp
+++ b/demo/viewer/info_dialog.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
+
 #ifndef INFO_DIALOG_HPP
 #define INFO_DIALOG_HPP

@ -25,12 +27,12 @@

 class info_dialog : public QDialog
 {
-    Q_OBJECT
+  Q_OBJECT
  public:
-    info_dialog(QVector<QPair<QString, QString>> const& info, QWidget* parent = 0);
-
-  private:
-    Ui::InfoDialog ui;
+      info_dialog(QVector<QPair<QString,QString> > const& info,QWidget * parent = 0);
+   private:
+      Ui::InfoDialog ui;
 };

-#endif // INFO_DIALOG_HPP
+
+#endif //INFO_DIALOG_HPP
--- a/demo/viewer/layer_info_dialog.cpp
+++ b/demo/viewer/layer_info_dialog.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include "layer_info_dialog.hpp"

 // mapnik
@ -25,13 +26,14 @@
 #include <mapnik/params_impl.hpp>
 #include <mapnik/layer.hpp>

-layer_info_dialog::layer_info_dialog(mapnik::layer& lay, QWidget* parent)
-    : QDialog(parent)
+
+layer_info_dialog::layer_info_dialog(mapnik::layer& lay, QWidget *parent)
+  : QDialog(parent)
 {
    ui.setupUi(this);

-    ui.tableWidget->setHorizontalHeaderItem(0, new QTableWidgetItem("Name"));
-    ui.tableWidget->setHorizontalHeaderItem(1, new QTableWidgetItem("Value"));
+    ui.tableWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Name"));
+    ui.tableWidget->setHorizontalHeaderItem(1,new QTableWidgetItem("Value"));

    // Layer name
    ui.layerNameEdit->setText(QString(lay.name().c_str()));
@ -48,17 +50,17 @@ layer_info_dialog::layer_info_dialog(mapnik::layer& lay, QWidget* parent)
        ui.tableWidget->setColumnCount(2);

        mapnik::parameters::const_iterator pos;
-        int index = 0;
-        for (pos = ps.begin(); pos != ps.end(); ++pos)
+        int index=0;
+        for (pos = ps.begin();pos != ps.end();++pos)
        {
-            std::optional<std::string> result;
-            mapnik::util::apply_visitor(mapnik::value_extractor_visitor<std::string>(result), pos->second);
+            boost::optional<std::string> result;
+            mapnik::util::apply_visitor(mapnik::value_extractor_visitor<std::string>(result),pos->second);
            if (result)
            {
-                QTableWidgetItem* keyItem = new QTableWidgetItem(QString(pos->first.c_str()));
-                QTableWidgetItem* valueItem = new QTableWidgetItem(QString((*result).c_str()));
-                ui.tableWidget->setItem(index, 0, keyItem);
-                ui.tableWidget->setItem(index, 1, valueItem);
+                QTableWidgetItem *keyItem = new QTableWidgetItem(QString(pos->first.c_str()));
+                QTableWidgetItem *valueItem = new QTableWidgetItem(QString((*result).c_str()));
+                ui.tableWidget->setItem(index,0,keyItem);
+                ui.tableWidget->setItem(index,1,valueItem);
                ++index;
            }
        }
@ -67,5 +69,5 @@ layer_info_dialog::layer_info_dialog(mapnik::layer& lay, QWidget* parent)

 Ui::LayerInfoDialog& layer_info_dialog::getUI()
 {
-    return ui;
+   return ui;
 }
--- a/demo/viewer/layer_info_dialog.hpp
+++ b/demo/viewer/layer_info_dialog.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,25 +17,28 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
+
 #ifndef LAYER_INFO_DIALOG_HPP
 #define LAYER_INFO_DIALOG_HPP

 #include "ui_layer_info.h"
 #include <QDialog>

-namespace mapnik {
+namespace mapnik
+{
 class layer;
 }

 class layer_info_dialog : public QDialog
 {
-    Q_OBJECT
+  Q_OBJECT
  public:
-    layer_info_dialog(mapnik::layer& l, QWidget* parent = 0);
+    layer_info_dialog(mapnik::layer& l, QWidget * parent = 0);
    Ui::LayerInfoDialog& getUI();
-
-  private:
-    Ui::LayerInfoDialog ui;
+   private:
+      Ui::LayerInfoDialog ui;
 };

-#endif // LAYER_INFO_DIALOG_HPP
+
+#endif //LAYER_INFO_DIALOG_HPP
--- a/demo/viewer/layerdelegate.cpp
+++ b/demo/viewer/layerdelegate.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,32 +17,38 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include <QtGui>
 #include "layerdelegate.hpp"

-LayerDelegate::LayerDelegate(QObject* parent)
+LayerDelegate::LayerDelegate(QObject *parent)
    : QAbstractItemDelegate(parent)
-{}
+{
+}

-void LayerDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+void LayerDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                          const QModelIndex &index) const
 {
    painter->setRenderHint(QPainter::Antialiasing);
-    painter->setPen(QPen(QColor(255, 0, 0), 1));
+    painter->setPen(QPen(QColor(255,0,0),1));

    if (option.state & QStyle::State_Selected)
        painter->setBrush(QBrush(QColor(0, 0, 255, 64)));
    else
        painter->setBrush(QBrush(QColor(255, 0, 0, 64)));

-    painter->drawRoundedRect(option.rect, 4, 4);
+
+    painter->drawRoundRect(option.rect,4,4);

    if (option.state & QStyle::State_Selected)
        painter->setBrush(option.palette.highlightedText());
    else
        painter->setBrush(QBrush(QColor(255, 120, 0, 127)));
+
 }

-QSize LayerDelegate::sizeHint(const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const
+QSize LayerDelegate::sizeHint(const QStyleOptionViewItem & /* option */,
+                              const QModelIndex & /* index */) const
 {
-    return QSize(120, 24);
+    return QSize(120,24);
 }
--- a/demo/viewer/layerdelegate.hpp
+++ b/demo/viewer/layerdelegate.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -33,10 +33,12 @@ class LayerDelegate : public QAbstractItemDelegate
 {
    Q_OBJECT

-  public:
-    LayerDelegate(QObject* parent = 0);
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
-    QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
+public:
+    LayerDelegate(QObject *parent = 0);
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+    const QModelIndex &index) const;
+    QSize sizeHint(const QStyleOptionViewItem &option,
+                       const QModelIndex &index ) const;
 };

-#endif // LAYER_DELEGATE_HPP
+#endif //LAYER_DELEGATE_HPP
--- a/demo/viewer/layerlistmodel.cpp
+++ b/demo/viewer/layerlistmodel.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,26 +17,27 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
+
 #include "layerlistmodel.hpp"
 #include <QIcon>
-#include <QBrush>
+
+#include <iostream>
 #include <mapnik/layer.hpp>

 using mapnik::Map;

-LayerListModel::LayerListModel(std::shared_ptr<Map> map, QObject* parent)
-    : QAbstractListModel(parent)
-    , map_(map)
-{}
+LayerListModel::LayerListModel(std::shared_ptr<Map> map,QObject *parent)
+    : QAbstractListModel(parent),
+      map_(map) {}

 int LayerListModel::rowCount(QModelIndex const&) const
 {
-    if (map_)
-        return map_->layers().size();
-    return 0;
+   if (map_) return map_->layers().size();
+   return 0;
 }

-QVariant LayerListModel::data(QModelIndex const& index, int role) const
+QVariant LayerListModel::data(QModelIndex const& index,int role) const
 {
    if (!index.isValid() || !map_)
        return QVariant();
@ -59,16 +60,9 @@ QVariant LayerListModel::data(QModelIndex const& index, int role) const
    else if (role == Qt::CheckStateRole)
    {
        if (map_->layers().at(index.row()).active())
-            return QVariant(Qt::Checked);
+           return QVariant(Qt::Checked);
        else
-            return QVariant(Qt::Unchecked);
-    }
-    else if (role == Qt::ForegroundRole)
-    {
-        if (map_->layers().at(index.row()).active())
-            return QBrush(QColor("black"));
-        else
-            return QBrush(QColor("lightgrey"));
+           return QVariant(Qt::Unchecked);
    }
    else
    {
@ -76,7 +70,8 @@ QVariant LayerListModel::data(QModelIndex const& index, int role) const
    }
 }

-QVariant LayerListModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant LayerListModel::headerData(int section, Qt::Orientation orientation,
+                                         int role) const
 {
    if (role != Qt::DisplayRole)
        return QVariant();
@ -87,37 +82,38 @@ QVariant LayerListModel::headerData(int section, Qt::Orientation orientation, in
        return QString("TODO Row %1").arg(section);
 }

-bool LayerListModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool LayerListModel::setData(const QModelIndex &index,
+                             const QVariant &value, int role)
 {
-    if (!map_)
-        return false;
+   if (!map_) return false;

-    if (index.isValid() && role == Qt::CheckStateRole)
-    {
-        int status = value.toInt();
-        std::vector<mapnik::layer>& layers = const_cast<std::vector<mapnik::layer>&>(map_->layers());
-        layers.at(index.row()).set_active(status);
-        emit dataChanged(index, index);
-        return true;
-    }
-    return false;
+   if (index.isValid() && role == Qt::CheckStateRole)
+   {
+      int status = value.toInt();
+      std::vector<mapnik::layer> & layers = const_cast<std::vector<mapnik::layer>& >(map_->layers());
+      layers.at(index.row()).set_active(status);
+      emit dataChanged(index, index);
+      return true;
+   }
+   return false;
 }

 Qt::ItemFlags LayerListModel::flags(QModelIndex const& index) const
 {
    Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+
    if (index.isValid())
-        flags |= Qt::ItemIsUserCheckable;
+       flags |= Qt::ItemIsUserCheckable;
    return flags;
 }

 boost::optional<mapnik::layer&> LayerListModel::map_layer(int i)
 {
-    if (map_)
-    {
-        std::vector<mapnik::layer>& layers = const_cast<std::vector<mapnik::layer>&>(map_->layers());
-        if (i < int(layers.size()))
-            return boost::optional<mapnik::layer&>(layers[i]);
-    }
-    return boost::optional<mapnik::layer&>();
+   if (map_)
+   {
+      std::vector<mapnik::layer> & layers = const_cast<std::vector<mapnik::layer>& >(map_->layers());
+      if (i < int(layers.size()))
+          return boost::optional<mapnik::layer&>(layers[i]);
+   }
+   return boost::optional<mapnik::layer&>();
 }
--- a/demo/viewer/layerlistmodel.hpp
+++ b/demo/viewer/layerlistmodel.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
+
 #ifndef LAYER_LIST_MODEL_HPP
 #define LAYER_LIST_MODEL_HPP

@ -30,18 +32,20 @@

 class LayerListModel : public QAbstractListModel
 {
-    Q_OBJECT
-  public:
-    LayerListModel(std::shared_ptr<mapnik::Map> map, QObject* parent = 0);
-    int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    QVariant data(const QModelIndex& index, int role) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-    Qt::ItemFlags flags(QModelIndex const& index) const;
-    boost::optional<mapnik::layer&> map_layer(int i);
+   Q_OBJECT
+   public:
+      LayerListModel(std::shared_ptr<mapnik::Map> map, QObject * parent = 0);
+      int rowCount(const QModelIndex &parent = QModelIndex()) const;
+      QVariant data(const QModelIndex &index, int role) const;
+      QVariant headerData(int section, Qt::Orientation orientation,
+                          int role = Qt::DisplayRole) const;
+      bool setData(const QModelIndex &index, const QVariant &value,
+                   int role = Qt::EditRole);
+      Qt::ItemFlags flags(QModelIndex const& index) const;
+      boost::optional<mapnik::layer&> map_layer(int i);

-  private:
-    std::shared_ptr<mapnik::Map> map_;
+   private:
+      std::shared_ptr<mapnik::Map> map_;
 };

-#endif // LAYER_LIST_MODEL_HPP
+#endif //LAYER_LIST_MODEL_HPP
--- a/demo/viewer/layerwidget.cpp
+++ b/demo/viewer/layerwidget.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include "layerwidget.hpp"
 #include <qabstractitemdelegate.h>
 #include <qapplication.h>
@ -28,63 +29,72 @@
 #include <qscrollbar.h>
 #include <qrubberband.h>
 #include <qdebug.h>
+#include <iostream>
 #include "layerlistmodel.hpp"
 #include "layer_info_dialog.hpp"

-LayerTab::LayerTab(QWidget* parent)
-    : QListView(parent)
-{}
+using namespace std;

-void LayerTab::paintEvent(QPaintEvent* e)
+LayerTab::LayerTab(QWidget* parent)
+    : QListView(parent) {}
+
+
+void LayerTab::paintEvent(QPaintEvent *e)
 {
    QListView::paintEvent(e);
 }

-void LayerTab::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
+void LayerTab::dataChanged(const QModelIndex &topLeft,
+                           const QModelIndex &bottomRight)
 {
-    emit update_mapwidget();
-    QListView::dataChanged(topLeft, bottomRight, roles);
+   QListView::dataChanged(topLeft, bottomRight);
+   qDebug("FIXME : update map view!");
+   emit update_mapwidget();
 }

-void LayerTab::selectionChanged(const QItemSelection& selected, const QItemSelection&)
+void LayerTab::selectionChanged(const QItemSelection & selected, const QItemSelection &)
 {
-    QModelIndexList list = selected.indexes();
-    if (list.size() != 0)
-    {
-        qDebug("SELECTED LAYER -> %d", list[0].row());
-        emit layerSelected(list[0].row());
-    }
+   QModelIndexList list = selected.indexes();
+   if (list.size() != 0)
+   {
+      std::cout << "SELECTED LAYER ->" << list[0].row() << "\n";
+      emit layerSelected(list[0].row());
+   }
 }

 void LayerTab::layerInfo()
 {
-    qDebug("Layer info");
-    QModelIndexList indexes = selectedIndexes();
-    if (indexes.size() > 0)
-    {
-        qDebug("id = %d", indexes[0].row());
-    }
+   qDebug("Layer info");
+   QModelIndexList indexes = selectedIndexes();
+   if (indexes.size() > 0)
+   {
+      qDebug("id = %d",indexes[0].row());
+
+   }
 }

 void LayerTab::layerInfo2(QModelIndex const& index)
 {
-    qDebug("LayerInfo id = %d", index.row());
-    QVector<QPair<QString, QString>> params;
-    QVector<QString> style_names;
-    unsigned i = index.row();
-    LayerListModel* model = static_cast<LayerListModel*>(this->model());
-    boost::optional<mapnik::layer&> layer = model->map_layer(i);
+   qDebug("LayerInfo id = %d",index.row());
+   QVector<QPair<QString,QString> > params;
+   QVector<QString> style_names;
+   unsigned i = index.row();
+   LayerListModel * model = static_cast<LayerListModel*>(this->model());
+   boost::optional<mapnik::layer&> layer = model->map_layer(i);

-    if (layer)
-    {
-        layer_info_dialog dlg(*layer, this);
-        dlg.exec();
-    }
+   if (layer)
+   {
+       layer_info_dialog dlg(*layer,this);
+       dlg.exec();
+   }
 }

-StyleTab::StyleTab(QWidget*) {}
-
-void StyleTab::contextMenuEvent(QContextMenuEvent* event)
+StyleTab::StyleTab(QWidget*)
 {
-    qDebug("test");
+
+}
+
+void StyleTab::contextMenuEvent(QContextMenuEvent * event )
+{
+   qDebug("test");
 }
--- a/demo/viewer/layerwidget.hpp
+++ b/demo/viewer/layerwidget.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #ifndef LAYERWIDGET_HPP
 #define LAYERWIDGET_HPP

@ -26,29 +27,28 @@

 class LayerTab : public QListView
 {
-    Q_OBJECT
-  public:
-    LayerTab(QWidget* parent = 0);
-    void paintEvent(QPaintEvent* e);
-  signals:
-    void update_mapwidget();
-    void layerSelected(int) const;
-  public slots:
-    void layerInfo();
-    void layerInfo2(QModelIndex const&);
-  protected slots:
-    void dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles);
-    void selectionChanged(const QItemSelection& selected, const QItemSelection&);
+   Q_OBJECT
+   public:
+      LayerTab(QWidget* parent=0);
+      void paintEvent(QPaintEvent *e);
+   signals:
+      void update_mapwidget();
+      void layerSelected(int) const;
+   public slots:
+      void layerInfo();
+      void layerInfo2(QModelIndex const&);
+   protected slots:
+      void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+      void selectionChanged(const QItemSelection & selected, const QItemSelection &);
 };

 class StyleTab : public QTreeView
 {
    Q_OBJECT
-  public:
-    StyleTab(QWidget* parent = 0);
-
-  protected:
-    void contextMenuEvent(QContextMenuEvent* event);
+public:
+    StyleTab(QWidget* parent=0);
+protected:
+      void contextMenuEvent(QContextMenuEvent * event );
 };

 #endif
--- a/demo/viewer/main.cpp
+++ b/demo/viewer/main.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,36 +17,34 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 // qt
 #include <QApplication>
 #include <QStringList>
 #include <QSettings>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/mapnik.hpp>
 #include "mainwindow.hpp"

-int main(int argc, char** argv)
+int main( int argc, char **argv )
 {
    using mapnik::datasource_cache;
    using mapnik::freetype_engine;
-    mapnik::setup();
    try
    {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
        QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
        QCoreApplication::setOrganizationName("Mapnik");
        QCoreApplication::setOrganizationDomain("mapnik.org");
        QCoreApplication::setApplicationName("Viewer");
-        QSettings settings("viewer.ini", QSettings::IniFormat);
+        QSettings settings("viewer.ini",QSettings::IniFormat);

        // register input plug-ins
-        QString plugins_dir = settings.value("mapnik/plugins_dir", QVariant("/usr/local/lib/mapnik/input/")).toString();
+        QString plugins_dir = settings.value("mapnik/plugins_dir",
+                                             QVariant("/usr/local/lib/mapnik/input/")).toString();
        datasource_cache::instance().register_datasources(plugins_dir.toStdString());
        // register fonts
        int count = settings.beginReadArray("mapnik/fonts");
-        for (int index = 0; index < count; ++index)
+        for (int index=0; index < count; ++index)
        {
            settings.setArrayIndex(index);
            QString font_dir = settings.value("dir").toString();
@ -54,37 +52,33 @@ int main(int argc, char** argv)
        }
        settings.endArray();

-        QApplication app(argc, argv);
+        QApplication app( argc, argv );
        MainWindow window;
        window.show();
-        if (argc > 1)
-            window.open(argv[1]);
+        if (argc > 1) window.open(argv[1]);
        if (argc >= 3)
        {
            QStringList list = QString(argv[2]).split(",");
-            if (list.size() == 4)
+            if (list.size()==4)
            {
                bool ok;
                double x0 = list[0].toDouble(&ok);
                double y0 = list[1].toDouble(&ok);
                double x1 = list[2].toDouble(&ok);
                double y1 = list[3].toDouble(&ok);
-                if (ok)
-                    window.set_default_extent(x0, y0, x1, y1);
+                if (ok) window.set_default_extent(x0,y0,x1,y1);
            }
        }
        else
        {
            std::shared_ptr<mapnik::Map> map = window.get_map();
-            if (map)
-                map->zoom_all();
+            if (map) map->zoom_all();
        }
        if (argc == 4)
        {
            bool ok;
            double scaling_factor = QString(argv[3]).toDouble(&ok);
-            if (ok)
-                window.set_scaling_factor(scaling_factor);
+            if (ok) window.set_scaling_factor(scaling_factor);
        }
        return app.exec();
    }
--- a/demo/viewer/mainwindow.cpp
+++ b/demo/viewer/mainwindow.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 // stl
 #include <iostream>

@ -38,7 +39,7 @@
 // mapnik

 #ifndef Q_MOC_RUN // QT moc chokes on BOOST_JOIN
-// #include <mapnik/config_error.hpp>
+//#include <mapnik/config_error.hpp>
 #include <mapnik/load_map.hpp>
 #include <mapnik/save_map.hpp>
 #include <mapnik/projection.hpp>
@ -57,27 +58,27 @@
 #include <boost/algorithm/string.hpp>

 MainWindow::MainWindow()
-    : filename_()
-    , default_extent_(-20037508.3428, -20037508.3428, 20037508.3428, 20037508.3428)
+    : filename_(),
+      default_extent_(-20037508.3428,-20037508.3428,20037508.3428,20037508.3428)
 {
    mapWidget_ = new MapWidget(this);
-    QSplitter* splitter = new QSplitter(this);
-    QTabWidget* tabWidget = new QTabWidget;
+    QSplitter *splitter = new QSplitter(this);
+    QTabWidget *tabWidget=new QTabWidget;
    layerTab_ = new LayerTab;
    layerTab_->setFocusPolicy(Qt::NoFocus);
-    layerTab_->setIconSize(QSize(16, 16));
+    layerTab_->setIconSize(QSize(16,16));

-    // LayerDelegate *delegate = new LayerDelegate(this);
-    // layerTab_->setItemDelegate(delegate);
-    // layerTab_->setItemDelegate(new QItemDelegate(this));
-    // layerTab_->setViewMode(QListView::IconMode);
+    //LayerDelegate *delegate = new LayerDelegate(this);
+    //layerTab_->setItemDelegate(delegate);
+    //layerTab_->setItemDelegate(new QItemDelegate(this));
+    //layerTab_->setViewMode(QListView::IconMode);

    layerTab_->setFlow(QListView::TopToBottom);
-    tabWidget->addTab(layerTab_, tr("Layers"));
+    tabWidget->addTab(layerTab_,tr("Layers"));

    // Styles tab
    styleTab_ = new StyleTab;
-    tabWidget->addTab(styleTab_, tr("Styles"));
+    tabWidget->addTab(styleTab_,tr("Styles"));
    splitter->addWidget(tabWidget);
    splitter->addWidget(mapWidget_);
    QList<int> list;
@ -88,7 +89,7 @@ MainWindow::MainWindow()
    mapWidget_->setFocusPolicy(Qt::StrongFocus);
    mapWidget_->setFocus();

-    // setCentralWidget(mapWidget_);
+    //setCentralWidget(mapWidget_);
    setCentralWidget(splitter);
    createActions();
    createMenus();
@ -96,25 +97,29 @@ MainWindow::MainWindow()
    createContextMenu();

    setWindowTitle(tr("Mapnik Viewer"));
-    status = new QStatusBar(this);
+    status=new QStatusBar(this);
    status->showMessage(tr(""));
    setStatusBar(status);
-    resize(800, 600);
+    resize(800,600);

-    // connect mapview to layerlist
-    connect(mapWidget_, SIGNAL(mapViewChanged()), layerTab_, SLOT(update()));
+    //connect mapview to layerlist
+    connect(mapWidget_, SIGNAL(mapViewChanged()),layerTab_, SLOT(update()));
    // slider
-    connect(slider_, SIGNAL(valueChanged(int)), mapWidget_, SLOT(zoomToLevel(int)));
+    connect(slider_,SIGNAL(valueChanged(int)),mapWidget_,SLOT(zoomToLevel(int)));
    // renderer selector
-    connect(renderer_selector_, SIGNAL(currentIndexChanged(int)), mapWidget_, SLOT(updateRenderer(int)));
+    connect(renderer_selector_,SIGNAL(currentIndexChanged(QString const&)),
+            mapWidget_, SLOT(updateRenderer(QString const&)));

    // scale factor
-    connect(scale_factor_, SIGNAL(valueChanged(double)), mapWidget_, SLOT(updateScaleFactor(double)));
+    connect(scale_factor_,SIGNAL(valueChanged(double)),
+            mapWidget_, SLOT(updateScaleFactor(double)));
    //
-    connect(layerTab_, SIGNAL(update_mapwidget()), mapWidget_, SLOT(updateMap()));
-    connect(layerTab_, SIGNAL(layerSelected(int)), mapWidget_, SLOT(layerSelected(int)));
+    connect(layerTab_,SIGNAL(update_mapwidget()),mapWidget_,SLOT(updateMap()));
+    connect(layerTab_,SIGNAL(layerSelected(int)),
+            mapWidget_,SLOT(layerSelected(int)));
 }

+
 MainWindow::~MainWindow()
 {
    delete mapWidget_;
@ -136,7 +141,8 @@ void MainWindow::open(QString const& path)
 {
    if (path.isNull())
    {
-        filename_ = QFileDialog::getOpenFileName(this, tr("Open Mapnik file"), currentPath, "*.xml");
+        filename_ = QFileDialog::getOpenFileName(this,tr("Open Mapnik file"),
+                                                 currentPath,"*.xml");
    }
    else
    {
@ -145,15 +151,18 @@ void MainWindow::open(QString const& path)

    if (!filename_.isEmpty())
    {
+
        load_map_file(filename_);
        setWindowTitle(tr("%1 - Mapnik Viewer").arg(filename_));
    }
+
 }

 void MainWindow::reload()
 {
    if (!filename_.isEmpty())
    {
+
        mapnik::box2d<double> bbox = mapWidget_->getMap()->get_current_extent();
        load_map_file(filename_);
        mapWidget_->zoomToBox(bbox);
@ -164,28 +173,28 @@ void MainWindow::reload()
 void MainWindow::save()
 {
    QString initialPath = QDir::currentPath() + "/untitled.xml";
-    QString filename = QFileDialog::getSaveFileName(this,
-                                                    tr("Save"),
+    QString filename = QFileDialog::getSaveFileName(this, tr("Save"),
                                                    initialPath,
-                                                    tr("%1 Files (*.xml)").arg(QString("Mapnik definition")));
+                                                    tr("%1 Files (*.xml)")
+                                                    .arg(QString("Mapnik definition")));
    if (!filename.isEmpty())
    {
-        std::cout << "saving " << filename.toStdString() << std::endl;
-        mapnik::save_map(*mapWidget_->getMap(), filename.toStdString());
+        std::cout<<"saving "<< filename.toStdString() << std::endl;
+        mapnik::save_map(*mapWidget_->getMap(),filename.toStdString());
    }
 }

 void MainWindow::load_map_file(QString const& filename)
 {
-    std::cout << "loading " << filename.toStdString() << std::endl;
+    std::cout << "loading "<< filename.toStdString() << std::endl;
    unsigned width = mapWidget_->width();
    unsigned height = mapWidget_->height();
-    std::shared_ptr<mapnik::Map> map(new mapnik::Map(width, height));
+    std::shared_ptr<mapnik::Map> map(new mapnik::Map(width,height));
    mapWidget_->setMap(map);
    try
    {
        mapnik::auto_cpu_timer t(std::clog, "loading map took: ");
-        mapnik::load_map(*map, filename.toStdString());
+        mapnik::load_map(*map,filename.toStdString());
    }
    catch (std::exception const& ex)
    {
@ -195,8 +204,8 @@ void MainWindow::load_map_file(QString const& filename)
    {
        std::cerr << "Exception caught in load_map\n";
    }
-    layerTab_->setModel(new LayerListModel(map, this));
-    styleTab_->setModel(new StyleModel(map, this));
+    layerTab_->setModel(new LayerListModel(map,this));
+    styleTab_->setModel(new StyleModel(map,this));
    zoom_all();
 }

@ -243,15 +252,15 @@ void MainWindow::about()

 void MainWindow::export_as()
 {
-    QAction* action = qobject_cast<QAction*>(sender());
+    QAction *action = qobject_cast<QAction *>(sender());
    QByteArray fileFormat = action->data().toByteArray();
    QString initialPath = QDir::currentPath() + "/map." + fileFormat;

-    QString fileName = QFileDialog::getSaveFileName(
-      this,
-      tr("Export As"),
-      initialPath,
-      tr("%1 Files (*.%2);;All Files (*)").arg(QString(fileFormat.toUpper())).arg(QString(fileFormat)));
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Export As"),
+                                                    initialPath,
+                                                    tr("%1 Files (*.%2);;All Files (*)")
+                                                    .arg(QString(fileFormat.toUpper()))
+                                                    .arg(QString(fileFormat)));
    if (!fileName.isEmpty())
    {
        QPixmap const& pix = mapWidget_->pixmap();
@ -261,76 +270,77 @@ void MainWindow::export_as()

 void MainWindow::print()
 {
-    // Q_ASSERT(mapWidget_->pixmap());
-    // QPrintDialog dialog(&printer, this);
-    // if (dialog.exec()) {
-    //    QPainter painter(&printer);
-    //    QRect rect = painter.viewport();
-    //    QSize size = mapWidget_->pixmap()->size();
-    //    size.scale(rect.size(), Qt::KeepAspectRatio);
-    //    painter.setViewport(rect.x(), rect.y(), size.width(), size.height());
-    //    painter.setWindow(mapWidget_->pixmap()->rect());
-    //    painter.drawPixmap(0, 0, *mapWidget_->pixmap());
-    // }
+
+    //Q_ASSERT(mapWidget_->pixmap());
+    //QPrintDialog dialog(&printer, this);
+    //if (dialog.exec()) {
+    //   QPainter painter(&printer);
+    //   QRect rect = painter.viewport();
+    //   QSize size = mapWidget_->pixmap()->size();
+    //   size.scale(rect.size(), Qt::KeepAspectRatio);
+    //   painter.setViewport(rect.x(), rect.y(), size.width(), size.height());
+    //   painter.setWindow(mapWidget_->pixmap()->rect());
+    //   painter.drawPixmap(0, 0, *mapWidget_->pixmap());
+    //}
 }

 void MainWindow::createActions()
 {
-    // exportAct = new QAction(tr("&Export as ..."),this);
-    // exportAct->setShortcut(tr("Ctrl+E"));
-    // connect(exportAct, SIGNAL(triggered()), this, SLOT(export_as()));
-    zoomAllAct = new QAction(QIcon(":/images/home.png"), tr("Zoom All"), this);
+    //exportAct = new QAction(tr("&Export as ..."),this);
+    //exportAct->setShortcut(tr("Ctrl+E"));
+    //connect(exportAct, SIGNAL(triggered()), this, SLOT(export_as()));
+    zoomAllAct = new QAction(QIcon(":/images/home.png"),tr("Zoom All"),this);
    connect(zoomAllAct, SIGNAL(triggered()), this, SLOT(zoom_all()));

-    zoomBoxAct = new QAction(QIcon(":/images/zoombox.png"), tr("Zoom To Box"), this);
+    zoomBoxAct = new QAction(QIcon(":/images/zoombox.png"),tr("Zoom To Box"),this);
    zoomBoxAct->setCheckable(true);
    connect(zoomBoxAct, SIGNAL(triggered()), this, SLOT(zoom_to_box()));

-    panAct = new QAction(QIcon(":/images/pan.png"), tr("Pan"), this);
+    panAct = new QAction(QIcon(":/images/pan.png"),tr("Pan"),this);
    panAct->setCheckable(true);
    connect(panAct, SIGNAL(triggered()), this, SLOT(pan()));

-    infoAct = new QAction(QIcon(":/images/info.png"), tr("Info"), this);
+    infoAct = new QAction(QIcon(":/images/info.png"),tr("Info"),this);
    infoAct->setCheckable(true);
    connect(infoAct, SIGNAL(triggered()), this, SLOT(info()));

-    toolsGroup = new QActionGroup(this);
+    toolsGroup=new QActionGroup(this);
    toolsGroup->addAction(zoomBoxAct);
    toolsGroup->addAction(panAct);
    toolsGroup->addAction(infoAct);
    zoomBoxAct->setChecked(true);

-    openAct = new QAction(tr("Open Map definition"), this);
-    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
-    saveAct = new QAction(tr("Save Map definition"), this);
-    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+    openAct=new QAction(tr("Open Map definition"),this);
+    connect(openAct,SIGNAL(triggered()),this,SLOT(open()));
+    saveAct=new QAction(tr("Save Map definition"),this);
+    connect(saveAct,SIGNAL(triggered()),this,SLOT(save()));

-    panLeftAct = new QAction(QIcon(":/images/left.png"), tr("&Pan Left"), this);
+    panLeftAct = new QAction(QIcon(":/images/left.png"),tr("&Pan Left"),this);
    connect(panLeftAct, SIGNAL(triggered()), this, SLOT(pan_left()));
-    panRightAct = new QAction(QIcon(":/images/right.png"), tr("&Pan Right"), this);
+    panRightAct = new QAction(QIcon(":/images/right.png"),tr("&Pan Right"),this);
    connect(panRightAct, SIGNAL(triggered()), this, SLOT(pan_right()));
-    panUpAct = new QAction(QIcon(":/images/up.png"), tr("&Pan Up"), this);
+    panUpAct = new QAction(QIcon(":/images/up.png"),tr("&Pan Up"),this);
    connect(panUpAct, SIGNAL(triggered()), this, SLOT(pan_up()));
-    panDownAct = new QAction(QIcon(":/images/down.png"), tr("&Pan Down"), this);
+    panDownAct = new QAction(QIcon(":/images/down.png"),tr("&Pan Down"),this);
    connect(panDownAct, SIGNAL(triggered()), this, SLOT(pan_down()));

-    reloadAct = new QAction(QIcon(":/images/reload.png"), tr("Reload"), this);
+    reloadAct = new QAction(QIcon(":/images/reload.png"),tr("Reload"),this);
    connect(reloadAct, SIGNAL(triggered()), this, SLOT(reload()));

-    layerInfo = new QAction(QIcon(":/images/info.png"), tr("&Layer info"), layerTab_);
-    connect(layerInfo, SIGNAL(triggered()), layerTab_, SLOT(layerInfo()));
-    connect(layerTab_, SIGNAL(doubleClicked(QModelIndex const&)), layerTab_, SLOT(layerInfo2(QModelIndex const&)));
+    layerInfo = new QAction(QIcon(":/images/info.png"),tr("&Layer info"),layerTab_);
+    connect(layerInfo, SIGNAL(triggered()), layerTab_,SLOT(layerInfo()));
+    connect(layerTab_, SIGNAL(doubleClicked(QModelIndex const&)), layerTab_,SLOT(layerInfo2(QModelIndex const&)));
    foreach (QByteArray format, QImageWriter::supportedImageFormats())
    {
        QString text = tr("%1...").arg(QString(format).toUpper());

-        QAction* action = new QAction(text, this);
+        QAction *action = new QAction(text, this);
        action->setData(format);
        connect(action, SIGNAL(triggered()), this, SLOT(export_as()));
        exportAsActs.append(action);
    }

-    printAct = new QAction(QIcon(":/images/print.png"), tr("&Print ..."), this);
+    printAct = new QAction(QIcon(":/images/print.png"),tr("&Print ..."),this);
    printAct->setShortcut(tr("Ctrl+E"));
    connect(printAct, SIGNAL(triggered()), this, SLOT(print()));

@ -338,17 +348,17 @@ void MainWindow::createActions()
    exitAct->setShortcut(tr("Ctrl+Q"));
    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));

-    aboutAct = new QAction(QIcon(":/images/about.png"), tr("&About"), this);
+    aboutAct = new QAction(QIcon(":/images/about.png"),tr("&About"), this);
    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
 }

 void MainWindow::createMenus()
 {
    exportMenu = new QMenu(tr("&Export As"), this);
-    foreach (QAction* action, exportAsActs)
+    foreach (QAction *action, exportAsActs)
        exportMenu->addAction(action);

-    fileMenu = new QMenu(tr("&File"), this);
+    fileMenu = new QMenu(tr("&File"),this);
    fileMenu->addAction(openAct);
    fileMenu->addAction(saveAct);
    fileMenu->addMenu(exportMenu);
@ -387,13 +397,13 @@ void MainWindow::createToolBars()

    scale_factor_ = new QDoubleSpinBox(fileToolBar);
    scale_factor_->setMinimum(0.1);
-    scale_factor_->setMaximum(10.0);
+    scale_factor_->setMaximum(5.0);
    scale_factor_->setSingleStep(0.1);
    scale_factor_->setValue(1.0);

    fileToolBar->addWidget(scale_factor_);
-    slider_ = new QSlider(Qt::Horizontal, fileToolBar);
-    slider_->setRange(1, 18);
+    slider_ = new QSlider(Qt::Horizontal,fileToolBar);
+    slider_->setRange(1,18);
    slider_->setTickPosition(QSlider::TicksBelow);
    slider_->setTickInterval(1);
    slider_->setTracking(false);
@ -401,7 +411,9 @@ void MainWindow::createToolBars()
    fileToolBar->addAction(aboutAct);
 }

-void MainWindow::set_default_extent(double x0, double y0, double x1, double y1)
+
+
+void MainWindow::set_default_extent(double x0,double y0, double x1, double y1)
 {
    try
    {
@ -409,15 +421,14 @@ void MainWindow::set_default_extent(double x0, double y0, double x1, double y1)
        if (map_ptr)
        {
            mapnik::projection prj(map_ptr->srs());
-            prj.forward(x0, y0);
-            prj.forward(x1, y1);
-            default_extent_ = mapnik::box2d<double>(x0, y0, x1, y1);
+            prj.forward(x0,y0);
+            prj.forward(x1,y1);
+            default_extent_=mapnik::box2d<double>(x0,y0,x1,y1);
            mapWidget_->zoomToBox(default_extent_);
-            std::cout << "SET DEFAULT EXT:" << default_extent_ << std::endl;
+            std::cout << "SET DEFAULT EXT\n";
        }
    }
-    catch (...)
-    {}
+    catch (...) {}
 }

 void MainWindow::set_scaling_factor(double scaling_factor)
--- a/demo/viewer/mainwindow.hpp
+++ b/demo/viewer/mainwindow.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #ifndef MAINWINDOW_HPP
 #define MAINWINDOW_HPP

@ -29,7 +30,7 @@

 #include "mapwidget.hpp"

-// using namespace mapnik;
+//using namespace mapnik;

 class LayerTab;
 class StyleTab;
@ -40,24 +41,22 @@ class QDoubleSpinBox;
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
-  public:
+    public:
    MainWindow();
    virtual ~MainWindow();
-    void set_default_extent(double x0, double y0, double x1, double y1);
+    void set_default_extent(double x0,double y0,double x1, double y1);
    void set_scaling_factor(double scaling_factor);
-
-  public:
+public :
    std::shared_ptr<mapnik::Map> get_map();
-
-  protected:
+protected:
    void closeEvent(QCloseEvent* event);
-  public slots:
+public slots:
    void zoom_all();
    void zoom_to_box();
    void pan();
    void info();
    void export_as();
-    void open(QString const& path = QString());
+    void open(QString const&  path = QString());
    void reload();
    void save();
    void print();
@ -66,8 +65,7 @@ class MainWindow : public QMainWindow
    void pan_right();
    void pan_up();
    void pan_down();
-
-  private:
+private:
    void createActions();
    void createMenus();
    void createToolBars();
@ -76,42 +74,43 @@ class MainWindow : public QMainWindow

    QString currentPath;
    QString filename_;
-    QAbstractItemModel* model;
-    LayerTab* layerTab_;
-    StyleTab* styleTab_;
-    MapWidget* mapWidget_;
-    // actions
-    QList<QAction*> exportAsActs;
-    QActionGroup* toolsGroup;
+    QAbstractItemModel *model;
+    LayerTab  *layerTab_;
+    StyleTab * styleTab_;
+    MapWidget * mapWidget_;
+    //actions
+    QList<QAction *> exportAsActs;
+    QActionGroup *toolsGroup;

-    QAction* zoomAllAct;
-    QAction* zoomBoxAct;
-    QAction* panAct;
-    QAction* infoAct;
-    QAction* openAct;
-    QAction* saveAct;
-    QAction* printAct;
-    QAction* exitAct;
-    QAction* aboutAct;
-    QAction* panLeftAct;
-    QAction* panRightAct;
-    QAction* panUpAct;
-    QAction* panDownAct;
-    QAction* reloadAct;
-    QAction* layerInfo;
-    // toolbars
-    QToolBar* fileToolBar;
-    QToolBar* editToolBar;
-    // menus
-    QMenu* exportMenu;
-    QMenu* fileMenu;
-    QMenu* helpMenu;
-    // status bar
-    QStatusBar* status;
-    QSlider* slider_;
-    QComboBox* renderer_selector_;
-    QDoubleSpinBox* scale_factor_;
+    QAction *zoomAllAct;
+    QAction *zoomBoxAct;
+    QAction *panAct;
+    QAction *infoAct;
+    QAction *openAct;
+    QAction *saveAct;
+    QAction *printAct;
+    QAction *exitAct;
+    QAction *aboutAct;
+    QAction *panLeftAct;
+    QAction *panRightAct;
+    QAction *panUpAct;
+    QAction *panDownAct;
+    QAction *reloadAct;
+    QAction *layerInfo;
+    //toolbars
+    QToolBar *fileToolBar;
+    QToolBar *editToolBar;
+    //menus
+    QMenu *exportMenu;
+    QMenu *fileMenu;
+    QMenu *helpMenu;
+    //status bar
+    QStatusBar *status;
+    QSlider * slider_;
+    QComboBox * renderer_selector_;
+    QDoubleSpinBox * scale_factor_;
    mapnik::box2d<double> default_extent_;
 };

-#endif // MAINWINDOW_HPP
+
+#endif //MAINWINDOW_HPP
--- a/demo/viewer/mapwidget.cpp
+++ b/demo/viewer/mapwidget.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,12 +17,13 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include <QtGui>

 #include <boost/bind.hpp>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/layer.hpp>
-#include <mapnik/proj_transform.hpp>
+#include <mapnik/projection.hpp>
 #include <mapnik/scale_denominator.hpp>
 #include <mapnik/view_transform.hpp>
 #include <mapnik/transform_path_adapter.hpp>
@ -40,139 +41,153 @@
 #include "mapwidget.hpp"
 #include "info_dialog.hpp"

+using mapnik::image_rgba8;
+using mapnik::Map;
+using mapnik::layer;
 using mapnik::box2d;
 using mapnik::coord2d;
-using mapnik::feature_kv_iterator;
 using mapnik::feature_ptr;
-using mapnik::image_rgba8;
-using mapnik::layer;
-using mapnik::Map;
+using mapnik::view_transform;
 using mapnik::projection;
 using mapnik::scale_denominator;
-using mapnik::view_transform;
+using mapnik::feature_kv_iterator;

-double scales[] = {279541132.014, 139770566.007, 69885283.0036, 34942641.5018, 17471320.7509,
-                   8735660.37545, 4367830.18772, 2183915.09386, 1091957.54693, 545978.773466,
-                   272989.386733, 136494.693366, 68247.3466832, 34123.6733416, 17061.8366708,
-                   8530.9183354,  4265.4591677,  2132.72958385, 1066.36479192, 533.182395962};
+double scales [] = {279541132.014,
+                    139770566.007,
+                    69885283.0036,
+                    34942641.5018,
+                    17471320.7509,
+                    8735660.37545,
+                    4367830.18772,
+                    2183915.09386,
+                    1091957.54693,
+                    545978.773466,
+                    272989.386733,
+                    136494.693366,
+                    68247.3466832,
+                    34123.6733416,
+                    17061.8366708,
+                    8530.9183354,
+                    4265.4591677,
+                    2132.72958385,
+                    1066.36479192,
+                    533.182395962};

-MapWidget::MapWidget(QWidget* parent)
-    : QWidget(parent)
-    , map_()
-    , selected_(1)
-    , extent_()
-    , cur_tool_(ZoomToBox)
-    , start_x_(0)
-    , start_y_(0)
-    , end_x_(0)
-    , end_y_(0)
-    , drag_(false)
-    , first_(true)
-    , pen_(QColor(0, 0, 255, 96))
-    , selectedLayer_(-1)
-    , scaling_factor_(1.0)
-    , cur_renderer_(AGG)
+MapWidget::MapWidget(QWidget *parent)
+   : QWidget(parent),
+     map_(),
+     selected_(1),
+     extent_(),
+     cur_tool_(ZoomToBox),
+     start_x_(0),
+     start_y_(0),
+     end_x_(0),
+     end_y_(0),
+     drag_(false),
+     first_(true),
+     pen_(QColor(0,0,255,96)),
+     selectedLayer_(-1),
+     scaling_factor_(1.0),
+     cur_renderer_(AGG)
 {
-    pen_.setWidth(3);
-    pen_.setCapStyle(Qt::RoundCap);
-    pen_.setJoinStyle(Qt::RoundJoin);
+   pen_.setWidth(3);
+   pen_.setCapStyle(Qt::RoundCap);
+   pen_.setJoinStyle(Qt::RoundJoin);
 }

 void MapWidget::setTool(eTool tool)
 {
-    cur_tool_ = tool;
+   cur_tool_=tool;
 }

 void MapWidget::paintEvent(QPaintEvent*)
 {
-    QPainter painter(this);
+   QPainter painter(this);

-    if (drag_)
-    {
-        if (cur_tool_ == ZoomToBox)
-        {
-            unsigned width = end_x_ - start_x_;
-            unsigned height = end_y_ - start_y_;
-            painter.drawPixmap(QPoint(0, 0), pix_);
-            painter.setPen(pen_);
-            painter.setBrush(QColor(200, 200, 255, 128));
-            painter.drawRect(start_x_, start_y_, width, height);
-        }
-        else if (cur_tool_ == Pan)
-        {
-            int dx = end_x_ - start_x_;
-            int dy = end_y_ - start_y_;
-            painter.setBrush(QColor(200, 200, 200, 128));
-            painter.drawRect(0, 0, width(), height());
-            painter.drawPixmap(QPoint(dx, dy), pix_);
-        }
-    }
-    else
-    {
-        painter.drawPixmap(QPoint(0, 0), pix_);
-    }
-    painter.end();
+   if (drag_)
+   {
+      if (cur_tool_ == ZoomToBox)
+      {
+         unsigned width = end_x_-start_x_;
+         unsigned height = end_y_-start_y_;
+         painter.drawPixmap(QPoint(0, 0),pix_);
+         painter.setPen(pen_);
+         painter.setBrush(QColor(200,200,255,128));
+         painter.drawRect(start_x_,start_y_,width,height);
+      }
+      else if (cur_tool_ == Pan)
+      {
+         int dx = end_x_-start_x_;
+         int dy = end_y_-start_y_;
+         painter.setBrush(QColor(200,200,200,128));
+         painter.drawRect(0,0,width(),height());
+         painter.drawPixmap(QPoint(dx,dy),pix_);
+      }
+   }
+   else
+   {
+      painter.drawPixmap(QPoint(0, 0),pix_);
+   }
+   painter.end();
 }

-void MapWidget::resizeEvent(QResizeEvent* ev)
+void MapWidget::resizeEvent(QResizeEvent * ev)
 {
-    if (map_)
-    {
-        map_->resize(ev->size().width(), ev->size().height());
-        updateMap();
-    }
+   if (map_)
+   {
+      map_->resize(ev->size().width(),ev->size().height());
+      updateMap();
+   }
 }

 void MapWidget::mousePressEvent(QMouseEvent* e)
 {
-    if (e->button() == Qt::LeftButton)
-    {
-        if (cur_tool_ == ZoomToBox || cur_tool_ == Pan)
-        {
-            start_x_ = e->x();
-            start_y_ = e->y();
-            drag_ = true;
-        }
-        else if (cur_tool_ == Info)
-        {
-            if (map_)
+   if (e->button()==Qt::LeftButton)
+   {
+      if (cur_tool_ == ZoomToBox || cur_tool_==Pan)
+      {
+         start_x_ = e->x();
+         start_y_ = e->y();
+         drag_=true;
+      }
+      else if (cur_tool_==Info)
+      {
+         if (map_)
+         {
+            QVector<QPair<QString,QString> > info;
+
+            projection map_proj(map_->srs()); // map projection
+            double scale_denom = scale_denominator(map_->scale(),map_proj.is_geographic());
+            view_transform t(map_->width(),map_->height(),map_->get_current_extent());
+
+            for (unsigned index = 0; index <  map_->layer_count();++index)
            {
-                QVector<QPair<QString, QString>> info;
+               if (int(index) != selectedLayer_) continue;

-                projection map_proj(map_->srs(), true); // map projection
-                double scale_denom = scale_denominator(map_->scale(), map_proj.is_geographic());
-                view_transform t(map_->width(), map_->height(), map_->get_current_extent());
+               layer & layer = map_->layers()[index];
+               if (!layer.visible(scale_denom)) continue;
+               std::string name = layer.name();
+               double x = e->x();
+               double y = e->y();
+               std::cout << "query at " << x << "," << y << "\n";
+               projection layer_proj(layer.srs());
+               mapnik::proj_transform prj_trans(map_proj,layer_proj);
+               //std::auto_ptr<mapnik::memory_datasource> data(new mapnik::memory_datasource);
+               mapnik::featureset_ptr fs = map_->query_map_point(index,x,y);

-                for (unsigned index = 0; index < map_->layer_count(); ++index)
-                {
-                    if (int(index) != selectedLayer_)
-                        continue;
+               if (fs)
+               {
+                   feature_ptr feat  = fs->next();
+                   if (feat)
+                   {
+                       feature_kv_iterator itr(*feat,true);
+                       feature_kv_iterator end(*feat);

-                    layer& layer = map_->layers()[index];
-                    if (!layer.visible(scale_denom))
-                        continue;
-                    std::string name = layer.name();
-                    double x = e->x();
-                    double y = e->y();
-                    std::cout << "query at " << x << "," << y << "\n";
-                    projection layer_proj(layer.srs(), true);
-                    mapnik::proj_transform prj_trans(map_proj, layer_proj);
-                    // std::auto_ptr<mapnik::memory_datasource> data(new mapnik::memory_datasource);
-                    mapnik::featureset_ptr fs = map_->query_map_point(index, x, y);
-
-                    if (fs)
-                    {
-                        feature_ptr feat = fs->next();
-                        if (feat)
-                        {
-                            feature_kv_iterator itr(*feat, true);
-                            feature_kv_iterator end(*feat);
-
-                            for (; itr != end; ++itr)
-                            {
-                                info.push_back(QPair<QString, QString>(QString(std::get<0>(*itr).c_str()),
-                                                                       std::get<1>(*itr).to_string().c_str()));
-                            }
+                       for ( ;itr!=end; ++itr)
+                       {
+                           info.push_back(QPair<QString,QString>(QString(std::get<0>(*itr).c_str()),
+                                                                 std::get<1>(*itr).to_string().c_str()));
+                       }

 #if 0 //
                       using path_type = mapnik::transform_path_adapter<mapnik::view_transform,mapnik::vertex_adapter>;
@ -204,285 +219,271 @@ void MapWidget::mousePressEvent(QMouseEvent* e)
                           }
                       }
 #endif
-                        }
-                    }
+                   }
+               }

-                    if (info.size() > 0)
-                    {
-                        info_dialog info_dlg(info, this);
-                        info_dlg.exec();
-                        break;
-                    }
-                }
-
-                // remove annotation layer
-                map_->layers().erase(
-                  remove_if(map_->layers().begin(), map_->layers().end(), bind(&layer::name, _1) == "*annotations*"),
-                  map_->layers().end());
+               if (info.size() > 0)
+               {
+                  info_dialog info_dlg(info,this);
+                  info_dlg.exec();
+                  break;
+               }
            }
-        }
-    }
-    else if (e->button() == Qt::RightButton)
-    {
-        // updateMap();
-    }
+
+            // remove annotation layer
+            map_->layers().erase(remove_if(map_->layers().begin(),
+                                           map_->layers().end(),
+                                           bind(&layer::name,_1) == "*annotations*")
+                                 , map_->layers().end());
+         }
+      }
+   }
+   else if (e->button()==Qt::RightButton)
+   {
+      //updateMap();
+   }
 }

 void MapWidget::mouseMoveEvent(QMouseEvent* e)
 {
-    if (cur_tool_ == ZoomToBox || cur_tool_ == Pan)
-    {
-        end_x_ = e->x();
-        end_y_ = e->y();
-        update();
-    }
+   if (cur_tool_ == ZoomToBox || cur_tool_==Pan)
+   {
+      end_x_ = e->x();
+      end_y_ = e->y();
+      update();
+   }
 }

 void MapWidget::mouseReleaseEvent(QMouseEvent* e)
 {
-    if (e->button() == Qt::LeftButton)
-    {
-        end_x_ = e->x();
-        end_y_ = e->y();
-        if (cur_tool_ == ZoomToBox)
-        {
-            drag_ = false;
-            if (map_)
-            {
-                view_transform t(map_->width(), map_->height(), map_->get_current_extent());
-                box2d<double> box = t.backward(box2d<double>(start_x_, start_y_, end_x_, end_y_));
-                map_->zoom_to_box(box);
-                updateMap();
-            }
-        }
-        else if (cur_tool_ == Pan)
-        {
-            drag_ = false;
-            if (map_)
-            {
-                int cx = int(0.5 * map_->width());
-                int cy = int(0.5 * map_->height());
-                int dx = end_x_ - start_x_;
-                int dy = end_y_ - start_y_;
-                map_->pan(cx - dx, cy - dy);
-                updateMap();
-            }
-        }
-    }
+   if (e->button()==Qt::LeftButton)
+   {
+      end_x_ = e->x();
+      end_y_ = e->y();
+      if (cur_tool_ == ZoomToBox)
+      {
+         drag_=false;
+         if (map_)
+         {
+            view_transform t(map_->width(),map_->height(),map_->get_current_extent());
+            box2d<double> box = t.backward(box2d<double>(start_x_,start_y_,end_x_,end_y_));
+            map_->zoom_to_box(box);
+            updateMap();
+         }
+      }
+      else if (cur_tool_==Pan)
+      {
+         drag_=false;
+         if (map_)
+         {
+            int cx = int(0.5 * map_->width());
+            int cy = int(0.5 * map_->height());
+            int dx = end_x_ - start_x_;
+            int dy = end_y_ - start_y_;
+            map_->pan(cx - dx ,cy - dy);
+            updateMap();
+         }
+      }
+   }
 }

 void MapWidget::wheelEvent(QWheelEvent* e)
 {
-    if (!map_)
-    {
-        return;
-    }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QPointF corner(map_->width(), map_->height());
-    QPointF zoomCoords;
-    double zoom;
-    if (e->angleDelta().y() > 0)
-    {
-        zoom = 0.5;
-        QPointF center = corner / 2;
-        QPointF delta = e->position() - center;
-        zoomCoords = zoom * delta + center;
-    }
-    else
-    {
-        zoom = 2.0;
-        zoomCoords = corner - e->position();
-    }
-#else
-    QPoint corner(map_->width(), map_->height());
-    QPoint zoomCoords;
-    double zoom;
-    if (e->delta() > 0)
-    {
-        zoom = 0.5;
-        QPoint center = corner / 2;
-        QPoint delta = e->pos() - center;
-        zoomCoords = zoom * delta + center;
-    }
-    else
-    {
-        zoom = 2.0;
-        zoomCoords = corner - e->pos();
-    }
-#endif
+   if (!map_)
+   {
+      return;
+   }

-    map_->pan_and_zoom(zoomCoords.x(), zoomCoords.y(), zoom);
-    updateMap();
+   QPoint corner(map_->width(), map_->height());
+   QPoint zoomCoords;
+   double zoom;
+   if (e->delta() > 0)
+   {
+      zoom = 0.5;
+      QPoint center = corner / 2;
+      QPoint delta = e->pos() - center;
+      zoomCoords = zoom * delta + center;
+   }
+   else
+   {
+      zoom = 2.0;
+      zoomCoords = corner - e->pos();
+   }
+
+   map_->pan_and_zoom(zoomCoords.x(), zoomCoords.y(), zoom);
+   updateMap();
 }

-void MapWidget::keyPressEvent(QKeyEvent* e)
+void MapWidget::keyPressEvent(QKeyEvent *e)
 {
-    std::cout << "key pressed:" << e->key() << "\n";
-    switch (e->key())
-    {
-        case Qt::Key_Minus:
-            zoomOut();
-            break;
-        case Qt::Key_Plus:
-        case 61:
-            zoomIn();
-            break;
-        case 65:
-            defaultView();
-            break;
-        case Qt::Key_Up:
-            panUp();
-            break;
-        case Qt::Key_Down:
-            panDown();
-            break;
-        case Qt::Key_Left:
-            panLeft();
-            break;
-        case Qt::Key_Right:
-            panRight();
-            break;
-        case 49:
-            zoomToLevel(10);
-            break;
-        case 50:
-            zoomToLevel(11);
-            break;
-        case 51:
-            zoomToLevel(12);
-            break;
-        case 52:
-            zoomToLevel(13);
-            break;
-        case 53:
-            zoomToLevel(14);
-            break;
-        case 54:
-            zoomToLevel(15);
-            break;
-        case 55:
-            zoomToLevel(16);
-            break;
-        case 56:
-            zoomToLevel(17);
-            break;
-        case 57:
-            zoomToLevel(18);
-            break;
-        default:
-            QWidget::keyPressEvent(e);
-    }
+   std::cout << "key pressed:"<< e->key()<<"\n";
+   switch (e->key()) {
+      case Qt::Key_Minus:
+         zoomOut();
+         break;
+      case Qt::Key_Plus:
+      case 61:
+         zoomIn();
+         break;
+      case 65:
+         defaultView();
+         break;
+      case Qt::Key_Up:
+         panUp();
+         break;
+      case Qt::Key_Down:
+         panDown();
+         break;
+      case Qt::Key_Left:
+         panLeft();
+         break;
+      case Qt::Key_Right:
+         panRight();
+         break;
+      case 49:
+         zoomToLevel(10);
+         break;
+      case 50:
+         zoomToLevel(11);
+         break;
+      case 51:
+         zoomToLevel(12);
+         break;
+      case 52:
+         zoomToLevel(13);
+         break;
+      case 53:
+         zoomToLevel(14);
+         break;
+      case 54:
+         zoomToLevel(15);
+         break;
+      case 55:
+         zoomToLevel(16);
+         break;
+      case 56:
+         zoomToLevel(17);
+         break;
+      case 57:
+         zoomToLevel(18);
+         break;
+   default:
+       QWidget::keyPressEvent(e);
+   }
+
+
 }

 void MapWidget::zoomToBox(mapnik::box2d<double> const& bbox)
 {
-    if (map_)
-    {
-        map_->zoom_to_box(bbox);
-        updateMap();
-    }
+   if (map_)
+   {
+      map_->zoom_to_box(bbox);
+      updateMap();
+   }
 }

 void MapWidget::defaultView()
 {
-    if (map_)
-    {
-        map_->resize(width(), height());
-        map_->zoom_all();
-        updateMap();
-    }
+   if (map_)
+   {
+      map_->resize(width(),height());
+      map_->zoom_all();
+      updateMap();
+   }
 }

 void MapWidget::zoomIn()
 {
-    if (map_)
-    {
-        map_->zoom(0.5);
-        updateMap();
-    }
+   if (map_)
+   {
+      map_->zoom(0.5);
+      updateMap();
+   }
 }

 void MapWidget::zoomOut()
 {
-    if (map_)
-    {
-        map_->zoom(2.0);
-        updateMap();
-    }
+   if (map_)
+   {
+      map_->zoom(2.0);
+      updateMap();
+   }
 }

 void MapWidget::panUp()
 {
-    if (map_)
-    {
-        double cx = 0.5 * map_->width();
-        double cy = 0.5 * map_->height();
-        map_->pan(int(cx), int(cy - cy * 0.25));
-        updateMap();
-    }
+   if (map_)
+   {
+      double cx = 0.5*map_->width();
+      double cy = 0.5*map_->height();
+      map_->pan(int(cx),int(cy - cy*0.25));
+      updateMap();
+   }
 }

 void MapWidget::panDown()
 {
-    if (map_)
-    {
-        double cx = 0.5 * map_->width();
-        double cy = 0.5 * map_->height();
-        map_->pan(int(cx), int(cy + cy * 0.25));
-        updateMap();
-    }
+   if (map_)
+   {
+      double cx = 0.5*map_->width();
+      double cy = 0.5*map_->height();
+      map_->pan(int(cx),int(cy + cy*0.25));
+      updateMap();
+   }
 }

 void MapWidget::panLeft()
 {
-    if (map_)
-    {
-        double cx = 0.5 * map_->width();
-        double cy = 0.5 * map_->height();
-        map_->pan(int(cx - cx * 0.25), int(cy));
-        updateMap();
-    }
+   if (map_)
+   {
+      double cx = 0.5*map_->width();
+      double cy = 0.5*map_->height();
+      map_->pan(int(cx - cx * 0.25),int(cy));
+      updateMap();
+   }
 }

 void MapWidget::panRight()
 {
-    if (map_)
-    {
-        double cx = 0.5 * map_->width();
-        double cy = 0.5 * map_->height();
-        map_->pan(int(cx + cx * 0.25), int(cy));
-        updateMap();
-    }
+   if (map_)
+   {
+      double cx = 0.5*map_->width();
+      double cy = 0.5*map_->height();
+      map_->pan(int(cx + cx * 0.25),int(cy));
+      updateMap();
+   }
 }

+
 void MapWidget::zoomToLevel(int level)
 {
-    if (map_ && level >= 0 && level < 19)
-    {
-        double scale_denom = scales[level];
-        std::cerr << "scale denominator = " << scale_denom << "\n";
-        mapnik::box2d<double> ext = map_->get_current_extent();
-        double width = static_cast<double>(map_->width());
-        double height = static_cast<double>(map_->height());
-        mapnik::coord2d pt = ext.center();
+   if ( map_ && level >= 0 && level < 19 )
+   {
+      double scale_denom  = scales[level];
+      std::cerr << "scale denominator = " << scale_denom << "\n";
+      mapnik::box2d<double> ext = map_->get_current_extent();
+      double width = static_cast<double>(map_->width());
+      double height= static_cast<double>(map_->height());
+      mapnik::coord2d pt = ext.center();

-        double res = scale_denom * 0.00028;
+      double res = scale_denom * 0.00028;

-        mapnik::box2d<double> box(pt.x - 0.5 * width * res,
-                                  pt.y - 0.5 * height * res,
-                                  pt.x + 0.5 * width * res,
-                                  pt.y + 0.5 * height * res);
-        map_->zoom_to_box(box);
-        updateMap();
-    }
+      mapnik::box2d<double> box(pt.x - 0.5 * width * res,
+                                   pt.y - 0.5 * height*res,
+                                   pt.x + 0.5 * width * res,
+                                   pt.y + 0.5 * height*res);
+      map_->zoom_to_box(box);
+      updateMap();
+   }
 }

-void MapWidget::export_to_file(unsigned, unsigned, std::string const&, std::string const&)
+void MapWidget::export_to_file(unsigned ,unsigned ,std::string const&,std::string const&)
 {
-    // image_rgba8 image(width,height);
-    // agg_renderer renderer(map,image);
-    // renderer.apply();
-    // image.saveToFile(filename,type);
+   //image_rgba8 image(width,height);
+   //agg_renderer renderer(map,image);
+   //renderer.apply();
+   //image.saveToFile(filename,type);
    std::cout << "Export to file .." << std::endl;
 }

@ -491,25 +492,25 @@ void MapWidget::set_scaling_factor(double scaling_factor)
    scaling_factor_ = scaling_factor;
 }

-void render_agg(mapnik::Map const& map, double scaling_factor, QPixmap& pix)
+void render_agg(mapnik::Map const& map, double scaling_factor, QPixmap & pix)
 {
-    unsigned width = map.width();
-    unsigned height = map.height();
+    unsigned width=map.width();
+    unsigned height=map.height();

-    image_rgba8 buf(width, height);
-    mapnik::agg_renderer<image_rgba8> ren(map, buf, scaling_factor);
+    image_rgba8 buf(width,height);
+    mapnik::agg_renderer<image_rgba8> ren(map,buf,scaling_factor);

    try
    {
        mapnik::auto_cpu_timer t(std::clog, "rendering took: ");
        ren.apply();
-        QImage image((uchar*)buf.data(), width, height, QImage::Format_ARGB32);
+        QImage image((uchar*)buf.data(),width,height,QImage::Format_ARGB32);
        pix = QPixmap::fromImage(image.rgbSwapped());
    }
-    // catch (mapnik::config_error & ex)
+    //catch (mapnik::config_error & ex)
    //{
-    //     std::cerr << ex.what() << std::endl;
-    // }
+    //    std::cerr << ex.what() << std::endl;
+    //}
    catch (std::exception const& ex)
    {
        std::cerr << "exception: " << ex.what() << std::endl;
@ -520,16 +521,18 @@ void render_agg(mapnik::Map const& map, double scaling_factor, QPixmap& pix)
    }
 }

-void render_grid(mapnik::Map const& map, double scaling_factor, QPixmap& pix)
+
+void render_grid(mapnik::Map const& map, double scaling_factor, QPixmap & pix)
 {
    std::cerr << "Not supported" << std::endl;
 }

-void render_cairo(mapnik::Map const& map, double scaling_factor, QPixmap& pix)
+
+void render_cairo(mapnik::Map const& map, double scaling_factor, QPixmap & pix)
 {
 // FIXME
 #ifdef HAVE_CAIRO
-    mapnik::cairo_surface_ptr image_surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, map.width(), map.height()),
+    mapnik::cairo_surface_ptr image_surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32,map.width(),map.height()),
                                            mapnik::cairo_surface_closer());
    mapnik::cairo_ptr cairo = mapnik::create_context(image_surface);
    if (cairo)
@ -540,20 +543,17 @@ void render_cairo(mapnik::Map const& map, double scaling_factor, QPixmap& pix)
    }
    mapnik::image_rgba8 data(map.width(), map.height());
    mapnik::cairo_image_to_rgba8(data, image_surface);
-    QImage image((uchar*)data.bytes(), data.width(), data.height(), QImage::Format_ARGB32);
+    QImage image((uchar*)data.bytes(),data.width(),data.height(),QImage::Format_ARGB32);
    pix = QPixmap::fromImage(image.rgbSwapped());
 #endif
 }

-void MapWidget::updateRenderer(int index)
+void MapWidget::updateRenderer(QString const& txt)
 {
-    std::cerr << "updateRenderer:" << index << std::endl;
-    if (index == 0)
-        cur_renderer_ = AGG;
-    else if (index == 1)
-        cur_renderer_ = Cairo;
-    else if (index == 2)
-        cur_renderer_ = Grid;
+    if (txt == "AGG") cur_renderer_ = AGG;
+    else if (txt == "Cairo") cur_renderer_ = Cairo;
+    else if (txt == "Grid") cur_renderer_ = Grid;
+    std::cerr << "Update renderer called" << std::endl;
    updateMap();
 }

@ -565,63 +565,59 @@ void MapWidget::updateScaleFactor(double scale_factor)

 void MapWidget::updateMap()
 {
-    if (map_)
-    {
-        if (cur_renderer_ == AGG)
-        {
-            render_agg(*map_, scaling_factor_, pix_);
-        }
-        else if (cur_renderer_ == Cairo)
-        {
-            render_cairo(*map_, scaling_factor_, pix_);
-        }
-        else if (cur_renderer_ == Grid)
-        {
-            render_grid(*map_, scaling_factor_, pix_);
-        }
-        else
-        {
-            std::cerr << "Unknown renderer..." << std::endl;
-        }
+   if (map_)
+   {
+       if (cur_renderer_== AGG)
+       {
+           render_agg(*map_, scaling_factor_, pix_);
+       }
+       else if (cur_renderer_ == Cairo)
+       {
+           render_cairo(*map_, scaling_factor_, pix_);
+       }
+       else if (cur_renderer_ == Grid)
+       {
+           render_grid(*map_, scaling_factor_, pix_);
+       }
+       else
+       {
+           std::cerr << "Unknown renderer..." << std::endl;
+       }

-        try
-        {
-            projection prj(map_->srs(), true); // map projection
-            box2d<double> ext = map_->get_current_extent();
-            double x0 = ext.minx();
-            double y0 = ext.miny();
-            double x1 = ext.maxx();
-            double y1 = ext.maxy();
-            double z = 0;
-            std::string dest_srs = {"epsg:4326"};
-            mapnik::proj_transform proj_tr(map_->srs(), dest_srs);
-
-            proj_tr.forward(x0, y0, z);
-            proj_tr.forward(x1, y1, z);
-            std::cout << "MAP SIZE:" << map_->width() << "," << map_->height() << std::endl;
-            std::cout << "BBOX (WGS84): " << x0 << "," << y0 << "," << x1 << "," << y1 << "\n";
-            update();
-            // emit signal to interested widgets
-            emit mapViewChanged();
-        }
-        catch (...)
-        {
-            std::cerr << "Unknown exception caught!\n";
-        }
-    }
+       try
+       {
+          projection prj(map_->srs()); // map projection
+          box2d<double> ext = map_->get_current_extent();
+          double x0 = ext.minx();
+          double y0 = ext.miny();
+          double x1 = ext.maxx();
+          double y1 = ext.maxy();
+          prj.inverse(x0,y0);
+          prj.inverse(x1,y1);
+          std::cout << "BBOX (WGS84): " << x0 << "," << y0 << "," << x1 << "," << y1 << "\n";
+          update();
+          // emit signal to interested widgets
+          emit mapViewChanged();
+      }
+      catch (...)
+      {
+          std::cerr << "Unknown exception caught!\n";
+      }
+   }
 }

 std::shared_ptr<Map> MapWidget::getMap()
 {
-    return map_;
+   return map_;
 }

 void MapWidget::setMap(std::shared_ptr<Map> map)
 {
-    map_ = map;
+   map_ = map;
 }

+
 void MapWidget::layerSelected(int index)
 {
-    selectedLayer_ = index;
+   selectedLayer_ = index;
 }
--- a/demo/viewer/mapwidget.hpp
+++ b/demo/viewer/mapwidget.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #ifndef MAP_WIDGET_HPP
 #define MAP_WIDGET_HPP

@ -29,6 +30,7 @@
 #include <string>
 #include <memory>

+
 #ifndef Q_MOC_RUN
 #include <mapnik/map.hpp>
 #endif
@ -37,16 +39,22 @@ class MapWidget : public QWidget
 {
    Q_OBJECT

-  public:
-    enum eTool {
+public:
+    enum eTool
+    {
        ZoomToBox = 1,
        Pan,
        Info,
    };

-    enum eRenderer { AGG, Cairo, Grid };
+    enum eRenderer
+    {
+        AGG,
+        Cairo,
+        Grid
+    };

-  private:
+private:
    std::shared_ptr<mapnik::Map> map_;
    int selected_;
    QPixmap pix_;
@ -62,12 +70,11 @@ class MapWidget : public QWidget
    int selectedLayer_;
    double scaling_factor_;
    eRenderer cur_renderer_;
-
-  public:
-    MapWidget(QWidget* parent = 0);
+public:
+    MapWidget(QWidget *parent=0);
    void setTool(eTool tool);
    std::shared_ptr<mapnik::Map> getMap();
-    inline QPixmap const& pixmap() const { return pix_; }
+    inline QPixmap const& pixmap() const { return pix_;}
    void setMap(std::shared_ptr<mapnik::Map> map);
    void defaultView();
    void zoomToBox(mapnik::box2d<double> const& box);
@ -78,24 +85,26 @@ class MapWidget : public QWidget
    void panUp();
    void panDown();
    void set_scaling_factor(double);
-  public slots:
+public slots:
    void zoomToLevel(int level);
    void updateMap();
    void layerSelected(int);
-    void updateRenderer(int);
+    void updateRenderer(QString const& txt);
    void updateScaleFactor(double scale_factor);
-  signals:
+signals:
    void mapViewChanged();
-
-  protected:
+protected:
    void paintEvent(QPaintEvent* ev);
    void resizeEvent(QResizeEvent* ev);
    void mousePressEvent(QMouseEvent* e);
    void mouseMoveEvent(QMouseEvent* e);
    void mouseReleaseEvent(QMouseEvent* e);
    void wheelEvent(QWheelEvent* e);
-    void keyPressEvent(QKeyEvent* e);
-    void export_to_file(unsigned width, unsigned height, std::string const& filename, std::string const& type);
+    void keyPressEvent(QKeyEvent *e);
+    void export_to_file(unsigned width,
+                        unsigned height,
+                        std::string const& filename,
+                        std::string const& type);
 };

 #endif // MAP_WIDGET_HPP
--- a/demo/viewer/styles_model.cpp
+++ b/demo/viewer/styles_model.cpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #include "styles_model.hpp"
 #include <mapnik/config.hpp>
 #include <mapnik/util/variant.hpp>
@ -38,50 +39,70 @@ class node : private mapnik::util::noncopyable
 {
    struct node_base
    {
-        virtual QString name() const = 0;
-        virtual QIcon icon() const = 0;
+        virtual QString name() const=0;
+        virtual QIcon   icon() const=0;
        virtual ~node_base() {}
    };

-    template<typename T>
+    template <typename T>
    struct wrap : public node_base
    {
-        wrap(T const& obj)
-            : obj_(obj)
-        {}
+    wrap(T const& obj)
+        : obj_(obj) {}

-        ~wrap() {}
+    ~wrap() {}

-        QString name() const { return obj_.name(); }
+    QString name () const
+    {
+        return obj_.name();
+    }

-        QIcon icon() const { return obj_.icon(); }
+    QIcon icon() const
+    {
+        return obj_.icon();
+    }

-        T obj_;
+    T obj_;
    };

-  public:
-    template<typename T>
-    node(T const& obj, node* parent = 0)
-        : impl_(new wrap<T>(obj))
-        , parent_(parent)
+public:
+    template <typename T>
+    node ( T const& obj, node * parent=0)
+    : impl_(new wrap<T>(obj)),
+      parent_(parent)
    {}

-    QString name() const { return impl_->name(); }
+    QString name() const
+    {
+        return impl_->name();
+    }

-    QIcon icon() const { return impl_->icon(); }
+    QIcon icon() const
+    {
+        return impl_->icon();
+    }

-    unsigned num_children() const { return children_.count(); }
+    unsigned num_children() const
+    {
+        return children_.count();
+    }

-    node* child(unsigned row) const { return children_.value(row); }
+    node * child(unsigned row) const
+    {
+        return children_.value(row);
+    }

-    node* parent() const { return parent_; }
+    node * parent() const
+    {
+        return parent_;
+    }

-    node* add_child(node* child)
+    node * add_child(node * child)
    {
        children_.push_back(child);
        return child;
    }
-    int row() const
+    int row () const
    {
        if (parent_)
            return parent_->children_.indexOf(const_cast<node*>(this));
@ -89,90 +110,94 @@ class node : private mapnik::util::noncopyable
            return 0;
    }

-    ~node() { qDeleteAll(children_); }
+    ~node()
+    {
+        qDeleteAll(children_);
+    }

-  private:
+private:
    const std::unique_ptr<node_base> impl_;
    QList<node*> children_;
-    node* parent_;
+    node * parent_;
 };

+
 struct symbolizer_info
 {
-    QString operator()(mapnik::point_symbolizer const& sym) const
+    QString operator() (mapnik::point_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("PointSymbolizer");
    }

-    QString operator()(mapnik::line_symbolizer const& sym) const
+    QString operator() (mapnik::line_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("LineSymbolizer");
    }

-    QString operator()(mapnik::line_pattern_symbolizer const& sym) const
+    QString operator() (mapnik::line_pattern_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("LinePatternSymbolizer");
    }

-    QString operator()(mapnik::polygon_symbolizer const& sym) const
+    QString operator() (mapnik::polygon_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("PolygonSymbolizer");
    }

-    QString operator()(mapnik::polygon_pattern_symbolizer const& sym) const
+    QString operator() (mapnik::polygon_pattern_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("PolygonSymbolizer");
    }

-    QString operator()(mapnik::text_symbolizer const& sym) const
+    QString operator() (mapnik::text_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("TextSymbolizer");
    }

-    QString operator()(mapnik::shield_symbolizer const& sym) const
+    QString operator() (mapnik::shield_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("ShieldSymbolizer");
    }

-    QString operator()(mapnik::markers_symbolizer const& sym) const
+    QString operator() (mapnik::markers_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("MarkersSymbolizer");
    }

-    QString operator()(mapnik::building_symbolizer const& sym) const
+    QString operator() (mapnik::building_symbolizer const& sym) const
    {
        boost::ignore_unused_variable_warning(sym);
        return QString("BuildingSymbolizer");
    }

-    template<typename T>
-    QString operator()(T const&) const
+    template <typename T>
+    QString operator() (T const& ) const
    {
-        return QString("FIXME");
+        return QString ("FIXME");
    }
 };

 struct symbolizer_icon
 {
-    QIcon operator()(mapnik::polygon_symbolizer const& sym) const
+    QIcon operator() (mapnik::polygon_symbolizer const& sym) const
    {
-        QPixmap pix(16, 16);
+        QPixmap pix(16,16);
        QPainter painter(&pix);
        mapnik::color const& fill = mapnik::get<mapnik::color>(sym, mapnik::keys::fill);
-        QBrush brush(QColor(fill.red(), fill.green(), fill.blue(), fill.alpha()));
+        QBrush brush(QColor(fill.red(),fill.green(),fill.blue(),fill.alpha()));
        painter.fillRect(0, 0, 16, 16, brush);
        return QIcon(pix);
    }

-    QIcon operator()(mapnik::point_symbolizer const& sym) const
+    QIcon operator() (mapnik::point_symbolizer const& sym) const
    {
        // FIXME!
        /*
@ -187,57 +212,55 @@ struct symbolizer_icon
        */
        return QIcon();
    }
-    QIcon operator()(mapnik::line_symbolizer const& sym) const
+    QIcon operator() (mapnik::line_symbolizer const& sym) const
    {
-        QPixmap pix(48, 16);
+        QPixmap pix(48,16);
        pix.fill();
        QPainter painter(&pix);
-        // mapnik::stroke const&  strk = sym.get_stroke();
+        //mapnik::stroke const&  strk = sym.get_stroke();
        mapnik::color const& col = mapnik::get<mapnik::color>(sym, mapnik::keys::stroke);
-        QPen pen(QColor(col.red(), col.green(), col.blue(), col.alpha()));
+        QPen pen(QColor(col.red(),col.green(),col.blue(),col.alpha()));
        pen.setWidth(mapnik::get<double>(sym, mapnik::keys::width));
        painter.setPen(pen);
-        painter.drawLine(0, 7, 47, 7);
-        // painter.drawLine(7,15,12,0);
-        // painter.drawLine(12,0,8,15);
+        painter.drawLine(0,7,47,7);
+        //painter.drawLine(7,15,12,0);
+        //painter.drawLine(12,0,8,15);
        return QIcon(pix);
    }

-    template<typename T>
-    QIcon operator()(T const&) const
+    template <typename T>
+    QIcon operator() (T const& ) const
    {
-        return QIcon(":/images/filter.png");
+        return QIcon (":/images/filter.png");
    }
 };

 class symbolizer_node
 {
-  public:
-    symbolizer_node(mapnik::symbolizer const& sym)
-        : sym_(sym)
-    {}
-    ~symbolizer_node() {}
+public:
+    symbolizer_node(mapnik::symbolizer const & sym)
+        : sym_(sym) {}
+    ~symbolizer_node(){}

    QString name() const
    {
-        // return QString("Symbolizer:fixme");
-        return mapnik::util::apply_visitor(symbolizer_info(), sym_);
+        //return QString("Symbolizer:fixme");
+        return mapnik::util::apply_visitor(symbolizer_info(),sym_);
    }

    QIcon icon() const
    {
-        return mapnik::util::apply_visitor(symbolizer_icon(), sym_); // QIcon(":/images/filter.png");
+        return mapnik::util::apply_visitor(symbolizer_icon(),sym_);//QIcon(":/images/filter.png");
    }
    mapnik::symbolizer const& sym_;
 };

 class rule_node
 {
-  public:
-    rule_node(QString name, mapnik::rule const& r)
-        : name_(name)
-        , rule_(r)
-    {}
+public:
+    rule_node(QString name,mapnik::rule const & r)
+    : name_(name),
+      rule_(r) {}
    ~rule_node() {}
    QString name() const
    {
@ -245,68 +268,81 @@ class rule_node
        return QString(mapnik::to_expression_string(*filter).c_str());
    }

-    QIcon icon() const { return QIcon(":/images/filter.png"); }
+    QIcon icon() const
+    {
+        return QIcon(":/images/filter.png");
+    }

-  private:
+private:
    QString name_;
    mapnik::rule const& rule_;
 };

 class style_node
 {
-  public:
+public:
    style_node(QString name, mapnik::feature_type_style const& style)
-        : name_(name)
-        , style_(style)
-    {}
+    : name_(name),
+      style_(style) {}

    ~style_node() {}

-    QString name() const { return name_; }
+    QString name() const
+    {
+        return name_;
+    }

-    QIcon icon() const { return QIcon(":/images/style.png"); }
+    QIcon icon() const
+    {
+        return QIcon(":/images/style.png");
+    }

-  private:
+private:
    QString name_;
    mapnik::feature_type_style const& style_;
 };

 class map_node
 {
-  public:
+public:
    explicit map_node(std::shared_ptr<mapnik::Map> map)
-        : map_(map)
-    {}
+    : map_(map)  {}
    ~map_node() {}

-    QString name() const { return QString("Map"); }
+    QString name() const
+    {
+        return QString("Map");
+    }

-    QIcon icon() const { return QIcon(":/images/map.png"); }
+    QIcon icon() const
+    {
+        return QIcon(":/images/map.png");
+    }

-  private:
+private:
    std::shared_ptr<mapnik::Map> map_;
 };

-StyleModel::StyleModel(std::shared_ptr<mapnik::Map> map, QObject* parent)
-    : QAbstractItemModel(parent)
-    , root_(new node(map_node(map)))
+StyleModel::StyleModel(std::shared_ptr<mapnik::Map> map, QObject * parent)
+    : QAbstractItemModel(parent),
+      root_(new node(map_node(map)))
 {
-    using style_type = std::map<std::string, mapnik::feature_type_style>;
-    style_type const& styles = map->styles();
+    using style_type = std::map<std::string,mapnik::feature_type_style>;
+    style_type const & styles = map->styles();
    style_type::const_iterator itr = styles.begin();
    style_type::const_iterator end = styles.end();
    for (; itr != end; ++itr)
    {
-        node* style_n = root_->add_child(new node(style_node(QString(itr->first.c_str()), itr->second), root_.get()));
+        node * style_n = root_->add_child(new node(style_node(QString(itr->first.c_str()),itr->second),root_.get()));
        mapnik::rules const& rules = itr->second.get_rules();
        mapnik::rules::const_iterator itr2 = rules.begin();
-        for (; itr2 != rules.end(); ++itr2)
+        for ( ; itr2 != rules.end();++itr2)
        {
-            node* rule_n = style_n->add_child(new node(rule_node(QString("Rule"), *itr2), style_n));
+            node* rule_n = style_n->add_child(new node(rule_node(QString("Rule"),*itr2),style_n));
            mapnik::rule::symbolizers::const_iterator itr3 = (*itr2).begin();
-            for (; itr3 != itr2->end(); ++itr3)
+            for ( ; itr3 !=itr2->end();++itr3)
            {
-                rule_n->add_child(new node(symbolizer_node(*itr3), rule_n));
+            rule_n->add_child(new node(symbolizer_node(*itr3),rule_n));
            }
        }
    }
@ -315,39 +351,38 @@ StyleModel::StyleModel(std::shared_ptr<mapnik::Map> map, QObject* parent)
 StyleModel::~StyleModel() {}

 // interface
-QModelIndex StyleModel::index(int row, int col, QModelIndex const& parent) const
+QModelIndex StyleModel::index (int row, int col, QModelIndex const& parent) const
 {
-    //   qDebug("index() row=%d col=%d parent::internalId() = %lld", row,col,parent.internalId());
-    node* parent_node;
+//   qDebug("index() row=%d col=%d parent::internalId() = %lld", row,col,parent.internalId());
+    node * parent_node;

    if (!parent.isValid())
        parent_node = root_.get();
    else
        parent_node = static_cast<node*>(parent.internalPointer());

-    node* child_node = parent_node->child(row);
+    node * child_node = parent_node->child(row);
    if (child_node)
-        return createIndex(row, col, child_node);
+        return createIndex(row,col,child_node);
    else
        return QModelIndex();
 }

-QModelIndex StyleModel::parent(QModelIndex const& index) const
+QModelIndex StyleModel::parent (QModelIndex const& index) const
 {
-    node* child_node = static_cast<node*>(index.internalPointer());
-    node* parent_node = child_node->parent();
+    node * child_node = static_cast<node*>(index.internalPointer());
+    node * parent_node = child_node->parent();
    if (parent_node == root_.get())
        return QModelIndex();

-    return createIndex(parent_node->row(), 0, parent_node);
+    return createIndex(parent_node->row(),0,parent_node);
 }

 int StyleModel::rowCount(QModelIndex const& parent) const
 {
-    // qDebug("rowCount");
-    node* parent_node;
-    if (parent.column() > 0)
-        return 0;
+    //qDebug("rowCount");
+    node * parent_node;
+    if (parent.column() > 0) return 0;
    if (!parent.isValid())
        parent_node = root_.get();
    else
@ -355,24 +390,25 @@ int StyleModel::rowCount(QModelIndex const& parent) const
    return parent_node->num_children();
 }

-int StyleModel::columnCount(QModelIndex const&) const
+int StyleModel::columnCount( QModelIndex const&) const
 {
    return 1;
 }

-QVariant StyleModel::data(const QModelIndex& index, int role) const
+QVariant StyleModel::data(const QModelIndex & index, int role) const
 {
-    // qDebug("data index::internalId() = %lld", index.internalId());
+    //qDebug("data index::internalId() = %lld", index.internalId());
    if (!index.isValid())
        return QVariant();
-    node* cur_node = static_cast<node*>(index.internalPointer());
+    node * cur_node = static_cast<node*>(index.internalPointer());
    if (cur_node)
    {
        if (role == Qt::DisplayRole)
        {
+
            return QVariant(cur_node->name());
        }
-        else if (role == Qt::DecorationRole)
+        else if ( role == Qt::DecorationRole)
        {
            return cur_node->icon();
        }
--- a/demo/viewer/styles_model.hpp
+++ b/demo/viewer/styles_model.hpp
@ -1,6 +1,6 @@
 /* This file is part of Mapnik (c++ mapping toolkit)
 *
- * Copyright (C) 2024 Artem Pavlenko
+ * Copyright (C) 2017 Artem Pavlenko
 *
 * Mapnik is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

+
 #ifndef STYLE_MODEL_HPP
 #define STYLE_MODEL_HPP

@ -26,23 +27,24 @@
 #include <mapnik/map.hpp>
 #endif

+
+
 class node;
 class StyleModel : public QAbstractItemModel
 {
-    Q_OBJECT
+      Q_OBJECT
  public:
-    StyleModel(std::shared_ptr<mapnik::Map> map, QObject* parent = 0);
-    ~StyleModel();
-    // interface
-    QModelIndex index(int row, int col, QModelIndex const& parent = QModelIndex()) const;
-    QModelIndex parent(QModelIndex const& child) const;
-    int rowCount(QModelIndex const& parent = QModelIndex()) const;
-    int columnCount(QModelIndex const& parent = QModelIndex()) const;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-
-  private:
-    // std::shared_ptr<mapnik::Map> map_;
-    const std::unique_ptr<node> root_;
+      StyleModel(std::shared_ptr<mapnik::Map> map, QObject * parent=0);
+      ~StyleModel();
+      // interface
+      QModelIndex index  (int row, int col, QModelIndex const& parent = QModelIndex()) const;
+      QModelIndex parent (QModelIndex const& child) const;
+      int rowCount( QModelIndex const& parent = QModelIndex()) const;
+      int columnCount( QModelIndex const& parent = QModelIndex()) const;
+      QVariant  data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+   private:
+      //std::shared_ptr<mapnik::Map> map_;
+      const std::unique_ptr<node> root_;
 };

 #endif // STYLE_MODEL_HPP
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@ -1 +0,0 @@
-add_subdirectory(agg)
--- a/deps/agg/.clang-format
+++ b/deps/agg/.clang-format
@ -1 +0,0 @@
-DisableFormat: true
--- a/deps/agg/CMakeLists.txt
+++ b/deps/agg/CMakeLists.txt
@ -1,19 +0,0 @@
-project(agg)
-
-add_library(agg INTERFACE)
-add_library(mapnik::agg ALIAS agg)
-
-target_include_directories(agg INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-)
-target_link_libraries(agg INTERFACE mapnik::core)
-
-install(TARGETS agg
-    EXPORT MapnikTargets
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION bin
-    PUBLIC_HEADER DESTINATION include
-)
-# agg headers would be installed in the top level CMakeLists.txt
--- a/deps/agg/include/agg_array.h
+++ b/deps/agg/include/agg_array.h
@ -124,10 +124,11 @@ namespace agg
            memcpy(m_array, v.m_array, sizeof(T) * m_size);
        }

-        pod_array(self_type && rhs) :
-            m_array(rhs.m_array),
-            m_size(rhs.m_size)
+        pod_array(self_type && rhs)
        {
+            pod_allocator<T>::deallocate(m_array, m_size);
+            m_array = rhs.m_array;
+            m_size = rhs.m_size;
            rhs.m_array = nullptr;
            rhs.m_size = 0;
        }
@ -283,11 +284,12 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class T> pod_vector<T>::pod_vector(pod_vector<T> && rhs) :
-        m_size(rhs.m_size),
-        m_capacity(rhs.m_capacity),
-        m_array(rhs.m_array)
+    template<class T> pod_vector<T>::pod_vector(pod_vector<T> && rhs)
    {
+        pod_allocator<T>::deallocate(m_array, m_capacity);
+        m_size = rhs.m_size;
+        m_capacity = rhs.m_capacity;
+        m_array = rhs.m_array;
        rhs.m_size = 0;
        rhs.m_capacity = 0;
        rhs.m_array = nullptr;
--- a/deps/agg/include/agg_basics.h
+++ b/deps/agg/include/agg_basics.h
@ -365,7 +365,7 @@ namespace agg
    inline bool is_close(unsigned c)
    {
        return (c & ~(path_flags_cw | path_flags_ccw)) ==
-            (path_cmd_end_poly | static_cast<path_commands_e>(path_flags_close));
+               (path_cmd_end_poly | path_flags_close);
    }

    //------------------------------------------------------------is_next_poly
--- a/deps/agg/include/agg_color_gray.h
+++ b/deps/agg/include/agg_color_gray.h
@ -436,8 +436,7 @@ struct gray16
    static value_type luminance(const rgba& c)
    {
        // Calculate grayscale value as per ITU-R BT.709.
-        return value_type(uround((0.2126 * c.r + 0.7152 * c.g + 0.0722 * c.b)
-                                 * static_cast<double>(base_mask)));
+        return value_type(uround((0.2126 * c.r + 0.7152 * c.g + 0.0722 * c.b) * base_mask));
    }

    static value_type luminance(const rgba16& c)
@ -538,13 +537,13 @@ struct gray16
    //--------------------------------------------------------------------
    static AGG_INLINE double to_double(value_type a)
    {
-        return static_cast<double>(a) / static_cast<double>(base_mask);
+        return double(a) / base_mask;
    }

    //--------------------------------------------------------------------
    static AGG_INLINE value_type from_double(double a)
    {
-        return value_type(uround(a * static_cast<double>(base_mask)));
+        return value_type(uround(a * base_mask));
    }

    //--------------------------------------------------------------------
@ -699,7 +698,7 @@ struct gray16
    self_type gradient(self_type c, double k) const
    {
        self_type ret;
-        calc_type ik = uround(k * static_cast<double>(base_scale));
+        calc_type ik = uround(k * base_scale);
        ret.v = lerp(v, c.v, ik);
        ret.a = lerp(a, c.a, ik);
        return ret;
@ -950,7 +949,7 @@ struct gray32
    //--------------------------------------------------------------------
    static AGG_INLINE value_type mult_cover(value_type a, cover_type b)
    {
-        return value_type(a * b / static_cast<double>(cover_mask));
+        return value_type(a * b / cover_mask);
    }

    //--------------------------------------------------------------------
--- a/deps/agg/include/agg_color_rgba.h
+++ b/deps/agg/include/agg_color_rgba.h
@ -281,10 +281,10 @@ struct rgba8T

    static void convert(rgba8T<linear>& dst, const rgba& src)
    {
-        dst.r = value_type(uround(src.r * static_cast<double>(base_mask)));
-        dst.g = value_type(uround(src.g * static_cast<double>(base_mask)));
-        dst.b = value_type(uround(src.b * static_cast<double>(base_mask)));
-        dst.a = value_type(uround(src.a * static_cast<double>(base_mask)));
+        dst.r = value_type(uround(src.r * base_mask));
+        dst.g = value_type(uround(src.g * base_mask));
+        dst.b = value_type(uround(src.b * base_mask));
+        dst.a = value_type(uround(src.a * base_mask));
    }

    static void convert(rgba8T<sRGB>& dst, const rgba& src)
@ -761,13 +761,13 @@ struct rgba16
    //--------------------------------------------------------------------
    static AGG_INLINE double to_double(value_type a)
    {
-        return static_cast<double>(a) / static_cast<double>(base_mask);
+        return double(a) / base_mask;
    }

    //--------------------------------------------------------------------
    static AGG_INLINE value_type from_double(double a)
    {
-        return value_type(uround(a * static_cast<double>(base_mask)));
+        return value_type(uround(a * base_mask));
    }

    //--------------------------------------------------------------------
@ -955,7 +955,7 @@ struct rgba16
    AGG_INLINE self_type gradient(const self_type& c, double k) const
    {
        self_type ret;
-        calc_type ik = uround(k * static_cast<double>(base_mask));
+        calc_type ik = uround(k * base_mask);
        ret.r = lerp(r, c.r, ik);
        ret.g = lerp(g, c.g, ik);
        ret.b = lerp(b, c.b, ik);
@ -1194,7 +1194,7 @@ struct rgba32
    //--------------------------------------------------------------------
    static AGG_INLINE value_type mult_cover(value_type a, cover_type b)
    {
-        return value_type(a * b / static_cast<float>(cover_mask));
+        return value_type(a * b / cover_mask);
    }

    //--------------------------------------------------------------------
--- a/deps/agg/include/agg_conv_adaptor_vpgen.h
+++ b/deps/agg/include/agg_conv_adaptor_vpgen.h
@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@ -37,7 +37,7 @@ namespace agg

    private:
        conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&);
-        const conv_adaptor_vpgen<VertexSource, VPGen>&
+        const conv_adaptor_vpgen<VertexSource, VPGen>& 
            operator = (const conv_adaptor_vpgen<VertexSource, VPGen>&);

        VertexSource* m_source;
@ -52,8 +52,8 @@ namespace agg

    //------------------------------------------------------------------------
    template<class VertexSource, class VPGen>
-    void conv_adaptor_vpgen<VertexSource, VPGen>::rewind(unsigned path_id)
-    {
+    void conv_adaptor_vpgen<VertexSource, VPGen>::rewind(unsigned path_id) 
+    { 
        m_source->rewind(path_id);
        m_vpgen.reset();
        m_start_x    = 0;
@ -84,7 +84,7 @@ namespace agg

            if(m_vertices < 0)
            {
-                if(m_vertices < -1)
+                if(m_vertices < -1) 
                {
                    m_vertices = 0;
                    return path_cmd_stop;
@ -98,13 +98,12 @@ namespace agg
            cmd = m_source->vertex(&tx, &ty);
            if(is_vertex(cmd))
            {
-                if(is_move_to(cmd))
+                if(is_move_to(cmd)) 
                {
                    if(m_vpgen.auto_close() && m_vertices > 2)
                    {
                        m_vpgen.line_to(m_start_x, m_start_y);
-                        m_poly_flags = path_cmd_end_poly
-                            | static_cast<path_commands_e>(path_flags_close);
+                        m_poly_flags = path_cmd_end_poly | path_flags_close;
                        m_start_x    = tx;
                        m_start_y    = ty;
                        m_vertices   = -1;
@ -115,7 +114,7 @@ namespace agg
                    m_start_y  = ty;
                    m_vertices = 1;
                }
-                else
+                else 
                {
                    m_vpgen.line_to(tx, ty);
                    ++m_vertices;
@ -142,8 +141,7 @@ namespace agg
                    if(m_vpgen.auto_close() && m_vertices > 2)
                    {
                        m_vpgen.line_to(m_start_x, m_start_y);
-                        m_poly_flags = path_cmd_end_poly
-                            | static_cast<path_commands_e>(path_flags_close);
+                        m_poly_flags = path_cmd_end_poly | path_flags_close;
                        m_vertices   = -2;
                        continue;
                    }
@ -159,3 +157,4 @@ namespace agg


 #endif
+
--- a/deps/agg/include/agg_image_filters.h
+++ b/deps/agg/include/agg_image_filters.h
@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@ -22,25 +22,24 @@

 #include "agg_array.h"
 #include "agg_math.h"
-#include <cstdint>

 namespace agg
 {

-    // See Implementation agg_image_filters.cpp
+    // See Implementation agg_image_filters.cpp 

    enum image_filter_scale_e
    {
        image_filter_shift = 14,                      //----image_filter_shift
-        image_filter_scale = 1 << image_filter_shift, //----image_filter_scale
-        image_filter_mask  = image_filter_scale - 1   //----image_filter_mask
+        image_filter_scale = 1 << image_filter_shift, //----image_filter_scale 
+        image_filter_mask  = image_filter_scale - 1   //----image_filter_mask 
    };

    enum image_subpixel_scale_e
    {
        image_subpixel_shift = 8,                         //----image_subpixel_shift
-        image_subpixel_scale = 1 << image_subpixel_shift, //----image_subpixel_scale
-        image_subpixel_mask  = image_subpixel_scale - 1   //----image_subpixel_mask
+        image_subpixel_scale = 1 << image_subpixel_shift, //----image_subpixel_scale 
+        image_subpixel_mask  = image_subpixel_scale - 1   //----image_subpixel_mask 
    };


@ -59,13 +58,12 @@ namespace agg
            {
                double x = double(i) / double(image_subpixel_scale);
                double y = filter.calc_weight(x);
-                m_weight_array[pivot + i] =
-                    m_weight_array[pivot - i] =
-                    static_cast<std::int16_t>(iround(y * static_cast<double>(image_filter_scale)));
+                m_weight_array[pivot + i] = 
+                m_weight_array[pivot - i] = (int16)iround(y * image_filter_scale);
            }
            unsigned end = (diameter() << image_subpixel_shift) - 1;
            m_weight_array[0] = m_weight_array[end];
-            if(normalization)
+            if(normalization) 
            {
                normalize();
            }
@ -73,7 +71,7 @@ namespace agg

        image_filter_lut() : m_radius(0), m_diameter(0), m_start(0) {}

-        template<class FilterF> image_filter_lut(const FilterF& filter,
+        template<class FilterF> image_filter_lut(const FilterF& filter, 
                                                 bool normalization=true)
        {
            calculate(filter, normalization);
@ -82,7 +80,7 @@ namespace agg
        double       radius()       const { return m_radius;   }
        unsigned     diameter()     const { return m_diameter; }
        int          start()        const { return m_start;    }
-        std::int16_t const* weight_array() const { return &m_weight_array[0]; }
+        const int16* weight_array() const { return &m_weight_array[0]; }
        void         normalize();

    private:
@ -93,7 +91,7 @@ namespace agg
        double           m_radius;
        unsigned         m_diameter;
        int              m_start;
-        pod_array<std::int16_t> m_weight_array;
+        pod_array<int16> m_weight_array;
    };


@ -152,7 +150,7 @@ namespace agg
            return (2.0 * x - 3.0) * x * x + 1.0;
        }
    };
-
+   
    //------------------------------------------------image_filter_quadric
    struct image_filter_quadric
    {
@ -179,7 +177,7 @@ namespace agg
        static double calc_weight(double x)
        {
            return
-                (1.0/6.0) *
+                (1.0/6.0) * 
                (pow3(x + 2) - 4 * pow3(x + 1) + 6 * pow3(x) - 4 * pow3(x - 1));
        }
    };
@ -213,7 +211,7 @@ namespace agg
            sum = 1.;
            y = x * x / 4.;
            t = y;
-
+        
            for(i = 2; t > epsilon; i++)
            {
                sum += t;
@ -300,7 +298,7 @@ namespace agg
    struct image_filter_gaussian
    {
        static double radius() { return 2.0; }
-        static double calc_weight(double x)
+        static double calc_weight(double x) 
        {
            return exp(-2.0 * x * x) * sqrt(2.0 / pi);
        }
@ -310,7 +308,7 @@ namespace agg
    //------------------------------------------------image_filter_bessel
    struct image_filter_bessel
    {
-        static double radius() { return 3.2383; }
+        static double radius() { return 3.2383; } 
        static double calc_weight(double x)
        {
            return (x == 0.0) ? pi / 4.0 : besj(pi * x, 1) / (2.0 * x);
--- a/deps/agg/include/agg_line_aa_basics.h
+++ b/deps/agg/include/agg_line_aa_basics.h
@ -44,13 +44,13 @@ namespace agg
    //------------------------------------------------------------------line_mr
    AGG_INLINE int line_mr(int x)
    {
-        return x >> (line_subpixel_shift - static_cast<line_subpixel_scale_e>(line_mr_subpixel_shift));
+        return x >> (line_subpixel_shift - line_mr_subpixel_shift);
    }

    //-------------------------------------------------------------------line_hr
    AGG_INLINE int line_hr(int x)
    {
-        return x << (line_subpixel_shift - static_cast<line_subpixel_scale_e>(line_mr_subpixel_shift));
+        return x << (line_subpixel_shift - line_mr_subpixel_shift);
    }

    //---------------------------------------------------------------line_dbl_hr
@ -64,7 +64,7 @@ namespace agg
    {
        AGG_INLINE static int conv(double x)
        {
-            return iround(x * static_cast<double>(line_subpixel_scale));
+            return iround(x * line_subpixel_scale);
        }
    };

@ -73,7 +73,7 @@ namespace agg
    {
        AGG_INLINE static int conv(double x)
        {
-            return saturation<line_max_coord>::iround(x * static_cast<double>(line_subpixel_scale));
+            return saturation<line_max_coord>::iround(x * line_subpixel_scale);
        }
    };

--- a/deps/agg/include/agg_path_storage.h
+++ b/deps/agg/include/agg_path_storage.h
@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@ -92,7 +92,7 @@ namespace agg
            {
                pod_allocator<T>::deallocate(
                    *coord_blk,
-                    block_size * 2 +
+                    block_size * 2 + 
                    block_size / (sizeof(T) / sizeof(unsigned char)));
                --coord_blk;
            }
@ -137,7 +137,7 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    const vertex_block_storage<T,S,P>&
+    const vertex_block_storage<T,S,P>& 
    vertex_block_storage<T,S,P>::operator = (const vertex_block_storage<T,S,P>& v)
    {
        remove_all();
@ -160,7 +160,7 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    inline void vertex_block_storage<T,S,P>::add_vertex(double x, double y,
+    inline void vertex_block_storage<T,S,P>::add_vertex(double x, double y, 
                                                        unsigned cmd)
    {
        T* coord_ptr = 0;
@ -172,7 +172,7 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    inline void vertex_block_storage<T,S,P>::modify_vertex(unsigned idx,
+    inline void vertex_block_storage<T,S,P>::modify_vertex(unsigned idx, 
                                                           double x, double y)
    {
        T* pv = m_coord_blocks[idx >> block_shift] + ((idx & block_mask) << 1);
@ -182,8 +182,8 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    inline void vertex_block_storage<T,S,P>::modify_vertex(unsigned idx,
-                                                           double x, double y,
+    inline void vertex_block_storage<T,S,P>::modify_vertex(unsigned idx, 
+                                                           double x, double y, 
                                                           unsigned cmd)
    {
        unsigned block = idx >> block_shift;
@ -196,7 +196,7 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    inline void vertex_block_storage<T,S,P>::modify_command(unsigned idx,
+    inline void vertex_block_storage<T,S,P>::modify_command(unsigned idx, 
                                                            unsigned cmd)
    {
        m_cmd_blocks[idx >> block_shift][idx & block_mask] = (int8u)cmd;
@ -277,7 +277,7 @@ namespace agg

    //------------------------------------------------------------------------
    template<class T, unsigned S, unsigned P>
-    inline unsigned vertex_block_storage<T,S,P>::vertex(unsigned idx,
+    inline unsigned vertex_block_storage<T,S,P>::vertex(unsigned idx, 
                                                        double* x, double* y) const
    {
        unsigned nb = idx >> block_shift;
@ -298,22 +298,22 @@ namespace agg
    template<class T, unsigned S, unsigned P>
    void vertex_block_storage<T,S,P>::allocate_block(unsigned nb)
    {
-        if(nb >= m_max_blocks)
+        if(nb >= m_max_blocks) 
        {
-            T** new_coords =
+            T** new_coords = 
                pod_allocator<T*>::allocate((m_max_blocks + block_pool) * 2);

-            unsigned char** new_cmds =
+            unsigned char** new_cmds = 
                (unsigned char**)(new_coords + m_max_blocks + block_pool);

            if(m_coord_blocks)
            {
-                memcpy(new_coords,
-                       m_coord_blocks,
+                memcpy(new_coords, 
+                       m_coord_blocks, 
                       m_max_blocks * sizeof(T*));

-                memcpy(new_cmds,
-                       m_cmd_blocks,
+                memcpy(new_cmds, 
+                       m_cmd_blocks, 
                       m_max_blocks * sizeof(unsigned char*));

                pod_allocator<T*>::deallocate(m_coord_blocks, m_max_blocks * 2);
@ -322,11 +322,11 @@ namespace agg
            m_cmd_blocks   = new_cmds;
            m_max_blocks  += block_pool;
        }
-        m_coord_blocks[nb] =
-            pod_allocator<T>::allocate(block_size * 2 +
+        m_coord_blocks[nb] = 
+            pod_allocator<T>::allocate(block_size * 2 + 
                   block_size / (sizeof(T) / sizeof(unsigned char)));

-        m_cmd_blocks[nb]  =
+        m_cmd_blocks[nb]  = 
            (unsigned char*)(m_coord_blocks[nb] + block_size * 2);

        m_total_blocks++;
@ -354,8 +354,8 @@ namespace agg
    public:
        typedef T value_type;

-        poly_plain_adaptor() :
-            m_data(0),
+        poly_plain_adaptor() : 
+            m_data(0), 
            m_ptr(0),
            m_end(0),
            m_closed(false),
@ -363,7 +363,7 @@ namespace agg
        {}

        poly_plain_adaptor(const T* data, unsigned num_points, bool closed) :
-            m_data(data),
+            m_data(data), 
            m_ptr(data),
            m_end(data + num_points * 2),
            m_closed(closed),
@ -398,8 +398,7 @@ namespace agg
            if(m_closed && !m_stop)
            {
                m_stop = true;
-                return path_cmd_end_poly
-                    | static_cast<agg::path_commands_e>(path_flags_close);
+                return path_cmd_end_poly | path_flags_close;
            }
            return path_cmd_stop;
        }
@ -422,15 +421,15 @@ namespace agg
    public:
        typedef typename Container::value_type vertex_type;

-        poly_container_adaptor() :
-            m_container(0),
+        poly_container_adaptor() : 
+            m_container(0), 
            m_index(0),
            m_closed(false),
            m_stop(false)
        {}

        poly_container_adaptor(const Container& data, bool closed) :
-            m_container(&data),
+            m_container(&data), 
            m_index(0),
            m_closed(closed),
            m_stop(false)
@ -464,8 +463,7 @@ namespace agg
            if(m_closed && !m_stop)
            {
                m_stop = true;
-                return path_cmd_end_poly
-                    | static_cast<agg::path_commands_e>(path_flags_close);
+                return path_cmd_end_poly | path_flags_close;
            }
            return path_cmd_stop;
        }
@ -485,15 +483,15 @@ namespace agg
    public:
        typedef typename Container::value_type vertex_type;

-        poly_container_reverse_adaptor() :
-            m_container(0),
+        poly_container_reverse_adaptor() : 
+            m_container(0), 
            m_index(-1),
            m_closed(false),
            m_stop(false)
        {}

        poly_container_reverse_adaptor(const Container& data, bool closed) :
-            m_container(&data),
+            m_container(&data), 
            m_index(-1),
            m_closed(closed),
            m_stop(false)
@ -527,8 +525,7 @@ namespace agg
            if(m_closed && !m_stop)
            {
                m_stop = true;
-                return path_cmd_end_poly
-                    | static_cast<agg::path_commands_e>(path_flags_close);
+                return path_cmd_end_poly | path_flags_close;
            }
            return path_cmd_stop;
        }
@ -559,7 +556,7 @@ namespace agg
            m_coord[2] = x2;
            m_coord[3] = y2;
        }
-
+        
        void init(double x1, double y1, double x2, double y2)
        {
            m_coord[0] = x1;
@ -597,10 +594,10 @@ namespace agg


    //---------------------------------------------------------------path_base
-    // A container to store vertices with their flags.
-    // A path consists of a number of contours separated with "move_to"
+    // A container to store vertices with their flags. 
+    // A path consists of a number of contours separated with "move_to" 
    // commands. The path storage can keep and maintain more than one
-    // path.
+    // path. 
    // To navigate to the beginning of a particular path, use rewind(path_id);
    // Where path_id is what start_new_path() returns. So, when you call
    // start_new_path() you need to store its return value somewhere else
@ -647,28 +644,28 @@ namespace agg
                     bool sweep_flag,
                     double dx, double dy);

-        void curve3(double x_ctrl, double y_ctrl,
+        void curve3(double x_ctrl, double y_ctrl, 
                    double x_to,   double y_to);

-        void curve3_rel(double dx_ctrl, double dy_ctrl,
+        void curve3_rel(double dx_ctrl, double dy_ctrl, 
                        double dx_to,   double dy_to);

        void curve3(double x_to, double y_to);

        void curve3_rel(double dx_to, double dy_to);

-        void curve4(double x_ctrl1, double y_ctrl1,
-                    double x_ctrl2, double y_ctrl2,
+        void curve4(double x_ctrl1, double y_ctrl1, 
+                    double x_ctrl2, double y_ctrl2, 
                    double x_to,    double y_to);

-        void curve4_rel(double dx_ctrl1, double dy_ctrl1,
-                        double dx_ctrl2, double dy_ctrl2,
+        void curve4_rel(double dx_ctrl1, double dy_ctrl1, 
+                        double dx_ctrl2, double dy_ctrl2, 
                        double dx_to,    double dy_to);

-        void curve4(double x_ctrl2, double y_ctrl2,
+        void curve4(double x_ctrl2, double y_ctrl2, 
                    double x_to,    double y_to);

-        void curve4_rel(double x_ctrl2, double y_ctrl2,
+        void curve4_rel(double x_ctrl2, double y_ctrl2, 
                        double x_to,    double y_to);


@ -677,8 +674,8 @@ namespace agg

        // Accessors
        //--------------------------------------------------------------------
-        const container_type& vertices() const { return m_vertices; }
-              container_type& vertices()       { return m_vertices; }
+        const container_type& vertices() const { return m_vertices; } 
+              container_type& vertices()       { return m_vertices; } 

        unsigned total_vertices() const;

@ -702,9 +699,9 @@ namespace agg
        void     rewind(unsigned path_id);
        unsigned vertex(double* x, double* y);

-        // Arrange the orientation of a polygon, all polygons in a path,
-        // or in all paths. After calling arrange_orientations() or
-        // arrange_orientations_all_paths(), all the polygons will have
+        // Arrange the orientation of a polygon, all polygons in a path, 
+        // or in all paths. After calling arrange_orientations() or 
+        // arrange_orientations_all_paths(), all the polygons will have 
        // the same orientation, i.e. path_flags_cw or path_flags_ccw
        //--------------------------------------------------------------------
        unsigned arrange_polygon_orientation(unsigned start, path_flags_e orientation);
@ -712,7 +709,7 @@ namespace agg
        void     arrange_orientations_all_paths(path_flags_e orientation);
        void     invert_polygon(unsigned start);

-        // Flip all vertices horizontally or vertically,
+        // Flip all vertices horizontally or vertically, 
        // between x1 and x2, or between y1 and y2 respectively
        //--------------------------------------------------------------------
        void flip_x(double x1, double x2);
@ -720,7 +717,7 @@ namespace agg

        // Concatenate path. The path is added as is.
        //--------------------------------------------------------------------
-        template<class VertexSource>
+        template<class VertexSource> 
        void concat_path(VertexSource& vs, unsigned path_id = 0)
        {
            double x=0;
@ -734,9 +731,9 @@ namespace agg
        }

        //--------------------------------------------------------------------
-        // Join path. The path is joined with the existing one, that is,
+        // Join path. The path is joined with the existing one, that is, 
        // it behaves as if the pen of a plotter was always down (drawing)
-        template<class VertexSource>
+        template<class VertexSource> 
        void join_path(VertexSource& vs, unsigned path_id = 0)
        {
            double x=0.0, y=0.0;
@ -772,16 +769,16 @@ namespace agg
                }
                while(!is_stop(cmd = vs.vertex(&x, &y)))
                {
-                    m_vertices.add_vertex(x, y, is_move_to(cmd) ?
-                                                    unsigned(path_cmd_line_to) :
+                    m_vertices.add_vertex(x, y, is_move_to(cmd) ? 
+                                                    unsigned(path_cmd_line_to) : 
                                                    cmd);
                }
            }
        }

-        // Concatenate polygon/polyline.
+        // Concatenate polygon/polyline. 
        //--------------------------------------------------------------------
-        template<class T> void concat_poly(const T* data,
+        template<class T> void concat_poly(const T* data, 
                                           unsigned num_points,
                                           bool closed)
        {
@ -791,7 +788,7 @@ namespace agg

        // Join polygon/polyline continuously.
        //--------------------------------------------------------------------
-        template<class T> void join_poly(const T* data,
+        template<class T> void join_poly(const T* data, 
                                         unsigned num_points,
                                         bool closed)
        {
@ -849,7 +846,7 @@ namespace agg
    };

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    unsigned path_base<VC>::start_new_path()
    {
        if(!is_stop(m_vertices.last_command()))
@ -861,7 +858,7 @@ namespace agg


    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::rel_to_abs(double* x, double* y) const
    {
        if(m_vertices.total_vertices())
@ -873,7 +870,7 @@ namespace agg
                *x += x2;
                *y += y2;
            }
-            else if (!is_stop(m_vertices.last_command()) &&
+            else if (!is_stop(m_vertices.last_command()) && 
                     is_vertex(m_vertices.prev_vertex(&x2, &y2)))
            {
                *x += x2;
@ -883,14 +880,14 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::move_to(double x, double y)
    {
        m_vertices.add_vertex(x, y, path_cmd_move_to);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::move_rel(double dx, double dy)
    {
        rel_to_abs(&dx, &dy);
@ -898,14 +895,14 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::line_to(double x, double y)
    {
        m_vertices.add_vertex(x, y, path_cmd_line_to);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::line_rel(double dx, double dy)
    {
        rel_to_abs(&dx, &dy);
@ -913,14 +910,14 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::hline_to(double x)
    {
        m_vertices.add_vertex(x, last_y(), path_cmd_line_to);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::hline_rel(double dx)
    {
        double dy = 0;
@ -929,14 +926,14 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::vline_to(double y)
    {
        m_vertices.add_vertex(last_x(), y, path_cmd_line_to);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::vline_rel(double dy)
    {
        double dx = 0;
@ -945,7 +942,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::arc_to(double rx, double ry,
                               double angle,
                               bool large_arc_flag,
@ -964,7 +961,7 @@ namespace agg

            // Ensure radii are valid
            //-------------------------
-            if(rx < epsilon || ry < epsilon)
+            if(rx < epsilon || ry < epsilon) 
            {
                line_to(x, y);
                return;
@ -981,11 +978,10 @@ namespace agg
            {
                join_path(a);
            }
-            // We are adding an explicit line_to, even if we've already add the
-            // bezier arc to the current path. This is to prevent subsequent smooth
-            // bezier curves from accidentally assuming that the previous command
-            // was a bezier curve as well when calculating reflection points.
-            line_to(x, y);
+            else
+            {
+                line_to(x, y);
+            }
        }
        else
        {
@ -994,7 +990,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::arc_rel(double rx, double ry,
                                double angle,
                                bool large_arc_flag,
@ -1006,8 +1002,8 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve3(double x_ctrl, double y_ctrl,
+    template<class VC> 
+    void path_base<VC>::curve3(double x_ctrl, double y_ctrl, 
                               double x_to,   double y_to)
    {
        m_vertices.add_vertex(x_ctrl, y_ctrl, path_cmd_curve3);
@ -1015,8 +1011,8 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve3_rel(double dx_ctrl, double dy_ctrl,
+    template<class VC> 
+    void path_base<VC>::curve3_rel(double dx_ctrl, double dy_ctrl, 
                                   double dx_to,   double dy_to)
    {
        rel_to_abs(&dx_ctrl, &dy_ctrl);
@ -1026,7 +1022,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::curve3(double x_to, double y_to)
    {
        double x0;
@ -1034,7 +1030,7 @@ namespace agg
        if(is_vertex(m_vertices.last_vertex(&x0, &y0)))
        {
            double x_ctrl;
-            double y_ctrl;
+            double y_ctrl; 
            unsigned cmd = m_vertices.prev_vertex(&x_ctrl, &y_ctrl);
            if(is_curve(cmd))
            {
@ -1051,7 +1047,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::curve3_rel(double dx_to, double dy_to)
    {
        rel_to_abs(&dx_to, &dy_to);
@ -1059,9 +1055,9 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve4(double x_ctrl1, double y_ctrl1,
-                               double x_ctrl2, double y_ctrl2,
+    template<class VC> 
+    void path_base<VC>::curve4(double x_ctrl1, double y_ctrl1, 
+                               double x_ctrl2, double y_ctrl2, 
                               double x_to,    double y_to)
    {
        m_vertices.add_vertex(x_ctrl1, y_ctrl1, path_cmd_curve4);
@ -1070,9 +1066,9 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve4_rel(double dx_ctrl1, double dy_ctrl1,
-                                   double dx_ctrl2, double dy_ctrl2,
+    template<class VC> 
+    void path_base<VC>::curve4_rel(double dx_ctrl1, double dy_ctrl1, 
+                                   double dx_ctrl2, double dy_ctrl2, 
                                   double dx_to,    double dy_to)
    {
        rel_to_abs(&dx_ctrl1, &dy_ctrl1);
@ -1084,8 +1080,8 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve4(double x_ctrl2, double y_ctrl2,
+    template<class VC> 
+    void path_base<VC>::curve4(double x_ctrl2, double y_ctrl2, 
                               double x_to,    double y_to)
    {
        double x0;
@ -1093,7 +1089,7 @@ namespace agg
        if(is_vertex(last_vertex(&x0, &y0)))
        {
            double x_ctrl1;
-            double y_ctrl1;
+            double y_ctrl1; 
            unsigned cmd = prev_vertex(&x_ctrl1, &y_ctrl1);
            if(is_curve(cmd))
            {
@ -1110,8 +1106,8 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    void path_base<VC>::curve4_rel(double dx_ctrl2, double dy_ctrl2,
+    template<class VC> 
+    void path_base<VC>::curve4_rel(double dx_ctrl2, double dy_ctrl2, 
                                   double dx_to,    double dy_to)
    {
        rel_to_abs(&dx_ctrl2, &dy_ctrl2);
@ -1120,7 +1116,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::end_poly(unsigned flags)
    {
        if(is_vertex(m_vertices.last_command()))
@ -1130,91 +1126,91 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::close_polygon(unsigned flags)
    {
        end_poly(path_flags_close | flags);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::total_vertices() const
    {
        return m_vertices.total_vertices();
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::last_vertex(double* x, double* y) const
    {
        return m_vertices.last_vertex(x, y);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::prev_vertex(double* x, double* y) const
    {
        return m_vertices.prev_vertex(x, y);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline double path_base<VC>::last_x() const
    {
        return m_vertices.last_x();
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline double path_base<VC>::last_y() const
    {
        return m_vertices.last_y();
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::vertex(unsigned idx, double* x, double* y) const
    {
        return m_vertices.vertex(idx, x, y);
    }
-
+ 
    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::command(unsigned idx) const
    {
        return m_vertices.command(idx);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::modify_vertex(unsigned idx, double x, double y)
    {
        m_vertices.modify_vertex(idx, x, y);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::modify_vertex(unsigned idx, double x, double y, unsigned cmd)
    {
        m_vertices.modify_vertex(idx, x, y, cmd);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::modify_command(unsigned idx, unsigned cmd)
    {
        m_vertices.modify_command(idx, cmd);
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline void path_base<VC>::rewind(unsigned path_id)
    {
        m_iterator = path_id;
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    inline unsigned path_base<VC>::vertex(double* x, double* y)
    {
        if(m_iterator >= m_vertices.total_vertices()) return path_cmd_stop;
@ -1222,7 +1218,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    unsigned path_base<VC>::perceive_polygon_orientation(unsigned start,
                                                         unsigned end)
    {
@ -1242,12 +1238,12 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::invert_polygon(unsigned start, unsigned end)
    {
        unsigned i;
        unsigned tmp_cmd = m_vertices.command(start);
-
+        
        --end; // Make "end" inclusive

        // Shift all commands to one position
@ -1267,45 +1263,45 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::invert_polygon(unsigned start)
    {
        // Skip all non-vertices at the beginning
-        while(start < m_vertices.total_vertices() &&
+        while(start < m_vertices.total_vertices() && 
              !is_vertex(m_vertices.command(start))) ++start;

        // Skip all insignificant move_to
-        while(start+1 < m_vertices.total_vertices() &&
+        while(start+1 < m_vertices.total_vertices() && 
              is_move_to(m_vertices.command(start)) &&
              is_move_to(m_vertices.command(start+1))) ++start;

        // Find the last vertex
        unsigned end = start + 1;
-        while(end < m_vertices.total_vertices() &&
+        while(end < m_vertices.total_vertices() && 
              !is_next_poly(m_vertices.command(end))) ++end;

        invert_polygon(start, end);
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    unsigned path_base<VC>::arrange_polygon_orientation(unsigned start,
+    template<class VC> 
+    unsigned path_base<VC>::arrange_polygon_orientation(unsigned start, 
                                                        path_flags_e orientation)
    {
        if(orientation == path_flags_none) return start;
-
+        
        // Skip all non-vertices at the beginning
-        while(start < m_vertices.total_vertices() &&
+        while(start < m_vertices.total_vertices() && 
              !is_vertex(m_vertices.command(start))) ++start;

        // Skip all insignificant move_to
-        while(start+1 < m_vertices.total_vertices() &&
+        while(start+1 < m_vertices.total_vertices() && 
              is_move_to(m_vertices.command(start)) &&
              is_move_to(m_vertices.command(start+1))) ++start;

        // Find the last vertex
        unsigned end = start + 1;
-        while(end < m_vertices.total_vertices() &&
+        while(end < m_vertices.total_vertices() && 
              !is_next_poly(m_vertices.command(end))) ++end;

        if(end - start > 2)
@ -1315,7 +1311,7 @@ namespace agg
                // Invert polygon, set orientation flag, and skip all end_poly
                invert_polygon(start, end);
                unsigned cmd;
-                while(end < m_vertices.total_vertices() &&
+                while(end < m_vertices.total_vertices() && 
                      is_end_poly(cmd = m_vertices.command(end)))
                {
                    m_vertices.modify_command(end++, set_orientation(cmd, orientation));
@ -1326,8 +1322,8 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
-    unsigned path_base<VC>::arrange_orientations(unsigned start,
+    template<class VC> 
+    unsigned path_base<VC>::arrange_orientations(unsigned start, 
                                                 path_flags_e orientation)
    {
        if(orientation != path_flags_none)
@ -1346,7 +1342,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::arrange_orientations_all_paths(path_flags_e orientation)
    {
        if(orientation != path_flags_none)
@ -1360,7 +1356,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::flip_x(double x1, double x2)
    {
        unsigned i;
@ -1376,7 +1372,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::flip_y(double y1, double y2)
    {
        unsigned i;
@ -1392,7 +1388,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::translate(double dx, double dy, unsigned path_id)
    {
        unsigned num_ver = m_vertices.total_vertices();
@ -1411,7 +1407,7 @@ namespace agg
    }

    //------------------------------------------------------------------------
-    template<class VC>
+    template<class VC> 
    void path_base<VC>::translate_all_paths(double dx, double dy)
    {
        unsigned idx;
@ -1444,8 +1440,8 @@ namespace agg

        void add_vertex(double x, double y, unsigned cmd)
        {
-            m_vertices.push_back(vertex_type(value_type(x),
-                                             value_type(y),
+            m_vertices.push_back(vertex_type(value_type(x), 
+                                             value_type(y), 
                                             int8u(cmd)));
        }

@ -1478,8 +1474,8 @@ namespace agg

        unsigned last_command() const
        {
-            return m_vertices.size() ?
-                m_vertices[m_vertices.size() - 1].cmd :
+            return m_vertices.size() ? 
+                m_vertices[m_vertices.size() - 1].cmd : 
                path_cmd_stop;
        }

@ -1549,11 +1545,11 @@ namespace agg
 // Example of declarations path_storage with std::vector as a container
 //---------------------------------------------------------------------------

-//#include <vector>
-//namespace agg
-//{
-//    typedef path_base<vertex_stl_storage<std::vector<vertex_d> > > path_storage;
-//}
+//#include <vector> 
+//namespace agg 
+//{ 
+//    typedef path_base<vertex_stl_storage<std::vector<vertex_d> > > path_storage;  
+//} 


 #endif
--- a/deps/agg/include/agg_pixfmt_base.h
+++ b/deps/agg/include/agg_pixfmt_base.h
@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@ -35,7 +35,7 @@ namespace agg
    };

    //--------------------------------------------------------------blender_base
-    template<class ColorT, class Order = void>
+    template<class ColorT, class Order = void> 
    struct blender_base
    {
        typedef ColorT color_type;
@ -47,14 +47,14 @@ namespace agg
            if (cover > cover_none)
            {
                rgba c(
-                    color_type::to_double(r),
-                    color_type::to_double(g),
-                    color_type::to_double(b),
+                    color_type::to_double(r), 
+                    color_type::to_double(g), 
+                    color_type::to_double(b), 
                    color_type::to_double(a));

                if (cover < cover_full)
                {
-                    double x = static_cast<double>(cover) / static_cast<double>(cover_full);
+                    double x = double(cover) / cover_full;
                    c.r *= x;
                    c.g *= x;
                    c.b *= x;
@ -69,10 +69,10 @@ namespace agg
        static rgba get(const value_type* p, cover_type cover = cover_full)
        {
            return get(
-                p[order_type::R],
-                p[order_type::G],
-                p[order_type::B],
-                p[order_type::A],
+                p[order_type::R], 
+                p[order_type::G], 
+                p[order_type::B], 
+                p[order_type::A], 
                cover);
        }

--- a/Show more
+++ b/Show more