From 5ec30a966f9dc9e28eaf74ec2d9f6bca4d6398f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=B6rflinger?= <dev.doerfl@gmail.com>
Date: Wed, 19 Mar 2025 16:23:42 +0100
Subject: [PATCH] [BUG] Fixed an issue where multiple markers where added

Previously instead of moving the existing marker, always a new marker
was added. Now the existing marker is replaced.
---
 .idea/deploymentTargetDropDown.xml            | 15 +++++++++++-
 .../familyhelpers/ShareLocationActivity.java  | 24 +++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..c9bb603 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="47111FDAS0039V" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2025-03-19T15:23:01.624733903Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java b/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
index 2a0893c..63c8948 100644
--- a/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
+++ b/app/src/main/java/com/aldo/apps/familyhelpers/ShareLocationActivity.java
@@ -20,6 +20,7 @@ import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MapStyleOptions;
+import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -101,6 +102,11 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
      */
     private boolean mIsNightMode;
 
+    /**
+     * Reference to the Google Maps Marker, to update it's position rather than adding a new one.
+     */
+    private Marker mGmapsMarker;
+
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -168,9 +174,13 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
 
         final LatLng received = new LatLng(locationObject.getLatitude(), locationObject.getLongitude());
 
-        mGmap.addMarker(new MarkerOptions()
-                .position(received)
-                .title(mCurrentUser.getDisplayName()));
+        if (mGmapsMarker == null) {
+            mGmap.addMarker(new MarkerOptions()
+                    .position(received)
+                    .title(mCurrentUser.getDisplayName()));
+        } else {
+            mGmapsMarker.setPosition(received);
+        }
         mGmap.moveCamera(CameraUpdateFactory.newLatLngZoom(received, 15.0f));
 
     }
@@ -207,7 +217,13 @@ public class ShareLocationActivity extends AppCompatActivity implements OnMapRea
         }
         final LatLng defaultHome = new LatLng(48.41965746149261, 9.909289365473684);
 
-        mGmap.addMarker(new MarkerOptions().position(defaultHome).title("Default - Home"));
+        if (mGmapsMarker == null) {
+            mGmap.addMarker(new MarkerOptions()
+                    .position(defaultHome)
+                    .title("Default - Home"));
+        } else {
+            mGmapsMarker.setPosition(defaultHome);
+        }
         mGmap.moveCamera(CameraUpdateFactory.newLatLngZoom(defaultHome, 15.0f));
     }