From ade0b7898b5e067364c632001a0f92358a93eee1 Mon Sep 17 00:00:00 2001
From: Thomas Chandelle <thomas.chandelle@1spatial.com>
Date: Thu, 12 Jan 2017 10:58:01 +0100
Subject: [PATCH 1/2] Remove "margin" at the bottom of the canvas

---
 src/ol/renderer/canvas/map.js |  1 +
 src/ol/renderer/webgl/map.js  |  1 +
 test/spec/ol/map.test.js      | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/src/ol/renderer/canvas/map.js b/src/ol/renderer/canvas/map.js
index 6db282e133..a0b484b7e7 100644
--- a/src/ol/renderer/canvas/map.js
+++ b/src/ol/renderer/canvas/map.js
@@ -41,6 +41,7 @@ ol.renderer.canvas.Map = function(container, map) {
 
   this.canvas_.style.width = '100%';
   this.canvas_.style.height = '100%';
+  this.canvas_.style.display = 'block';
   this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
   container.insertBefore(this.canvas_, container.childNodes[0] || null);
 
diff --git a/src/ol/renderer/webgl/map.js b/src/ol/renderer/webgl/map.js
index 772992807e..2799444316 100644
--- a/src/ol/renderer/webgl/map.js
+++ b/src/ol/renderer/webgl/map.js
@@ -40,6 +40,7 @@ if (ol.ENABLE_WEBGL) {
         (document.createElement('CANVAS'));
     this.canvas_.style.width = '100%';
     this.canvas_.style.height = '100%';
+    this.canvas_.style.display = 'block';
     this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
     container.insertBefore(this.canvas_, container.childNodes[0] || null);
 
diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js
index a1b2a7926e..1679b0d91a 100644
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -355,6 +355,38 @@ describe('ol.Map', function() {
 
   });
 
+  describe('#updateSize', function() {
+    var map, target;
+
+    beforeEach(function(done) {
+      target = document.createElement('div');
+      document.body.appendChild(target);
+      map = new ol.Map({
+        controls: [],
+        target: target,
+        view: new ol.View({
+          center: [0, 0],
+          zoom: 2
+        })
+      });
+      map.once('postrender', function() {
+        done();
+      });
+    });
+
+    afterEach(function() {
+      map.setTarget(null);
+      document.body.removeChild(target);
+    });
+
+    it('should always generate the same size', function() {
+      var initialSize = map.getSize();
+      map.updateSize();
+      expect(map.getSize()).to.eql(initialSize);
+    });
+
+  });
+
   describe('create interactions', function() {
 
     var options;

From 20c039135b0a1b17b679d4ea785f9bdb7d495a88 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Sun, 5 Feb 2017 18:51:38 +0100
Subject: [PATCH 2/2] Move updateSize test in the rendering tests

---
 test/spec/ol/map.test.js           | 32 ---------------------
 test_rendering/spec/ol/map.test.js | 45 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js
index 1679b0d91a..a1b2a7926e 100644
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -355,38 +355,6 @@ describe('ol.Map', function() {
 
   });
 
-  describe('#updateSize', function() {
-    var map, target;
-
-    beforeEach(function(done) {
-      target = document.createElement('div');
-      document.body.appendChild(target);
-      map = new ol.Map({
-        controls: [],
-        target: target,
-        view: new ol.View({
-          center: [0, 0],
-          zoom: 2
-        })
-      });
-      map.once('postrender', function() {
-        done();
-      });
-    });
-
-    afterEach(function() {
-      map.setTarget(null);
-      document.body.removeChild(target);
-    });
-
-    it('should always generate the same size', function() {
-      var initialSize = map.getSize();
-      map.updateSize();
-      expect(map.getSize()).to.eql(initialSize);
-    });
-
-  });
-
   describe('create interactions', function() {
 
     var options;
diff --git a/test_rendering/spec/ol/map.test.js b/test_rendering/spec/ol/map.test.js
index d8e35ba614..4c391c1c76 100644
--- a/test_rendering/spec/ol/map.test.js
+++ b/test_rendering/spec/ol/map.test.js
@@ -36,6 +36,51 @@ describe('ol.rendering.Map', function() {
     return map;
   }
 
+  describe('#updateSize()', function() {
+    var map, target;
+
+    function createMap(renderer) {
+      target = document.createElement('div');
+      document.body.appendChild(target);
+      map = new ol.Map({
+        renderer: renderer,
+        controls: [],
+        target: target,
+        view: new ol.View({
+          center: [0, 0],
+          zoom: 2
+        })
+      });
+      return map;
+    }
+
+    afterEach(function() {
+      map.setTarget(null);
+      document.body.removeChild(target);
+    });
+
+    it('tests the canvas renderer', function(done) {
+      map = createMap('canvas');
+      map.once('postrender', function() {
+        var initialSize = map.getSize();
+        map.updateSize();
+        expect(map.getSize()).to.eql(initialSize);
+        done();
+      });
+    });
+
+    it('tests the WebGL renderer', function(done) {
+      assertWebGL();
+      map = createMap('webgl');
+      map.once('postrender', function() {
+        var initialSize = map.getSize();
+        map.updateSize();
+        expect(map.getSize()).to.eql(initialSize);
+        done();
+      });
+    });
+  });
+
   describe('#render()', function() {
     afterEach(function() {
       disposeMap(map);