update dependencies, package.json, and tests

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## HEAD
+## 4.4.0
 
+- Update protozero to v1.6.8
+- Update geometry.hpp to v1.0.0
+- Update wagyu to 0.5.0
 - Drop support for Node versions less than 10.
+- Consistent output image size compatible with other SVG libraries (#938)
 
 ## 4.3.1
 - Update to mapnik@a0ea7db1a

package.json

@@ -4,8 +4,8 @@
   "url": "http://github.com/mapnik/node-mapnik",
   "homepage": "http://mapnik.org",
   "author": "Dane Springmeyer <[email protected]> (mapnik.org)",
-  "version": "4.3.1",
-  "mapnik_version": "a0ea7db1a",
+  "version": "4.4.0",
+  "mapnik_version": "0636734f8",
   "main": "./lib/mapnik.js",
   "binary": {
     "module_name": "mapnik",
@@ -53,11 +53,11 @@
     "docs": "documentation build src/*.cpp src/mapnik_plugins.hpp --polyglot -o documentation -f html --github --name Mapnik"
   },
   "devDependencies": {
+    "@mapbox/sphericalmercator": "~1.0.2",
     "aws-sdk": "2.0.12",
+    "bytes": "~2.1.0",
     "jshint": "^2.5.10",
-    "mocha": "2.x",
-    "@mapbox/sphericalmercator": "~1.0.2",
-    "bytes": "~2.1.0"
+    "mocha": "^7.0.1"
   },
   "jshintConfig": {
     "node": true,

test/image.svg.test.js

@@ -235,7 +235,7 @@ describe('mapnik.Image SVG', function() {
         assert.ok(img instanceof mapnik.Image);
         assert.equal(img.width(), 256);
         assert.equal(img.height(), 256);
-        assert.equal(img.encodeSync('png32').length, 17571);
+        assert.equal(img.encodeSync('png32').length, 17546);
     });
 
     it('#fromSVGSync load from SVG file - 2', function() {
@@ -244,7 +244,7 @@ describe('mapnik.Image SVG', function() {
         assert.ok(img instanceof mapnik.Image);
         assert.equal(img.width(), 256);
         assert.equal(img.height(), 256);
-        assert.equal(img.encodeSync('png32').length, 17571);
+        assert.equal(img.encodeSync('png32').length, 17546);
     });
 
 
@@ -253,7 +253,7 @@ describe('mapnik.Image SVG', function() {
             assert.ok(img); assert.ok(img instanceof mapnik.Image);
             assert.equal(img.width(), 256);
             assert.equal(img.height(), 256);
-            assert.equal(img.encodeSync('png32').length, 17571);
+            assert.equal(img.encodeSync('png32').length, 17546);
             assert.equal(img.premultiplied(), false);
             done();
         });

test/vector-tile.test.js

@@ -2241,7 +2241,7 @@ describe('mapnik.VectorTile ', function() {
             if (err) throw err;
             if (hasBoostSimple) {
                 assert.equal(vtile.reportGeometrySimplicity().length, 0);
-                assert.equal(vtile.reportGeometryValidity().length, 25); // Dataset not expected to be OGC valid
+                assert.equal(vtile.reportGeometryValidity().length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0.mvt';
@@ -2279,7 +2279,7 @@ describe('mapnik.VectorTile ', function() {
             if (hasBoostSimple) {
                 // commented since this is not stable across boost versions
                 //assert.equal(vtile.reportGeometrySimplicity().length, 1); // seems simple, boost bug?
-                assert.equal(vtile.reportGeometryValidity().length, 25); // Dataset not expected to be OGC valid
+                assert.equal(vtile.reportGeometryValidity().length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile_threading_auto.mvt';
@@ -2318,7 +2318,7 @@ describe('mapnik.VectorTile ', function() {
             if (hasBoostSimple) {
                 // commented since this is not stable across boost versions
                 //assert.equal(vtile.reportGeometrySimplicity().length, 1); // geometry is simple, boost bug?
-                assert.equal(vtile.reportGeometryValidity().length, 25); // Dataset not expected to be OGC valid
+                assert.equal(vtile.reportGeometryValidity().length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile_threading_async.mvt';
@@ -2349,7 +2349,7 @@ describe('mapnik.VectorTile ', function() {
             if (err) throw err;
             if (hasBoostSimple) {
                 assert.equal(vtile.reportGeometrySimplicity().length, 0);
-                assert.equal(vtile.reportGeometryValidity().length, 24); // Dataset not expected to be OGC valid
+                assert.equal(vtile.reportGeometryValidity().length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-area_threshold.mvt';
@@ -2381,7 +2381,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-strictly_simple.mvt';
@@ -2416,10 +2416,10 @@ describe('mapnik.VectorTile ', function() {
                 var validityReport3 = vtile.reportGeometryValidity({lat_lon:true});
                 var validityReport4 = vtile.reportGeometryValidity({web_merc:true});
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(validityReport2.length, 0); // Dataset not expected to be OGC valid
-                assert.equal(validityReport3.length, 26); // Dataset not expected to be OGC valid
-                assert.equal(validityReport4.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport3.length, 24); // Dataset not expected to be OGC valid
+                assert.equal(validityReport4.length, 23); // Dataset not expected to be OGC valid
             }
             var expected = './test/data/vector_tile/tile0-strictly_simple_false.mvt';
             var actual = './test/data/vector_tile/tile0-strictly_simple_false.actual.mvt';
@@ -2450,7 +2450,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 33); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 30); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-simplify_distance.mvt';
@@ -2490,7 +2490,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 33); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 30); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-simple_and_distance.mvt';
@@ -2531,7 +2531,7 @@ describe('mapnik.VectorTile ', function() {
                 var validityReport = vtile.reportGeometryValidity();
                 var validityReport2 = vtile.reportGeometryValidity({split_multi_features:true});
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(validityReport2.length, 0);
             }
             var expected = './test/data/vector_tile/tile0-mpu-false.mvt';
@@ -2595,7 +2595,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-evenOdd.mvt';
@@ -2627,7 +2627,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-nonZero.mvt';
@@ -2659,7 +2659,7 @@ describe('mapnik.VectorTile ', function() {
                 var simplicityReport = vtile.reportGeometrySimplicity();
                 var validityReport = vtile.reportGeometryValidity();
                 assert.equal(simplicityReport.length, 0);
-                assert.equal(validityReport.length, 25); // Dataset not expected to be OGC valid
+                assert.equal(validityReport.length, 23); // Dataset not expected to be OGC valid
                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
             }
             var expected = './test/data/vector_tile/tile0-process-all-mp-rings.mvt';