From fd9e50cd05e9f2b96c823f5ccf9759337286e64f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:11:53 +0100
Subject: [PATCH 01/13] add legend on map

---
 webapp/locales/de.json |  5 +++++
 webapp/locales/en.json |  5 +++++
 webapp/pages/map.vue   | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f302a2cf8..a8277f677 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -8,6 +8,11 @@
     "loadMore": "mehr laden",
     "save": "Speichern"
   },
+  "position": {
+    "my":"Meine Position",
+    "members":"Mitglied",
+    "organizations":"Organisation"
+  },
   "admin": {
     "categories": {
       "categoryName": "Name",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 792622465..87173cb76 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -8,6 +8,11 @@
     "loadMore": "load more",
     "save": "Save"
   },
+  "position": {
+    "my":"My position",
+    "members":"Members",
+    "organizations":"Organizations"
+  },
   "admin": {
     "categories": {
       "categoryName": "Name",
diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index f5082904a..f1ac6462a 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -3,8 +3,20 @@
   <div>
     <ds-space margin="small">
       <ds-heading tag="h1">{{ $t('map.pageTitle') }}</ds-heading>
+      <small>
+        <div>
+     
+     <img alt="my position" src="/img/mapbox/marker-icons/mapbox-marker-icon-orange.svg" width="15"/> 
+     {{ $t('position.my') }}
+     <img alt="members" src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg" width="15"/> 
+     {{ $t('position.members') }}
+     <img alt="organisations" src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg" width="15"/> 
+     {{ $t('position.organizations') }}
+   </div>
+      </small>
     </ds-space>
-    <ds-space margin="large" />
+   
+    <ds-space margin="small" />
     <client-only v-if="!isEmpty($env.MAPBOX_TOKEN)">
       <map-styles-buttons
         v-if="isMobile"

From fc896181b33baae6042980576a199983c009d3f4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:12:16 +0100
Subject: [PATCH 02/13] fix locales

---
 webapp/locales/de.json | 10 +++++-----
 webapp/locales/en.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a8277f677..142f64dd1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -8,11 +8,6 @@
     "loadMore": "mehr laden",
     "save": "Speichern"
   },
-  "position": {
-    "my":"Meine Position",
-    "members":"Mitglied",
-    "organizations":"Organisation"
-  },
   "admin": {
     "categories": {
       "categoryName": "Name",
@@ -651,6 +646,11 @@
     "title": "Benachrichtigungen",
     "user": "Benutzer"
   },
+  "position": {
+    "members": "Mitglied",
+    "my": "Meine Position",
+    "organizations": "Organisation"
+  },
   "post": {
     "comment": {
       "reply": "Antworten",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 87173cb76..ac3cb84b6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -8,11 +8,6 @@
     "loadMore": "load more",
     "save": "Save"
   },
-  "position": {
-    "my":"My position",
-    "members":"Members",
-    "organizations":"Organizations"
-  },
   "admin": {
     "categories": {
       "categoryName": "Name",
@@ -651,6 +646,11 @@
     "title": "Notifications",
     "user": "User"
   },
+  "position": {
+    "members": "Members",
+    "my": "My position",
+    "organizations": "Organizations"
+  },
   "post": {
     "comment": {
       "reply": "Reply",

From 13d49e416222d82f9352428c34627c80ffe87e2e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:12:59 +0100
Subject: [PATCH 03/13] fix lint

---
 webapp/pages/map.vue | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index f1ac6462a..79528ac95 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -5,17 +5,28 @@
       <ds-heading tag="h1">{{ $t('map.pageTitle') }}</ds-heading>
       <small>
         <div>
-     
-     <img alt="my position" src="/img/mapbox/marker-icons/mapbox-marker-icon-orange.svg" width="15"/> 
-     {{ $t('position.my') }}
-     <img alt="members" src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg" width="15"/> 
-     {{ $t('position.members') }}
-     <img alt="organisations" src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg" width="15"/> 
-     {{ $t('position.organizations') }}
-   </div>
+          <img
+            alt="my position"
+            src="/img/mapbox/marker-icons/mapbox-marker-icon-orange.svg"
+            width="15"
+          />
+          {{ $t('position.my') }}
+          <img
+            alt="members"
+            src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg"
+            width="15"
+          />
+          {{ $t('position.members') }}
+          <img
+            alt="organisations"
+            src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg"
+            width="15"
+          />
+          {{ $t('position.organizations') }}
+        </div>
       </small>
     </ds-space>
-   
+
     <ds-space margin="small" />
     <client-only v-if="!isEmpty($env.MAPBOX_TOKEN)">
       <map-styles-buttons

From 33dd8dd8896fbbeb0242f632459f337242ebb002 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:23:17 +0100
Subject: [PATCH 04/13] Update webapp/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 142f64dd1..4e15429bc 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -647,7 +647,7 @@
     "user": "Benutzer"
   },
   "position": {
-    "members": "Mitglied",
+    "user": "Benutzer",
     "my": "Meine Position",
     "organizations": "Organisation"
   },

From cdb346a9010d20c05ed2f718e357317fcd3f9d75 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:23:33 +0100
Subject: [PATCH 05/13] Update webapp/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 4e15429bc..6f6b18421 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -649,7 +649,7 @@
   "position": {
     "user": "Benutzer",
     "my": "Meine Position",
-    "organizations": "Organisation"
+    "group": "Gruppe"
   },
   "post": {
     "comment": {

From 802151c7efc5cda94af0c16cd03f51a6309f8613 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:23:51 +0100
Subject: [PATCH 06/13] Update webapp/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index ac3cb84b6..39050ea5e 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -647,7 +647,7 @@
     "user": "User"
   },
   "position": {
-    "members": "Members",
+    "user": "User",
     "my": "My position",
     "organizations": "Organizations"
   },

From 3d39e4db466cf98f99ad88e4ef0d9219fc7137e1 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:24:08 +0100
Subject: [PATCH 07/13] Update webapp/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 39050ea5e..9dd9a74b7 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -649,7 +649,7 @@
   "position": {
     "user": "User",
     "my": "My position",
-    "organizations": "Organizations"
+    "group": "Group"
   },
   "post": {
     "comment": {

From 8a0bc6edda9f74cbf340739ef7278784873c5aa7 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:24:29 +0100
Subject: [PATCH 08/13] Update webapp/pages/map.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/pages/map.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 79528ac95..cc3d9d49d 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -12,7 +12,7 @@
           />
           {{ $t('position.my') }}
           <img
-            alt="members"
+            alt="user"
             src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg"
             width="15"
           />

From f9bdec550cf18a604c8c7aad765381126018b79a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:29:58 +0100
Subject: [PATCH 09/13] Update webapp/pages/map.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/pages/map.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index cc3d9d49d..807e835d2 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -16,7 +16,7 @@
             src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg"
             width="15"
           />
-          {{ $t('position.members') }}
+          {{ $t('position.user') }}
           <img
             alt="organisations"
             src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg"

From 61de57fb568770a2e2ee7609aa27def18868a285 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:30:06 +0100
Subject: [PATCH 10/13] Update webapp/pages/map.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/pages/map.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 807e835d2..720ab6fe4 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -18,7 +18,7 @@
           />
           {{ $t('position.user') }}
           <img
-            alt="organisations"
+            alt="group"
             src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg"
             width="15"
           />

From ba9ad0a5c6acf23d7d5bbbae7f38e391980c698d Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Wed, 8 Feb 2023 12:31:23 +0100
Subject: [PATCH 11/13] Update webapp/pages/map.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/pages/map.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 720ab6fe4..68cb85d29 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -22,7 +22,7 @@
             src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg"
             width="15"
           />
-          {{ $t('position.organizations') }}
+          {{ $t('position.group') }}
         </div>
       </small>
     </ds-space>

From e0751403a71410d4afde9ea651b1302b7445e583 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Feb 2023 12:35:45 +0100
Subject: [PATCH 12/13] Sort locales

---
 webapp/locales/de.json | 4 ++--
 webapp/locales/en.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6f6b18421..61f87fd19 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -647,9 +647,9 @@
     "user": "Benutzer"
   },
   "position": {
-    "user": "Benutzer",
+    "group": "Gruppe",
     "my": "Meine Position",
-    "group": "Gruppe"
+    "user": "Benutzer"
   },
   "post": {
     "comment": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9dd9a74b7..79620a965 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -647,9 +647,9 @@
     "user": "User"
   },
   "position": {
-    "user": "User",
+    "group": "Group",
     "my": "My position",
-    "group": "Group"
+    "user": "User"
   },
   "post": {
     "comment": {

From 3b72bd29100bcceba793230a24dc5b6131697583 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Feb 2023 12:55:07 +0100
Subject: [PATCH 13/13] linting

---
 webapp/pages/map.vue | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 68cb85d29..424061203 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -11,17 +11,9 @@
             width="15"
           />
           {{ $t('position.my') }}
-          <img
-            alt="user"
-            src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg"
-            width="15"
-          />
+          <img alt="user" src="/img/mapbox/marker-icons/mapbox-marker-icon-green.svg" width="15" />
           {{ $t('position.user') }}
-          <img
-            alt="group"
-            src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg"
-            width="15"
-          />
+          <img alt="group" src="/img/mapbox/marker-icons/mapbox-marker-icon-blue.svg" width="15" />
           {{ $t('position.group') }}
         </div>
       </small>