wip: Reorganize sticky map-based components #1085

Author: cnouguier

core/client/components/action/KToggleStickyVisibility.vue

@@ -27,6 +27,7 @@ const sticky = Layout.findSticky(props.stickyId)
 
 // Functions
 function toggleSticky (context, value) {
-  Layout.setStickyVisible(props.stickyId, value)
+  if (value) Layout.showSticky(props.stickyId)
+  else Layout.hideSticky(props.stickyId)
 }
 </script>

core/client/i18n/core_en.json

@@ -718,13 +718,13 @@
     "UPLOAD_FILE_ERRORED": "Cannot upload file {file} !"
   },
   "KToggleWidgetVisibility": {
-    "DISPLAY_LEGEND": "Display legend",
+    "SHOW_LEGEND": "Show legend",
     "HIDE_LEGEND": "Hide legend"
   },
   "KToggleStickyVisibility": {
-    "DISPLAY_POSITION": "Display geographical coordinates",
+    "SHOW_POSITION": "Show geographical coordinates",
     "HIDE_POSITION": "Hide geographical coordinates",
-    "DISPLAY_NORTH": "Display north arrow",
+    "SHOW_NORTH": "Show north arrow",
     "HIDE_NORTH": "Hide north arrow"
   }
 }

core/client/i18n/core_fr.json

@@ -716,13 +716,13 @@
     "UPLOAD_FILE_ERRORED": "Impossible de transférer le fichier {file} !"
   },
   "KToggleWidgetVisibility": {
-    "DISPLAY_LEGEND": "Afficher la légende",
+    "SHOW_LEGEND": "Afficher la légende",
     "HIDE_LEGEND": "Masquer la légende"
   },
   "KToggleStickyVisibility": {
-    "DISPLAY_POSITION": "Afficher les coordonnées géographiques",
+    "SHOW_POSITION": "Afficher les coordonnées géographiques",
     "HIDE_POSITION": "Masquer les coordonnées géographiques",
-    "DISPLAY_NORTH": "Afficher la flèche d’orientation vers le nord",
+    "SHOW_NORTH": "Afficher la flèche d’orientation vers le nord",
     "HIDE_NORTH": "Masquer la flèche d’orientation vers le nord"
   }
 }

core/client/layout.js

@@ -302,13 +302,21 @@ export const Layout = {
   findSticky (stickyId) {
     return _.find(this.getStickies().components, { id: stickyId })
   },
-  setStickyVisible (stickyId, visible) {
+  showSticky (stickyId) {
     const sticky = this.findSticky(stickyId)
     if (!sticky) {
       logger.error(`[KDK] Cannot find sticky with id '${stickyId}'`)
       return
     }
-    _.set(sticky, 'visible', visible)
+    _.set(sticky, 'visible', true)
+  },
+  hideSticky (stickyId) {
+    const sticky = this.findSticky(stickyId)
+    if (!sticky) {
+      logger.error(`[KDK] Cannot find sticky with id '${stickyId}'`)
+      return
+    }
+    _.set(sticky, 'visible', false)
   },
   getFab () {
     return this.getElement('fab')
@@ -447,10 +455,10 @@ export const Layout = {
   clearWindow (placement) {
     this.clearElement(`windows.${placement}`)
   },
-  findWindow (widget) {
+  findWindow (widgeId) {
     for (const placement of this.placements) {
       const window = this.getWindow(placement)
-      if (_.find(window.components, { id: widget })) {
+      if (_.find(window.components, { id: widgeId })) {
         return { placement, window }
       }
     }

map/client/components/stickies/KPosition.vue

@@ -30,7 +30,7 @@ import KAction from '../../../../core/client/components/action/KAction.vue'
 const props = defineProps({
   target: {
     type: String,
-    default: 'target'
+    default: 'target-sticky'
   }
 })
 
@@ -59,7 +59,7 @@ async function onCopy () {
 
 onMounted(() => {
   // Show target sticky
-  if (props.target) Layout.setStickyVisible(props.target, true)
+  if (props.target) Layout.showSticky(props.target)
   // Listen move events
   CurrentActivity.value.$engineEvents.on('movestart', updatePosition)
   CurrentActivity.value.$engineEvents.on('move', updatePosition)
@@ -69,7 +69,7 @@ onMounted(() => {
 })
 // Hooks
 onBeforeUnmount(() => {
-  if (props.target) Layout.setStickyVisible(props.target, false)
+  if (props.target) Layout.hideSticky(props.target)
   // Stop listening move events
   CurrentActivity.value.$engineEvents.off('movestart', updatePosition)
   CurrentActivity.value.$engineEvents.off('move', updatePosition)