Merge pull request #5371 from camptocamp/print-custom-scale

Fix print custom scale
camptocamp · Dec 17, 2019 · 16a239c · 16a239c
2 parents 6b8f768 + c7285de
commit 16a239c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/print/Service.js b/src/print/Service.js
@@ -181,6 +181,7 @@ PrintService.prototype.encodeMap_ = function(map, scale, object) {
   object.projection = viewProjection.getCode();
   object.rotation = viewRotation;
   object.scale = scale;
+  object.useNearestScale = false;
   object.layers = [];
 
   const mapLayerGroup = map.getLayerGroup();

diff --git a/src/print/mapfish-print-v3.js b/src/print/mapfish-print-v3.js
@@ -23,6 +23,8 @@
  * @property {Array.<MapFishPrintLayer>} layers
  * @property {string} projection
  * @property {number} rotation
+ * @property {boolean} [useNearestScale] Indicates if the map should adjust its scale/zoom level to be
+ *    equal to one of those defined in the configuration file.
  */
 
 

diff --git a/test/spec/services/print.spec.js b/test/spec/services/print.spec.js
@@ -114,6 +114,7 @@ describe('ngeo.print.Service', () => {
               projection: 'EPSG:3857',
               rotation: 0,
               scale: 500,
+              useNearestScale: false,
               layers: [{
                 baseURL: 'http://example.com/wms',
                 imageFormat: 'image/jpeg',
@@ -173,6 +174,7 @@ describe('ngeo.print.Service', () => {
               center: [3000, 4000],
               projection: 'EPSG:3857',
               scale: 500,
+              useNearestScale: false,
               rotation: 0,
               layers: [{
                 baseURL: 'http://example.com/wms',
@@ -248,6 +250,7 @@ describe('ngeo.print.Service', () => {
               projection: 'EPSG:3857',
               rotation: 0,
               scale: 500,
+              useNearestScale: false,
               layers: [{
                 baseURL: 'http://example.com/wmts/{Layer}/{Style}/' +
                     '{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg',
@@ -543,6 +546,7 @@ describe('ngeo.print.Service', () => {
               projection: 'EPSG:3857',
               rotation: 0,
               scale: 500,
+              useNearestScale: false,
               layers: [{
                 geoJson: {
                   type: 'FeatureCollection',
@@ -656,6 +660,7 @@ describe('ngeo.print.Service', () => {
             center: [3000, 4000],
             projection: 'EPSG:3857',
             scale: 500,
+            useNearestScale: false,
             layers: [{
               baseURL: 'http://example.com/wms',
               imageFormat: 'image/jpeg',