Merge pull request #764 from mapnik/image_fix

flippmoke · web-flow · commit d8129f81df07 · 2017-06-13T11:30:17.000-05:00
Fixes zero width or height image reading
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ node_modules
 src/*.*~
 npm-debug.log
 test/tmp
+test/data/images/*actual*
 test/data/vector_tile/*actual*
 test/data/vector_tile/pasted/*actual*
 *.7z
diff --git a/.travis.yml b/.travis.yml
@@ -65,9 +65,14 @@ matrix:
     - os: linux
       env: BUILDTYPE=debug
       node_js: 6
+    # linux publishable node v7
     - os: linux
       env: BUILDTYPE=release
       node_js: 7
+    # linux publishable node v8
+    - os: linux
+      env: BUILDTYPE=release
+      node_js: 8
     # osx publishable node v0.10
     - os: osx
       osx_image: xcode8.3
@@ -88,6 +93,11 @@ matrix:
       osx_image: xcode8.2
       env: BUILDTYPE=release
       node_js: 7
+    # osx publishable node v8
+    - os: osx
+      osx_image: xcode8.2
+      env: BUILDTYPE=release
+      node_js: 8
     # Sanitizer build node v4/Debug
     - os: linux
       env: BUILDTYPE=debug TOOLSET=-asan
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 3.6.1
+
+Updated for a fix associated with mapnik-vector-tile where images could be requested that would have a width or height of zero resulting
+in exceptions. 
+
+Several fixes associated with different mapnik by updating to use 3.0.14. Please see mapnik change log for specifics. In
+general note worthy changes from mapnik include stricter geojson parsing, fixes for raster plugin, fixes to image scaling,
+changing the meaning of filter-factor, and improvements to the the TIFF decoder. 
+
+Due to changes in the mapnik core version during this update you should see some changes in the image rescaling of raster and gdal plugin source data. This will definitely change the expected output. This is due to fixes in long standing bugs in the mapnik library.
+
+- Updated to mapnik-vector-tile@1.4.0
+- Mapnik minimum version updated to 3.0.14. Does not work with mapnik 3.1.x currently.
+- Fixed tests around zlib compression and decompression when comparing to node's implementation
+- Fixes rare situation of seg faults during mapnik-vector-tile image processing.
+- Corrects the resolution of images in mapnik-vector-tile when using parameters from postgis plugin.
+
 ## 3.6.0
 
 This release has major performance and stability improvements.
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,18 +10,16 @@ environment:
     - nodejs_version: 0.10
       msvs_toolset: 14
       platform: x86
-    # Fixed at version until https://github.com/nodejs/node/issues/12244 is resolved by nodejs
-    - nodejs_version: 4.8.1
+    - nodejs_version: 4
       msvs_toolset: 14
       platform: x64
-    - nodejs_version: 4.8.1
+    - nodejs_version: 4
       msvs_toolset: 14
       platform: x86
-    # Fixed at version until https://github.com/nodejs/node/issues/12244 is resolved by nodejs
-    - nodejs_version: 6.10.1
+    - nodejs_version: 6
       msvs_toolset: 14
       platform: x64
-    - nodejs_version: 6.10.1
+    - nodejs_version: 6
       msvs_toolset: 14
       platform: x86
     - nodejs_version: 8
diff --git a/install_mason.sh b/install_mason.sh
@@ -12,7 +12,7 @@ ICU_VERSION="57.1"
 
 if [ ! -f ./mason/mason.sh ]; then
     mkdir -p ./mason
-    curl -sSfL https://github.com/mapbox/mason/archive/d1a9856.tar.gz | tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=./mason
+    curl -sSfL https://github.com/mapbox/mason/archive/9eac60614fda7cfeb8a9e81d18e8cca5c1ae8fbc.tar.gz | tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=./mason
 fi
 
 if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
@@ -38,5 +38,5 @@ if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
     # NOTE: sync this version with the `mapnik_version` in package.json (which is used for windows builds)
     # In the future we could pull from that version automatically if mason were to support knowing the right dep
     # versions to install automatically. Until then there is not much point since the deps are still hardcoded here.
-    install mapnik 3.0.13-1
+    install mapnik 3.0.14
 fi
diff --git a/package.json b/package.json
@@ -4,8 +4,8 @@
   "url": "http://github.com/mapnik/node-mapnik",
   "homepage": "http://mapnik.org",
   "author": "Dane Springmeyer <dane@mapbox.com> (mapnik.org)",
-  "version": "3.6.0",
-  "mapnik_version":"v3.0.13",
+  "version": "3.6.1",
+  "mapnik_version":"v3.0.14",
   "main": "./lib/mapnik.js",
   "binary": {
     "module_name": "mapnik",
@@ -36,7 +36,7 @@
   ],
   "license": "BSD-3-Clause",
   "dependencies": {
-    "mapnik-vector-tile": "1.3.0",
+    "mapnik-vector-tile": "1.4.0",
     "protozero": "1.5.1",
     "nan": "~2.5.0",
     "node-pre-gyp": "~0.6.30"
diff --git a/test/data/images/14_2788_6533.webp b/test/data/images/14_2788_6533.webp
diff --git a/test/data/images/large_overzoom.expected.png b/test/data/images/large_overzoom.expected.png
diff --git a/test/data/images/sat_image-expected-100x100-offset.tif b/test/data/images/sat_image-expected-100x100-offset.tif
diff --git a/test/data/images/sat_image-expected-50x50-offset.tif b/test/data/images/sat_image-expected-50x50-offset.tif
diff --git a/test/data/large_overzoom.xml b/test/data/large_overzoom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over" base="/Users/mthompson/src/api-maps/node_modules/mapbox-maps/node_modules/@mapbox/tilelive-vector/" maximum-extent="-20037508.34,-20037508.34,20037508.34,20037508.34">
+  <Parameters>
+    <Parameter name="bounds">-180,-85.0511,180,85.0511</Parameter>
+    <Parameter name="center">0,0,3</Parameter>
+    <Parameter name="format">png8:m=h</Parameter>
+    <Parameter name="maxzoom">22</Parameter>
+    <Parameter name="minzoom">0</Parameter>
+    <Parameter name="scale">1</Parameter>
+  </Parameters>
+  <Style name="_image" filter-mode="first" comp-op="screen">
+    <Rule>
+      <Filter>([mapnik::geometry_type]=3)</Filter>
+      <LineSymbolizer stroke="rgba(85,187,102,0.502)" stroke-width="0.5"/>
+      <PolygonSymbolizer fill="rgba(85,187,102,0.051)"/>
+    </Rule>
+    <Rule>
+      <Filter>([mapnik::geometry_type]=2)</Filter>
+      <LineSymbolizer stroke="rgba(85,187,102,0.502)" stroke-width="1"/>
+    </Rule>
+    <Rule>
+      <Filter>([mapnik::geometry_type]=1)</Filter>
+      <DotSymbolizer fill="rgba(85,187,102,0.502)" width="5"/>
+      <TextSymbolizer allow-overlap="true" dy="6" justify-alignment="left" face-name="Source Sans Pro Regular" size="12" fill="rgba(85,187,102,0.749)">[name]</TextSymbolizer>
+    </Rule>
+  </Style>
+  <Style name="_image-raster" filter-mode="first">
+    <Rule>
+      <ElseFilter/>
+      <RasterSymbolizer opacity="1"/>
+    </Rule>
+  </Style>
+  <Layer name="_image" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <StyleName>_image</StyleName>
+    <StyleName>_image-raster</StyleName>
+  </Layer>
+  <Layer name="_image" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
+    <StyleName>_image</StyleName>
+  </Layer>
+</Map>
diff --git a/test/data/sat_map.xml b/test/data/sat_map.xml
@@ -1,7 +1,7 @@
 <Map srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
     <Style name="style">
         <Rule>
-            <RasterSymbolizer scaling="sinc" filter-factor="2.5"/>
+            <RasterSymbolizer scaling="sinc" filter-factor="2.0"/>
         </Rule>
     </Style>
     <Layer name="raster" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
diff --git a/test/data/vector_tile/compositing/expected/2-1-1b.png b/test/data/vector_tile/compositing/expected/2-1-1b.png
diff --git a/test/data/vector_tile/tile-raster.expected.jpg b/test/data/vector_tile/tile-raster.expected.jpg
diff --git a/test/geometry.test.js b/test/geometry.test.js
@@ -183,20 +183,6 @@ describe('mapnik.Geometry ', function() {
         assert.equal(geom.typeName(), 'GeometryCollection');
     });
 
-    it('should return a type name for an unknown geometry', function() {
-        var input = {
-            type: 'Feature',
-            properties: {},
-            geometry: {
-                type: 'MultiPoint',
-                coordinates: [ 10, 15 ]
-            }
-        };
-        var f = new mapnik.Feature.fromJSON(JSON.stringify(input));
-        var geom = f.geometry();
-        assert.equal(geom.typeName(), 'Unknown');
-    });
-
     it('should return a type name for a broken geometry', function() {
         var input = {
             type: 'Feature',
diff --git a/test/image.test.js b/test/image.test.js
@@ -1493,7 +1493,7 @@ describe('mapnik.Image ', function() {
     it('resize async should yield the same results as rendered image', function(done) {
         var im = new mapnik.Image.open('test/data/images/sat_image.png');
         im.premultiply();
-        im.resize(50,50, {scaling_method:mapnik.imageScaling.sinc, filter_factor:2.5}, function(err, result) {
+        im.resize(50,50, {scaling_method:mapnik.imageScaling.sinc, filter_factor:2.0}, function(err, result) {
             if (err) throw err;
             var map = new mapnik.Map(50,50);
             map.load('test/data/sat_map.xml', function(err, map) {
@@ -1513,7 +1513,7 @@ describe('mapnik.Image ', function() {
     it('resize sync should yield the same results as rendered image', function(done) {
         var im = new mapnik.Image.open('test/data/images/sat_image.png');
         im.premultiply();
-        var result = im.resizeSync(50, 50, {scaling_method:mapnik.imageScaling.sinc, filter_factor:2.5});
+        var result = im.resizeSync(50, 50, {scaling_method:mapnik.imageScaling.sinc, filter_factor:2.0});
         var map = new mapnik.Map(50,50);
         map.load('test/data/sat_map.xml', function(err, map) {
             if (err) throw err;
diff --git a/test/vector-tile.query.test.js b/test/vector-tile.query.test.js
@@ -521,7 +521,7 @@ describe('mapnik.VectorTile query (distance <= tolerance)', function() {
             "type": "Feature",
             "geometry": {
               "type": "Polygon",
-              "coordinates": [ [-180,85], [180,-85], [-180,-85], [-180,85] ]
+              "coordinates": [[[-180,85], [180,-85], [-180,-85], [-180,85]]]
             },
             "properties": { "name": "A" }
           }]
diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js
@@ -2078,6 +2078,35 @@ describe('mapnik.VectorTile ', function() {
         });
     });
 
+    it('should render an image with a large amount of overzooming', function(done) {
+        var data = fs.readFileSync("./test/data/images/14_2788_6533.webp");
+        var vtile = new mapnik.VectorTile(14,2788,6533);
+        vtile.addImageBufferSync(data, '_image'); 
+        var map = new mapnik.Map(256,256);
+        map.loadSync('./test/data/large_overzoom.xml');
+        var opts = { z: 24, x: 2855279, y: 6690105, scale: 1, buffer_size: 256 };
+        var img = new mapnik.Image(256,256);
+        vtile.render(map, img, opts, function(err, image) {
+            if (err) throw err;
+            var expected = './test/data/images/large_overzoom.expected.png';
+            var actual = './test/data/images/large_overzoom.actual.png';
+            if (!existsSync(expected) || process.env.UPDATE) {
+                image.save(expected, 'png32');
+            }
+            image.save(actual, 'png32');
+            var e = fs.readFileSync(expected);
+            var a = fs.readFileSync(actual);
+            if (mapnik.versions.mapnik_number >= 300000) {
+                assert.ok(Math.abs(e.length - a.length) < 100);
+            } else {
+                assert.equal(e.length,a.length);
+            }
+
+            done();
+        });
+
+    });
+
     it('should render expected results - with objectional arguments', function(done) {
         var data = fs.readFileSync("./test/data/vector_tile/tile3.mvt");
         var vtile = new mapnik.VectorTile(5,28,12);
