From 1488a955b7dd389babcb416bf7fa81d3e4d1db17 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 10 May 2020 15:03:44 +0300
Subject: [PATCH] v1.4.12

---
 index.html           | 18 ++++++------------
 modules/ui/layers.js |  5 +++--
 modules/ui/style.js  |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/index.html b/index.html
index ed98113a..e93fe534 100644
--- a/index.html
+++ b/index.html
@@ -1776,17 +1776,6 @@
             </td>
           </tr>
 
-          <tr data-tip="Define scale of a saved png/jpeg image (e.g. 5x). Saving big images is slow and may cause a browser crash!">
-            <td></td>
-            <td>PNG/JPEG scale</td>
-            <td>
-              <input id="pngResolutionInput" data-stored="pngResolution" type="range" min=1 max=8 value=1>
-            </td>
-            <td>
-              <input id="pngResolutionOutput" data-stored="pngResolution" type="number" min=1 max=8 value=1>
-            </td>
-          </tr>
-
           <tr data-tip="Set minimum and maximum possible zoom level">
             <td></td>
             <td>Zoom extent</td>
@@ -3535,7 +3524,7 @@
     <div id="preview3d" class="dialog stable" style="display: none; padding: 0px"></div>
 
     <div id="saveMapData" style="display: none" class="dialog">
-      <div style="margin-bottom: .3em">Please select a saving variant:</div>
+      <div style="margin-bottom: .3em; font-weight: bold">Please select saving variant:</div>
       <div>
         <button onclick="saveMap()" data-tip="Download the map as fully-functional .map file to your machine">.map</button>
         <button onclick="saveSVG()" data-tip="Download the map as vector image (open in browser or Inkscape)">.svg</button>
@@ -3545,6 +3534,11 @@
         <button onclick="quickSave()" data-tip="Save fully-functional map to browser storage. Shortcut: F6">storage</button>
       </div>
       <p style="font-style: italic">Generator uses pop-up window to download files. Please ensure your browser does not block popups</p>
+      <div data-tip="Define scale of a saved png/jpeg image (e.g. 5x). Saving big images is slow and may cause a browser crash!" style="margin-bottom: .3em">
+        PNG / JPEG scale:
+        <input id="pngResolutionInput" data-stored="pngResolution" type="range" min=1 max=8 value=1 style="width: 10.8em">
+        <input id="pngResolutionOutput" data-stored="pngResolution" type="number" min=1 max=8 value=1>
+      </div>
     </div>
 
     <div id="loadMapData" style="display: none" class="dialog">
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 614b556d..4298ec17 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -16,6 +16,7 @@ function restoreLayers() {
   if (layerIsOn("toggleCultures")) drawCultures();
   if (layerIsOn("toggleProvinces")) drawProvinces();
   if (layerIsOn("toggleReligions")) drawReligions();
+  if (layerIsOn("toggleIce")) drawIce();
 
   // states are getting rendered each time, if it's not required than layers should be hidden
   if (!layerIsOn("toggleBorders")) $('#borders').fadeOut();
@@ -28,13 +29,13 @@ restoreCustomPresets(); // run on-load
 
 function getDefaultPresets() {
   return {
-    "political": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
+    "political": ["toggleBorders", "toggleIcons", "toggleIce", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
     "cultural": ["toggleBorders", "toggleCultures", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "religions": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleReligions", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "provinces": ["toggleBorders", "toggleIcons", "toggleProvinces", "toggleRivers", "toggleScaleBar"],
     "biomes": ["toggleBiomes", "toggleIce", "toggleRivers", "toggleScaleBar"],
     "heightmap": ["toggleHeight", "toggleRivers"],
-    "physical": ["toggleCoordinates", "toggleHeight", "toggleRivers", "toggleScaleBar"],
+    "physical": ["toggleCoordinates", "toggleHeight", "toggleIce", "toggleRivers", "toggleScaleBar"],
     "poi": ["toggleBorders", "toggleHeight", "toggleIce", "toggleIcons", "toggleMarkers", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "military": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleMilitary", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
     "landmass": ["toggleScaleBar"]
diff --git a/modules/ui/style.js b/modules/ui/style.js
index ffd87be9..f715a884 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -716,7 +716,7 @@ function applyDefaultStyle() {
   armies.attr("opacity", 1).attr("fill-opacity", 1).attr("font-size", 6).attr("box-size", 3).attr("stroke", "#000").attr("stroke-width", .3);
 
   biomes.attr("opacity", null).attr("filter", null).attr("mask", null);
-  ice.attr("opacity", 1).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
+  ice.attr("opacity", .8).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
   stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null);
   provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .2).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt").attr("filter", null);
   cells.attr("opacity", null).attr("stroke", "#808080").attr("stroke-width", .1).attr("filter", null).attr("mask", null);