Merge pull request #919 from geoadmin/bug-PB-546-print-scale

PB-546: Improved default print scale computed from map size
geoadmin · Jun 17, 2024 · 0268423 · 0268423
2 parents eee65b7 + b28b6a9
commit 0268423
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js b/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js
@@ -20,8 +20,10 @@ export default function usePrintAreaRenderer(map) {
     const selectedScale = computed(() => store.state.print.selectedScale)
     // For simplicity we use the screen size for the map size
     const mapWidth = computed(() => store.state.ui.width)
-    // Same here for simplicity we take the screen size minus the header size for the map size
-    const mapHeight = computed(() => store.state.ui.height - store.state.ui.headerHeight)
+    // Same here for simplicity we take the screen size minus the header size for the map size (map
+    // is under the header). We take the header size twice as the overlay is then centered on the
+    // whole map (not only the part below the header)
+    const mapHeight = computed(() => store.state.ui.height - store.state.ui.headerHeight * 2)
 
     watch(isActive, (newValue) => {
         if (newValue) {
@@ -168,6 +170,6 @@ export default function usePrintAreaRenderer(map) {
             selectedLayoutScales
         )
         // Find the first scale that is smaller than the testScale in descending order
-        return selectedLayoutScales.find((scale) => scale < testScale) ?? selectedLayoutScales[0]
+        return selectedLayoutScales.find((scale) => scale <= testScale) ?? selectedLayoutScales[0]
     }
 }
diff --git a/tests/cypress/tests-e2e/print.cy.js b/tests/cypress/tests-e2e/print.cy.js
@@ -76,7 +76,7 @@ describe('Testing print', () => {
             cy.get('[data-cy="print-scale-selector"]').find('option').should('have.length', 15)
             cy.get('[data-cy="print-scale-selector"]')
                 .find('option:selected')
-                .should('have.text', `1:${formatThousand(2500000)}`)
+                .should('have.text', `1:${formatThousand(1500000)}`)
         })
     })
 
@@ -120,7 +120,7 @@ describe('Testing print', () => {
                 )
 
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(2500000)
+                expect(mapAttributes['scale']).to.equals(1500000)
                 expect(mapAttributes['dpi']).to.equals(254)
                 expect(mapAttributes['projection']).to.equals('EPSG:2056')
 
@@ -271,7 +271,7 @@ describe('Testing print', () => {
                 )
 
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(2500000)
+                expect(mapAttributes['scale']).to.equals(1500000)
                 expect(mapAttributes['dpi']).to.equals(254)
                 expect(mapAttributes['projection']).to.equals('EPSG:2056')
 
@@ -312,7 +312,7 @@ describe('Testing print', () => {
                 )
 
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(10000)
+                expect(mapAttributes['scale']).to.equals(5000)
                 expect(mapAttributes['dpi']).to.equals(254)
                 expect(mapAttributes['projection']).to.equals('EPSG:2056')
 
@@ -444,7 +444,7 @@ describe('Testing print', () => {
                 )
 
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(10000)
+                expect(mapAttributes['scale']).to.equals(5000)
                 expect(mapAttributes['dpi']).to.equals(254)
                 expect(mapAttributes['projection']).to.equals('EPSG:2056')
 
@@ -515,7 +515,7 @@ describe('Testing print', () => {
                 )
 
                 const mapAttributes = attributes.map
-                expect(mapAttributes['scale']).to.equals(10000)
+                expect(mapAttributes['scale']).to.equals(5000)
                 expect(mapAttributes['dpi']).to.equals(254)
                 expect(mapAttributes['projection']).to.equals('EPSG:2056')