From 96b542f3b1ccbd473ac9932f8f6a0fdf3620353d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 26 Jan 2023 08:27:07 +0100
Subject: [PATCH] Refine map marker popups

- Translate texts.
---
 webapp/locales/de.json |  5 ++++
 webapp/locales/en.json |  5 ++++
 webapp/pages/map.vue   | 52 +++++++++++++++++-------------------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e37280a42..d26b0b23d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -523,6 +523,11 @@
     "title": "{APPLICATION_NAME} befindet sich in der Wartung"
   },
   "map": {
+    "markerTypes": {
+      "group": "Gruppe",
+      "theUser": "deine Position",
+      "user": "Benutzer"
+    },
     "pageTitle": "Karte",
     "styles": {
       "dark": "Dunkel",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 5635b4e4b..fc7601569 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -523,6 +523,11 @@
     "title": "{APPLICATION_NAME} is under maintenance"
   },
   "map": {
+    "markerTypes": {
+      "group": "group",
+      "theUser": "your position",
+      "user": "user"
+    },
     "pageTitle": "Map",
     "styles": {
       "dark": "Dark",
diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 74c982ed6..febdd6488 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -189,7 +189,7 @@ export default {
         }),
       )
 
-      // example: https://docs.mapbox.com/mapbox-gl-js/example/popup-on-hover/
+      // example for popup: https://docs.mapbox.com/mapbox-gl-js/example/popup-on-hover/
       // create a popup, but don't add it to the map yet
       this.markers.popup = new mapboxgl.Popup({
         closeButton: false,
@@ -197,7 +197,7 @@ export default {
       })
 
       this.map.on('mouseenter', 'markers', (e) => {
-        // if (e.features[0].properties.type !== 'the-user') {}
+        // if (e.features[0].properties.type !== 'theUser') {}
         if (this.markers.popup.isOpen()) {
           this.map.getCanvas().style.cursor = ''
           this.markers.popup.remove()
@@ -210,38 +210,33 @@ export default {
         const coordinates = e.features[0].geometry.coordinates.slice()
         const markerTypeLabel =
           e.features[0].properties.type === 'group'
-            ? 'Gruppe'
+            ? this.$t('map.markerTypes.group')
             : e.features[0].properties.type === 'user'
-            ? 'Benutzer'
-            : 'Deine Position'
-        const markerAboutLabel = e.features[0].properties.type === 'group' ? 'Ziel' : 'Über'
-        const markerProfileLinkLabel = 'Profil besuchen'
-        const markerProfileLinkTitle = `@${e.features[0].properties.slug}`
+            ? this.$t('map.markerTypes.user')
+            : this.$t('map.markerTypes.theUser')
+        const markerProfileLinkTitle =
+          (e.features[0].properties.type === 'group' ? '&' : '@') + e.features[0].properties.slug
         const markerProfileLink =
           (e.features[0].properties.type === 'group' ? '/group' : '/profile') +
           `/${e.features[0].properties.id}/${e.features[0].properties.slug}`
         let description = `
           <div>
             <div>
-              <i>${markerTypeLabel}:</i> <b>${e.features[0].properties.name}</b>
-            </div>`
-        description +=
-          e.features[0].properties.about && e.features[0].properties.about.length > 0
-            ? `
-            <hr>
-            <div style="margin-top: 4pt;">
-              <i>${markerAboutLabel}:</i> ${e.features[0].properties.about}
-            </div>`
-            : ''
-        description += `
-            <hr>
-            <div style="margin-top: 4pt;">
-              <i>${markerProfileLinkLabel}:</i>
-              <br>
+              <b>${e.features[0].properties.name}</b> <i>(${markerTypeLabel})</i>
+            </div>
+            <div>
               <a href="${markerProfileLink}" target="_blank">${markerProfileLinkTitle}</a>
             </div>
           </div>
         `
+        description +=
+          e.features[0].properties.about && e.features[0].properties.about.length > 0
+            ? `
+            <hr>
+            <div>
+              ${e.features[0].properties.about}
+            </div>`
+            : ''
 
         // Ensure that if the map is zoomed out such that multiple
         // copies of the feature are visible, the popup appears
@@ -255,11 +250,6 @@ export default {
         this.markers.popup.setLngLat(coordinates).setHTML(description).addTo(this.map)
       })
 
-      // this.map.on('mouseleave', 'markers', () => {
-      //   this.map.getCanvas().style.cursor = ''
-      //   this.markers.popup.remove()
-      // })
-
       // load markers
       this.loadMarkesIconsAndAddMarkers()
     },
@@ -301,7 +291,7 @@ export default {
               type: 'Feature',
               properties: {
                 type: 'user',
-                iconName: 'marker-blue',
+                iconName: 'marker-green',
                 iconRotate: 0.0,
                 id: user.id,
                 slug: user.slug,
@@ -322,7 +312,7 @@ export default {
               type: 'Feature',
               properties: {
                 type: 'group',
-                iconName: 'marker-green',
+                iconName: 'marker-blue',
                 iconRotate: 0.0,
                 id: group.id,
                 slug: group.slug,
@@ -341,7 +331,7 @@ export default {
           this.markers.geoJSON.push({
             type: 'Feature',
             properties: {
-              type: 'the-user',
+              type: 'theUser',
               iconName: 'marker-orange',
               iconRotate: 45.0,
               id: this.currentUser.id,