From 54626178d1fa80dfa9539b31f54b7433c5aefbca Mon Sep 17 00:00:00 2001
From: Raphael Antonietti <raphael.antonietti@swisstopo.ch>
Date: Thu, 2 Jul 2026 17:59:10 +0200
Subject: [PATCH 1/5] PB-2337: compact overflowing map attributions

---
 .../src/modules/i18n/locales/de.json          |   3 +
 .../src/modules/i18n/locales/en.json          |   3 +
 .../src/modules/i18n/locales/fr.json          |   3 +
 .../src/modules/i18n/locales/it.json          |   3 +
 .../src/modules/i18n/locales/rm.json          |   3 +
 .../footer/MapFooterAttributionItem.vue       |   2 +
 .../footer/MapFooterAttributionList.vue       | 160 ++++++++++++++++--
 7 files changed, 166 insertions(+), 11 deletions(-)

diff --git a/packages/mapviewer/src/modules/i18n/locales/de.json b/packages/mapviewer/src/modules/i18n/locales/de.json
index d0ab0eb2de..be33c84c11 100644
--- a/packages/mapviewer/src/modules/i18n/locales/de.json
+++ b/packages/mapviewer/src/modules/i18n/locales/de.json
@@ -27,6 +27,9 @@
     "appcache_update_available": "Neue Version der Offline Funktion verfügbar. Wollen Sie sie laden?",
     "approx_abbr": "ca.",
     "are": "ARE",
+    "attribution_overflow_hide_sources": "Weitere Quellenangaben ausblenden",
+    "attribution_overflow_show_source": "Eine weitere Quellenangabe anzeigen",
+    "attribution_overflow_show_sources": "{count} weitere Quellenangaben anzeigen",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=de",
     "are_service_link_label": "www.are.admin.ch",
     "area": "Fläche",
diff --git a/packages/mapviewer/src/modules/i18n/locales/en.json b/packages/mapviewer/src/modules/i18n/locales/en.json
index 456214aa50..dc82b2b898 100644
--- a/packages/mapviewer/src/modules/i18n/locales/en.json
+++ b/packages/mapviewer/src/modules/i18n/locales/en.json
@@ -27,6 +27,9 @@
     "appcache_update_available": "A new version of offline function is available. Load it?",
     "approx_abbr": "approx.",
     "are": "ARE",
+    "attribution_overflow_hide_sources": "Hide additional attribution sources",
+    "attribution_overflow_show_source": "Show 1 more attribution source",
+    "attribution_overflow_show_sources": "Show {count} more attribution sources",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=en",
     "are_service_link_label": "www.are.admin.ch",
     "area": "Area",
diff --git a/packages/mapviewer/src/modules/i18n/locales/fr.json b/packages/mapviewer/src/modules/i18n/locales/fr.json
index d7ed9f75bb..826fb33f2c 100644
--- a/packages/mapviewer/src/modules/i18n/locales/fr.json
+++ b/packages/mapviewer/src/modules/i18n/locales/fr.json
@@ -27,6 +27,9 @@
     "appcache_update_available": "Une mise à jour du site est disponible. Voulez-vous l'utiliser?",
     "approx_abbr": "env.",
     "are": "ARE",
+    "attribution_overflow_hide_sources": "Masquer les autres sources d'attribution",
+    "attribution_overflow_show_source": "Afficher une autre source d'attribution",
+    "attribution_overflow_show_sources": "Afficher {count} autres sources d'attribution",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=fr",
     "are_service_link_label": "www.are.admin.ch",
     "area": "Aire",
diff --git a/packages/mapviewer/src/modules/i18n/locales/it.json b/packages/mapviewer/src/modules/i18n/locales/it.json
index 9e95c5750e..eaf927f098 100644
--- a/packages/mapviewer/src/modules/i18n/locales/it.json
+++ b/packages/mapviewer/src/modules/i18n/locales/it.json
@@ -27,6 +27,9 @@
     "appcache_update_available": "È a disposizione un aggiornamento del sito. Desiderate utilizzarlo?",
     "approx_abbr": "ca.",
     "are": "ARE",
