Add addImage, removeImage API (#7610)

2 files changed, 173 insertions, 0 deletions

diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js
index e3b287f68f..145f62ef5f 100644
--- a/platform/node/test/js/map.test.js
+++ b/platform/node/test/js/map.test.js
@@ -111,6 +111,8 @@ test('Map', function(t) {
             'addSource',
             'addLayer',
             'removeLayer',
+            'addImage',
+            'removeImage',
             'setLayoutProperty',
             'setPaintProperty',
             'setFilter',
@@ -129,6 +131,164 @@ test('Map', function(t) {
         t.end();
     });
 
+    t.test('.addImage', function(t) {
+        var options = {
+            request: function() {},
+            ratio: 1
+        };
+
+        t.test('requires 3 arguments', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage();
+            }, /Three arguments required/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires image argument to be an object', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', '', {});
+            }, /Second argument must be an object/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires options argument to have a height param', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', {}, {
+                    width: 40,
+                    pixelRatio: 2
+                });
+            }, /height parameter required/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires options argument to have a pixelRatio param', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', {}, {
+                    width: 40,
+                    height: 40
+                });
+            }, /pixelRatio parameter required/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires specified height to be actual height of image', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', new Buffer(''), {
+                    width: 401,
+                    height: 400,
+                    pixelRatio: 1
+                }, 'Image size does not match buffer size');
+            });
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires height and width to be less than 1024', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', new Buffer(''), {
+                    width: 1025,
+                    height: 1025,
+                    pixelRatio: 1
+                }, 'Max height and width is 1024');
+            });
+
+            map.release();
+            t.end();
+        });
+
+
+        t.test('requires specified height to be actual height of image', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.addImage('foo', new Buffer('   '), {
+                    width: 401,
+                    height: 400,
+                    pixelRatio: 1
+                }, 'Image size does not match buffer size');
+            });
+
+            map.release();
+            t.end();
+        });
+
+        t.test('No error', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.doesNotThrow(function() {
+                map.addImage('foo', new Buffer('    '), {
+                    width: 1,
+                    height: 1,
+                    pixelRatio: 1
+                });
+            });
+
+            map.release();
+            t.end();
+        });
+    });
+
+    t.test('.removeImage', function(t) {
+        var options = {
+            request: function() {},
+            ratio: 1
+        };
+
+        t.test('requires one argument', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.removeImage();
+            }, /One argument required/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('requires string as first argument', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.throws(function() {
+                map.removeImage({});
+            }, /First argument must be a string/);
+
+            map.release();
+            t.end();
+        });
+
+        t.test('removes image', function(t) {
+            var map = new mbgl.Map(options);
+
+            t.doesNotThrow(function() {
+                map.removeImage('fooBar');
+            });
+
+            map.release();
+            t.end();
+        });
+    });
+
     t.test('.load', function(t) {
         var options = {
             request: function() {},
diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js
index 3abf4136c4..55d7c64d2a 100644
--- a/platform/node/test/suite_implementation.js
+++ b/platform/node/test/suite_implementation.js
@@ -2,6 +2,9 @@
 
 var mbgl = require('../index');
 var request = require('request');
+var PNG = require('pngjs').PNG;
+var fs = require('fs');
+var path = require('path');
 
 mbgl.on('message', function(msg) {
     console.log('%s (%s): %s', msg.severity, msg.class, msg.text);
@@ -65,6 +68,16 @@ module.exports = function (style, options, callback) {
                 applyOperations(operations.slice(1), callback);
             });
 
+        } else if (operation[0] === 'addImage') {
+            var img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../node_modules', 'mapbox-gl-test-suite', operation[2])));
+
+            map.addImage(operation[1], img.data, {
+                height: img.height,
+                width: img.width,
+                pixelRatio: 1
+            });
+
+            applyOperations(operations.slice(1), callback);
         } else {
             // Ensure that the next `map.render(options)` does not overwrite this change.
             if (operation[0] === 'setCenter') {