From b142df8f0a6841652a149d744e168e6cead475b6 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Fri, 13 Sep 2024 14:02:16 +0200
Subject: [PATCH] fix: regenerate burgs to re-render layers

---
 modules/dynamic/auto-update.js        | 1 +
 modules/renderers/draw-burg-icons.js  | 2 ++
 modules/renderers/draw-burg-labels.js | 2 ++
 modules/ui/layers.js                  | 2 --
 modules/ui/tools.js                   | 3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/dynamic/auto-update.js b/modules/dynamic/auto-update.js
index 4dbff524..d985c6a5 100644
--- a/modules/dynamic/auto-update.js
+++ b/modules/dynamic/auto-update.js
@@ -948,6 +948,7 @@ export function resolveVersionConflicts(mapVersion) {
     Provinces.getPoles();
 
     // v1.104.00 removed some layers from initial render
+    viewbox.select("#icons").style("display", null);
     viewbox.select("#armies").style("display", null);
     viewbox.select("#ice").style("display", null);
 
diff --git a/modules/renderers/draw-burg-icons.js b/modules/renderers/draw-burg-icons.js
index e706fac8..8e11bf3b 100644
--- a/modules/renderers/draw-burg-icons.js
+++ b/modules/renderers/draw-burg-icons.js
@@ -3,6 +3,8 @@
 function drawBurgIcons() {
   TIME && console.time("drawBurgIcons");
 
+  icons.selectAll("circle, use").remove(); // cleanup
+
   // capitals
   const capitals = pack.burgs.filter(b => b.capital && !b.removed);
   const capitalIcons = burgIcons.select("#cities");
diff --git a/modules/renderers/draw-burg-labels.js b/modules/renderers/draw-burg-labels.js
index f1d60e9e..d887b9ca 100644
--- a/modules/renderers/draw-burg-labels.js
+++ b/modules/renderers/draw-burg-labels.js
@@ -3,6 +3,8 @@
 function drawBurgLabels() {
   TIME && console.time("drawBurgLabels");
 
+  burgLabels.selectAll("text").remove(); // cleanup
+
   const capitals = pack.burgs.filter(b => b.capital && !b.removed);
   const capitalSize = burgIcons.select("#cities").attr("size") || 1;
   burgLabels
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index d34121dd..c8438373 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -895,14 +895,12 @@ function drawLabels() {
 function toggleBurgIcons(event) {
   if (!layerIsOn("toggleBurgIcons")) {
     turnButtonOn("toggleBurgIcons");
-    $("#icons").fadeIn();
     drawBurgIcons();
     if (event && isCtrlClick(event)) editStyle("burgIcons");
   } else {
     if (event && isCtrlClick(event)) return editStyle("burgIcons");
     turnButtonOff("toggleBurgIcons");
     icons.selectAll("circle, use").remove();
-    $("#icons").fadeOut();
   }
 }
 
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index e5f598dc..b876cb11 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -444,6 +444,9 @@ function regenerateBurgs() {
   BurgsAndStates.defineBurgFeatures();
   regenerateRoutes();
 
+  drawBurgIcons();
+  drawBurgLabels();
+
   // remove emblems
   document.querySelectorAll("[id^=burgCOA]").forEach(el => el.remove());
   emblems.selectAll("use").remove();