+    "attribution_overflow_hide_sources": "Nascondi altre fonti di attribuzione",
+    "attribution_overflow_show_source": "Mostra un'altra fonte di attribuzione",
+    "attribution_overflow_show_sources": "Mostra altre {count} fonti di attribuzione",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=it",
     "are_service_link_label": "www.are.admin.ch",
     "area": "Zona",
diff --git a/packages/mapviewer/src/modules/i18n/locales/rm.json b/packages/mapviewer/src/modules/i18n/locales/rm.json
index 62af07c544..43985511c3 100644
--- a/packages/mapviewer/src/modules/i18n/locales/rm.json
+++ b/packages/mapviewer/src/modules/i18n/locales/rm.json
@@ -27,6 +27,9 @@
     "appcache_update_available": "Ina nova versiun stat a disposiziun offline. La vulais Vus chargiar giu?",
     "approx_abbr": "ca.",
     "are": "ARE",
+    "attribution_overflow_hide_sources": "Zuppentar ulteriuras funtaunas d'attribuziun",
+    "attribution_overflow_show_source": "Mussar ina ulteriura funtauna d'attribuziun",
+    "attribution_overflow_show_sources": "Mussar {count} ulteriuras funtaunas d'attribuziun",
     "are_service_link_href": "http://www.are.admin.ch/index.html?lang=de",
     "are_service_link_label": "www.are.admin.ch",
     "area": "Surfatscha",
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
index debfb814a9..b213ffc1d6 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
@@ -29,9 +29,11 @@ const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast } = definePro
         :id="`source-${sourceId}`"
         :href="sourceUrl"
         :target="sourceUrl ? '_blank' : null"
+        :rel="sourceUrl ? 'noopener noreferrer' : null"
         class="map-footer-attribution-source clear-no-ios-long-press"
         :class="{ 'text-primary': hasDataDisclaimer, 'is-link': sourceUrl || hasDataDisclaimer }"
         :data-cy="`layer-copyright-${sourceName}`"
+        :title="sourceName"
     >
         {{ `${sourceName}${isLast ? '' : ','}` }}
     </component>
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
index b8458dec37..84d4f059e4 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
@@ -8,6 +8,8 @@ import ThirdPartyDisclaimer from '@/utils/components/ThirdPartyDisclaimer.vue'
 
 const store = useStore()
 const { t } = useI18n()
+const COMPACT_SOURCE_COUNT = 3
+const isExpanded = ref(false)
 
 const visibleLayers = computed(() => store.getters.visibleLayers)
 const currentBackgroundLayer = computed(() => store.getters.currentBackgroundLayer)
