[Pkg-javascript-commits] [node-mapnik] 03/04: Import changes 0-day NMU.
Bas Couwenberg
sebastic at debian.org
Wed Feb 21 10:36:07 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository node-mapnik.
commit 2d936acefcb03fed7fc95d09d47df31f6721c823
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Feb 21 11:11:15 2018 +0100
Import changes 0-day NMU.
---
debian/changelog | 9 +++
debian/patches/852.patch | 144 +++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 154 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 276b4be..0743a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,15 @@ node-mapnik (3.6.2+dfsg-4) UNRELEASED; urgency=medium
-- Bas Couwenberg <sebastic at debian.org> Fri, 09 Feb 2018 12:14:25 +0100
+node-mapnik (3.6.2+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/852.patch
+ - upstream build fix (Closes: #889962)
+ * Tweak 852.patch to avoid test images, and patching package.json
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Wed, 21 Feb 2018 10:20:06 +0100
+
node-mapnik (3.6.2+dfsg-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/852.patch b/debian/patches/852.patch
new file mode 100644
index 0000000..1342434
--- /dev/null
+++ b/debian/patches/852.patch
@@ -0,0 +1,144 @@
+From a904fe08b0121470eba66a72656b6d6208372c4c Mon Sep 17 00:00:00 2001
+From: Blake Thompson <flippmoke at gmail.com>
+Date: Mon, 5 Feb 2018 17:41:01 -0500
+Subject: [PATCH 1/4] Updates around removal of spherical merc class in mapnik
+ vector tile
+
+---
+ src/mapnik_vector_tile.cpp | 13 +++++--------
+ .../vector_tile/compositing/expected/2-1-1b.png | Bin 154739 -> 154748 bytes
+ .../expected/world-reencode-max-extent.png | Bin 7993 -> 7992 bytes
+ .../compositing/expected/world-reencode.png | Bin 7981 -> 7980 bytes
+ test/vector-tile.test.js | 8 ++++----
+ 5 files changed, 9 insertions(+), 12 deletions(-)
+
+--- a/src/mapnik_vector_tile.cpp
++++ b/src/mapnik_vector_tile.cpp
+@@ -5144,20 +5144,17 @@ void VectorTile::EIO_RenderTile(uv_work_
+ try
+ {
+ mapnik::Map const& map_in = *closure->m->get();
+- mapnik::vector_tile_impl::spherical_mercator merc(closure->d->tile_size());
+- double minx,miny,maxx,maxy;
++ mapnik::box2d<double> map_extent;
+ if (closure->zxy_override)
+ {
+- merc.xyz(closure->x,closure->y,closure->z,minx,miny,maxx,maxy);
++ map_extent = mapnik::vector_tile_impl::tile_mercator_bbox(closure->x,closure->y,closure->z);
+ }
+ else
+ {
+- merc.xyz(closure->d->get_tile()->x(),
+- closure->d->get_tile()->y(),
+- closure->d->get_tile()->z(),
+- minx,miny,maxx,maxy);
++ map_extent = mapnik::vector_tile_impl::tile_mercator_bbox(closure->d->get_tile()->x(),
++ closure->d->get_tile()->y(),
++ closure->d->get_tile()->z());
+ }
+- mapnik::box2d<double> map_extent(minx,miny,maxx,maxy);
+ mapnik::request m_req(closure->width, closure->height, map_extent);
+ m_req.set_buffer_size(closure->buffer_size);
+ mapnik::projection map_proj(map_in.srs(),true);
+--- a/test/vector-tile.test.js
++++ b/test/vector-tile.test.js
+@@ -906,7 +906,7 @@ describe('mapnik.VectorTile ', function(
+ it('should be able to change tile coordinates and it change the extent', function(done) {
+ var vtile = new mapnik.VectorTile(9,112,195);
+ var extent = vtile.extent();
+- var expected = [-11271098.44281895, 4696291.017841229, -11192826.925854929, 4774562.534805248];
++ var expected = [-11271098.442818949, 4696291.017841229, -11192826.925854929, 4774562.534805249];
+ // typically not different, but rounding can cause different values
+ // so we assert each value's difference is nominal
+ assert(Math.abs(extent[0] - expected[0]) < 1e-8);
+@@ -919,7 +919,7 @@ describe('mapnik.VectorTile ', function(
+ vtile.x = 0;
+ assert.equal(vtile.x, 0);
+ extent = vtile.extent();
+- var expected_x = [-20037508.342789244, 4696291.017841229, -19959236.825825226, 4774562.534805248];
++ var expected_x = [-20037508.342789244, 4696291.017841229, -19959236.82582522, 4774562.534805249];
+ assert(Math.abs(extent[0] - expected_x[0]) < 1e-8);
+ assert(Math.abs(extent[1] - expected_x[1]) < 1e-8);
+ assert(Math.abs(extent[2] - expected_x[2]) < 1e-8);
+@@ -927,7 +927,7 @@ describe('mapnik.VectorTile ', function(
+ vtile.y = 0;
+ assert.equal(vtile.y, 0);
+ extent = vtile.extent();
+- var expected_y = [-20037508.342789244, 19959236.825825218, -19959236.825825226, 20037508.342789277];
++ var expected_y = [-20037508.342789244, 19959236.82582522, -19959236.82582522, 20037508.342789244];
+ assert(Math.abs(extent[0] - expected_y[0]) < 1e-8);
+ assert(Math.abs(extent[1] - expected_y[1]) < 1e-8);
+ assert(Math.abs(extent[2] - expected_y[2]) < 1e-8);
+@@ -935,7 +935,7 @@ describe('mapnik.VectorTile ', function(
+ vtile.z = 0;
+ assert.equal(vtile.z, 0);
+ extent = vtile.extent();
+- var expected_z = [-20037508.342789244, -20037508.34278924, 20037508.342789244, 20037508.342789277];
++ var expected_z = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244];
+ assert(Math.abs(extent[0] - expected_z[0]) < 1e-8);
+ assert(Math.abs(extent[1] - expected_z[1]) < 1e-8);
+ assert(Math.abs(extent[2] - expected_z[2]) < 1e-8);
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -1,5 +1,12 @@
+ # Changelog
+
++## 3.7.0
++
++Updated to 3.0.18 of mapnik. See [here](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md).
++
++- Updated to mapnik-vector-tile at 1.6.1
++- Removed windows support (https://github.com/mapnik/node-mapnik/issues/848)
++
+ ## 3.6.2
+
+ Updated to 3.0.15 of mapnik. The full changelog for this release is located [here](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md#3015).
+--- a/README.md
++++ b/README.md
+@@ -175,6 +175,13 @@ Then run (within the cloned `node-mapnik
+
+ make release_base
+
++#### Note on SSE:
++
++By default node mapnik is built with SSE support. If you are building on a platform that is not `x86_64` you will need to disable feature by setting the environment variable `SSE_MATH=false`.
++
++```
++SSE_MATH=false make
++```
+
+ ### Windows specific
+
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -2,6 +2,7 @@
+ 'includes': [ 'common.gypi' ],
+ 'variables': {
+ 'ENABLE_GLIBC_WORKAROUND%':'false', # can be overriden by a command line variable because of the % sign
++ 'enable_sse%':'true'
+ },
+ 'targets': [
+ {
+@@ -107,7 +108,10 @@
+ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0'
+ }
+ },
+- ]
++ ],
++ ['enable_sse == "true"', {
++ 'defines' : [ 'SSE_MATH' ]
++ }]
+ ]
+ },
+ {
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@ coverage:
+ clean:
+ rm -rf lib/binding
+ rm -rf build
+- rm -rf mason
++ rm -rf .mason
+ find test/ -name *actual* -exec rm {} \;
+ echo "run make distclean to also remove mason_packages and node_modules"
+
diff --git a/debian/patches/series b/debian/patches/series
index e32d3a4..7d323ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ upstream-git.patch
test_disable_raster_layer.patch
use-packaged-dependencies.patch
no-mason.patch
+852.patch
--
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