[Pkg-javascript-commits] [node-mapnik] 10/15: Merge tag 'upstream/3.0.4+dfsg'
Jérémy Lal
kapouer at moszumanska.debian.org
Wed May 27 19:57:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master
in repository node-mapnik.
commit ac0167caa35a96b46ee14a19722470e1f2c820b8
Merge: 06cd113 914d303
Author: Jérémy Lal <kapouer at melix.org>
Date: Sat Oct 25 00:54:43 2014 +0200
Merge tag 'upstream/3.0.4+dfsg'
Upstream version 3.0.4+dfsg
# gpg: Signature faite le sam. 25 oct. 2014 00:54:40 CEST avec la clef RSA d'identifiant DD39F374
# gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
# gpg: alias « Jérémy Lal <jerry at edagames.com> »
.gitignore | 20 +-
.gitmodules | 0
.npmignore | 20 +
.travis.yml | 65 +-
CHANGELOG.md | 237 ++-
Makefile | 34 +-
README.md | 117 +-
appveyor.yml | 45 +
binding.gyp | 197 +-
common.gypi | 85 +-
configure | 4 -
docs/FAQ.md | 60 -
docs/Release.md | 54 -
gen_settings.py | 3 +-
lib/mapnik.js | 61 +-
package.json | 32 +-
scripts/build_against_sdk.sh | 179 ++
scripts/build_against_sdk_00-START-HERE.bat | 54 +
scripts/build_against_sdk_01-download-deps.ps1 | 44 +
...uild_against_sdk_02-copy-deps-to-bindingdir.ps1 | 42 +
.../build_against_sdk_03-write-mapnik.settings.ps1 | 22 +
scripts/package_osx.sh | 37 +
scripts/ubuntu_ppa_tests.sh | 22 +
scripts/validate_tag.sh | 24 +
src/blend.cpp | 654 ++++++
src/blend.hpp | 108 +
src/ds_emitter.hpp | 116 +-
src/js_grid_utils.hpp | 270 +--
src/mapnik_.cpp | 19 +-
src/mapnik_.hpp | 10 +-
src/mapnik_cairo_surface.cpp | 87 +-
src/mapnik_cairo_surface.hpp | 14 +-
src/mapnik_color.cpp | 124 +-
src/mapnik_color.hpp | 23 +-
src/mapnik_datasource.cpp | 189 +-
src/mapnik_datasource.hpp | 19 +-
src/mapnik_expression.cpp | 108 +-
src/mapnik_expression.hpp | 17 +-
src/mapnik_feature.cpp | 290 +--
src/mapnik_feature.hpp | 31 +-
src/mapnik_featureset.cpp | 53 +-
src/mapnik_featureset.hpp | 10 +-
src/mapnik_fonts.hpp | 74 +-
src/mapnik_geometry.cpp | 89 +-
src/mapnik_geometry.hpp | 16 +-
src/mapnik_grid.cpp | 602 ++----
src/mapnik_grid.hpp | 38 +-
src/mapnik_grid_view.cpp | 519 ++---
src/mapnik_grid_view.hpp | 25 +-
src/mapnik_image.cpp | 959 +++++----
src/mapnik_image.hpp | 65 +-
src/mapnik_image_view.cpp | 332 ++-
src/mapnik_image_view.hpp | 34 +-
src/mapnik_js_datasource.cpp | 124 --
src/mapnik_js_datasource.hpp | 24 -
src/mapnik_layer.cpp | 200 +-
src/mapnik_layer.hpp | 22 +-
src/mapnik_map.cpp | 1659 ++++++++-------
src/mapnik_map.hpp | 75 +-
src/mapnik_memory_datasource.cpp | 204 +-
src/mapnik_memory_datasource.hpp | 23 +-
src/mapnik_palette.cpp | 79 +-
src/mapnik_palette.hpp | 15 +-
src/mapnik_plugins.hpp | 61 +-
src/mapnik_proj_transform.cpp | 196 --
src/mapnik_proj_transform.hpp | 34 -
src/mapnik_projection.cpp | 354 ++-
src/mapnik_projection.hpp | 41 +-
src/mapnik_query.cpp | 32 -
src/mapnik_query.hpp | 31 -
src/mapnik_vector_tile.cpp | 2248 +++++++++++++++-----
src/mapnik_vector_tile.hpp | 111 +-
src/mem_datasource.hpp | 214 --
src/node_mapnik.cpp | 160 +-
src/object_to_container.hpp | 33 +
src/pbf.hpp | 171 ++
src/reader.hpp | 75 +
src/tint.hpp | 87 +
src/utils.hpp | 73 +-
test/constants.test.js | 11 +-
test/data/images/10x10.jpeg | Bin 0 -> 634 bytes
test/data/images/10x10.png | Bin 0 -> 83 bytes
test/data/images/10x10.tiff | Bin 0 -> 350 bytes
test/data/images/10x10.webp | Bin 0 -> 64 bytes
test/{ => data}/markers.xml | 8 +-
test/data/roads.csv | 853 ++++++++
test/data/roads.xml | 98 +
test/data/vector_tile/10.196.370.vector.pbf | Bin 0 -> 573 bytes
test/data/vector_tile/12.771.1608.vector.pbf | Bin 0 -> 217 bytes
test/data/vector_tile/13.1337.2825.vector.pbf | Bin 0 -> 435 bytes
test/data/vector_tile/cloudless_1_0_0.jpg | Bin 0 -> 12146 bytes
.../compositing/expected/0-0-0-mosaic.png | Bin 0 -> 3176 bytes
.../compositing/expected/2-1-1-empty.png | Bin 0 -> 334 bytes
.../compositing/expected/2-1-1-no-point.png | Bin 0 -> 1242 bytes
.../vector_tile/compositing/expected/2-1-1.png | Bin 0 -> 1544 bytes
.../vector_tile/compositing/expected/concat.png | Bin 0 -> 2446 bytes
.../compositing/expected/image_concat.png | Bin 0 -> 115377 bytes
test/data/vector_tile/compositing/layers/lines.xml | 21 +
.../data/vector_tile/compositing/layers/points.xml | 19 +
test/data/vector_tile/compositing/styles/all.xml | 36 +
.../compositing/tiles/lines-0-0-0.vector.pbf | Bin 0 -> 48 bytes
.../compositing/tiles/lines-1-0-0.vector.pbf | Bin 0 -> 49 bytes
.../compositing/tiles/lines-1-0-1.vector.pbf | Bin 0 -> 49 bytes
.../compositing/tiles/lines-1-1-0.vector.pbf | 6 +
.../compositing/tiles/lines-1-1-1.vector.pbf | 4 +
.../compositing/tiles/lines-2-0-0.vector.pbf | 2 +
.../compositing/tiles/lines-2-0-1.vector.pbf | Bin 0 -> 31 bytes
.../compositing/tiles/lines-2-1-1.vector.pbf | 6 +
.../compositing/tiles/points-0-0-0.vector.pbf | Bin 0 -> 44 bytes
.../compositing/tiles/points-1-0-0.vector.pbf | Bin 0 -> 44 bytes
.../compositing/tiles/points-1-0-1.vector.pbf | Bin 0 -> 43 bytes
.../compositing/tiles/points-1-1-0.vector.pbf | Bin 0 -> 43 bytes
.../compositing/tiles/points-1-1-1.vector.pbf | Bin 0 -> 42 bytes
.../compositing/tiles/points-2-0-0.vector.pbf | 2 +
.../compositing/tiles/points-2-0-1.vector.pbf | 2 +
.../compositing/tiles/points-2-1-1.vector.pbf | Bin 0 -> 44 bytes
test/data/vector_tile/raster_layer.xml | 15 +
test/data/vector_tile/raster_style.xml | 16 +
test/data/vector_tile/tile-raster.expected.jpg | Bin 0 -> 6606 bytes
test/data/vector_tile/tile-raster2.expected.png | Bin 0 -> 121986 bytes
test/data/vector_tile/tile0-b.actual.png | Bin 13035 -> 0 bytes
test/data/vector_tile/tile0-b.expected.png | Bin 13035 -> 15931 bytes
test/data/vector_tile/tile0-c.expected.png | Bin 14137 -> 14148 bytes
test/data/vector_tile/tile0.actual.png | Bin 27091 -> 0 bytes
test/data/vector_tile/tile0.expected-cairo.svg | 246 +++
test/data/vector_tile/tile0.expected-svg.svg | 252 +++
test/data/vector_tile/tile0.expected.grid.json | 91 +-
test/data/vector_tile/tile0.expected.png | Bin 27091 -> 17667 bytes
test/data/vector_tile/tile0.vector.pbf | Bin 87627 -> 87994 bytes
test/data/vector_tile/tile2.vector.pbf | Bin 445 -> 449 bytes
test/data/vector_tile/tile3.actual.png | Bin 6334 -> 0 bytes
test/data/vector_tile/tile3.expected.png | Bin 6334 -> 5535 bytes
test/data/world_merc.converted.geojson | 1294 +++++------
test/datasource.test.js | 2 +
test/expression.test.js | 1 +
test/feature.test.js | 3 +
test/font_path.test.js | 20 +
test/fonts.test.js | 15 +-
test/geotiff-load.test.js | 26 +
test/grid_view.test.js | 1 +
test/image.test.js | 126 +-
test/layers.test.js | 1 +
test/map.test.js | 45 +-
test/map_generation.test.js | 2 +
test/palette.test.js | 2 +
test/parameters.test.js | 12 +-
test/query-map.test.js | 2 +
test/render-async.test.js | 4 +
test/render-sync.test.js | 3 +
test/render_grid.test.js | 75 +-
test/shp2geojson.test.js | 9 +-
test/stylesheet.xml | 3 +-
test/support/grid2.json | 570 ++++-
test/support/grid__id__.json | 694 +++++-
test/support/grid__id__2.json | 694 +++++-
test/support/grid__id__3.json | 197 +-
test/support/grid_view.json | 54 +-
test/unicode-loading.test.js | 64 +-
test/vector-tile.composite.test.js | 397 ++++
test/vector-tile.query.test.js | 428 ++++
test/vector-tile.queryMany.test.js | 188 ++
test/vector-tile.test.js | 424 +++-
vcbuild.bat | 16 +-
163 files changed, 13490 insertions(+), 6269 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