chore: parse DEBUG setting as an object

index.html

@@ -8073,7 +8073,7 @@
     <script src="modules/ui/style-presets.js?v=1.100.00"></script>
     <script src="modules/ui/general.js?v=1.100.00"></script>
     <script src="modules/ui/options.js?v=1.105.12"></script>
-    <script src="main.js?v=1.105.16"></script>
+    <script src="main.js?v=1.105.19"></script>
 
     <script defer src="modules/relief-icons.js?v=1.99.05"></script>
     <script defer src="modules/ui/style.js?v=1.104.0"></script>
@@ -8120,7 +8120,7 @@
     <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
     <script defer src="modules/io/save.js?v=1.100.00"></script>
     <script defer src="modules/io/load.js?v=1.105.17"></script>
-    <script defer src="modules/io/cloud.js?v=1.99.00"></script>
+    <script defer src="modules/io/cloud.js?v=1.105.19"></script>
     <script defer src="modules/io/export.js?v=1.100.00"></script>
 
     <script defer src="modules/renderers/draw-features.js?v=1.105.14"></script>
@@ -8131,7 +8131,7 @@
     <script defer src="modules/renderers/draw-temperature.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-emblems.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-military.js?v=1.104.13"></script>
-    <script defer src="modules/renderers/draw-state-labels.js?v=1.105.16"></script>
+    <script defer src="modules/renderers/draw-state-labels.js?v=1.105.19"></script>
     <script defer src="modules/renderers/draw-burg-labels.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-burg-icons.js?v=1.104.0"></script>
   </body>

main.js

@@ -4,7 +4,7 @@
 
 // set debug options
 const PRODUCTION = location.hostname && location.hostname !== "localhost" && location.hostname !== "127.0.0.1";
-const DEBUG = localStorage.getItem("debug");
+const DEBUG = JSON.safeParse(localStorage.getItem("debug")) || {};
 const INFO = true;
 const TIME = true;
 const WARN = true;
@@ -922,7 +922,7 @@ function calculateTemperatures() {
     const [, y] = grid.points[rowCellId];
     const rowLatitude = mapCoordinates.latN - (y / graphHeight) * mapCoordinates.latT; // [90; -90]
     const tempSeaLevel = calculateSeaLevelTemp(rowLatitude);
-    DEBUG && console.info(`${rn(rowLatitude)}° sea temperature: ${rn(tempSeaLevel)}°C`);
+    DEBUG.temperature && console.info(`${rn(rowLatitude)}° sea temperature: ${rn(tempSeaLevel)}°C`);
 
     for (let cellId = rowCellId; cellId < rowCellId + grid.cellsX; cellId++) {
       const tempAltitudeDrop = getAltitudeTemperatureDrop(cells.h[cellId]);

modules/io/cloud.js

@@ -60,7 +60,7 @@ window.Cloud = (function () {
 
     async save(fileName, contents) {
       const resp = await this.call("filesUpload", {path: "/" + fileName, contents});
-      DEBUG && console.info("Dropbox response:", resp);
+      DEBUG.cloud && console.info("Dropbox response:", resp);
       return true;
     },
 
@@ -104,7 +104,7 @@ window.Cloud = (function () {
 
     // Callback function for auth window
     async setDropBoxToken(token) {
-      DEBUG && console.info("Access token:", token);
+      DEBUG.cloud && console.info("Access token:", token);
       setToken(this.name, token);
       await this.connect(token);
       this.authWindow.close();
@@ -131,7 +131,7 @@ window.Cloud = (function () {
         allow_download: true
       };
       const resp = await this.call("sharingCreateSharedLinkWithSettings", {path, settings});
-      DEBUG && console.info("Dropbox link object:", resp.result);
+      DEBUG.cloud && console.info("Dropbox link object:", resp.result);
       return resp.result.url;
     }
   };

modules/io/load.js

@@ -13,7 +13,7 @@ async function quickLoad() {
 async function loadFromDropbox() {
   const mapPath = byId("loadFromDropboxSelect")?.value;
 
-  DEBUG && console.info("Loading map from Dropbox:", mapPath);
+  console.info("Loading map from Dropbox:", mapPath);
   const blob = await Cloud.providers.dropbox.load(mapPath);
   uploadMap(blob);
 }

modules/renderers/draw-state-labels.js

@@ -47,8 +47,10 @@ function drawStateLabels(list) {
       const pathPoints = [[ray1.x, ray1.y], state.pole, [ray2.x, ray2.y]];
       if (ray1.x > ray2.x) pathPoints.reverse();
 
-      DEBUG && drawPoint(state.pole, {color: "black", radius: 1});
-      DEBUG && drawPath(pathPoints, {color: "black", width: 0.2});
+      if (DEBUG.stateLabels) {
+        drawPoint(state.pole, {color: "black", radius: 1});
+        drawPath(pathPoints, {color: "black", width: 0.2});
+      }
 
       labelPaths.push([state.i, pathPoints]);
     }
@@ -163,9 +165,11 @@ function drawStateLabels(list) {
       const offset1 = [x + -dy * offset, y + dx * offset];
       const offset2 = [x + dy * offset, y + -dx * offset];
 
-      DEBUG && drawPoint([x, y], {color: isInsideState(x, y) ? "blue" : "red", radius: 0.8});
-      DEBUG && drawPoint(offset1, {color: isInsideState(...offset1) ? "blue" : "red", radius: 0.4});
-      DEBUG && drawPoint(offset2, {color: isInsideState(...offset2) ? "blue" : "red", radius: 0.4});
+      if (DEBUG.stateLabels) {
+        drawPoint([x, y], {color: isInsideState(x, y) ? "blue" : "red", radius: 0.8});
+        drawPoint(offset1, {color: isInsideState(...offset1) ? "blue" : "red", radius: 0.4});
+        drawPoint(offset2, {color: isInsideState(...offset2) ? "blue" : "red", radius: 0.4});
+      }
 
       const inState = isInsideState(x, y) && isInsideState(...offset1) && isInsideState(...offset2);
       if (!inState) break;

modules/submap.js

@@ -31,7 +31,6 @@ window.Submap = (function () {
     seed = parentMap.seed;
     Math.random = aleaPRNG(seed);
     INFO && console.group("SubMap with seed: " + seed);
-    DEBUG && console.info("Using Options:", options);
 
     applyGraphSize();
     grid = generateGrid();
@@ -373,7 +372,7 @@ window.Submap = (function () {
           b.removed = true;
           return;
         }
-        DEBUG && console.info(`Moving ${b.name} from ${cityCell} to ${newCell} near ${neighbor}.`);
+
         [b.x, b.y] = b.port ? getCloseToEdgePoint(newCell, neighbor) : cells.p[newCell];
         if (b.port) b.port = cells.f[neighbor]; // copy feature number
         b.cell = newCell;

utils/stringUtils.js

@@ -56,3 +56,11 @@ JSON.isValid = str => {
   }
   return true;
 };
+
+JSON.safeParse = str => {
+  try {
+    return JSON.parse(str);
+  } catch (e) {
+    return null;
+  }
+};

versioning.js

@@ -12,7 +12,7 @@
  *
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
-const VERSION = "1.105.18";
+const VERSION = "1.105.19";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {