[Pkg-javascript-commits] [node-mapnik] 03/12: Merge tag 'upstream/1.1.3'
Jérémy Lal
kapouer at alioth.debian.org
Thu Aug 29 09:48:24 UTC 2013
This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master
in repository node-mapnik.
commit c83fb0495e78fa245c27e11c32c07910bfd35c11
Merge: 61d57e1 e3c587d
Author: Jérémy Lal <kapouer at melix.org>
Date: Tue Aug 27 10:27:54 2013 +0200
Merge tag 'upstream/1.1.3'
Upstream version 1.1.3
# gpg: Signature faite le mar. 27 août 2013 10:27:52 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 | 10 +
.npmignore | 2 -
CHANGELOG.md | 342 ++++
LICENSE.txt | 2 +-
Makefile | 50 +-
README.md | 123 +-
bin/mapnik-inspect.js | 59 +-
binding.gyp | 130 ++
build.gyp | 116 --
common.gypi | 29 +
configure | 2 +-
docs/Release.md | 16 +-
examples/README.md | 36 -
examples/js_datasource/simple.js | 110 --
examples/js_datasource/usgs_quakes.js | 93 -
examples/memory_datasource/simple.js | 92 -
examples/simple/blank.js | 19 -
examples/simple/render.js | 33 -
examples/simple/simple.js | 42 -
examples/simple/simple_express.js | 31 -
examples/simple/simple_pool.js | 74 -
examples/tile/database/app.js | 72 -
examples/tile/database/point_vector.xml | 75 -
examples/tile/elastic/README.md | 98 -
examples/tile/elastic/app.js | 161 --
examples/tile/elastic/create.sh | 20 -
examples/tile/elastic/seed_es_index.js | 60 -
examples/tile/index.html | 20 -
examples/tile/map.js | 19 -
examples/tile/pool/app.js | 102 --
examples/utils/pool.js | 33 -
examples/utils/sphericalmercator.js | 90 -
examples/utils/tile.js | 45 -
examples/wms/wms.js | 99 -
examples/wms/wms_pool.js | 92 -
gen_settings.py | 18 +-
gyp/.npmignore | 1 -
gyp/test/home_dot_gyp/home/.gyp/include.gypi | 5 -
gyp/test/home_dot_gyp/home2/.gyp/include.gypi | 5 -
lib/mapnik.js | 76 +-
package.json | 52 +-
src/ds_emitter.hpp | 294 +--
src/js_grid_utils.hpp | 279 ++-
src/layer_emitter.hpp | 83 -
src/mapnik_.cpp | 4 +-
src/mapnik_.hpp | 6 +-
src/mapnik_cairo_surface.cpp | 99 +
src/mapnik_cairo_surface.hpp | 57 +
src/mapnik_color.cpp | 64 +-
src/mapnik_color.hpp | 16 +-
src/mapnik_datasource.cpp | 148 +-
src/mapnik_datasource.hpp | 21 +-
src/mapnik_expression.cpp | 40 +-
src/mapnik_expression.hpp | 15 +-
src/mapnik_feature.cpp | 134 +-
src/mapnik_feature.hpp | 11 +-
src/mapnik_featureset.cpp | 22 +-
src/mapnik_featureset.hpp | 8 +-
src/mapnik_fonts.hpp | 57 +-
src/mapnik_geometry.cpp | 73 +-
src/mapnik_geometry.hpp | 7 +-
src/mapnik_grid.cpp | 540 +++++-
src/mapnik_grid.hpp | 19 +-
src/mapnik_grid_view.cpp | 516 +++++-
src/mapnik_grid_view.hpp | 23 +-
src/mapnik_image.cpp | 942 ++++++++--
src/mapnik_image.hpp | 33 +-
src/mapnik_image_view.cpp | 304 ++--
src/mapnik_image_view.hpp | 20 +-
src/mapnik_js_datasource.cpp | 34 +-
src/mapnik_js_datasource.hpp | 13 +-
src/mapnik_layer.cpp | 237 ++-
src/mapnik_layer.hpp | 24 +-
src/mapnik_map.cpp | 1893 ++++++++++----------
src/mapnik_map.hpp | 41 +-
src/mapnik_memory_datasource.cpp | 129 +-
src/mapnik_memory_datasource.hpp | 6 +-
src/mapnik_palette.cpp | 32 +-
src/mapnik_palette.hpp | 6 +-
src/mapnik_plugins.hpp | 33 +-
src/mapnik_proj_transform.cpp | 196 ++
src/mapnik_proj_transform.hpp | 34 +
src/mapnik_projection.cpp | 231 +--
src/mapnik_projection.hpp | 10 +-
src/mapnik_query.cpp | 32 +
src/mapnik_query.hpp | 31 +
src/mapnik_vector_tile.cpp | 1366 ++++++++++++++
src/mapnik_vector_tile.hpp | 83 +
src/mem_datasource.hpp | 46 +-
src/node_mapnik.cpp | 240 ++-
src/utils.hpp | 53 +-
test/cairo_surface.test.js | 26 +
test/color.test.js | 76 +-
test/compositing.test.js | 52 +
test/constants.test.js | 77 +-
...41\214\346\224\277\345\214\272\345\210\222.csv" | 3 +
.../points.csv" | 3 +
.../\344\275\240\345\245\275-ellipses.svg" | 14 +
...240\345\245\275_DejaVuSansMono-BoldOblique.ttf" | Bin 0 -> 235848 bytes
"test/data/u\314\210nicode_symbols.xml" | 48 +
.../data/vector_tile/layers.xml | 18 +-
test/data/vector_tile/tile0.actual.png | Bin 0 -> 27091 bytes
test/data/vector_tile/tile0.expected.grid.json | 1 +
test/data/vector_tile/tile0.expected.png | Bin 0 -> 27053 bytes
test/data/vector_tile/tile0.vector.pbf | Bin 0 -> 87627 bytes
test/data/vector_tile/tile1.vector.pbf | Bin 0 -> 213 bytes
test/data/vector_tile/tile2.vector.pbf | Bin 0 -> 445 bytes
test/data/vector_tile/tile3.actual.png | Bin 0 -> 6334 bytes
test/data/vector_tile/tile3.expected.png | Bin 0 -> 6334 bytes
test/data/vector_tile/tile3.vector.pbf | Bin 0 -> 544 bytes
{examples => test}/data/world_merc.dbf | Bin 24641 -> 24641 bytes
{examples => test}/data/world_merc.index | Bin 9092 -> 9092 bytes
{examples => test}/data/world_merc.json | 0
{examples => test}/data/world_merc.prj | 0
{examples => test}/data/world_merc.shp | Bin 428328 -> 428328 bytes
{examples => test}/data/world_merc.shx | Bin 2060 -> 2060 bytes
{examples => test}/data/world_merc_license.txt | 0
"test/data/\344\275\240\345\245\275_points.csv" | 3 +
"test/data/\344\275\240\345\245\275_points.dbf" | Bin 0 -> 688 bytes
.../data/\344\275\240\345\245\275_points.geojson" | 8 +
"test/data/\344\275\240\345\245\275_points.prj" | 1 +
"test/data/\344\275\240\345\245\275_points.shp" | Bin 0 -> 128 bytes
"test/data/\344\275\240\345\245\275_points.shx" | Bin 0 -> 108 bytes
"test/data/\344\275\240\345\245\275_points.sqlite" | Bin 0 -> 20480 bytes
test/datasource.test.js | 186 +-
test/expression.test.js | 52 +-
test/feature.test.js | 80 +-
test/fonts.test.js | 51 +-
test/grid.test.js | 149 +-
test/grid_view.test.js | 77 +-
test/image.test.js | 244 ++-
test/image_view.test.js | 97 +-
test/layers.test.js | 62 +-
test/map.test.js | 120 ++
test/map_generation.test.js | 343 +---
test/palette.test.js | 94 +-
test/parameters.test.js | 33 +-
test/proj_transform.test.js | 96 +
test/projection.test.js | 86 +-
test/query-map.test.js | 154 ++
test/render-async.test.js | 70 +-
test/render-sync.test.js | 28 +-
test/render_grid.test.js | 157 +-
test/run_examples.sh | 20 -
{examples => test}/stylesheet.xml | 0
test/support/a.png | Bin 0 -> 7543 bytes
test/support/b.png | Bin 0 -> 2789 bytes
test/support/composites.xml | 58 +
test/support/grid__id__.json | 1 +
test/support/grid__id__2.json | 1 +
test/support/grid__id__3.json | 1 +
test/unicode-loading.test.js | 123 ++
test/vector-tile.test.js | 322 ++++
tools/cpp.el | 12 +
tools/fix_cpp_style.sh | 6 +
vcbuild.bat => vcbuild-old.bat | 14 +-
vcbuild.bat | 21 +-
wscript | 100 +-
158 files changed, 8958 insertions(+), 5389 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