V3.2.x

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "test/data-visual"]
  path = test/data-visual
  url = https://github.com/mapnik/test-data-visual.git
- branch = master
+ branch = 3.0.x
 [submodule "deps/mapbox/variant"]
  path = deps/mapbox/variant
  url = https://github.com/mapbox/variant.git

.travis.yml

@@ -8,62 +8,60 @@ env:
  global:
  - CCACHE_TEMPDIR=/tmp/.ccache-temp
  - CCACHE_COMPRESS=1
- - HEAVY_JOBS="2"
  - PREFIX=/tmp/mapnik
- - secure: "D5CLP5lbyFru788iZO8RqDenY/YsHPREvr34zCEi93xMqOTxPmME/zyuEZSyjP5ZLyf8g/fxOuPYSDbOQ1QLwNDBWxB0JomWOahyimHKrMCrMcGHCjl//2W2mE+p9VwF5VLGgfy7CskGkS49Mye37FDK0ejwuq6MDI45DsH4Fkk="
- - secure: "ZPHyAVL3ID5g3KEmwcnzG9z2tAQwSx526Qd3Y6tsZ3Yj+aSagVBiZQjZGKWgNX74lymtmYKnb2Md46apWLeImt6tjB3MWTu7WwWoZRnqUligz/8Nmg4Lgo7EOCkQcjN/gpA1i+cM5b+ZKDTZYOaHO6/+DAaunQzA7/p99hw/XYg="
  - secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
-addons:
- postgresql: "9.4"
 
 cache:
  directories:
  - $HOME/.ccache
 
+dist: trusty
+sudo: false
+
 matrix:
  include:
  - os: linux
- sudo: false
- compiler: ": clang"
- env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true
+ 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.4"
  apt:
- sources: [ 'ubuntu-toolchain-r-test']
- packages: [ 'libstdc++-5-dev', 'xutils-dev']
+ sources: [ 'ubuntu-toolchain-r-test' ]
+ packages: [ 'clang-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ]
  - os: linux
- sudo: false
- compiler: ": clang-coverage"
- env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8"
+ name: Linux clang-3.9 + coverage
+ env: >-
+ CXX="ccache clang++-3.9 -Qunused-arguments"
+ CC="clang-3.9"
+ COVERAGE=true
+ before_install:
+ - export LINKFLAGS="-fuse-ld=gold-2.26"
+ - export LLVM_COV="llvm-cov-3.9"
  addons:
+ postgresql: "9.4"
  apt:
- sources: [ 'ubuntu-toolchain-r-test']
- packages: ['libstdc++-5-dev', 'xutils-dev' ]
+ sources: [ 'ubuntu-toolchain-r-test' ]
+ packages: [ 'clang-3.9', 'llvm-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ]
  - os: osx
- compiler: ": clang-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: JOBS=4 MASON_PUBLISH=true CXX="ccache clang++ -Qunused-arguments"
+ env: >-
+ CXX="ccache clang++ -Qunused-arguments"
 
-before_install:
+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
- - |
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
- rvm get head || true
- fi
- - source scripts/travis-common.sh
- - export PYTHONUSERBASE=$(pwd)/mason_packages/.link
- - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
+ - on 'osx' rvm get head || true
+ - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
  - export COVERAGE=${COVERAGE:-false}
- - export MASON_PUBLISH=${MASON_PUBLISH:-false}
  - export BENCH=${BENCH:-false}
- - if [[ ${TRAVIS_BRANCH} != 'master' ]]; then export MASON_PUBLISH=false; fi
- - if [[ ${TRAVIS_PULL_REQUEST} != 'false' ]]; then export MASON_PUBLISH=false; fi
- - git_submodule_update --init --depth=10
-
-install:
- - on 'linux' export PYTHONPATH=${PYTHONUSERBASE}/lib/python2.7/site-packages
- - on 'osx' export PYTHONPATH=${PYTHONUSERBASE}/lib/python/site-packages
  - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
  - on 'osx' rm -rf ${DATA_PATH}
  - on 'osx' initdb ${DATA_PATH} -E utf8
@@ -72,40 +70,31 @@ install:
  - 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} pip install --user cpp-coveralls
+ - 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
- - |
- if [[ $(uname -s) == 'Linux' ]]; then
- mason install clang 3.8.0
- export PATH=$(mason prefix clang 3.8.0)/bin:${PATH}
- which clang++
- export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
- fi
  - ccache --version
  - ccache -p || true
  - ccache --show-stats || true
  - commit_message_parse
 
 script:
- - export SCONSFLAGS='--debug=time'
- - configure BENCHMARK=${BENCH}
+ - git_submodule_update --init deps/
+ - configure BENCHMARK=${BENCH} ENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-false}
  - cat config.log
  # 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
- - DURATION=2400
- - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
- - make test
- - enabled ${COVERAGE} coverage
- - enabled ${BENCH} make bench
-
-after_success:
- - enabled ${TRIGGER} trigger_downstream
- - if enabled ${MASON_PUBLISH}; then
- source ./.mason/mason.sh &&
- ./mason_latest.sh build &&
- ./mason_latest.sh publish;
- fi
+ - DEADLINE=$(( $(date +%s) + 40 * 60 ))
+ - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline="$DEADLINE" make
+ - test_ok && git_submodule_update --init test/
+ - test_ok && make test
+ - test_ok && enabled ${COVERAGE} coverage
+ - test_ok && enabled ${BENCH} make bench
+ - ./scripts/check_glibcxx.sh

CHANGELOG.md

@@ -6,6 +6,172 @@ Developers: Please commit along with changes.
 
 For a complete change history, see the git log.
 
+## 3.0.24
+
+Released: January 5, 2021
+
+(Packaged from be0904fcd)
+
+- Backport support for `BOOST_VERSION >= 1_74`
+
+## 3.0.23
+
+Released: February 18, 2020
+
+(Packaged from bdb30f47a)
+
+- Complete build system migration to Py3 syntax (4b0bdd8630f6999e5db346fd767a06b8ceba8fb9)
+- Add support for `BOOST_VERSION >= 1_72`
+- gdal.input - add support for int32 pixel types (efc65126db5d51977d6374f9b983fc441f334eb6)
+
+
+## 3.0.22
+
+Released: January 22, 2019
+
+(Packaged from c338cacd7)
+
+- Improved padding calculation for clipping polygons and lines ([#4001](https://github.com/mapnik/mapnik/pull/4001))
+- New option `line-pattern="repeat"` of LinePatternSymbolizer to repeat the pattern in the area given by `stroke-` options ([#4004](https://github.com/mapnik/mapnik/pull/4004))
+- Fixed global and local pattern alignment ([#4005](https://github.com/mapnik/mapnik/pull/4005))
+- SVG patterns are rendered as vectors into PDF or SVG with Cairo backend ([#4012](https://github.com/mapnik/mapnik/pull/4012))
+
+## 3.0.21
+
+Released: October 8, 2018
+
+(Packaged from 1dbb1d2c1)
+
+#### Core
+
+- Fixed compilation with ICU >= 61 (#3963)
+- Fixed bbox reprojection (#3940)
+- SVG: enabled unsupported attributes handling
+
+#### Plugins
+
+- GDAL: Fixed several issues with overviews (#3939)
+
+
+## 3.0.20
+
+Released: April 12, 2018
+
+(Packaged from f02c7bcdb)
+
+ - Make max_image_area a datasource parameter for GDAL.
+ - GDAL Driver Overview Fix and Memory Reduction (#3872)
+ - Raster colorizer: check image bounds (#3879)
+ - Removed usage of `typename` in template template declarations (available in c++17) (#3882)
+
+## 3.0.19
+
+Released: March 06, 2018
+
+(Packaged from d50562d54)
+
+ - Backported scaling of precision by polygon size (#3844)
+ - Backported GRID placement (#3847, #3854, #3855)
+ - Added missing `MAPNIK_DECL` to all `text_placement_` types (7ce142a5aa8e9da5ddd11266a054c1e69052230d)
+ - Fixed invalid memory access if input_buffer size is zero (a602c65354a4b595821d2300f38ebc107d07e2a9)
+ - Fixed handling of an empty polygon in grid_vertex_converter (2f2dcf1eeae71aaa7878f4bc9a39741321f07e68)
+ - Fixed PROJ_LIB detection logic (44f1ae3a6e9e9979d1a93343f40db6cd7dbf51d5)
+ - Default to `icu-config` for obtaining `ICU_DATA` if `u_getDataDirectory fails (2cef98d7f76cdd302afcf15f1c585379537e8f1d)
+
+## 3.0.18
+
+Released: January 26, 2018
+
+(Packaged from 44ef46c81)
+
+ - SVG parser - fixed logic for calculating dimensions when `width` and `height` expressed in
+ percentage units (#3812)
+ - New improved `interior` placement algorithm (#3839)
+ - Fixed handling of an empty interior rings in `polygon_vertex_processor` (#3833)
+ - Fixed handling of an empty interior rings in `vertex_adapter' (#3842)(#3838)
+
+## 3.0.17
+
+Released: November 29, 2017
+
+(Packaged from ebdd96c61)
+
+ - Use `Scons 3` as an internal build sytsem + support both Python 2 and 3.
+ - Added glibcxx workaround to support libstdc++-4.8
+
+## 3.0.16
+
+Released: November 16, 2017
+
+(Packaged from 8d7b75e)
+
+ - Added "strict" SVG parsing mode with consistent error handling and disabled processing of unsupported attributes.
+ - Added support for `<use>` element.
+ - Implemented compile time string literal to integer conversion, to be able to convert large `if/else if/else` statements to `switch`.
+ - WKB reader - pre-allocate optimisations in `multi_polygon` and `geometry_collection`.
+ - Set alpha values in RGBA TIFFs even when `NODATA` value is pesent.
+ - Support building with ICU >= 59.
+ - SCons - added ICU_DATA, PROJ_LIB and GDAL_DATA settings, available via `mapnik-config`
+ - Fixed centroid and interior text placement algorithms (#3771)
+ - Fixed memory leak (#3775)
+ - SVG parser - fixed default gradient vector in linear gradient.
+ - Fixed bounding box collection logic (#3709)
+
+## 3.0.15
+
+Released: June 16, 2017
+
+#### Summary
+
+(Packaged from 6e6cf84)
+
+- Restored `filter_factor` logic in `gdal.input` and added to `raster.input` (#3699)
+ (updated tests https://github.com/mapnik/test-data-visual/commit/fd518f1f512b8aea4ac740c2ce12c249616a291c)
+- Fixed bug related to rows swapping implementation in `tiff_reader` ref #3679
+ (updated visual tests to catch this regression in the future
+ https://github.com/mapnik/test-data-visual/commit/be0ba965cd2240576a8edfca84801cbb7a4832d6)
+- TIFF I/O - port memory mapped based I/O from master
+
+## 3.0.14
+
+Released: June 5, 2017
+
+(Packaged from 2b42e17)
+
+#### Summary
+
+- Fixed problems with high levels of overzooming in the GDAL and raster plugin where data would be slightly offset
+- High levels of overzooming on raster data no longer results in the return of a transparent image.
+- Fixed bug in `mapnik::util::file::data()` (a220bda05d2aa1)
+- TIFF I/O - added support for grey scale multiband images + fixed and made generic `read_stripped` and `read_generic`.
+- shapeindex - return error code when no features can read from shapefile (#3198)
+- Upgrade Scons to `2.5.1`
+- Fixed bug (typo) in `raster_featureset.cpp` (#3696)
+- Made `freetype_engine` singleton again. This allows for better control of its life-time. Original interface is preserved via adding static methods (#3688)
+
+## 3.0.13
+
+Released: February 8, 2017
+
+(Packaged from 2a153c0)
+
+#### Summary
+
+- Unbundle `unifont` font from distribution
+- GeoJSON: improved parsing grammar avoiding temp synthesised attribute (#3507)
+- GeoJSON: expose `num_features_to_query` datasource parameter + unit test (#3515)
+- Fixed intersecting extents in different projections (PR #3525 )
+- Fixed `blur` implementation by taking into account `scale_factor`
+- postgis.input - use 2D box for pgraster bounding box (PR #3551)
+- Fixed GroupSymbolizer PairLayout with 3+ items (#3526)
+- Simplified `hash` implementation (204d30e58d3553278ab6bcda2d4122b0f13f6392)
+- Simplified `mapnik::value` conversion rules (#3570)
+- Changed `render_thunk_list` to `std::list<render_thunk>` (PR #3585)
+- Upgraded to variant `v1.1.5`
+- CSV.input - fixed `blank` line test (8a3a380b3b5c64681f2478b4f0d06f6a907f5eed)
+- GeoJSON - handle empty elements in position grammar (ref #3609)
+- mapnik-index - return failure on invalid bounding box (ref #3611)
+
 ## 3.0.12
 
 Released: September 8, 2016

Makefile

@@ -1,7 +1,7 @@
 
 OS := $(shell uname -s)
 
-PYTHON = python
+PYTHON = python3
 
 ifeq ($(JOBS),)
  JOBS:=1

README.md

@@ -9,7 +9,6 @@ _/ _/ _/_/_/ _/_/_/ _/ _/ _/ _/ _/
 ```
 
 [![Build Status Linux](https://api.travis-ci.org/mapnik/mapnik.svg?branch=master)](http://travis-ci.org/mapnik/mapnik)
-[![Build Status Windows](https://ci.appveyor.com/api/projects/status/hc9l7okdjtucfqqn?branch=master&svg=true)](https://ci.appveyor.com/project/Mapbox/mapnik)
 [![Coverage Status](https://coveralls.io/repos/mapnik/mapnik/badge.svg?branch=master&service=github)](https://coveralls.io/github/mapnik/mapnik?branch=master)
 
 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.
@@ -28,4 +27,4 @@ Please note that this project is released with a [Contributor Code of Conduct](h
 
 # License
 
-Mapnik software is free and is released under the LGPL ([GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl.html)). Please see [COPYING](https://github.com/mapnik/mapnik/blob/master/COPYING) for more information.
+Mapnik software is free and is released under the LGPL v2.1 ([GNU Lesser General Public License, version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)). Please see [COPYING](https://github.com/mapnik/mapnik/blob/master/COPYING) for more information.