refactor(GalaxyMapCluster): change ReAssign method to virtual

  Class GalaxyMapCluster: ~ReAssign(GalaxyMapViewer, Cluster?): made virtual for extensibility
  Class GalaxyMapCluster: ~Clear(GalaxyMapViewer, Canvas): renamed from Remove for clarity

refactor(GalaxyMapSector): rename Remove method to Clear

  Class GalaxyMapSector: ~Clear(GalaxyMapViewer, Canvas): renamed from Remove for consistency

refactor(GalaxyMapViewer): update method calls to use Clear

  Class GalaxyMapViewer: ~GalaxyMapClusterReassign(GalaxyMapCluster, Cluster?): added method for reassignment
  Class GalaxyMapViewer: ~Clear(GalaxyMapViewer, Canvas): updated calls to Clear instead of Remove

Author: chemodun

src/X4Map/GalaxyMapCluster.cs

@@ -353,7 +353,7 @@ public virtual double Create(GalaxyMapViewer map)
       return maxInternalSizeKm; // Return the maximum internal size of the sectors in the cluster
     }
 
-    public void ReAssign(GalaxyMapViewer map, Cluster? cluster)
+    public virtual void ReAssign(GalaxyMapViewer map, Cluster? cluster)
     {
       Cluster = cluster;
       if (Hexagon != null)
@@ -375,23 +375,20 @@ public void ReAssign(GalaxyMapViewer map, Cluster? cluster)
         Hexagon.Stroke = Cluster != null ? (Cluster.Source == "New" ? Brushes.DarkGreen : Brushes.Black) : Brushes.DarkGray;
         Hexagon.Tag = Cluster != null ? Cluster.Name : "Empty Map Cell";
         Hexagon.DataContext = Cluster == null ? this : Cluster;
-        if (Cluster != null && Cluster.Source != "New")
-        {
-          Create(map);
-        }
       }
     }
 
-    public virtual void Remove(GalaxyMapViewer map, Canvas canvas)
+    public virtual void Clear(GalaxyMapViewer map, Canvas canvas)
     {
       if (Hexagon != null)
       {
         canvas.Children.Remove(Hexagon);
+        Hexagon = null;
       }
 
       foreach (GalaxyMapSector sector in Sectors)
       {
-        sector.Remove(map, canvas);
+        sector.Clear(map, canvas);
       }
     }
 

src/X4Map/GalaxyMapSector.cs

@@ -196,11 +196,14 @@ public override double Create(GalaxyMapViewer map)
       return SectorMapHelper.InternalSizeKm;
     }
 
-    public override void Remove(GalaxyMapViewer map, Canvas canvas)
+    public override void Clear(GalaxyMapViewer map, Canvas canvas)
     {
       if (Grid != null)
       {
         canvas.Children.Remove(Grid);
+        Grid = null;
+        TextBlock = null;
+        Hexagon = null;
       }
       foreach (SectorMapItem item in SectorMapHelper.Items)
       {

src/X4Map/GalaxyMapViewer.cs

@@ -275,6 +275,19 @@ double scaleFactor
       return newCluster;
     }
 
+    public virtual void GalaxyMapClusterReassign(GalaxyMapCluster galaxyCluster, Cluster? cluster)
+    {
+      if (galaxyCluster == null)
+      {
+        return;
+      }
+      if (!_clusters.Contains(galaxyCluster))
+      {
+        _clusters.Add(galaxyCluster);
+      }
+      galaxyCluster.ReAssign(this, cluster);
+    }
+
     public virtual GalaxyMapSector CreateMapSector(
       double x,
       double y,
@@ -299,12 +312,12 @@ public void RefreshGalaxyData()
       {
         foreach (GalaxyMapSector sector in _sectors)
         {
-          sector.Remove(this, GalaxyCanvas);
+          sector.Clear(this, GalaxyCanvas);
         }
         _sectors.Clear();
         foreach (GalaxyMapCluster cluster in _clusters)
         {
-          cluster.Remove(this, GalaxyCanvas);
+          cluster.Clear(this, GalaxyCanvas);
         }
         _clusters.Clear();
         foreach (GalaxyMapInterConnection connection in InterConnections)
@@ -575,7 +588,7 @@ public void RemoveCluster(GalaxyMapCluster cluster)
       {
         return;
       }
-      cluster.Remove(this, GalaxyCanvas);
+      cluster.Clear(this, GalaxyCanvas);
       _clusters.Remove(cluster);
       foreach (GalaxyMapSector sector in cluster.Sectors)
       {
@@ -590,7 +603,7 @@ public void RemoveSector(GalaxyMapSector sector)
       {
         return;
       }
-      sector.Remove(this, GalaxyCanvas);
+      sector.Clear(this, GalaxyCanvas);
       _sectors.Remove(sector);
       GalaxyMapCluster? ownerCluster = _clusters.Find(cl => cl.Sectors.Contains(sector));
       if (ownerCluster != null)
@@ -724,6 +737,26 @@ public virtual void UpdateMap()
       }
     }
 
+    public GalaxyMapCluster? GetClusterByMacro(string macro)
+    {
+      return _clusters.Find(cluster => StringHelper.EqualsIgnoreCase(cluster.Macro, macro));
+    }
+
+    public GalaxyMapSector? GetSectorByMacro(string macro)
+    {
+      return _sectors.Find(sector => StringHelper.EqualsIgnoreCase(sector.Macro, macro));
+    }
+
+    public GalaxyMapCluster? GetClusterBySectorMacro(string sectorMacro)
+    {
+      GalaxyMapSector? sector = GetSectorByMacro(sectorMacro);
+      if (sector != null)
+      {
+        return _clusters.Find(cluster => cluster.Sectors.Contains(sector));
+      }
+      return null;
+    }
+
     protected void GalaxyMapViewer_SizeChanged(object sender, SizeChangedEventArgs e)
     {
       if (ActualWidth != 0 && ActualHeight != 0 && _canvasWidthBase != 0 && _canvasHeightBase != 0)