From 41bd157165b9c60f2cad21ebe705ea40f6cfc177 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.com>
Date: Mon, 15 May 2023 01:00:25 +0400
Subject: [PATCH] feat(#942): coord data for burgs, markers and regiments csv

---
 index.html                       |  6 ++--
 modules/ui/burgs-overview.js     | 51 ++++++++++++++++++++++-------
 modules/ui/markers-overview.js   | 20 ++++++++----
 modules/ui/regiments-overview.js | 56 ++++++++++++++++++++++----------
 versioning.js                    |  2 +-
 5 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/index.html b/index.html
index a221df2a..ff7c5515 100644
--- a/index.html
+++ b/index.html
@@ -7889,11 +7889,11 @@
     <script defer src="modules/ui/notes-editor.js?v=1.89.03"></script>
     <script defer src="modules/ui/diplomacy-editor.js?v=1.88.04"></script>
     <script defer src="modules/ui/zones-editor.js"></script>
-    <script defer src="modules/ui/burgs-overview.js"></script>
+    <script defer src="modules/ui/burgs-overview.js?v=1.89.20"></script>
     <script defer src="modules/ui/rivers-overview.js"></script>
     <script defer src="modules/ui/military-overview.js"></script>
-    <script defer src="modules/ui/regiments-overview.js"></script>
-    <script defer src="modules/ui/markers-overview.js"></script>
+    <script defer src="modules/ui/regiments-overview.js?v=1.89.20"></script>
+    <script defer src="modules/ui/markers-overview.js?v=1.89.20"></script>
     <script defer src="modules/ui/regiment-editor.js"></script>
     <script defer src="modules/ui/battle-screen.js"></script>
     <script defer src="modules/ui/emblems-editor.js"></script>
diff --git a/modules/ui/burgs-overview.js b/modules/ui/burgs-overview.js
index bf819465..5920c442 100644
--- a/modules/ui/burgs-overview.js
+++ b/modules/ui/burgs-overview.js
@@ -93,7 +93,9 @@ function overviewBurgs() {
         data-type="${type}"
       >
         <span data-tip="Click to zoom into view" class="icon-dot-circled pointer"></span>
-        <input data-tip="Burg name. Click and type to change" class="burgName" value="${b.name}" autocorrect="off" spellcheck="false" />
+        <input data-tip="Burg name. Click and type to change" class="burgName" value="${
+          b.name
+        }" autocorrect="off" spellcheck="false" />
         <input data-tip="Burg province" class="burgState" value="${province}" disabled />
         <input data-tip="Burg state" class="burgState" value="${state}" disabled />
         <select data-tip="Dominant culture. Click to change burg culture (to change cell culture use Cultures Editor)" class="stateCulture">
@@ -106,10 +108,14 @@ function overviewBurgs() {
             data-tip="${b.capital ? " This burg is a state capital" : "Click to assign a capital status"}"
             class="icon-star-empty${b.capital ? "" : " inactive pointer"}"
           ></span>
-          <span data-tip="Click to toggle port status" class="icon-anchor pointer${b.port ? "" : " inactive"}" style="font-size:.9em"></span>
+          <span data-tip="Click to toggle port status" class="icon-anchor pointer${
+            b.port ? "" : " inactive"
+          }" style="font-size:.9em"></span>
         </div>
         <span data-tip="Edit burg" class="icon-pencil"></span>
-        <span class="locks pointer ${b.lock ? "icon-lock" : "icon-lock-open inactive"}" onmouseover="showElementLockTip(event)"></span>
+        <span class="locks pointer ${
+          b.lock ? "icon-lock" : "icon-lock-open inactive"
+        }" onmouseover="showElementLockTip(event)"></span>
         <span data-tip="Remove burg" class="icon-trash-empty"></span>
       </div>`;
     }
@@ -125,8 +131,12 @@ function overviewBurgs() {
     body.querySelectorAll("div > input.burgName").forEach(el => el.addEventListener("input", changeBurgName));
     body.querySelectorAll("div > span.icon-dot-circled").forEach(el => el.addEventListener("click", zoomIntoBurg));
     body.querySelectorAll("div > select.stateCulture").forEach(el => el.addEventListener("change", changeBurgCulture));
-    body.querySelectorAll("div > input.burgPopulation").forEach(el => el.addEventListener("change", changeBurgPopulation));
-    body.querySelectorAll("div > span.icon-star-empty").forEach(el => el.addEventListener("click", toggleCapitalStatus));
+    body
+      .querySelectorAll("div > input.burgPopulation")
+      .forEach(el => el.addEventListener("change", changeBurgPopulation));
+    body
+      .querySelectorAll("div > span.icon-star-empty")
+      .forEach(el => el.addEventListener("click", toggleCapitalStatus));
     body.querySelectorAll("div > span.icon-anchor").forEach(el => el.addEventListener("click", togglePortStatus));
     body.querySelectorAll("div > span.locks").forEach(el => el.addEventListener("click", toggleBurgLockStatus));
     body.querySelectorAll("div > span.icon-pencil").forEach(el => el.addEventListener("click", openBurgEditor));
@@ -137,7 +147,9 @@ function overviewBurgs() {
 
   function getCultureOptions(culture) {
     let options = "";
-    pack.cultures.filter(c => !c.removed).forEach(c => (options += `<option ${c.i === culture ? "selected" : ""} value="${c.i}">${c.name}</option>`));
+    pack.cultures
+      .filter(c => !c.removed)
+      .forEach(c => (options += `<option ${c.i === culture ? "selected" : ""} value="${c.i}">${c.name}</option>`));
     return options;
   }
 
@@ -228,7 +240,8 @@ function overviewBurgs() {
 
   function triggerBurgRemove() {
     const burg = +this.parentNode.dataset.id;
-    if (pack.burgs[burg].capital) return tip("You cannot remove the capital. Please change the capital first", false, "error");
+    if (pack.burgs[burg].capital)
+      return tip("You cannot remove the capital. Please change the capital first", false, "error");
 
     confirmationDialog({
       title: "Remove burg",
@@ -266,8 +279,10 @@ function overviewBurgs() {
   function addBurgOnClick() {
     const point = d3.mouse(this);
     const cell = findCell(point[0], point[1]);
-    if (pack.cells.h[cell] < 20) return tip("You cannot place state into the water. Please click on a land cell", false, "error");
-    if (pack.cells.burg[cell]) return tip("There is already a burg in this cell. Please select a free cell", false, "error");
+    if (pack.cells.h[cell] < 20)
+      return tip("You cannot place state into the water. Please click on a land cell", false, "error");
+    if (pack.cells.burg[cell])
+      return tip("There is already a burg in this cell. Please select a free cell", false, "error");
 
     addBurg(point); // add new burg
 
@@ -301,7 +316,19 @@ function overviewBurgs() {
         const capital = b.capital;
         const province = pack.cells.province[b.cell];
         const parent = province ? province + states.length - 1 : b.state;
-        return {id, i: b.i, state: b.state, culture: b.culture, province, parent, name: b.name, population, capital, x: b.x, y: b.y};
+        return {
+          id,
+          i: b.i,
+          state: b.state,
+          culture: b.culture,
+          province,
+          parent,
+          name: b.name,
+          population,
+          capital,
+          x: b.x,
+          y: b.y
+        };
       });
     const data = states.concat(burgs);
     if (data.length < 2) return tip("No burgs to show", false, "error");
@@ -452,7 +479,7 @@ function overviewBurgs() {
   }
 
   function downloadBurgsData() {
-    let data = `Id,Burg,Province,Province Full Name,State,State Full Name,Culture,Religion,Population,Latitude,Longitude,Elevation (${heightUnit.value}),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town`; // headers
+    let data = `Id,Burg,Province,Province Full Name,State,State Full Name,Culture,Religion,Population,X,Y,Latitude,Longitude,Elevation (${heightUnit.value}),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town`; // headers
     if (options.showMFCGMap) data += `,City Generator Link`;
     data += "\n";
 
@@ -471,6 +498,8 @@ function overviewBurgs() {
       data += rn(b.population * populationRate * urbanization) + ",";
 
       // add geography data
+      data += b.x + ",";
+      data += b.y + ",";
       data += getLatitude(b.y, 2) + ",";
       data += getLongitude(b.x, 2) + ",";
       data += parseInt(getHeight(pack.cells.h[b.cell])) + ",";
diff --git a/modules/ui/markers-overview.js b/modules/ui/markers-overview.js
index 5570ffb9..e0909278 100644
--- a/modules/ui/markers-overview.js
+++ b/modules/ui/markers-overview.js
@@ -54,8 +54,12 @@ function overviewMarkers() {
         <div data-tip="Marker icon and type" style="width:12em">${icon} ${type}</div>
         <span style="padding-right:.1em" data-tip="Edit marker" class="icon-pencil"></span>
         <span style="padding-right:.1em" data-tip="Focus on marker position" class="icon-dot-circled pointer"></span>
-        <span style="padding-right:.1em" data-tip="Pin marker (display only pinned markers)" class="icon-pin ${pinned ? "" : "inactive"}" pointer"></span>
-        <span style="padding-right:.1em" class="locks pointer ${lock ? "icon-lock" : "icon-lock-open inactive"}" onmouseover="showElementLockTip(event)"></span>
+        <span style="padding-right:.1em" data-tip="Pin marker (display only pinned markers)" class="icon-pin ${
+          pinned ? "" : "inactive"
+        }" pointer"></span>
+        <span style="padding-right:.1em" class="locks pointer ${
+          lock ? "icon-lock" : "icon-lock-open inactive"
+        }" onmouseover="showElementLockTip(event)"></span>
         <span data-tip="Remove marker" class="icon-trash-empty"></span>
       </div>`;
       })
