From 861b219e6e7c1811fc2b0514e5404235d700aab1 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sat, 21 Sep 2024 14:23:18 +0200
Subject: [PATCH] fix: don't hide armies layer

---
 index.html                     | 2 +-
 modules/dynamic/auto-update.js | 2 +-
 modules/io/load.js             | 2 +-
 versioning.js                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 1537ff6d..a17c18d3 100644
--- a/index.html
+++ b/index.html
@@ -8111,7 +8111,7 @@
     <script defer src="libs/rgbquant.min.js"></script>
     <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
     <script defer src="modules/io/save.js?v=1.100.00"></script>
-    <script defer src="modules/io/load.js?v=1.104.11"></script>
+    <script defer src="modules/io/load.js?v=1.104.12"></script>
     <script defer src="modules/io/cloud.js?v=1.99.00"></script>
     <script defer src="modules/io/export.js?v=1.100.00"></script>
 
diff --git a/modules/dynamic/auto-update.js b/modules/dynamic/auto-update.js
index 6190a243..0a6dcd24 100644
--- a/modules/dynamic/auto-update.js
+++ b/modules/dynamic/auto-update.js
@@ -949,7 +949,6 @@ export function resolveVersionConflicts(mapVersion) {
 
     // 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);
 
     // v1.104.00 added featurePaths to defs
@@ -960,5 +959,6 @@ export function resolveVersionConflicts(mapVersion) {
   if (isOlderThan("1.105.0")) {
     // v1.104.0 introduced some bugs
     viewbox.select("#regions").style("display", null);
+    viewbox.select("#armies").style("display", null);
   }
 }
diff --git a/modules/io/load.js b/modules/io/load.js
index 6f556205..c455fb52 100644
--- a/modules/io/load.js
+++ b/modules/io/load.js
@@ -459,7 +459,7 @@ async function parseLoadedData(data, mapVersion) {
 
     {
       // dynamically import and run auto-update script
-      const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.104.5");
+      const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.104.12");
       resolveVersionConflicts(mapVersion);
     }
 
diff --git a/versioning.js b/versioning.js
index 20e62730..dcdfb573 100644
--- a/versioning.js
+++ b/versioning.js
@@ -12,7 +12,7 @@
  *
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
-const VERSION = "1.104.11";
+const VERSION = "1.104.12";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {