Merge branch 'master' into geometry-refactor

.travis.yml

@@ -29,7 +29,7 @@ matrix:
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
-          packages: [ 'libstdc++-5-dev', 'xutils']
+          packages: [ 'libstdc++-5-dev', 'xutils-dev']
     - os: linux
       sudo: false
       compiler: ": clang-coverage"
@@ -37,7 +37,7 @@ matrix:
       addons:
         apt:
           sources: [ 'ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'xutils' ]
+          packages: ['libstdc++-5-dev', 'xutils-dev' ]
     - os: osx
       compiler: ": clang-osx"
       # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions

CHANGELOG.md

@@ -36,7 +36,11 @@ Released: xx-xx-xx
 - Added support for quantising small (less than 3 pixel) images (ref #3466)
 - Added support for natural logarithm function in expressions (ref #3475)
 - Improved logic determining if certain compiler features are available e.g `inheriting constructors` (MSVC)
-- GeoJSON - corrected quoting in `stringgifird` objects (ref #3491)
+- GeoJSON - corrected quoting in `stringify` objects (ref #3491)
+- GeoJSON - ensured consistent ordering of attribute descriptors (ref #3494)
+- GeoJSON - exposed `num_features_to_query` as datasource paramer (ref #3495)
+- Replaced `boost::mpl::vector<Types...>` with `std::tuple<Types...>` (ref #3503)
+- BuildingSymbolizer - fixed closing segment of polygon in building symbolizer (ref #3505)
 
 ## 3.0.11
 

bootstrap.sh

@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="7ed8931"
+MASON_VERSION="new-pkgs"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then
@@ -19,7 +19,7 @@ function setup_mason() {
         (cd ./.mason && git checkout ${MASON_VERSION})
     else
         echo "Updating to latest mason"
-        (cd ./.mason && git fetch && git checkout ${MASON_VERSION})
+        (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull)
     fi
     export PATH=$(pwd)/.mason:$PATH
     export CXX=${CXX:-clang++}
@@ -39,6 +39,8 @@ function install() {
             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
 }
 
@@ -47,21 +49,21 @@ ICU_VERSION="55.1"
 function install_mason_deps() {
     FAIL=0
     install ccache 3.2.4 &
-    install jpeg_turbo 1.4.0 libjpeg &
-    install libpng 1.6.20 libpng &
-    install libtiff 4.0.4beta libtiff &
-    install libpq 9.4.1 &
-    install sqlite 3.8.8.3 libsqlite3 &
-    install expat 2.1.0 libexpat &
+    install jpeg_turbo 1.5.0 libjpeg &
+    install libpng 1.6.24 libpng &
+    install libtiff 4.0.6 libtiff &
+    install libpq 9.5.2 &
+    install sqlite 3.14.1 libsqlite3 &
+    install expat 2.2.0 libexpat &
     install icu ${ICU_VERSION} &
-    install proj 4.8.0 libproj &
-    install pixman 0.32.6 libpixman-1 &
-    install cairo 1.14.2 libcairo &
+    install proj 4.9.2 libproj &
+    install pixman 0.34.0 libpixman-1 &
+    install cairo 1.14.6 libcairo &
     install protobuf 2.6.1 &
     # technically protobuf is not a mapnik core dep, but installing
     # here by default helps make mapnik-vector-tile builds easier
-    install webp 0.5.0 libwebp &
-    install gdal 1.11.2 libgdal &
+    install webp 0.5.1 libwebp &
+    install gdal 2.1.1 libgdal &
     install boost 1.61.0 &
     install boost_libsystem 1.61.0 &
     install boost_libfilesystem 1.61.0 &
@@ -71,8 +73,8 @@ function install_mason_deps() {
     # here by default helps make python-mapnik builds easier
     install boost_libthread 1.61.0 &
     install boost_libpython 1.61.0 &
-    install freetype 2.6 libfreetype &
-    install harfbuzz 0.9.41 libharfbuzz &
+    install freetype 2.6.5 libfreetype &
+    install harfbuzz 1.3.0 libharfbuzz &
     for job in $(jobs -p)
     do
         wait $job || let "FAIL+=1"

circle.yml

@@ -27,7 +27,7 @@ dependencies:
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   override:
     - sudo apt-get update -y
-    - sudo apt-get install -y libstdc++-5-dev xutils
+    - sudo apt-get install -y libstdc++-5-dev xutils-dev
 
 database:
   pre:

test/data

@@ -1 +1 @@
-Subproject commit fb1529e225b36f8a3077ad23f7005951a07c8a7e
+Subproject commit 6ce59adfc4f11b16a5dc0e2020c36dc614850989

test/data-visual

@@ -1 +1 @@
-Subproject commit 91bc22de33fb6bf438d94d3c0db8475a7633588e
+Subproject commit db7989be3a8b636c60c79356b9ba9ca579faa01d