[Pkg-javascript-commits] [node-mapnik] 02/14: Merge tag 'upstream/3.6.0+dfsg'
Bas Couwenberg
sebastic at debian.org
Sun Jun 11 16:26:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository node-mapnik.
commit a03305640f4e1b49a3c0a14238c205b72c2cb5c6
Merge: 0bab3c1 4f951a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jun 10 22:52:15 2017 +0200
Merge tag 'upstream/3.6.0+dfsg'
Upstream version 3.6.0+dfsg
.gitignore | 4 +-
.gitmodules | 6 +
.npmignore | 6 +
.travis.yml | 242 +-
CHANGELOG.md | 44 +-
Makefile | 81 +-
README.md | 6 +-
appveyor.yml | 3 +-
bin/mapnik-index.js | 2 +-
bin/mapnik-inspect.js | 12 +
bin/mapnik-render.js | 2 +-
bin/mapnik-shapeindex.js | 2 +-
binding.gyp | 46 +-
common.gypi | 3 +-
deps/clipper/clipper.cpp | 5598 --------------------
deps/clipper/clipper.hpp | 450 --
deps/clipper/fix.sh | 24 -
gen_settings.py | 4 +-
install_mason.sh | 42 +
package.json | 33 +-
scripts/build_against_sdk.sh | 6 +-
.../build_against_sdk_03-write-mapnik.settings.ps1 | 4 +-
scripts/coverage.sh | 29 +
scripts/create_scheme.sh | 39 +
scripts/library.xcscheme | 80 +
scripts/node.xcscheme | 98 +
scripts/postinstall.sh | 61 +
scripts/publish.sh | 104 +-
scripts/setup.sh | 131 +
src/mapnik_image.cpp | 246 +-
src/mapnik_map.cpp | 85 +-
src/mapnik_map.hpp | 2 +-
src/mapnik_plugins.hpp | 45 +
src/mapnik_vector_tile.cpp | 30 +-
src/mapnik_vector_tile.hpp | 6 +-
src/node_mapnik.cpp | 31 +
test/constants.test.js | 4 +-
.../vector_tile/compositing/expected/2-1-1b.png | Bin 154578 -> 154630 bytes
.../expected/world-reencode-max-extent.png | Bin 7994 -> 7993 bytes
.../compositing/expected/world-reencode.png | Bin 7981 -> 7981 bytes
test/data/vector_tile/nz-1b.png | Bin 23785 -> 25817 bytes
test/data/vector_tile/pasted/pasted1.mvt | Bin 223 -> 232 bytes
test/data/vector_tile/pasted/pasted10.mvt | Bin 54 -> 56 bytes
test/data/vector_tile/pasted/pasted11.mvt | Bin 213 -> 212 bytes
test/data/vector_tile/pasted/pasted12.mvt | Bin 105 -> 105 bytes
test/data/vector_tile/pasted/pasted13.mvt | Bin 549 -> 1937 bytes
test/data/vector_tile/pasted/pasted14.mvt | Bin 208 -> 737 bytes
test/data/vector_tile/pasted/pasted15.mvt | Bin 82 -> 82 bytes
test/data/vector_tile/pasted/pasted16.mvt | Bin 76 -> 76 bytes
test/data/vector_tile/pasted/pasted17.mvt | Bin 64 -> 65 bytes
test/data/vector_tile/pasted/pasted18.mvt | Bin 94 -> 94 bytes
test/data/vector_tile/pasted/pasted19.mvt | Bin 78 -> 78 bytes
test/data/vector_tile/pasted/pasted2.mvt | Bin 240 -> 244 bytes
test/data/vector_tile/pasted/pasted20.mvt | Bin 2201 -> 2217 bytes
test/data/vector_tile/pasted/pasted21.mvt | Bin 2219 -> 2246 bytes
test/data/vector_tile/pasted/pasted22.mvt | Bin 1226 -> 1246 bytes
test/data/vector_tile/pasted/pasted23.mvt | Bin 42470 -> 42762 bytes
test/data/vector_tile/pasted/pasted3.mvt | Bin 220 -> 228 bytes
test/data/vector_tile/pasted/pasted4.mvt | Bin 226 -> 239 bytes
test/data/vector_tile/pasted/pasted5.mvt | Bin 235 -> 233 bytes
test/data/vector_tile/pasted/pasted6.mvt | Bin 241 -> 256 bytes
test/data/vector_tile/pasted/pasted7.mvt | Bin 243 -> 247 bytes
test/data/vector_tile/pasted/pasted8.mvt | Bin 229 -> 231 bytes
test/data/vector_tile/tile0-area_threshold.mvt | Bin 50321 -> 63448 bytes
test/data/vector_tile/tile0-b.expected.png | Bin 12642 -> 12695 bytes
test/data/vector_tile/tile0-c.expected.png | Bin 13422 -> 13780 bytes
test/data/vector_tile/tile0-evenOdd.mvt | Bin 50363 -> 65310 bytes
.../vector_tile/tile0-fields.expected.grid.json | 16 +-
test/data/vector_tile/tile0-mpu-false.mvt | Bin 50321 -> 65314 bytes
test/data/vector_tile/tile0-mpu-true.mvt | Bin 50378 -> 66665 bytes
test/data/vector_tile/tile0-nonZero.mvt | Bin 50330 -> 65312 bytes
.../vector_tile/tile0-process-all-mp-rings.mvt | Bin 50321 -> 65314 bytes
.../data/vector_tile/tile0-simple_and_distance.mvt | Bin 43707 -> 55751 bytes
test/data/vector_tile/tile0-simplify_distance.mvt | Bin 43707 -> 55751 bytes
test/data/vector_tile/tile0-strictly_simple.mvt | Bin 50321 -> 65314 bytes
.../vector_tile/tile0-strictly_simple_false.mvt | Bin 50199 -> 65314 bytes
test/data/vector_tile/tile0.expected-cairo.svg | 417 +-
test/data/vector_tile/tile0.expected-svg.svg | 417 +-
test/data/vector_tile/tile0.expected.grid.json | 41 +-
test/data/vector_tile/tile0.expected.png | Bin 17116 -> 17403 bytes
test/data/vector_tile/tile0.mvt | Bin 50321 -> 65314 bytes
test/data/vector_tile/tile1.vector.pbf | Bin 431 -> 431 bytes
test/data/vector_tile/tile1.vector.pbf.gz | Bin 431 -> 431 bytes
test/data/vector_tile/tile2.mvt | Bin 431 -> 431 bytes
test/data/vector_tile/tile3.mvt | Bin 983 -> 987 bytes
test/data/vector_tile/tile_threading_async.mvt | Bin 50039 -> 64279 bytes
test/data/vector_tile/tile_threading_auto.mvt | Bin 50039 -> 64279 bytes
test/datasource.test.js | 6 +-
test/image.svg.test.js | 82 +-
test/image.test.js | 51 +-
test/vector-tile.composite.test.js | 10 +-
test/vector-tile.queryMany.test.js | 1 +
test/vector-tile.test.js | 71 +-
93 files changed, 1879 insertions(+), 6844 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git
More information about the Pkg-javascript-commits
mailing list