From 1a62cc97e213840942505344e52304d355238370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Gergely?= <goteguru@gmail.com>
Date: Wed, 23 Mar 2022 22:27:30 +0100
Subject: [PATCH] Update submap gui

---
 index.html           | 43 +++++++++++++++++++++++++------------------
 modules/ui/submap.js | 12 +++++++-----
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/index.html b/index.html
index 4d289b64..4f3fdcb5 100644
--- a/index.html
+++ b/index.html
@@ -3667,34 +3667,41 @@
         be automatically updated according to the current scale factor. If you'd like
         to generate a new parent-map, <b>don't forget to reset them!</b> Options are interpreted as usual.</p>
       <hr />
+      <p>Remap (copy) features:</p>
       <div data-tip="Copy burgs from old map. Regenerate burgs if not checked." >
         <input id="submapCopyBurgs" class="checkbox" type="checkbox" checked>
         <label for="submapCopyBurgs" class="checkbox-label">Copy cities</label>
       </div>
+      <div data-tip="Copy Rivers from the original map, regenerate otherwise (see errode riverbeds)." >
+        <input id="submapCopyZones" class="checkbox" type="checkbox" checked>
+        <label for="submapCopyZones" class="checkbox-label">Add Zones</label>
+      </div>
+      <div data-tip="Copy military data from the original map. Regenerate military if not checked." >
+        <input id="submapCopyMilitary" class="checkbox" type="checkbox">
+        <label for="submapCopyMilitary" class="checkbox-label">Add Military</label>
+      </div>
+      <div data-tip="Copy markers from the original map. Regenerate markers if not checked." >
+        <input id="submapCopyMarkers" class="checkbox" type="checkbox" checked>
+        <label for="submapCopyMarkers" class="checkbox-label">Add Markers</label>
+      </div>
+      <div data-tip="Copy Zones from the original map. Regenerate Zones if not checked." >
+        <input id="submapCopyZones" class="checkbox" type="checkbox" checked>
+        <label for="submapCopyZones" class="checkbox-label">Add Zones</label>
+      </div>
+      <hr />
+      <p>Extra / experimental features:</p>
+      <div data-tip="Rivers on the parent map errode land (helps to get similar river network.)" >
+        <input id="submapDepressRivers" class="checkbox" type="checkbox">
+        <label for="submapDepressRivers" class="checkbox-label">Errode riverbeds.</label>
+      </div>
       <div data-tip="All small cities of the parent map will be promoted to Capitals." >
         <input id="submapPromoteTown" class="checkbox" type="checkbox">
         <label for="submapPromoteTown" class="checkbox-label">Promote towns to cities.</label>
       </div>
-      <div data-tip="Rivers on the parent map errode land (helps to get similar river network.)" >
-        <input id="submapDepressRivers" class="checkbox" type="checkbox">
-        <label for="submapDepressRivers" class="checkbox-label">Errode riverbeds.</label>
-      </div>
-      <div data-tip="Add lakes in depressions. (Can be very slow on big landmass!)" >
+      <div data-tip="Add lakes in depressions. (Can be very slow on big landmasses!)" >
         <input id="submapAddLakeInDepression" class="checkbox" type="checkbox">
         <label for="submapAddLakeInDepression" class="checkbox-label">Add lakes in depressions.</label>
       </div>
-      <div data-tip="Regenerate military data in submap." >
-        <input id="submapAddMilitary" class="checkbox" type="checkbox">
-        <label for="submapAddMilitary" class="checkbox-label">Add Military</label>
-      </div>
-      <div data-tip="Regenerate markers data in submap." >
-        <input id="submapAddMarkers" class="checkbox" type="checkbox" checked>
-        <label for="submapAddMarkers" class="checkbox-label">Add Markers</label>
-      </div>
-      <div data-tip="Regenerate military data in submap." >
-        <input id="submapAddZones" class="checkbox" type="checkbox" checked>
-        <label for="submapAddZones" class="checkbox-label">Add Zones</label>
-      </div>
       <hr/>
       <button id="start" data-tip="Start submap resampling" class="options" onclick="generateSubmap()">Generate</button>
     </div>
@@ -4382,7 +4389,7 @@
           <path d="M 43.4,0 36.2,12.5 43.4,25 M 21.7,12.5 H 36.2 Z M 0,0 H 14.5 L 21.7,12.5 14.5,25 H 0"/>
         </pattern>
       </g>
-	  
+
       <g id="defs-hatching">
         <pattern id="hatch0" patternUnits="userSpaceOnUse" width="4" height="4">
           <line x1="0" y1="0" x2="0" y2="4" style="stroke:black; stroke-width:2"/>
diff --git a/modules/ui/submap.js b/modules/ui/submap.js
index ac0d1d45..5d044150 100644
--- a/modules/ui/submap.js
+++ b/modules/ui/submap.js
@@ -21,13 +21,15 @@ const generateSubmap = debounce(async function () {
   closeDialogs("#worldConfigurator, #options3d");
   const checked = id => Boolean(document.getElementById(id).checked)
   const options = {
-    promoteTown: checked("submapPromoteTown"),
-    depressRivers: checked("submapDepressRivers"),
     copyBurgs: checked("submapCopyBurgs"),
+    copyMilitary: checked("submapCopyMilitary"),
+    copyMarkers: checked("submapCopyMarkers"),
+    copyZones: checked("submapCopyZones"),
+    copyZones: checked("submapCopyRivers"),
+
+    depressRivers: checked("submapDepressRivers"),
     addLakesInDepressions: checked("submapAddLakeInDepression"),
-    addMilitary: checked("submapAddMilitary"),
-    addMarkers: checked("submapAddMarkers"),
-    addZones: checked("submapAddZones"),
+    promoteTown: checked("submapPromoteTown"),
     smoothHeightMap: scale > 2,
   }