feat: allow to render ocean heightmap - fix issue

modules/cultures-generator.js

@@ -54,8 +54,6 @@ window.Cultures = (function () {
     const colors = getColors(count);
     const emblemShape = document.getElementById("emblemShape").value;
 
-    console.log("--- c1 ---", Math.random());
-
     const codes = [];
 
     cultures.forEach(function (c, i) {
@@ -73,33 +71,24 @@ window.Cultures = (function () {
         return;
       }
 
-      console.log(JSON.stringify(c, null, 2));
-      console.log(Array.from(pack.cells.s).join());
-
       const sortingFn = c.sort ? c.sort : i => cells.s[i];
       const center = placeCenter(sortingFn);
 
-      console.log("--- c2-1 ---", i, Math.random());
       centers.add(cells.p[center]);
       c.center = center;
       c.i = newId;
       delete c.odd;
       delete c.sort;
       c.color = colors[i];
-      console.log("--- c2-2 ---", i, Math.random());
       c.type = defineCultureType(center);
-      console.log("--- c2-3 ---", i, Math.random());
       c.expansionism = defineCultureExpansionism(c.type);
       c.origins = [0];
       c.code = abbreviate(c.name, codes);
       codes.push(c.code);
       cultureIds[center] = newId;
       if (emblemShape === "random") c.shield = getRandomShield();
-      console.log("--- c2-4 ---", i, Math.random());
     });
 
-    console.log("--- c3 ---", Math.random());
-
     cells.culture = cultureIds;
 
     function placeCenter(sortingFn) {

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.log("Dropbox response:", resp);
+      DEBUG && console.info("Dropbox response:", resp);
       return true;
     },
 
@@ -104,7 +104,7 @@ window.Cloud = (function () {
 
     // Callback function for auth window
     async setDropBoxToken(token) {
-      DEBUG && console.log("Access token:", token);
+      DEBUG && 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.log("Dropbox link object:", resp.result);
+      DEBUG && console.info("Dropbox link object:", resp.result);
       return resp.result.url;
     }
   };

modules/io/load.js

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

modules/submap.js

@@ -28,7 +28,7 @@ window.Submap = (function () {
 
     const projection = options.projection;
     const inverse = options.inverse;
-    const stage = s => INFO && console.log("SUBMAP:", s);
+    const stage = s => INFO && console.info("SUBMAP:", s);
     const timeStart = performance.now();
     invokeActiveZooming();
 
@@ -36,7 +36,7 @@ window.Submap = (function () {
     seed = parentMap.seed;
     Math.random = aleaPRNG(seed);
     INFO && console.group("SubMap with seed: " + seed);
-    DEBUG && console.log("Using Options:", options);
+    DEBUG && console.info("Using Options:", options);
 
     // create new grid
     applyGraphSize();
@@ -396,7 +396,7 @@ window.Submap = (function () {
           b.removed = true;
           return;
         }
-        DEBUG && console.log(`Moving ${b.name} from ${cityCell} to ${newCell} near ${neighbor}.`);
+        DEBUG && console.info(`Moving ${b.name} from ${cityCell} to ${newCell} near ${neighbor}.`);
         [b.x, b.y] = b.port ? getMiddlePoint(newCell, neighbor) : cells.p[newCell];
         if (b.port) b.port = cells.f[neighbor]; // copy feature number
         b.cell = newCell;

modules/ui/layers.js

@@ -221,9 +221,11 @@ function drawHeightmap() {
 
     const skip = +ocean.attr("skip") + 1 || 1;
     const relax = +ocean.attr("relax") || 0;
+    lineGen.curve(d3[ocean.attr("curve") || "curveBasisClosed"]);
 
     let currentLayer = 0;
-    const heights = cells.i.sort((a, b) => cells.h[a] - cells.h[b]);
+    const heights = Array.from(cells.i).sort((a, b) => cells.h[a] - cells.h[b]);
+
     for (const i of heights) {
       const h = cells.h[i];
       if (h > currentLayer) currentLayer += skip;
@@ -248,9 +250,10 @@ function drawHeightmap() {
 
     const skip = +land.attr("skip") + 1 || 1;
     const relax = +land.attr("relax") || 0;
+    lineGen.curve(d3[land.attr("curve") || "curveBasisClosed"]);
 
     let currentLayer = 20;
-    const heights = cells.i.sort((a, b) => cells.h[a] - cells.h[b]);
+    const heights = Array.from(cells.i).sort((a, b) => cells.h[a] - cells.h[b]);
     for (const i of heights) {
       const h = cells.h[i];
       if (h > currentLayer) currentLayer += skip;
@@ -268,8 +271,6 @@ function drawHeightmap() {
     }
   }
 
-  return;
-
   // render paths
   for (const height of d3.range(0, 101)) {
     const group = height < 20 ? ocean : land;
@@ -298,8 +299,6 @@ function drawHeightmap() {
     }
 
     if (paths[height] && paths[height].length >= 10) {
-      const curve = group.attr("curve") || "curveBasisClosed";
-      lineGen.curve(d3[curve]);
       const terracing = group.attr("terracing") / 10 || 0;
       const color = getColor(height, scheme);
 

modules/ui/style.js

@@ -964,7 +964,7 @@ function textureProvideURL() {
 }
 
 function fetchTextureURL(url) {
-  INFO && console.log("Provided URL is", url);
+  INFO && console.info("Provided URL is", url);
   const img = new Image();
   img.onload = function () {
     const canvas = byId("texturePreview");