From 26c608402c3edffde0ddb0fba7821d32640d97ab Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Fri, 30 Aug 2024 17:37:33 +0200
Subject: [PATCH] feat: zones - editot changes

---
 modules/ui/layers.js       |  3 +--
 modules/ui/zones-editor.js | 16 +++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index f0106d35..ff64e929 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -1884,9 +1884,8 @@ function toggleZones(event) {
 function drawZones() {
   const filterBy = byId("zonesFilterType").value;
   const isFiltered = filterBy && filterBy !== "all";
-
   const visibleZones = pack.zones.filter(
-    zone => !zone.hidden && zone.cells.length && (!isFiltered || zone.type === filterBy)
+    ({hidden, cells, type}) => !hidden && cells.length && (!isFiltered || type === filterBy)
   );
   zones.html(visibleZones.map(drawZone).join(""));
 }
diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js
index bcaaaa44..ab9469d2 100644
--- a/modules/ui/zones-editor.js
+++ b/modules/ui/zones-editor.js
@@ -46,9 +46,9 @@ function editZones() {
 
     if (ev.target.closest("fill-box")) changeFill(ev.target.closest("fill-box").getAttribute("fill"), zone);
     else if (ev.target.classList.contains("zonePopulation")) changePopulation(zone);
-    else if (ev.target.classList.contains("icon-trash-empty")) zoneRemove(zone);
-    else if (ev.target.classList.contains("icon-eye")) toggleVisibility(zone);
-    else if (ev.target.classList.contains("icon-pin")) toggleFog(zone, ev.target.classList);
+    else if (ev.target.classList.contains("zoneRemove")) zoneRemove(zone);
+    else if (ev.target.classList.contains("zoneHide")) toggleVisibility(zone);
+    else if (ev.target.classList.contains("zoneFog")) toggleFog(zone, ev.target.classList);
   });
 
   body.on("input", function (ev) {
@@ -82,7 +82,7 @@ function editZones() {
       const rural = d3.sum(cells.map(i => pack.cells.pop[i])) * populationRate;
       const urban =
         d3.sum(cells.map(i => pack.cells.burg[i]).map(b => pack.burgs[b].population)) * populationRate * urbanization;
-      const population = rural + urban;
+      const population = rn(rural + urban);
       const populationTip = `Total population: ${si(population)}; Rural population: ${si(
         rural
       )}; Urban population: ${si(urban)}. Click to change`;
@@ -102,11 +102,13 @@ function editZones() {
         <span data-tip="${populationTip}" class="icon-male hide"></span>
         <div data-tip="${populationTip}" class="zonePopulation hide pointer">${si(population)}</div>
         <span data-tip="Drag to raise or lower the zone" class="icon-resize-vertical hide"></span>
-        <span data-tip="Toggle zone focus" class="icon-pin ${focused ? "" : "inactive"} hide ${
+        <span data-tip="Toggle zone focus" class="zoneFog icon-pin ${focused ? "" : "inactive"} hide ${
         cells.length ? "" : "placeholder"
       }"></span>
-        <span data-tip="Toggle zone visibility" class="icon-eye hide ${cells.length ? "" : " placeholder"}"></span>
-        <span data-tip="Remove zone" class="icon-trash-empty hide"></span>
+        <span data-tip="Toggle zone visibility" class="zoneHide icon-eye hide ${
+          cells.length ? "" : " placeholder"
+        }"></span>
+        <span data-tip="Remove zone" class="zoneRemove icon-trash-empty hide"></span>
       </div>`;
     });