@@ -170,16 +174,20 @@ function overviewMarkers() {
   }
 
   function exportMarkers() {
-    const headers = "Id,Type,Icon,Name,Note,X,Y\n";
+    const headers = "Id,Type,Icon,Name,Note,X,Y,Latitude,Longitude\n";
     const quote = s => '"' + s.replaceAll('"', '""') + '"';
 
     const body = pack.markers.map(marker => {
       const {i, type, icon, x, y} = marker;
       const id = `marker${i}`;
       const note = notes.find(note => note.id === id);
-      const name = note ? quote(note.name) : 'Unknown';
-      const legend = note ? quote(note.legend) : '';
-      return [id, type, icon, name, legend, x, y].join(",");
+      const name = note ? quote(note.name) : "Unknown";
+      const legend = note ? quote(note.legend) : "";
+
+      const lat = getLatitude(y, 2);
+      const lon = getLongitude(x, 2);
+
+      return [id, type, icon, name, legend, x, y, lat, lon].join(",");
     });
 
     const data = headers + body.join("\n");
diff --git a/modules/ui/regiments-overview.js b/modules/ui/regiments-overview.js
index 49fd7b8b..28f40d18 100644
--- a/modules/ui/regiments-overview.js
+++ b/modules/ui/regiments-overview.js
@@ -37,7 +37,9 @@ function overviewRegiments(state) {
     const insert = html => document.getElementById("regimentsTotal").insertAdjacentHTML("beforebegin", html);
     for (const u of options.military) {
       const label = capitalize(u.name.replace(/_/g, " "));
-      insert(`<div data-tip="Regiment ${u.name} units number. Click to sort" class="sortable removable" data-sortby="${u.name}">${label}&nbsp;</div>`);
+      insert(
+        `<div data-tip="Regiment ${u.name} units number. Click to sort" class="sortable removable" data-sortby="${u.name}">${label}&nbsp;</div>`
+      );
     }
     header.querySelectorAll(".removable").forEach(function (e) {
       e.addEventListener("click", function () {
@@ -60,10 +62,12 @@ function overviewRegiments(state) {
       for (const r of s.military) {
         const sortData = options.military.map(u => `data-${u.name}=${r.u[u.name] || 0}`).join(" ");
         const lineData = options.military
-          .map(u => `<div data-type="${u.name}" data-tip="${capitalize(u.name)} units number">${r.u[u.name] || 0}</div>`)
+          .map(
+            u => `<div data-type="${u.name}" data-tip="${capitalize(u.name)} units number">${r.u[u.name] || 0}</div>`
+          )
           .join(" ");
 
-        lines += /* html */ `<div class="states" data-id=${r.i} data-s="${s.i}" data-state="${s.name}" data-name="${r.name}" ${sortData} data-total="${r.a}">
+        lines += /* html */ `<div class="states" data-id="${r.i}" data-s="${s.i}" data-state="${s.name}" data-name="${r.name}" ${sortData} data-total="${r.a}">
           <fill-box data-tip="${s.fullName}" fill="${s.color}" disabled></fill-box>
           <input data-tip="${s.fullName}" style="width:6em" value="${s.name}" readonly />
           <span data-tip="Regiment's emblem" style="width:1em">${r.icon}</span>
@@ -79,7 +83,9 @@ function overviewRegiments(state) {
 
     lines += /* html */ `<div id="regimentsTotalLine" class="totalLine" data-tip="Total of all displayed regiments">
       <div style="width: 21em; margin-left: 1em">Regiments: ${regiments.length}</div>
-      ${options.military.map(u => `<div style="width:5em">${si(d3.sum(regiments.map(r => r.u[u.name] || 0)))}</div>`).join(" ")}
+      ${options.military
+        .map(u => `<div style="width:5em">${si(d3.sum(regiments.map(r => r.u[u.name] || 0)))}</div>`)
+        .join(" ")}
       <div style="width:5em">${si(d3.sum(regiments.map(r => r.a)))}</div>
     </div>`;
 
@@ -92,7 +98,9 @@ function overviewRegiments(state) {
 
     // add listeners
     body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseenter", ev => regimentHighlightOn(ev)));
-    body.querySelectorAll("div.states").forEach(el => el.addEventListener("mouseleave", ev => regimentHighlightOff(ev)));
+    body
+      .querySelectorAll("div.states")
+      .forEach(el => el.addEventListener("mouseleave", ev => regimentHighlightOff(ev)));
   }
 
   function updateFilter(state) {
@@ -158,10 +166,7 @@ function overviewRegiments(state) {
 
   function addRegimentOnClick() {
     const state = +regimentsFilter.value;
-    if (state === -1) {
-      tip("Please select state from the list", false, "error");
-      return;
-    }
+    if (state === -1) return tip("Please select state from the list", false, "error");
 
     const point = d3.mouse(this);
     const cell = findCell(point[0], point[1]);
@@ -180,15 +185,32 @@ function overviewRegiments(state) {
 
   function downloadRegimentsData() {
     const units = options.military.map(u => u.name);
-    let data = "State,Id,Name," + units.map(u => capitalize(u)).join(",") + ",Total\n"; // headers
+    let data =
+      "State,Id,Icon,Name," +
+      units.map(u => capitalize(u)).join(",") +
+      ",X,Y,Latitude,Longitude,Base X,Base Y,Base Latitude,Base Longitude\n"; // headers
 
-    body.querySelectorAll(":scope > div:not(.totalLine)").forEach(function (el) {
-      data += el.dataset.state + ",";
-      data += el.dataset.id + ",";
-      data += el.dataset.name + ",";
-      data += units.map(u => el.dataset[u]).join(",") + ",";
-      data += el.dataset.total + "\n";
-    });
+    for (const s of pack.states) {
+      if (!s.i || s.removed || !s.military.length) continue;
+
+      for (const r of s.military) {
+        data += s.name + ",";
+        data += r.i + ",";
+        data += r.icon + ",";
+        data += r.name + ",";
+        data += units.map(unit => r.u[unit]).join(",") + ",";
+
+        data += r.x + ",";
+        data += r.y + ",";
+        data += getLatitude(r.y, 2) + ",";
+        data += getLongitude(r.x, 2) + ",";
+
+        data += r.bx + ",";
+        data += r.by + ",";
+        data += getLatitude(r.by, 2) + ",";
+        data += getLongitude(r.bx, 2) + "\n";
+      }
+    }
 
     const name = getFileName("Regiments") + ".csv";
     downloadFile(data, name);
diff --git a/versioning.js b/versioning.js
index 94580ba9..e8a1a06c 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // version and caching control
-const version = "1.89.19"; // generator version, update each time
+const version = "1.89.20"; // generator version, update each time
 
 {
   document.title += " v" + version;