Merge pull request #775 from mapnik/zlib_fix

Fixes logic for zlib headers being slightly different in rare situati…

Author: flippmoke

.travis.yml

@@ -77,17 +77,17 @@ matrix:
     - os: osx
       osx_image: xcode8.3
       env: BUILDTYPE=release
-      node_js: "4.8.1" # Fixed at version until https://github.com/nodejs/node/issues/12244 is resolved by nodejs
+      node_js: 4
     # osx publishable node v6
     - os: osx
       osx_image: xcode8.3
       env: BUILDTYPE=release
-      node_js: "6.10.1" # Fixed at version until https://github.com/nodejs/node/issues/12244 is resolved by nodejs
+      node_js: 6
     # osx publishable node v7
     - os: osx
       osx_image: xcode8.2
       env: BUILDTYPE=release
-      node_js: "7.5.0" # Fixed at version until https://github.com/nodejs/node/issues/12244 is resolved by nodejs
+      node_js: 7
     # Sanitizer build node v4/Debug
     - os: linux
       env: BUILDTYPE=debug TOOLSET=-asan

test/vector-tile.test.js

@@ -985,9 +985,11 @@ describe('mapnik.VectorTile ', function() {
             gzip.removeAllListeners();
             gzip=null;
             var compressed = vtile.getData({compression:'gzip', strategy:'RLE'});
-            assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+            // Substring used to remove gzip header
+            assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
             vtile.getData({compression:'gzip', strategy:'RLE'}, function (err, compressed) {
-                assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+                // Substring used to remove gzip header
+                assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
                 done();
             });
         });
@@ -1038,9 +1040,11 @@ describe('mapnik.VectorTile ', function() {
             gzip.removeAllListeners();
             gzip=null;
             var compressed = vtile.getData({compression:'gzip', strategy:'FILTERED'});
-            assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+            // Substring used to remove gzip header
+            assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
             vtile.getData({compression:'gzip', strategy:'FILTERED'}, function (err, compressed) {
-                assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+                // Substring used to remove gzip header
+                assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
                 done();
             });
         });
@@ -1091,9 +1095,11 @@ describe('mapnik.VectorTile ', function() {
             gzip.removeAllListeners();
             gzip=null;
             var compressed = vtile.getData({compression:'gzip', strategy:'HUFFMAN_ONLY'});
-            assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+            // Substring used to remove gzip header
+            assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
             vtile.getData({compression:'gzip', strategy:'HUFFMAN_ONLY'}, function (err, compressed) {
-                assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+                // Substring used to remove gzip header
+                assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
                 done();
             });
         });
@@ -1144,9 +1150,11 @@ describe('mapnik.VectorTile ', function() {
             gzip.removeAllListeners();
             gzip=null;
             var compressed = vtile.getData({compression:'gzip', strategy:'FIXED'});
-            assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+            // Substring used to remove gzip header
+            assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
             vtile.getData({compression:'gzip', strategy:'FIXED'}, function (err, compressed) {
-                assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+                // Substring is used to remove gzip header
+                assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
                 done();
             });
         });
@@ -1197,9 +1205,11 @@ describe('mapnik.VectorTile ', function() {
             gzip.removeAllListeners();
             gzip=null;
             var compressed = vtile.getData({compression:'gzip', strategy:'DEFAULT'});
-            assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+            // Substring used to remove gzip header
+            assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
             vtile.getData({compression:'gzip', strategy:'DEFAULT'}, function (err, compressed) {
-                assert.equal(buffer.toString('hex'), compressed.toString('hex'));
+                // Substring used to remove gzip header
+                assert.equal(buffer.toString('hex').substring(20), compressed.toString('hex').substring(20));
                 done();
             });
         });