From df847ae35cb06f33c2d8a323b403612f4c8806fd Mon Sep 17 00:00:00 2001 From: Firstname Lastname Date: Mon, 18 Feb 2019 22:12:38 +0100 Subject: [PATCH 1/5] Fix zoom after export to PDF is done --- examples/export-pdf.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/export-pdf.js b/examples/export-pdf.js index aba978d71b..7e0c8060fc 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -55,6 +55,7 @@ exportButton.addEventListener('click', function() { const height = Math.round(dim[1] * resolution / 25.4); const size = map.getSize(); const extent = map.getView().calculateExtent(size); + const zoom = map.getView().getZoom(); map.once('rendercomplete', function() { domtoimage.toJpeg(map.getViewport().querySelector('.ol-layers')).then(function(dataUrl) { @@ -64,6 +65,7 @@ exportButton.addEventListener('click', function() { // Reset original map size map.setSize(size); map.getView().fit(extent, {size}); + map.getView().setZoom(zoom); exportButton.disabled = false; document.body.style.cursor = 'auto'; }); From 33ac3e34ee02c5c8b465652deff70f0b3bcb618c Mon Sep 17 00:00:00 2001 From: Umberto Minora Date: Tue, 19 Feb 2019 10:38:23 +0100 Subject: [PATCH 2/5] constrainResolution: false on view fit instead of setting the zoom --- examples/export-pdf.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 7e0c8060fc..f3970d342d 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -55,7 +55,6 @@ exportButton.addEventListener('click', function() { const height = Math.round(dim[1] * resolution / 25.4); const size = map.getSize(); const extent = map.getView().calculateExtent(size); - const zoom = map.getView().getZoom(); map.once('rendercomplete', function() { domtoimage.toJpeg(map.getViewport().querySelector('.ol-layers')).then(function(dataUrl) { @@ -64,8 +63,9 @@ exportButton.addEventListener('click', function() { pdf.save('map.pdf'); // Reset original map size map.setSize(size); - map.getView().fit(extent, {size}); - map.getView().setZoom(zoom); + map.getView().fit(extent, + {size: size, + constrainResolution: false}); exportButton.disabled = false; document.body.style.cursor = 'auto'; }); From a6023a710abb011df6ed824e273353768e6e296f Mon Sep 17 00:00:00 2001 From: Umberto Minora Date: Tue, 19 Feb 2019 10:48:11 +0100 Subject: [PATCH 3/5] Cleared mixed spaces and tabs --- examples/export-pdf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/export-pdf.js b/examples/export-pdf.js index f3970d342d..6ebd30f1b9 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -64,7 +64,7 @@ exportButton.addEventListener('click', function() { // Reset original map size map.setSize(size); map.getView().fit(extent, - {size: size, + {size: size, constrainResolution: false}); exportButton.disabled = false; document.body.style.cursor = 'auto'; From 8eadb3d04c913a222ee25a51131d495319c2e00c Mon Sep 17 00:00:00 2001 From: Umberto Minora Date: Tue, 19 Feb 2019 10:57:21 +0100 Subject: [PATCH 4/5] Fixed indent spaces so that hopefully ci/circleci: build does not fail --- examples/export-pdf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 6ebd30f1b9..3f89ac53d6 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -64,8 +64,8 @@ exportButton.addEventListener('click', function() { // Reset original map size map.setSize(size); map.getView().fit(extent, - {size: size, - constrainResolution: false}); + {size: size, + constrainResolution: false}); exportButton.disabled = false; document.body.style.cursor = 'auto'; }); From cefb5d4d3238a954f3e68d352db406b4c8fdbdb5 Mon Sep 17 00:00:00 2001 From: Umberto Minora Date: Tue, 19 Feb 2019 11:25:12 +0100 Subject: [PATCH 5/5] fixed indents checked with npm run lint --- examples/export-pdf.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 3f89ac53d6..1454339e6b 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -63,9 +63,10 @@ exportButton.addEventListener('click', function() { pdf.save('map.pdf'); // Reset original map size map.setSize(size); - map.getView().fit(extent, - {size: size, - constrainResolution: false}); + map.getView().fit(extent, { + size: size, + constrainResolution: false + }); exportButton.disabled = false; document.body.style.cursor = 'auto'; });