@@ -19,15 +21,15 @@ const layers = computed(() => {
         layersWithAttributions.push(currentBackgroundLayer.value)
     }
     layersWithAttributions.push(
-        ...visibleLayers.value.filter((layer) => layer.attributions.length > 0)
+        ...visibleLayers.value.filter((layer) => (layer.attributions ?? []).length > 0)
     )
     return layersWithAttributions
 })
 
 const sources = computed(() => {
     return layers.value
-        .map((layer) => {
-            return layer.attributions.map((attribution) => {
+        .flatMap((layer) => {
+            return (layer.attributions ?? []).map((attribution) => {
                 return {
                     id: attribution.name.replace(/[._]/g, '-'),
                     name: attribution.name,
@@ -41,24 +43,56 @@ const sources = computed(() => {
                 }
             })
         })
-        .flat()
         .filter((attribution, index, array) => {
             const firstIndex = array.findIndex((item) => item.name === attribution.name)
             return index === firstIndex
         })
 })
+
+const isCompact = computed(() => sources.value.length > COMPACT_SOURCE_COUNT)
+const hiddenSourceCount = computed(() =>
+    isCompact.value ? sources.value.length - COMPACT_SOURCE_COUNT : 0
+)
+const inlineSources = computed(() =>
+    isCompact.value ? sources.value.slice(0, COMPACT_SOURCE_COUNT) : sources.value
+)
+const expandedSources = computed(() =>
+    isCompact.value ? sources.value.slice(COMPACT_SOURCE_COUNT) : []
+)
+const toggleButtonText = computed(() => (isExpanded.value ? '-' : `+${hiddenSourceCount.value}`))
+
+const expandButtonLabel = computed(() => {
+    if (isExpanded.value) {
+        return t('attribution_overflow_hide_sources')
+    }
+    return t(
+        hiddenSourceCount.value === 1
+            ? 'attribution_overflow_show_source'
+            : 'attribution_overflow_show_sources',
+        { count: hiddenSourceCount.value }
+    )
+})
+
+function closeExpanded() {
+    isExpanded.value = false
+}
+
+function toggleExpanded() {
+    isExpanded.value = !isExpanded.value
+}
 </script>
 
 <template>
     <div
+        v-click-outside="closeExpanded"
         class="map-footer-attribution"
         data-cy="layers-copyrights"
     >
         <span v-if="sources.length > 0">{{ t('copyright_data') }}</span>
         <div
-            v-for="(source, index) in sources"
+            v-for="(source, index) in inlineSources"
             :key="source.name"
-            class="d-inline-flex"
+            class="map-footer-attribution-inline-item"
         >
             <ThirdPartyDisclaimer
                 v-if="source.hasDataDisclaimer"
@@ -67,22 +101,67 @@ const sources = computed(() => {
                 :is-local-file="source.isLocalFile"
             >
                 <MapFooterAttributionItem
-                    :source-id="source.id"
+                    :source-id="`${source.id}-${index}`"
                     :source-name="source.name"
                     :source-url="source.url"
                     :has-data-disclaimer="true"
-                    :is-last="index === sources.length - 1"
+                    :is-last="!isCompact && index === inlineSources.length - 1"
                 />
             </ThirdPartyDisclaimer>
             <MapFooterAttributionItem
                 v-else
-                :source-id="source.id"
+                :source-id="`${source.id}-${index}`"
                 :source-name="source.name"
                 :source-url="source.url"
                 :has-data-disclaimer="false"
-                :is-last="index === sources.length - 1"
+                :is-last="!isCompact && index === inlineSources.length - 1"
             />
         </div>
+        <button
+            v-if="isCompact"
+            type="button"
+            class="map-footer-attribution-toggle"
+            data-cy="attribution-expand-toggle"
+            :title="expandButtonLabel"
+            @click="toggleExpanded"
+        >
+            {{ toggleButtonText }}
+        </button>
+        <div
+            v-if="isCompact"
+            class="map-footer-attribution-expanded-list"
+            :class="{ 'map-footer-attribution-expanded-list-hidden': !isExpanded }"
+            data-cy="attribution-expanded-list"
+        >
+            <div
+                v-for="(source, index) in expandedSources"
+                :key="source.name"
+                class="map-footer-attribution-expanded-item"
+            >
+                <ThirdPartyDisclaimer
+                    v-if="source.hasDataDisclaimer"
+                    :source-name="source.name"
+                    :complete-disclaimer-on-click="!source.url"
+                    :is-local-file="source.isLocalFile"
+                >
+                    <MapFooterAttributionItem
+                        :source-id="`${source.id}-expanded-${index}`"
+                        :source-name="source.name"
+                        :source-url="source.url"
+                        :has-data-disclaimer="true"
+                        :is-last="true"
+                    />
+                </ThirdPartyDisclaimer>
+                <MapFooterAttributionItem
+                    v-else
+                    :source-id="`${source.id}-expanded-${index}`"
+                    :source-name="source.name"
+                    :source-url="source.url"
+                    :has-data-disclaimer="false"
+                    :is-last="true"
+                />
+            </div>
+        </div>
     </div>
 </template>
 
@@ -96,5 +175,64 @@ const sources = computed(() => {
     text-align: center;
     position: relative;
     pointer-events: all;
+    display: inline-flex;
+    flex-wrap: wrap;
+    align-items: center;
+    max-width: calc(100vw - 0.5rem);
+}
+
+.map-footer-attribution-inline-item {
+    display: inline-flex;
+    min-width: 0;
+}
+
+.map-footer-attribution-toggle {
+    margin-left: 2px;
+    padding: 0 0.35rem;
+    border: 1px solid rgba($black, 0.25);
+    border-radius: 0.2rem;
+    background: rgba($white, 0.85);
+    color: $black;
+    font: inherit;
+    line-height: 1.2;
+
+    &:hover {
+        text-decoration: underline;
+    }
+
+    &:focus-visible {
+        outline: 2px solid $primary;
+        outline-offset: 2px;
+    }
+}
+
+.map-footer-attribution-expanded-list {
+    position: absolute;
+    right: 0;
+    bottom: calc(100% + 0.25rem);
+    z-index: $zindex-desktop-footer-infobox;
+    display: flex;
+    flex-direction: column;
+    gap: 0.15rem;
+    max-width: min(24rem, calc(100vw - 1rem));
+    max-height: 30vh;
+    padding: 0.4rem 0.6rem;
+    overflow-y: auto;
+    background: rgba($white, 0.97);
+    border: 1px solid rgba($black, 0.15);
+    border-radius: 0.2rem;
+    box-shadow: 0 2px 6px rgba($black, 0.2);
+    text-align: left;
+    white-space: normal;
+}
+
+.map-footer-attribution-expanded-list-hidden {
+    display: none;
+}
+
+.map-footer-attribution-expanded-item {
+    display: flex;
+    min-width: 0;
+    line-height: 1.45;
 }
 </style>

From 5224bb03abb8985b52aff5a226405a09cb5c5e7e Mon Sep 17 00:00:00 2001
From: Raphael Antonietti <raphael.antonietti@swisstopo.ch>
Date: Fri, 3 Jul 2026 15:06:29 +0200
Subject: [PATCH 2/5] PB-2337: address PR review feedback

---
 .../components/footer/MapFooterAttributionList.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
index 84d4f059e4..f054fac955 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
@@ -53,12 +53,8 @@ const isCompact = computed(() => sources.value.length > COMPACT_SOURCE_COUNT)
 const hiddenSourceCount = computed(() =>
     isCompact.value ? sources.value.length - COMPACT_SOURCE_COUNT : 0
 )
-const inlineSources = computed(() =>
-    isCompact.value ? sources.value.slice(0, COMPACT_SOURCE_COUNT) : sources.value
-)
-const expandedSources = computed(() =>
-    isCompact.value ? sources.value.slice(COMPACT_SOURCE_COUNT) : []
-)
+const inlineSources = computed(() => sources.value.slice(0, COMPACT_SOURCE_COUNT))
+const expandedSources = computed(() => sources.value.slice(COMPACT_SOURCE_COUNT))
 const toggleButtonText = computed(() => (isExpanded.value ? '-' : `+${hiddenSourceCount.value}`))
 
 const expandButtonLabel = computed(() => {
@@ -129,8 +125,8 @@ function toggleExpanded() {
         </button>
         <div
             v-if="isCompact"
+            v-show="isExpanded"
             class="map-footer-attribution-expanded-list"
-            :class="{ 'map-footer-attribution-expanded-list-hidden': !isExpanded }"
             data-cy="attribution-expanded-list"
         >
             <div
@@ -226,10 +222,6 @@ function toggleExpanded() {
     white-space: normal;
 }
 
-.map-footer-attribution-expanded-list-hidden {
-    display: none;
-}
-
 .map-footer-attribution-expanded-item {
     display: flex;
     min-width: 0;

From 3cf56db3335eb7ff6a70782d846cd550029b5d05 Mon Sep 17 00:00:00 2001
From: Raphael Antonietti <raphael.antonietti@swisstopo.ch>
Date: Fri, 3 Jul 2026 16:07:39 +0200
Subject: [PATCH 3/5] PB-2337: reuse bootstrap utility classes for attribution
 styling

---
 .../footer/MapFooterAttributionList.vue       | 57 +++----------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
index f054fac955..2eb0b54cd6 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
@@ -81,14 +81,14 @@ function toggleExpanded() {
 <template>
     <div
         v-click-outside="closeExpanded"
-        class="map-footer-attribution"
+        class="map-footer-attribution d-inline-flex align-items-center flex-wrap"
         data-cy="layers-copyrights"
     >
         <span v-if="sources.length > 0">{{ t('copyright_data') }}</span>
         <div
             v-for="(source, index) in inlineSources"
             :key="source.name"
-            class="map-footer-attribution-inline-item"
+            class="d-inline-flex"
         >
             <ThirdPartyDisclaimer
                 v-if="source.hasDataDisclaimer"
@@ -116,7 +116,7 @@ function toggleExpanded() {
         <button
             v-if="isCompact"
             type="button"
-            class="map-footer-attribution-toggle"
+            class="map-footer-attribution-toggle btn btn-light btn-sm ms-1 border px-1 py-0"
             data-cy="attribution-expand-toggle"
             :title="expandButtonLabel"
             @click="toggleExpanded"
@@ -124,15 +124,14 @@ function toggleExpanded() {
             {{ toggleButtonText }}
         </button>
         <div
-            v-if="isCompact"
-            v-show="isExpanded"
-            class="map-footer-attribution-expanded-list"
+            v-if="isCompact && isExpanded"
+            class="map-footer-attribution-expanded-list position-absolute d-flex flex-column end-0 gap-1 overflow-y-auto rounded border bg-white p-2 text-start text-wrap shadow-sm"
             data-cy="attribution-expanded-list"
         >
             <div
                 v-for="(source, index) in expandedSources"
                 :key="source.name"
-                class="map-footer-attribution-expanded-item"
+                class="d-flex lh-base"
             >
                 <ThirdPartyDisclaimer
                     v-if="source.hasDataDisclaimer"
@@ -171,60 +170,18 @@ function toggleExpanded() {
     text-align: center;
     position: relative;
     pointer-events: all;
-    display: inline-flex;
-    flex-wrap: wrap;
-    align-items: center;
     max-width: calc(100vw - 0.5rem);
 }
 
-.map-footer-attribution-inline-item {
-    display: inline-flex;
-    min-width: 0;
-}
-
 .map-footer-attribution-toggle {
-    margin-left: 2px;
-    padding: 0 0.35rem;
-    border: 1px solid rgba($black, 0.25);
-    border-radius: 0.2rem;
-    background: rgba($white, 0.85);
-    color: $black;
-    font: inherit;
+    font-size: inherit;
     line-height: 1.2;
-
-    &:hover {
-        text-decoration: underline;
-    }
-
-    &:focus-visible {
-        outline: 2px solid $primary;
-        outline-offset: 2px;
-    }
 }
 
 .map-footer-attribution-expanded-list {
-    position: absolute;
-    right: 0;
     bottom: calc(100% + 0.25rem);
     z-index: $zindex-desktop-footer-infobox;
-    display: flex;
-    flex-direction: column;
-    gap: 0.15rem;
     max-width: min(24rem, calc(100vw - 1rem));
     max-height: 30vh;
-    padding: 0.4rem 0.6rem;
-    overflow-y: auto;
-    background: rgba($white, 0.97);
-    border: 1px solid rgba($black, 0.15);
-    border-radius: 0.2rem;
-    box-shadow: 0 2px 6px rgba($black, 0.2);
-    text-align: left;
-    white-space: normal;
-}
-
-.map-footer-attribution-expanded-item {
-    display: flex;
-    min-width: 0;
-    line-height: 1.45;
 }
 </style>

From 3f6f4788f7045ab92bad64c598591e2b2bfd6889 Mon Sep 17 00:00:00 2001
From: Raphael Antonietti <raphael.antonietti@swisstopo.ch>
Date: Wed, 8 Jul 2026 09:15:11 +0200
Subject: [PATCH 4/5] PB-2337: refine local attribution overflow

Keep official attribution sources ahead of local file sources when compacting the footer attribution list. Limit inline attribution entries to four and truncate local imported names so long file labels do not cover the map.
---
 .../footer/MapFooterAttributionItem.vue       | 21 +++++++++++++++++--
 .../footer/MapFooterAttributionList.vue       | 21 +++++++++++++------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
index b213ffc1d6..da4b0b9a2e 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
@@ -1,5 +1,5 @@
 <script setup>
-const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast } = defineProps({
+const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast, isTruncated } = defineProps({
     sourceId: {
         type: String,
         required: true,
@@ -20,6 +20,10 @@ const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast } = definePro
         type: Boolean,
         default: false,
     },
+    isTruncated: {
+        type: Boolean,
+        default: false,
+    },
 })
 </script>
 
@@ -31,7 +35,11 @@ const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast } = definePro
         :target="sourceUrl ? '_blank' : null"
         :rel="sourceUrl ? 'noopener noreferrer' : null"
         class="map-footer-attribution-source clear-no-ios-long-press"
-        :class="{ 'text-primary': hasDataDisclaimer, 'is-link': sourceUrl || hasDataDisclaimer }"
+        :class="{
+            'text-primary': hasDataDisclaimer,
+            'is-link': sourceUrl || hasDataDisclaimer,
+            'is-truncated': isTruncated,
+        }"
         :data-cy="`layer-copyright-${sourceName}`"
         :title="sourceName"
     >
@@ -46,6 +54,15 @@ const { sourceId, sourceName, sourceUrl, hasDataDisclaimer, isLast } = definePro
     margin-left: 2px;
     color: $black;
 
+    &.is-truncated {
+        display: inline-block;
+        max-width: min(16rem, 28vw);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: bottom;
+        white-space: nowrap;
+    }
+
     &.is-link {
         text-decoration: none;
         &:hover {
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
index 2eb0b54cd6..07303ad0d0 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
@@ -8,7 +8,7 @@ import ThirdPartyDisclaimer from '@/utils/components/ThirdPartyDisclaimer.vue'
 
 const store = useStore()
 const { t } = useI18n()
-const COMPACT_SOURCE_COUNT = 3
+const VISIBLE_SOURCE_COUNT = 4
 const isExpanded = ref(false)
 
 const visibleLayers = computed(() => store.getters.visibleLayers)
@@ -29,6 +29,7 @@ const layers = computed(() => {
 const sources = computed(() => {
     return layers.value
         .flatMap((layer) => {
+            const isLocalFile = store.getters.isLocalFile(layer)
             return (layer.attributions ?? []).map((attribution) => {
                 return {
                     id: attribution.name.replace(/[._]/g, '-'),
@@ -39,7 +40,8 @@ const sources = computed(() => {
                         layer.isExternal,
                         layer.baseUrl
                     ),
-                    isLocalFile: store.getters.isLocalFile(layer),
+                    isLocalFile,
+                    isTruncated: isLocalFile,
                 }
             })
         })
@@ -49,12 +51,15 @@ const sources = computed(() => {
         })
 })
 
-const isCompact = computed(() => sources.value.length > COMPACT_SOURCE_COUNT)
+const primarySources = computed(() => sources.value.filter((source) => !source.isLocalFile))
+const localSources = computed(() => sources.value.filter((source) => source.isLocalFile))
+const orderedSources = computed(() => [...primarySources.value, ...localSources.value])
+const isCompact = computed(() => orderedSources.value.length > VISIBLE_SOURCE_COUNT)
 const hiddenSourceCount = computed(() =>
-    isCompact.value ? sources.value.length - COMPACT_SOURCE_COUNT : 0
+    isCompact.value ? orderedSources.value.length - VISIBLE_SOURCE_COUNT : 0
 )
-const inlineSources = computed(() => sources.value.slice(0, COMPACT_SOURCE_COUNT))
-const expandedSources = computed(() => sources.value.slice(COMPACT_SOURCE_COUNT))
+const inlineSources = computed(() => orderedSources.value.slice(0, VISIBLE_SOURCE_COUNT))
+const expandedSources = computed(() => orderedSources.value.slice(VISIBLE_SOURCE_COUNT))
 const toggleButtonText = computed(() => (isExpanded.value ? '-' : `+${hiddenSourceCount.value}`))
 
 const expandButtonLabel = computed(() => {
@@ -102,6 +107,7 @@ function toggleExpanded() {
                     :source-url="source.url"
                     :has-data-disclaimer="true"
                     :is-last="!isCompact && index === inlineSources.length - 1"
+                    :is-truncated="source.isTruncated"
                 />
             </ThirdPartyDisclaimer>
             <MapFooterAttributionItem
@@ -111,6 +117,7 @@ function toggleExpanded() {
                 :source-url="source.url"
                 :has-data-disclaimer="false"
                 :is-last="!isCompact && index === inlineSources.length - 1"
+                :is-truncated="source.isTruncated"
             />
         </div>
         <button
@@ -145,6 +152,7 @@ function toggleExpanded() {
                         :source-url="source.url"
                         :has-data-disclaimer="true"
                         :is-last="true"
+                        :is-truncated="source.isTruncated"
                     />
                 </ThirdPartyDisclaimer>
                 <MapFooterAttributionItem
@@ -154,6 +162,7 @@ function toggleExpanded() {
                     :source-url="source.url"
                     :has-data-disclaimer="false"
                     :is-last="true"
+                    :is-truncated="source.isTruncated"
                 />
             </div>
         </div>

From 3d9d04ae605129427adcc7b7fb30173b293b854b Mon Sep 17 00:00:00 2001
From: Raphael Antonietti <raphael.antonietti@swisstopo.ch>
Date: Wed, 8 Jul 2026 14:41:24 +0200
Subject: [PATCH 5/5] PB-2337: keep primary attributions visible

Issue: the local-file attribution compaction could hide non-local primary attribution sources behind the overflow toggle when enough primary sources were active.\n\nSolution: keep every primary source inline and apply the overflow count only to local-file sources that exceed the remaining visible slots.
---
 .../footer/MapFooterAttributionList.vue         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
index 07303ad0d0..f9296c48cd 100644
--- a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
+++ b/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
@@ -8,7 +8,6 @@ import ThirdPartyDisclaimer from '@/utils/components/ThirdPartyDisclaimer.vue'
 
 const store = useStore()
 const { t } = useI18n()
-const VISIBLE_SOURCE_COUNT = 4
 const isExpanded = ref(false)
 
 const visibleLayers = computed(() => store.getters.visibleLayers)
@@ -51,15 +50,19 @@ const sources = computed(() => {
         })
 })
 
+const VISIBLE_SOURCE_COUNT = 4
 const primarySources = computed(() => sources.value.filter((source) => !source.isLocalFile))
 const localSources = computed(() => sources.value.filter((source) => source.isLocalFile))
-const orderedSources = computed(() => [...primarySources.value, ...localSources.value])
-const isCompact = computed(() => orderedSources.value.length > VISIBLE_SOURCE_COUNT)
-const hiddenSourceCount = computed(() =>
-    isCompact.value ? orderedSources.value.length - VISIBLE_SOURCE_COUNT : 0
+const visibleLocalSourceCount = computed(() =>
+    Math.max(VISIBLE_SOURCE_COUNT - primarySources.value.length, 0)
 )
-const inlineSources = computed(() => orderedSources.value.slice(0, VISIBLE_SOURCE_COUNT))
-const expandedSources = computed(() => orderedSources.value.slice(VISIBLE_SOURCE_COUNT))
+const inlineSources = computed(() => [
+    ...primarySources.value,
+    ...localSources.value.slice(0, visibleLocalSourceCount.value),
+])
+const expandedSources = computed(() => localSources.value.slice(visibleLocalSourceCount.value))
+const hiddenSourceCount = computed(() => expandedSources.value.length)
+const isCompact = computed(() => hiddenSourceCount.value > 0)
 const toggleButtonText = computed(() => (isExpanded.value ? '-' : `+${hiddenSourceCount.value}`))
 
 const expandButtonLabel = computed(() => {