[Pkg-javascript-commits] [node-mapnik] branch master updated (eb6089b -> 8bd31c4)

Jérémy Lal kapouer at moszumanska.debian.org
Wed May 27 19:57:35 UTC 2015


This is an automated email from the git hooks/post-receive script.

kapouer pushed a change to branch master
in repository node-mapnik.

      from  eb6089b   Update changelog
       new  ea1257b   watch file to get +dfsg.orig.tar.gz automatically after repack
       new  bec6514   Files-Excluded natural_earth.tif
       new  f68960d   Tighten dep on mapnik-vector-tile 0.5.1
       new  d67f1fa   Update changelog
       new  3cdaf68   Add autopkgtest
       new  fe9e155   Enable tests
       new  42f3f6f   Patch test that makes use of dfsg-excluded tif file
       new  06cd113   Apply patch for test using dfsg-excluded file
       new  914d303   Imported Upstream version 3.0.4+dfsg
       new  ac0167c   Merge tag 'upstream/3.0.4+dfsg'
       new  ed8803e   Update copyright
       new  9d328d1   Bump changelog version to 3.3.0+dfsg-1
       new  26e1946   Refresh patch
       new  6aef0d6   Imported Upstream version 3.3.0+dfsg
       new  8bd31c4   Merge tag 'upstream/3.3.0+dfsg'

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |   20 +-
 .gitmodules                                        |    0
 .npmignore                                         |   24 +
 .travis.yml                                        |  107 +-
 CHANGELOG.md                                       |  403 ++-
 Makefile                                           |   51 +-
 README.md                                          |  120 +-
 appveyor.yml                                       |   85 +
 bench/boundary.pbf                                 |  Bin 0 -> 214 bytes
 bench/error/test_vt_abort.js                       |   46 +
 bench/error/test_vt_abort2.js                      |   44 +
 bin/mapnik-inspect.js                              |    8 +-
 bin/mapnik-render.js                               |    4 +-
 bin/mapnik-shapeindex.js                           |   29 +
 binding.gyp                                        |  215 +-
 common.gypi                                        |   96 +-
 configure                                          |    4 -
 debian/changelog                                   |    8 +
 debian/control                                     |    5 +-
 debian/copyright                                   |    5 +
 debian/patches/series                              |    1 +
 debian/patches/test_disable_raster_layer.patch     |   32 +
 debian/rules                                       |    2 -
 debian/tests/control                               |    3 +
 debian/watch                                       |    6 +-
 docs/Contributing.md                               |   81 +
 docs/FAQ.md                                        |   60 -
 docs/Feature.md                                    |   14 +
 docs/Geometry.md                                   |   12 +
 docs/Image.md                                      |   35 +
 docs/Logger.md                                     |   24 +
 docs/Map.md                                        |   23 +
 docs/Release.md                                    |   54 -
 docs/Using-Fonts.md                                |   89 +
 docs/VectorTile.md                                 |  183 ++
 gen_settings.py                                    |    3 +-
 lib/mapnik.js                                      |   80 +-
 package.json                                       |   45 +-
 scripts/before-build.bat                           |   31 +
 scripts/build_against_sdk.sh                       |  109 +
 ...uild_against_sdk_02-copy-deps-to-bindingdir.ps1 |   41 +
 .../build_against_sdk_03-write-mapnik.settings.ps1 |   22 +
 scripts/install_node.sh                            |    9 +
 scripts/package_osx.sh                             |   37 +
 scripts/remove_node.bat                            |    7 +
 scripts/setup_cpp11_toolchain.sh                   |   72 +
 scripts/show_module_runtime.ps1                    |   12 +
 scripts/ubuntu_ppa_tests.sh                        |   22 +
 scripts/validate_tag.sh                            |   24 +
 src/blend.cpp                                      |  669 ++++
 src/blend.hpp                                      |  106 +
 src/ds_emitter.hpp                                 |  134 +-
 src/js_grid_utils.hpp                              |  274 +-
 src/mapnik_.cpp                                    |   30 -
 src/mapnik_.hpp                                    |   31 -
 src/mapnik_cairo_surface.cpp                       |   89 +-
 src/mapnik_cairo_surface.hpp                       |   22 +-
 src/mapnik_color.cpp                               |  257 +-
 src/mapnik_color.hpp                               |   30 +-
 src/mapnik_datasource.cpp                          |  196 +-
 src/mapnik_datasource.hpp                          |   25 +-
 src/mapnik_expression.cpp                          |  125 +-
 src/mapnik_expression.hpp                          |   22 +-
 src/mapnik_feature.cpp                             |  363 +--
 src/mapnik_feature.hpp                             |   34 +-
 src/mapnik_featureset.cpp                          |   57 +-
 src/mapnik_featureset.hpp                          |   16 +-
 src/mapnik_fonts.hpp                               |   96 +-
 src/mapnik_geometry.cpp                            |  317 +-
 src/mapnik_geometry.hpp                            |   34 +-
 src/mapnik_grid.cpp                                |  687 ++--
 src/mapnik_grid.hpp                                |   43 +-
 src/mapnik_grid_view.cpp                           |  591 ++--
 src/mapnik_grid_view.hpp                           |   31 +-
 src/mapnik_image.cpp                               | 2019 ++++++++----
 src/mapnik_image.hpp                               |   95 +-
 src/mapnik_image_view.cpp                          |  526 +--
 src/mapnik_image_view.hpp                          |   43 +-
 src/mapnik_js_datasource.cpp                       |  124 -
 src/mapnik_js_datasource.hpp                       |   24 -
 src/mapnik_layer.cpp                               |  303 +-
 src/mapnik_layer.hpp                               |   26 +-
 src/mapnik_logger.cpp                              |   61 +
 src/mapnik_logger.hpp                              |   33 +
 src/mapnik_map.cpp                                 | 2234 +++++++------
 src/mapnik_map.hpp                                 |   91 +-
 src/mapnik_memory_datasource.cpp                   |  229 +-
 src/mapnik_memory_datasource.hpp                   |   27 +-
 src/mapnik_palette.cpp                             |   70 +-
 src/mapnik_palette.hpp                             |   18 +-
 src/mapnik_plugins.hpp                             |   61 +-
 src/mapnik_proj_transform.cpp                      |  196 --
 src/mapnik_proj_transform.hpp                      |   34 -
 src/mapnik_projection.cpp                          |  378 ++-
 src/mapnik_projection.hpp                          |   49 +-
 src/mapnik_query.cpp                               |   32 -
 src/mapnik_query.hpp                               |   31 -
 src/mapnik_vector_tile.cpp                         | 3356 +++++++++++++++-----
 src/mapnik_vector_tile.hpp                         |  130 +-
 src/mem_datasource.hpp                             |  214 --
 src/node_mapnik.cpp                                |  193 +-
 src/object_to_container.hpp                        |   33 +
 src/pbf.hpp                                        |  171 +
 src/tint.hpp                                       |   88 +
 src/utils.hpp                                      |  115 +-
 test/blend-fixtures/1.png                          |  Bin 0 -> 10373 bytes
 test/blend-fixtures/1a.png                         |  Bin 0 -> 15831 bytes
 test/blend-fixtures/1x1.png                        |  Bin 0 -> 508 bytes
 test/blend-fixtures/2.png                          |  Bin 0 -> 96891 bytes
 test/blend-fixtures/2a.png                         |  Bin 0 -> 30365 bytes
 test/blend-fixtures/3.png                          |  Bin 0 -> 9548 bytes
 test/blend-fixtures/corrupt-1.png                  |  Bin 0 -> 8124 bytes
 test/blend-fixtures/expected-compression-5.webp    |  Bin 0 -> 9070 bytes
 test/blend-fixtures/expected-hex-palette-256.png   |  Bin 0 -> 8083 bytes
 test/blend-fixtures/expected-matte-6.png           |  Bin 0 -> 104353 bytes
 test/blend-fixtures/expected-matte-8.png           |  Bin 0 -> 24109 bytes
 test/blend-fixtures/expected-object-tint.png       |  Bin 0 -> 28662 bytes
 test/blend-fixtures/expected-object-x-y.png        |  Bin 0 -> 107676 bytes
 test/blend-fixtures/expected-oct-palette-256.png   |  Bin 0 -> 39926 bytes
 test/blend-fixtures/expected-palette-256.png       |  Bin 0 -> 22662 bytes
 test/blend-fixtures/expected.jpg                   |  Bin 0 -> 15187 bytes
 test/blend-fixtures/expected.png                   |  Bin 0 -> 104353 bytes
 test/blend-fixtures/expected.webp                  |  Bin 0 -> 9458 bytes
 test/blend-fixtures/not_a_real_image.txt           |    1 +
 test/blend.test.js                                 |  451 +++
 test/cairo_surface.test.js                         |    4 +-
 test/color.test.js                                 |   72 +-
 test/compositing.test.js                           |   35 +-
 test/constants.test.js                             |   13 +-
 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/images/corrupt-10x10.png                 |  Bin 0 -> 92 bytes
 .../data/map-a/DejaVuSerifCondensed-BoldItalic.ttf |  Bin 0 -> 335940 bytes
 test/data/map-b/DejaVuSerifCondensed-Bold.ttf      |  Bin 0 -> 320720 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 -> 7768 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 -> 15538 bytes
 test/data/vector_tile/tile0-c.expected.png         |  Bin 14137 -> 13333 bytes
 test/data/vector_tile/tile0.actual.png             |  Bin 27091 -> 0 bytes
 test/data/vector_tile/tile0.expected-cairo.svg     |  200 ++
 test/data/vector_tile/tile0.expected-svg.svg       |  201 ++
 test/data/vector_tile/tile0.expected.grid.json     |  107 +-
 test/data/vector_tile/tile0.expected.png           |  Bin 27091 -> 17101 bytes
 test/data/vector_tile/tile0.vector.pbf             |  Bin 87627 -> 50297 bytes
 test/data/vector_tile/tile2.vector.pbf             |  Bin 445 -> 429 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                            |   74 +-
 test/expression.test.js                            |   22 +-
 test/feature.test.js                               |  238 +-
 test/font_path.test.js                             |   22 +
 test/fonts.test.js                                 |  138 +-
 test/geometry.test.js                              |   75 +
 test/geotiff-load.test.js                          |   28 +
 test/grid.test.js                                  |   85 +-
 test/grid_view.test.js                             |   29 +-
 test/image.test.js                                 |  655 +++-
 test/image_view.test.js                            |  177 +-
 test/layers.test.js                                |   30 +-
 test/logger.test.js                                |   16 +
 test/map.test.js                                   |  290 +-
 test/map_generation.test.js                        |   10 +-
 test/mapnik-shapeindex.test.js                     |   56 +
 test/palette.test.js                               |   25 +-
 test/parameters.test.js                            |   30 +-
 test/proj_transform.test.js                        |   55 +-
 test/projection.test.js                            |   22 +-
 test/query-map.test.js                             |   65 +-
 test/render-async.test.js                          |  106 +-
 test/render-sync.test.js                           |  175 +-
 test/render_grid.test.js                           |  154 +-
 test/shp2geojson.test.js                           |   15 +-
 test/stylesheet.xml                                |    3 +-
 test/support/extra_arbitary_map_parameters.xml     |   24 +-
 test/support/grid2.json                            | 1314 +++++++-
 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/support/helper.js                             |    2 +
 test/unicode-loading.test.js                       |  130 +-
 test/vector-tile.composite.test.js                 |  493 +++
 test/vector-tile.query.test.js                     |  500 +++
 test/vector-tile.queryMany.test.js                 |  283 ++
 test/vector-tile.test.js                           |  895 +++++-
 vcbuild.bat                                        |   16 +-
 224 files changed, 21368 insertions(+), 7679 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 .npmignore
 create mode 100644 appveyor.yml
 create mode 100644 bench/boundary.pbf
 create mode 100644 bench/error/test_vt_abort.js
 create mode 100644 bench/error/test_vt_abort2.js
 create mode 100755 bin/mapnik-shapeindex.js
 delete mode 100755 configure
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/test_disable_raster_layer.patch
 create mode 100644 debian/tests/control
 create mode 100644 docs/Contributing.md
 delete mode 100644 docs/FAQ.md
 create mode 100644 docs/Feature.md
 create mode 100644 docs/Geometry.md
 create mode 100644 docs/Image.md
 create mode 100644 docs/Logger.md
 create mode 100644 docs/Map.md
 delete mode 100644 docs/Release.md
 create mode 100644 docs/Using-Fonts.md
 create mode 100644 docs/VectorTile.md
 create mode 100644 scripts/before-build.bat
 create mode 100755 scripts/build_against_sdk.sh
 create mode 100644 scripts/build_against_sdk_02-copy-deps-to-bindingdir.ps1
 create mode 100644 scripts/build_against_sdk_03-write-mapnik.settings.ps1
 create mode 100755 scripts/install_node.sh
 create mode 100755 scripts/package_osx.sh
 create mode 100644 scripts/remove_node.bat
 create mode 100755 scripts/setup_cpp11_toolchain.sh
 create mode 100644 scripts/show_module_runtime.ps1
 create mode 100755 scripts/ubuntu_ppa_tests.sh
 create mode 100755 scripts/validate_tag.sh
 create mode 100644 src/blend.cpp
 create mode 100644 src/blend.hpp
 delete mode 100644 src/mapnik_.cpp
 delete mode 100644 src/mapnik_.hpp
 delete mode 100644 src/mapnik_js_datasource.cpp
 delete mode 100644 src/mapnik_js_datasource.hpp
 create mode 100644 src/mapnik_logger.cpp
 create mode 100644 src/mapnik_logger.hpp
 delete mode 100644 src/mapnik_proj_transform.cpp
 delete mode 100644 src/mapnik_proj_transform.hpp
 delete mode 100644 src/mapnik_query.cpp
 delete mode 100644 src/mapnik_query.hpp
 delete mode 100644 src/mem_datasource.hpp
 create mode 100644 src/object_to_container.hpp
 create mode 100644 src/pbf.hpp
 create mode 100644 src/tint.hpp
 create mode 100644 test/blend-fixtures/1.png
 create mode 100644 test/blend-fixtures/1a.png
 create mode 100644 test/blend-fixtures/1x1.png
 create mode 100644 test/blend-fixtures/2.png
 create mode 100644 test/blend-fixtures/2a.png
 create mode 100644 test/blend-fixtures/3.png
 create mode 100644 test/blend-fixtures/corrupt-1.png
 create mode 100644 test/blend-fixtures/expected-compression-5.webp
 create mode 100644 test/blend-fixtures/expected-hex-palette-256.png
 create mode 100644 test/blend-fixtures/expected-matte-6.png
 create mode 100644 test/blend-fixtures/expected-matte-8.png
 create mode 100644 test/blend-fixtures/expected-object-tint.png
 create mode 100644 test/blend-fixtures/expected-object-x-y.png
 create mode 100644 test/blend-fixtures/expected-oct-palette-256.png
 create mode 100644 test/blend-fixtures/expected-palette-256.png
 create mode 100644 test/blend-fixtures/expected.jpg
 create mode 100644 test/blend-fixtures/expected.png
 create mode 100644 test/blend-fixtures/expected.webp
 create mode 100644 test/blend-fixtures/not_a_real_image.txt
 create mode 100644 test/blend.test.js
 create mode 100644 test/data/images/10x10.jpeg
 create mode 100644 test/data/images/10x10.png
 create mode 100644 test/data/images/10x10.tiff
 create mode 100644 test/data/images/10x10.webp
 create mode 100644 test/data/images/corrupt-10x10.png
 create mode 100644 test/data/map-a/DejaVuSerifCondensed-BoldItalic.ttf
 create mode 100644 test/data/map-b/DejaVuSerifCondensed-Bold.ttf
 rename test/{ => data}/markers.xml (73%)
 create mode 100644 test/data/roads.csv
 create mode 100644 test/data/roads.xml
 create mode 100644 test/data/vector_tile/10.196.370.vector.pbf
 create mode 100644 test/data/vector_tile/12.771.1608.vector.pbf
 create mode 100644 test/data/vector_tile/13.1337.2825.vector.pbf
 create mode 100644 test/data/vector_tile/cloudless_1_0_0.jpg
 create mode 100644 test/data/vector_tile/compositing/expected/0-0-0-mosaic.png
 create mode 100644 test/data/vector_tile/compositing/expected/2-1-1-empty.png
 create mode 100644 test/data/vector_tile/compositing/expected/2-1-1-no-point.png
 create mode 100644 test/data/vector_tile/compositing/expected/2-1-1.png
 create mode 100644 test/data/vector_tile/compositing/expected/concat.png
 create mode 100644 test/data/vector_tile/compositing/expected/image_concat.png
 create mode 100755 test/data/vector_tile/compositing/layers/lines.xml
 create mode 100755 test/data/vector_tile/compositing/layers/points.xml
 create mode 100755 test/data/vector_tile/compositing/styles/all.xml
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-0-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-1-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-1-0-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-1-1-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-1-1-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-2-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-2-0-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/lines-2-1-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-0-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-1-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-1-0-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-1-1-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-1-1-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-2-0-0.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-2-0-1.vector.pbf
 create mode 100644 test/data/vector_tile/compositing/tiles/points-2-1-1.vector.pbf
 create mode 100644 test/data/vector_tile/raster_layer.xml
 create mode 100644 test/data/vector_tile/raster_style.xml
 create mode 100644 test/data/vector_tile/tile-raster.expected.jpg
 create mode 100644 test/data/vector_tile/tile-raster2.expected.png
 delete mode 100644 test/data/vector_tile/tile0-b.actual.png
 delete mode 100644 test/data/vector_tile/tile0.actual.png
 create mode 100644 test/data/vector_tile/tile0.expected-cairo.svg
 create mode 100644 test/data/vector_tile/tile0.expected-svg.svg
 delete mode 100644 test/data/vector_tile/tile3.actual.png
 create mode 100644 test/font_path.test.js
 create mode 100644 test/geometry.test.js
 create mode 100644 test/geotiff-load.test.js
 create mode 100644 test/logger.test.js
 create mode 100644 test/mapnik-shapeindex.test.js
 create mode 100644 test/vector-tile.composite.test.js
 create mode 100644 test/vector-tile.query.test.js
 create mode 100644 test/vector-tile.queryMany.test.js

-- 
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