WIP Print view

Author: pakb

packages/geoadmin-coordinates/src/proj/CoordinateSystem.ts

@@ -34,6 +34,8 @@ export type ResolutionStep = {
     resolution: number
     /** Corresponding zoom level for this resolution step */
     zoom: number | undefined
+    /** Name of the map product shown at this resolution/zoom */
+    label?: string
 }
 
 export interface CoordinateSystemProps {

packages/geoadmin-coordinates/src/proj/SwissCoordinateSystem.ts

@@ -87,6 +87,24 @@ export const SWISSTOPO_TILEGRID_ZOOM_TO_STANDARD_ZOOM_MATRIX: number[] = [
     21, // max: 14
 ]
 
+const SWISSTOPO_ZOOM_TO_PRODUCT_SCALE: string[] = [
+    "1:2'500'000", // zoom 0
+    "1:2'500'000", // 1
+    "1:1'000'000", // 2
+    "1:1'000'000", // 3
+    "1:500'000", // 4
+    "1:200'000", // 5
+    "1:100'000", // 6
+    "1:50'000", // 7
+    "1:25'000", // 8
+    "1:25'000", // 9
+    "1:10'000", // 10
+    "1:10'000", // 11
+    "1:10'000", // 12
+    "1:10'000", // 13
+    "1:10'000", // max zoom: 14
+]
+
 const swisstopoZoomLevels: number[] = SWISSTOPO_TILEGRID_ZOOM_TO_STANDARD_ZOOM_MATRIX.map(
     (_, index) => index
 )
@@ -103,10 +121,18 @@ const swisstopoZoomLevels: number[] = SWISSTOPO_TILEGRID_ZOOM_TO_STANDARD_ZOOM_M
  */
 export default class SwissCoordinateSystem extends CustomCoordinateSystem {
     getResolutions(): ResolutionStep[] {
-        return SWISSTOPO_TILEGRID_RESOLUTIONS.map((resolution) => ({
-            zoom: LV95_RESOLUTIONS.indexOf(resolution) ?? undefined,
-            resolution: resolution,
-        }))
+        return SWISSTOPO_TILEGRID_RESOLUTIONS.map((resolution) => {
+            const zoom: number | undefined = LV95_RESOLUTIONS.indexOf(resolution) ?? undefined
+            let label: string | undefined
+            if (zoom) {
+                label = SWISSTOPO_ZOOM_TO_PRODUCT_SCALE[zoom]
+            }
+            return {
+                zoom,
+                label,
+                resolution: resolution,
+            }
+        })
     }
 
     get1_25000ZoomLevel(): number {

packages/mapviewer/src/config/print.config.js

@@ -8,10 +8,13 @@ export const MIN_PRINT_SCALE_SIZE = 0.0001
 
 /** Dimensions in pixel of the viewport for each print format */
 export const PRINT_DIMENSIONS = {
-    A0: [1189, 841],
-    A1: [841, 594],
-    A2: [594, 420],
-    A3: [420, 297],
-    A4: [297, 210],
-    A5: [210, 148],
+    A0: [3179, 4494],
+    A1: [2245, 3179],
+    A2: [1587, 2245],
+    A3: [1123, 1587],
+    A4: [794, 1123],
+    A5: [559, 794],
+    A6: [397, 559],
 }
+
+export const PRINT_DEFAULT_DPI = 96

packages/mapviewer/src/modules/i18n/locales/de.json

@@ -500,6 +500,7 @@
     "print_footer_description": "www.geo.admin.ch ist ein Portal zur Einsicht von geolokalisierten Informationen, Daten und Diensten, die von öffentlichen Einrichtungen zur Verfügung gestellt werden",
     "print_footer_disclaimer": "Obwohl die Bundesbehörden mit aller Sorgfalt auf die Richtigkeit der veröffentlichten Informationen achten, kann hinsichtlich der inhaltlichen Richtigkeit, Genauigkeit, Aktualität, Zuverlässigkeit und Vollständigkeit dieser Informationen keine Gewährleistung übernommen werden.Copyright: Bundesbehörden der Schweizerischen Eidgenossenschaft. https://www.admin.ch/gov/de/start/rechtliches.html. Falls Daten Dritter abgebildet werden, wird deren Verfügbarkeit durch den Drittanbieter gewährleistet. Es gelten zusätzlich die Bedingungen der entsprechenden Datenherren.",
     "print_layout": "Orientierung",
+    "print_printed_on": "Gedruckt am",
     "print_request_too_large": "Die Datei wird nicht gedruckt: zu gross.",
     "print_scale": "Massstab",
     "print_underway_message": "Wir bitten Sie um Geduld. Ein mehrseitiger Druck wird erstellt. Dies nimmt einige Zeit in Anspruch.",

packages/mapviewer/src/modules/i18n/locales/en.json

@@ -500,6 +500,7 @@
     "print_footer_description": "www.geo.admin.ch is a portal provided by the Federal Authorities of the Swiss Confederation to gain insight on publicly accessible geographical information, data and services",
     "print_footer_disclaimer": "Although every care has been taken by the Federal Authorities to ensure the accuracy of the information published, no warranty can be given in respect of the accuracy, reliability, up-to-dateness or completeness of this information. Copyright: Swiss federal authorities. https://www.admin.ch/gov/en/start/terms-and-conditions.html. If data from third parties are depicted, their availability is ensured by the third-party provider. Additionally, the conditions of the respective data owners apply.",
     "print_layout": "Orientation",
+    "print_printed_on": "Printed on",
     "print_request_too_large": "Printing error: the file to print is too large",
     "print_scale": "Scale",
     "print_underway_message": "We ask you for your patience. A multi-page print is underway, which can take some time.",

packages/mapviewer/src/modules/i18n/locales/fr.json

@@ -500,8 +500,9 @@
     "print_footer_description": "www.geo.admin.ch est un portail d'accès aux informations géolocalisées, données et services qui sont mis à disposition par l'administration fédérale",
     "print_footer_disclaimer": "Responsabilité: Malgré la grande attention qu'elles portent à la justesse des informations diffusées sur ce site, les autorités fédérales ne peuvent endosser aucune responsabilité quant à la fidélité, à l'exactitude, à l'actualité, à la fiabilité et à l'intégralité de ces informations. Droits d'auteur: autorités de la Confédération suisse. https://www.admin.ch/gov/fr/accueil/conditions-utilisation.html. Si des données de tiers sont représentées, leur disponibilité est garantie par le tiers fournisseur. Les conditions des détenteurs de données correspondants s'appliquent également.",
     "print_layout": "Orientation",
+    "print_printed_on": "Imprimé le",
     "print_request_too_large": "Impression impossible : le fichier est trop grand.",
-    "print_scale": "Echelle",
+    "print_scale": "Échelle",
     "print_underway_message": "Nous vous prions de bien vouloir patienter. Une impression de plusieurs pages est en réalisation. Cela prend un peu de temps.",
     "problem_announcement": "Annoncer un problème",
     "profile_distance": "Distance à vol d'oiseau",

packages/mapviewer/src/modules/i18n/locales/it.json

@@ -500,6 +500,7 @@
     "print_footer_description": " www.geo.admin.ch è un portale d'accesso ad informazioni, dati e servizi geografici messi a disposizione dall'amministrazione federale.",
     "print_footer_disclaimer": "Nonostante si presti grande attenzione all’esattezza delle informazioni pubblicate su questo sito, le autorità federali declinano ogni responsabilità per la fedeltà, l’esattezza, l’attualità, l’affidabilità e la completezza di tali informazioni. Diritti d’autore: autorità della Confederazione Svizzera. https://www.admin.ch/gov/it/pagina-iniziale/basi-legali.html. Se sono rappresentati dati di terze parti, la loro disponibilità è garantita dal fornitore terzo. Si applicano inoltre le condizioni dei rispettivi detentori dei dati.",
     "print_layout": "Orientamento",
+    "print_printed_on": "Stampato il",
     "print_request_too_large": "Errore di stampa: file troppo pesante",
     "print_scale": "Scala",
     "print_underway_message": "Le chiediamo di avere pazienza. È in corso una stampa su più pagine, che  può richiedere un po' di tempo.",

packages/mapviewer/src/modules/i18n/locales/rm.json

@@ -498,6 +498,7 @@
     "print_footer_description": "www.geo.admin.ch è in portal d'access ad infurmaziuns geolocalisadas, datas ed a servetschs che vegnan mess a disposiziun da l'administraziun federala.",
     "print_footer_disclaimer": "Malgrà che las autoritads fan bain adatg che las infurmaziuns publitgadas sin questa pagina d'internet sajan correctas, na pon ellas surpigliar nagina responsabladad per la correctadad dal cuntegn, per l'exactezza, per l'actualitad, per l'autenticitad e per la cumplettezza da talas infurmaziuns. Dretgs d'autur: autoritads da la Confederaziun svizra. https://www.admin.ch/gov/rm/pagina-iniziala/infurmaziuns-giuridicas.html. Sche datas da terzs vegnan mussadas, è lur disponibilitad garantida dal furnitur da terzs. Ultra da quai valan er las cundiziuns dals possesurs da las datas correspundentas.",
     "print_layout": "Orientaziun",
+    "print_printed_on": "Stampà ils",
     "print_request_too_large": "Betg pussaivel da stampar: Datoteca memia gronda.",
     "print_scale": "Scala",
     "print_underway_message": "Nus As supplitgain d'avair pazienza. In stampat da pliras paginas vegn preparà, quai dovra ses temp.",

packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMap.vue

@@ -66,8 +66,6 @@ function triggerReadyFlagIfAllRendered() {
 }
 map.once('rendercomplete', triggerReadyFlagIfAllRendered)
 
-map.once('rendercomplete', triggerReadyFlagIfAllRendered)
-
 onMounted(() => {
     map.setTarget(mapElement.value)
     useMapInteractions(map)

packages/mapviewer/src/modules/map/components/openlayers/OpenLayersScale.vue

@@ -4,6 +4,17 @@ import ScaleLine from 'ol/control/ScaleLine'
 import { computed, inject, onBeforeUnmount, onMounted, useTemplateRef } from 'vue'
 import { useStore } from 'vuex'
 
+const { scaleType, minWidth } = defineProps({
+    scaleType: {
+        type: String,
+        default: 'line',
+    },
+    minWidth: {
+        type: Number,
+        default: 100,
+    }
+})
+
 const scaleLineElement = useTemplateRef('scaleLineElement')
 
 const store = useStore()
@@ -13,7 +24,9 @@ const projection = computed(() => store.state.position.projection)
 const showScaleLine = computed(() => projection.value.epsg === LV95.epsg || zoom.value >= 9)
 
 const scaleLine = new ScaleLine({
-    className: 'scale-line',
+    className: `scale-${scaleType}`,
+    bar: scaleType === 'bar',
+    minWidth: minWidth,
 })
 
 const olMap = inject('olMap')
@@ -50,4 +63,56 @@ onBeforeUnmount(() => olMap.removeControl(scaleLine))
         background-color: rgba($white, 0.7);
     }
 }
+
+.scale-bar {
+    $scaleBarBorderColor: $black;
+    $scaleBarPrimary: $gray-800;
+    $scaleBarSecondary: $gray-300;
+
+    position: relative;
+
+    .scale-bar-inner {
+        display: flex;
+    }
+
+    .ol-scale-step-marker {
+        width: 1px;
+        height: 15px;
+        background-color: $scaleBarBorderColor;
+        float: right;
+        z-index: 10;
+    }
+
+    .ol-scale-step-text {
+        position: absolute;
+        bottom: -7px;
+        font-size: 11px;
+        z-index: 11;
+        color: $scaleBarBorderColor;
+    }
+
+    .ol-scale-text {
+        position: absolute;
+        font-size: 12px;
+        text-align: center;
+        bottom: 25px;
+        color: $scaleBarBorderColor;
+    }
+
+    .ol-scale-singlebar {
+        position: relative;
+        height: 10px;
+        z-index: 9;
+        box-sizing: border-box;
+        border: 1px solid $scaleBarBorderColor;
+    }
+
+    .ol-scale-singlebar-even {
+        background-color: $scaleBarSecondary;
+    }
+
+    .ol-scale-singlebar-odd {
+        background-color: $scaleBarPrimary;
+    }
+}
 </style>