From c398bc64d679e241d8f4221c2300ae2758fa03ac Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.com>
Date: Sat, 5 Aug 2023 13:38:30 +0400
Subject: [PATCH] refactor(markers): cleanup

---
 index.css                      |  3 +++
 libs/indexedDB.js              |  1 -
 modules/io/save.js             |  2 +-
 modules/ui/markers-overview.js | 27 ++++++++++++++-------------
 versioning.js                  |  1 -
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/index.css b/index.css
index 91c6c6ba..4bd1a328 100644
--- a/index.css
+++ b/index.css
@@ -2368,6 +2368,7 @@ svg.button {
 #markerTypeSelectMenu {
   display: none;
 }
+
 #markerTypeSelectMenu.visible {
   display: block;
   position: absolute;
@@ -2379,12 +2380,14 @@ svg.button {
   left: 0;
   background: white;
 }
+
 #markerTypeSelectMenu > button {
   display: block;
   width: 100%;
   border: 1px solid #ddd;
   margin-bottom: 1px;
 }
+
 #markerTypeSelectMenu > button:hover {
   background: #ccc;
 }
diff --git a/libs/indexedDB.js b/libs/indexedDB.js
index 100b7be4..9b2578e9 100644
--- a/libs/indexedDB.js
+++ b/libs/indexedDB.js
@@ -18,7 +18,6 @@ const openDatabase = () => {
 
       request.onerror = event => {
         console.error("indexedDB request error");
-        console.log(event);
         reject();
       };
 
diff --git a/modules/io/save.js b/modules/io/save.js
index 8cdd5c03..bf78fd0e 100644
--- a/modules/io/save.js
+++ b/modules/io/save.js
@@ -165,7 +165,7 @@ async function initiateAutosave() {
     const mapData = getMapData();
     const blob = new Blob([mapData], {type: "text/plain"});
     await ldb.set("lastMap", blob);
-    console.log("Autosaved at", new Date().toLocaleTimeString());
+    INFO && console.log("Autosaved at", new Date().toLocaleTimeString());
     lastSavedAt = Date.now();
   }
 
diff --git a/modules/ui/markers-overview.js b/modules/ui/markers-overview.js
index b30f3609..af0cc11f 100644
--- a/modules/ui/markers-overview.js
+++ b/modules/ui/markers-overview.js
@@ -36,21 +36,23 @@ function overviewMarkers() {
     listen(markersGenerationConfig, "click", configMarkersGeneration),
     listen(markersRemoveAll, "click", triggerRemoveAll),
     listen(markersExport, "click", exportMarkers),
-    listen(markerTypeSelector, "click", toggleMarkerTypeMenu),
-    //listen(markerTypeInput, "change", changeMarkerType),
+    listen(markerTypeSelector, "click", toggleMarkerTypeMenu)
   ];
 
-  [{type: "empty", icon: "❓"}, ...Markers.getConfig()].forEach(markerConfig => {
+  const types = [{type: "empty", icon: "❓"}, ...Markers.getConfig()];
+  types.forEach(({icon, type}) => {
     const option = document.createElement("button");
-    option.textContent = `${markerConfig.icon} ${markerConfig.type}`;
+    option.textContent = `${icon} ${type}`;
     markerTypeSelectMenu.appendChild(option);
-    console.log(option.textContent);
-    listeners.push(listen(option, "click", () => {
-      markerTypeSelector.textContent = markerConfig.icon;
-      markerTypeInput.value = markerConfig.type;
-      changeMarkerType();
-      toggleMarkerTypeMenu();
-    }));
+
+    listeners.push(
+      listen(option, "click", () => {
+        markerTypeSelector.textContent = icon;
+        markerTypeInput.value = type;
+        changeMarkerType();
+        toggleMarkerTypeMenu();
+      })
+    );
   });
 
   function handleLineClick(ev) {
@@ -156,11 +158,10 @@ function overviewMarkers() {
     });
   }
 
-
   function toggleMarkerTypeMenu() {
     document.getElementById("markerTypeSelectMenu").classList.toggle("visible");
   }
-  
+
   function toggleAddMarker() {
     markersAddFromOverview.classList.toggle("pressed");
     addMarker.click();
diff --git a/versioning.js b/versioning.js
index 91aeee55..7b66c215 100644
--- a/versioning.js
+++ b/versioning.js
@@ -36,7 +36,6 @@ const version = "1.89.38"; // generator version, update each time
         <li>Data Charts screen</li>
         <li>Сultures and religions can have multiple parents in hierarchy tree</li>
         <li>Heightmap selection screen</li>
-        <li>Randomly generated marker type selection and placement</li>
       </ul>
 
       <p>Join our <a href="${discord}" target="_blank">Discord server</a> and <a href="${reddit}" target="_blank">Reddit community</a> to ask questions, share maps, discuss the Generator and Worlbuilding, report bugs and propose new features.</p>