diff --git a/src/api/print.api.js b/src/api/print.api.js index 36c56e86d4..39d18c213a 100644 --- a/src/api/print.api.js +++ b/src/api/print.api.js @@ -135,8 +135,8 @@ class GeoAdminCustomizer extends BaseCustomizer { this.printResolution ) : 0 - // don't ask why it works, but that's the best I could do. - symbolizer.graphicYOffset = Math.round(1000 * symbolizer.graphicYOffset ?? 0) / 1000 + // if there is no graphicYOffset, we can't print points + symbolizer.graphicYOffset = Math.round(1000 * (symbolizer.graphicYOffset ?? 0)) / 1000 } if (size) { symbolizer.graphicWidth = adjustWidth(size[0] * scale, this.printResolution) diff --git a/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue b/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue index fdae21e510..45f4f6d56f 100644 --- a/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue +++ b/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue @@ -23,10 +23,9 @@ const { compact } = toRefs(props) const activeLayersList = ref(null) // used to deactivate the hover change of color on layer whenever one of them is dragged const aLayerIsDragged = ref(false) -const showLayerDescriptionForLayer = ref(null) const showLayerDetailIndex = ref(null) const layerDetailFocusMoveButton = ref(null) - +const showDescriptionForLayerId = ref(null) const store = useStore() // Users are used to have layers ordered top to bottom (the first layer is on top), but we store them in the opposite order. // So here we swap the order of this array to match the desired order on the UI @@ -96,15 +95,16 @@ function onToggleLayerDetail(index) { :class="{ 'drag-in-progress': aLayerIsDragged }" :show-layer-detail="showLayerDetailIndex === reverseIndex(index)" :focus-move-button="layerDetailFocusMoveButton" - @show-layer-description-popup="showLayerDescriptionForLayer = layer" + @show-layer-description-popup="showDescriptionForLayerId = layer.id" @toggle-layer-detail="onToggleLayerDetail" @move-layer="onMoveLayer" - /> - + > + +
- diff --git a/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue b/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue index 3c294cb5d0..bfe097d30c 100644 --- a/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue +++ b/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue @@ -171,6 +171,7 @@ function changeStyle(newStyle) {
+