make depressions resolve elevation change not that big

index.css

@@ -104,7 +104,7 @@ a {
 }
 
 #biomes {
-  stroke-width: .7;
+  stroke-width: 0.7;
 }
 
 #landmass {
@@ -285,6 +285,12 @@ i.icon-lock {
   animation: dash 80s linear backwards;
 }
 
+.arrow {
+  marker-end: url(#end-arrow-small);
+  stroke: #555;
+  stroke-width: 0.5;
+}
+
 @keyframes dash {
   to {
     stroke-dashoffset: 0;

index.html

@@ -3451,6 +3451,9 @@
       <marker id="end-arrow" viewBox="0 -5 10 10" refX="6" markerWidth="7" markerHeight="7" orient="auto">
         <path d="M0,-5L10,0L0,5" fill="#000"></path>
       </marker>
+      <marker id="end-arrow-small" viewBox="0 -5 10 10" refX="6" markerWidth="2" markerHeight="2" orient="auto">
+        <path d="M0,-5L10,0L0,5" fill="#555"></path>
+      </marker>
 
       <symbol id="icon-store" viewBox="0 0 616 512">
         <path d="M602 118.6L537.1 15C531.3 5.7 521 0 510 0H106C95 0 84.7 5.7 78.9 15L14 118.6c-33.5 53.5-3.8 127.9 58.8 136.4 4.5.6 9.1.9 13.7.9 29.6 0 55.8-13 73.8-33.1 18 20.1 44.3 33.1 73.8 33.1 29.6 0 55.8-13 73.8-33.1 18 20.1 44.3 33.1 73.8 33.1 29.6 0 55.8-13 73.8-33.1 18.1 20.1 44.3 33.1 73.8 33.1 4.7 0 9.2-.3 13.7-.9 62.8-8.4 92.6-82.8 59-136.4zM529.5 288c-10 0-19.9-1.5-29.5-3.8V384H116v-99.8c-9.6 2.2-19.5 3.8-29.5 3.8-6 0-12.1-.4-18-1.2-5.6-.8-11.1-2.1-16.4-3.6V480c0 17.7 14.3 32 32 32h448c17.7 0 32-14.3 32-32V283.2c-5.4 1.6-10.8 2.9-16.4 3.6-6.1.8-12.1 1.2-18.2 1.2z"></path>

modules/lakes.js

@@ -1,90 +1,110 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Lakes = factory());
-  typeof define === 'function' && define.amd ? define(factory) :
+})(this, function () {
-  (global.Lakes = factory());
+  "use strict";
-}(this, (function () {'use strict';
 
-const setClimateData = function(h) {
+  const setClimateData = function (h) {
-  const cells = pack.cells;
+    const cells = pack.cells;
-  const lakeOutCells = new Uint16Array(cells.i.length);
+    const lakeOutCells = new Uint16Array(cells.i.length);
 
-  pack.features.forEach(f => {
+    pack.features.forEach(f => {
-    if (f.type !== "lake") return;
+      if (f.type !== "lake") return;
 
-    // default flux: sum of precipition around lake first cell
+      // default flux: sum of precipition around lake first cell
-    f.flux = rn(d3.sum(f.shoreline.map(c => grid.cells.prec[cells.g[c]])) / 2);
+      f.flux = rn(d3.sum(f.shoreline.map(c => grid.cells.prec[cells.g[c]])) / 2);
-  
-    // temperature and evaporation to detect closed lakes
-    f.temp = f.cells < 6 ? grid.cells.temp[cells.g[f.firstCell]] : rn(d3.mean(f.shoreline.map(c => grid.cells.temp[cells.g[c]])), 1);
-    const height = (f.height - 18) ** heightExponentInput.value; // height in meters
-    const evaporation = (700 * (f.temp + .006 * height) / 50 + 75) / (80 - f.temp); // based on Penman formula, [1-11]
-    f.evaporation = rn(evaporation * f.cells);
 
-    // lake outlet cell
+      // temperature and evaporation to detect closed lakes
-    f.outCell = f.shoreline[d3.scan(f.shoreline, (a,b) => h[a] - h[b])];
+      f.temp = f.cells < 6 ? grid.cells.temp[cells.g[f.firstCell]] : rn(d3.mean(f.shoreline.map(c => grid.cells.temp[cells.g[c]])), 1);
-    lakeOutCells[f.outCell] = f.i;
+      const height = (f.height - 18) ** heightExponentInput.value; // height in meters
-  });
+      const evaporation = ((700 * (f.temp + 0.006 * height)) / 50 + 75) / (80 - f.temp); // based on Penman formula, [1-11]
+      f.evaporation = rn(evaporation * f.cells);
 
-  return lakeOutCells;
+      // no outlet for lakes in depressed areas
-}
+      if (f.closed) return;
 
-const cleanupLakeData = function() {
+      // lake outlet cell
-  for (const feature of pack.features) {
+      f.outCell = f.shoreline[d3.scan(f.shoreline, (a, b) => h[a] - h[b])];
-    if (feature.type !== "lake") continue;
+      lakeOutCells[f.outCell] = f.i;
-    delete feature.river;
+    });
-    delete feature.enteringFlux;
-    delete feature.shoreline;
-    delete feature.outCell;
-    feature.height = rn(feature.height);
 
-    const inlets = feature.inlets?.filter(r => pack.rivers.find(river => river.i === r));
+    return lakeOutCells;
-    if (!inlets || !inlets.length) delete feature.inlets;
+  };
-    else feature.inlets = inlets;
 
-    const outlet = feature.outlet && pack.rivers.find(river => river.i === feature.outlet);
+  // get array of land cells aroound lake
-    if (!outlet) delete feature.outlet;
+  const getShoreline = function (lake) {
-  }
+    const queue = [lake.firstCell];
-}
+    const used = [queue[0]];
+    const landCellsAround = [];
+    while (queue.length) {
+      const q = queue.pop();
+      for (const c of pack.cells.c[q]) {
+        if (used[c]) continue;
+        used[c] = true;
+        if (pack.cells.f[c] === lake.i) queue.push(c);
+        if (pack.cells.h[c] >= 20) landCellsAround.push(c);
+      }
+    }
 
-const defineGroup = function() {
+    lake.shoreline = landCellsAround;
-  for (const feature of pack.features) {
+  };
-    if (feature.type !== "lake") continue;
-    const lakeEl = lakes.select(`[data-f="${feature.i}"]`).node();
-    if (!lakeEl) continue;
 
-    feature.group = getGroup(feature);
+  const cleanupLakeData = function () {
-    document.getElementById(feature.group).appendChild(lakeEl);
+    for (const feature of pack.features) {
-  }
+      if (feature.type !== "lake") continue;
-}
+      delete feature.river;
+      delete feature.enteringFlux;
+      delete feature.shoreline;
+      delete feature.outCell;
+      delete feature.closed;
+      feature.height = rn(feature.height);
 
-const generateName = function() {
+      const inlets = feature.inlets?.filter(r => pack.rivers.find(river => river.i === r));
-  Math.random = aleaPRNG(seed);
+      if (!inlets || !inlets.length) delete feature.inlets;
-  for (const feature of pack.features) {
+      else feature.inlets = inlets;
-    if (feature.type !== "lake") continue;
-    feature.name = getName(feature);
-  }
-}
 
-const getName = function(feature) {
+      const outlet = feature.outlet && pack.rivers.find(river => river.i === feature.outlet);
-  const landCell = pack.cells.c[feature.firstCell].find(c => pack.cells.h[c] >= 20);
+      if (!outlet) delete feature.outlet;
-  const culture = pack.cells.culture[landCell];
+    }
-  return Names.getCulture(culture);
+  };
-}
 
-function getGroup(feature) {
+  const defineGroup = function () {
-  if (feature.temp < -3) return "frozen";
+    for (const feature of pack.features) {
-  if (feature.height > 60 && feature.cells < 10 && feature.firstCell % 5 === 0) return "lava";
+      if (feature.type !== "lake") continue;
+      const lakeEl = lakes.select(`[data-f="${feature.i}"]`).node();
+      if (!lakeEl) continue;
 
-  if (!feature.inlets && !feature.outlet) {
+      feature.group = getGroup(feature);
-    if (feature.evaporation / 2 > feature.flux) return "dry";
+      document.getElementById(feature.group).appendChild(lakeEl);
-    if (feature.cells < 3 && feature.firstCell % 5 === 0) return "sinkhole";
+    }
+  };
+
+  const generateName = function () {
+    Math.random = aleaPRNG(seed);
+    for (const feature of pack.features) {
+      if (feature.type !== "lake") continue;
+      feature.name = getName(feature);
+    }
+  };
+
+  const getName = function (feature) {
+    const landCell = pack.cells.c[feature.firstCell].find(c => pack.cells.h[c] >= 20);
+    const culture = pack.cells.culture[landCell];
+    return Names.getCulture(culture);
+  };
+
+  function getGroup(feature) {
+    if (feature.temp < -3) return "frozen";
+    if (feature.height > 60 && feature.cells < 10 && feature.firstCell % 5 === 0) return "lava";
+
+    if (!feature.inlets && !feature.outlet) {
+      if (feature.evaporation / 2 > feature.flux) return "dry";
+      if (feature.cells < 3 && feature.firstCell % 5 === 0) return "sinkhole";
+    }
+
+    if (!feature.outlet && feature.evaporation > feature.flux) return "salt";
+
+    return "freshwater";
   }
 
-  if (!feature.outlet && feature.evaporation > feature.flux) return "salt";
+  return {setClimateData, cleanupLakeData, defineGroup, generateName, getName, getShoreline};
-
+});
-  return "freshwater";
-}
-
-return {setClimateData, cleanupLakeData, defineGroup, generateName, getName};
-
-})));

modules/river-generator.js

@@ -1,355 +1,389 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Rivers = factory());
-  typeof define === 'function' && define.amd ? define(factory) :
+})(this, function () {
-  (global.Rivers = factory());
+  "use strict";
-}(this, (function () {'use strict';
 
-const generate = function(changeHeights = true) {
+  const generate = function (changeHeights = true) {
-  TIME && console.time('generateRivers');
+    TIME && console.time("generateRivers");
-  Math.random = aleaPRNG(seed);
+    Math.random = aleaPRNG(seed);
-  const cells = pack.cells, p = cells.p, features = pack.features;
+    const cells = pack.cells,
+      p = cells.p,
+      features = pack.features;
 
-  const riversData = []; // rivers data
+    const riversData = []; // rivers data
-  cells.fl = new Uint16Array(cells.i.length); // water flux array
+    cells.fl = new Uint16Array(cells.i.length); // water flux array
-  cells.r = new Uint16Array(cells.i.length); // rivers array
+    cells.r = new Uint16Array(cells.i.length); // rivers array
-  cells.conf = new Uint8Array(cells.i.length); // confluences array
+    cells.conf = new Uint8Array(cells.i.length); // confluences array
-  let riverNext = 1; // first river id is 1
+    let riverNext = 1; // first river id is 1
 
-  const h = alterHeights();
+    const h = alterHeights();
-  removeStoredLakeData();
+    prepareLakeData();
-  resolveDepressions(h);
+    resolveDepressions(h, 200);
-  drainWater();
+    drainWater();
-  defineRivers();
+    defineRivers();
-  Lakes.cleanupLakeData();
+    Lakes.cleanupLakeData();
 
-  if (changeHeights) cells.h = Uint8Array.from(h); // apply changed heights as basic one
+    if (changeHeights) cells.h = Uint8Array.from(h); // apply changed heights as basic one
 
-  TIME && console.timeEnd('generateRivers');
+    TIME && console.timeEnd("generateRivers");
 
-  // height with added t value to make map less depressed
+    function prepareLakeData() {
-  function alterHeights() {
+      features.forEach(f => {
-    const h = Array.from(cells.h)
+        if (f.type !== "lake") return;
-      .map((h, i) => h < 20 || cells.t[i] < 1 ? h : h + cells.t[i] / 100)
+        delete f.flux;
-      .map((h, i) => h < 20 || cells.t[i] < 1 ? h : h + d3.mean(cells.c[i].map(c => cells.t[c])) / 10000);
+        delete f.inlets;
-    return h;
+        delete f.outlet;
-  }
+        delete f.height;
+        !f.shoreline && Lakes.getShoreline(f);
+      });
+    }
 
-  function removeStoredLakeData() {
+    function drainWater() {
-    features.forEach(f => {
+      const MIN_FLUX_TO_FORM_RIVER = 30;
-      delete f.flux;
+      const land = cells.i.filter(i => h[i] >= 20).sort((a, b) => h[b] - h[a]);
-      delete f.inlets;
+      const lakeOutCells = Lakes.setClimateData(h);
-      delete f.outlet;
-      delete f.height;
-    });
-  }
 
-  function drainWater() {
+      land.forEach(function (i) {
-    const MIN_FLUX_TO_FORM_RIVER = 30;
+        cells.fl[i] += grid.cells.prec[cells.g[i]]; // flux from precipitation
-    const land = cells.i.filter(i => h[i] >= 20).sort((a,b) => h[b] - h[a]);
+        const [x, y] = p[i];
-    const lakeOutCells = Lakes.setClimateData(h);
 
-    land.forEach(function(i) {
+        // create lake outlet if lake is not in deep depression and flux > evaporation
-      cells.fl[i] += grid.cells.prec[cells.g[i]]; // flux from precipitation
+        const lakes = lakeOutCells[i] ? features.filter(feature => i === feature.outCell && feature.flux > feature.evaporation) : [];
-      const x = p[i][0], y = p[i][1];
+        for (const lake of lakes) {
+          const lakeCell = cells.c[i].find(c => h[c] < 20 && cells.f[c] === lake.i);
 
-      // create lake outlet if flux > evaporation
+          cells.fl[lakeCell] += Math.max(lake.flux - lake.evaporation, 0); // not evaporated lake water drains to outlet
-      const lakes = !lakeOutCells[i] ? [] : features.filter(feature => i === feature.outCell && feature.flux > feature.evaporation);
-      for (const lake of lakes) {
-        const lakeCell = cells.c[i].find(c => h[c] < 20 && cells.f[c] === lake.i);
 
-        cells.fl[lakeCell] += Math.max(lake.flux - lake.evaporation, 0); // not evaporated lake water drains to outlet
+          // allow chain lakes to retain identity
-
+          if (cells.r[lakeCell] !== lake.river) {
-        // allow chain lakes to retain identity
+            const sameRiver = cells.c[lakeCell].some(c => cells.r[c] === lake.river);
-        if (cells.r[lakeCell] !== lake.river) {
+            if (sameRiver) {
-          const sameRiver = cells.c[lakeCell].some(c => cells.r[c] === lake.river);
+              cells.r[lakeCell] = lake.river;
-          if (sameRiver) {
+              riversData.push({river: lake.river, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
-            cells.r[lakeCell] = lake.river;
+            } else {
-            riversData.push({river: lake.river, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
+              cells.r[lakeCell] = riverNext;
-          } else {
+              riversData.push({river: riverNext, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
-            cells.r[lakeCell] = riverNext;
+              riverNext++;
-            riversData.push({river: riverNext, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
+            }
-            riverNext++;
           }
+
+          lake.outlet = cells.r[lakeCell];
+          flowDown(i, cells.fl[i], cells.fl[lakeCell], lake.outlet);
         }
 
-        lake.outlet = cells.r[lakeCell];
+        // assign all tributary rivers to outlet basin
-        flowDown(i, cells.fl[i], cells.fl[lakeCell], lake.outlet);
+        for (let outlet = lakes[0]?.outlet, l = 0; l < lakes.length; l++) {
+          lakes[l].inlets?.forEach(fork => (riversData.find(r => r.river === fork).parent = outlet));
+        }
+
+        // near-border cell: pour water out of the screen
+        if (cells.b[i] && cells.r[i]) {
+          let to = [];
+          const min = Math.min(y, graphHeight - y, x, graphWidth - x);
+          if (min === y) to = [x, 0];
+          else if (min === graphHeight - y) to = [x, graphHeight];
+          else if (min === x) to = [0, y];
+          else if (min === graphWidth - x) to = [graphWidth, y];
+          riversData.push({river: cells.r[i], cell: i, x: to[0], y: to[1], flux: cells.fl[i]});
+          return;
+        }
+
+        // downhill cell (make sure it's not in the source lake)
+        const min = lakeOutCells[i] ? cells.c[i].filter(c => !lakes.map(lake => lake.i).includes(cells.f[c])).sort((a, b) => h[a] - h[b])[0] : cells.c[i].sort((a, b) => h[a] - h[b])[0];
+
+        if (cells.fl[i] < MIN_FLUX_TO_FORM_RIVER) {
+          if (h[min] >= 20) cells.fl[min] += cells.fl[i];
+          return; // flux is too small to operate as river
+        }
+
+        // proclaim a new river
+        if (!cells.r[i]) {
+          cells.r[i] = riverNext;
+          riversData.push({river: riverNext, cell: i, x, y, flux: cells.fl[i]});
+          riverNext++;
+        }
+
+        flowDown(min, cells.fl[min], cells.fl[i], cells.r[i], i);
+      });
+    }
+
+    function flowDown(toCell, toFlux, fromFlux, river, fromCell = 0) {
+      if (cells.r[toCell]) {
+        // downhill cell already has river assigned
+        if (toFlux < fromFlux) {
+          cells.conf[toCell] = cells.fl[toCell]; // mark confluence
+          if (h[toCell] >= 20) riversData.find(r => r.river === cells.r[toCell]).parent = river; // min river is a tributary of current river
+          cells.r[toCell] = river; // re-assign river if downhill part has less flux
+        } else {
+          cells.conf[toCell] += fromFlux; // mark confluence
+          if (h[toCell] >= 20) riversData.find(r => r.river === river).parent = cells.r[toCell]; // current river is a tributary of min river
+        }
+      } else cells.r[toCell] = river; // assign the river to the downhill cell
+
+      if (h[toCell] < 20) {
+        // pour water to the water body
+        const haven = fromCell ? cells.haven[fromCell] : toCell;
+        riversData.push({river, cell: haven, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
+
+        const waterBody = features[cells.f[toCell]];
+        if (waterBody.type === "lake") {
+          if (!waterBody.river || fromFlux > waterBody.enteringFlux) {
+            waterBody.river = river;
+            waterBody.enteringFlux = fromFlux;
+          }
+          waterBody.flux = waterBody.flux + fromFlux;
+          waterBody.inlets ? waterBody.inlets.push(river) : (waterBody.inlets = [river]);
+        }
+      } else {
+        // propagate flux and add next river segment
+        cells.fl[toCell] += fromFlux;
+        riversData.push({river, cell: toCell, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
+      }
+    }
+
+    function defineRivers() {
+      cells.r = new Uint16Array(cells.i.length); // re-initiate rivers array
+      pack.rivers = []; // rivers data
+      const riverPaths = [];
+
+      for (let r = 1; r <= riverNext; r++) {
+        const riverSegments = riversData.filter(d => d.river === r);
+        if (riverSegments.length < 3) continue;
+
+        for (const segment of riverSegments) {
+          const i = segment.cell;
+          if (cells.r[i]) continue;
+          if (cells.h[i] < 20) continue;
+          cells.r[i] = r;
+        }
+
+        const source = riverSegments[0].cell;
+        const mouth = riverSegments[riverSegments.length - 2].cell;
+
+        const widthFactor = rn(0.8 + Math.random() * 0.4, 1); // river width modifier [.8, 1.2]
+        const sourceWidth = cells.h[source] >= 20 ? 0.1 : rn(Math.min(Math.max((cells.fl[source] / 500) ** 0.4, 0.5), 1.7), 2);
+
+        const riverMeandered = addMeandering(riverSegments, sourceWidth * 10, 0.5);
+        const [path, length, offset] = getPath(riverMeandered, widthFactor, sourceWidth);
+        riverPaths.push([path, r]);
+
+        const parent = riverSegments[0].parent || 0;
+        const width = rn(offset ** 2, 2); // mounth width in km
+        const discharge = last(riverSegments).flux; // in m3/s
+        pack.rivers.push({i: r, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent});
       }
 
-      // assign all tributary rivers to outlet basin
+      // draw rivers
-      for (let outlet = lakes[0]?.outlet, l = 0; l < lakes.length; l++) {
+      rivers.html(riverPaths.map(d => `<path id="river${d[1]}" d="${d[0]}"/>`).join(""));
-        lakes[l].inlets?.forEach(fork => riversData.find(r => r.river === fork).parent = outlet);
+    }
-      }
+  };
 
-      // near-border cell: pour water out of the screen
+  // add distance to water value to land cells to make map less depressed
-      if (cells.b[i] && cells.r[i]) {
+  function alterHeights() {
-        const to = [];
+    const cells = pack.cells;
-        const min = Math.min(y, graphHeight - y, x, graphWidth - x);
+    return Array.from(cells.h).map((h, i) => {
-        if (min === y) {to[0] = x; to[1] = 0;} else
+      if (h < 20 || cells.t[i] < 1) return h;
-        if (min === graphHeight - y) {to[0] = x; to[1] = graphHeight;} else
+      return h + cells.t[i] / 100 + d3.mean(cells.c[i].map(c => cells.t[c])) / 10000;
-        if (min === x) {to[0] = 0; to[1] = y;} else
-        if (min === graphWidth - x) {to[0] = graphWidth; to[1] = y;}
-        riversData.push({river: cells.r[i], cell: i, x: to[0], y: to[1], flux: cells.fl[i]});
-        return;
-      }
-
-      // downhill cell (make sure it's not in the source lake)
-      const min = lakeOutCells[i]
-        ? cells.c[i].filter(c => !lakes.map(lake => lake.i).includes(cells.f[c])).sort((a, b) => h[a] - h[b])[0]
-        : cells.c[i].sort((a, b) => h[a] - h[b])[0];
-
-      if (cells.fl[i] < MIN_FLUX_TO_FORM_RIVER) {
-        if (h[min] >= 20) cells.fl[min] += cells.fl[i];
-        return; // flux is too small to operate as river
-      }
-
-      // proclaim a new river
-      if (!cells.r[i]) {
-        cells.r[i] = riverNext;
-        riversData.push({river: riverNext, cell: i, x, y, flux: cells.fl[i]});
-        riverNext++;
-      }
-
-      flowDown(min, cells.fl[min], cells.fl[i], cells.r[i], i);
     });
   }
 
-  function flowDown(toCell, toFlux, fromFlux, river, fromCell = 0) {
+  // depression filling algorithm (for a correct water flux modeling)
-    if (cells.r[toCell]) {
+  const resolveDepressions = function (h, maxIterations) {
-      // downhill cell already has river assigned
+    const {cells, features} = pack;
-      if (toFlux < fromFlux) {
+    const height = i => features[cells.f[i]].height || h[i]; // height of lake or specific cell
-        cells.conf[toCell] = cells.fl[toCell]; // mark confluence
+
-        if (h[toCell] >= 20) riversData.find(r => r.river === cells.r[toCell]).parent = river; // min river is a tributary of current river
+    const lakes = features.filter(f => f.type === "lake");
-        cells.r[toCell] = river; // re-assign river if downhill part has less flux
+    const land = cells.i.filter(i => h[i] >= 20 && !cells.b[i]); // exclude near-border cells
-      } else {
+    land.sort((a, b) => h[b] - h[a]); // highest cells go first
-        cells.conf[toCell] += fromFlux; // mark confluence
+
-        if (h[toCell] >= 20) riversData.find(r => r.river === river).parent = cells.r[toCell]; // current river is a tributary of min river
+    const progress = [];
+    let depressions = Infinity;
+    let prevDepressions = null;
+    for (let iteration = 0; depressions && iteration < maxIterations; iteration++) {
+      if (progress.length > 5 && d3.sum(progress) > 0) {
+        // bad progress, abort and set heights back
+        h = alterHeights();
+        depressions = progress[0];
+        break;
       }
-    } else cells.r[toCell] = river; // assign the river to the downhill cell
 
-    if (h[toCell] < 20) {
+      depressions = 0;
-      // pour water to the water body
-      const haven = fromCell ? cells.haven[fromCell] : toCell;
-      riversData.push({river, cell: haven, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
 
-      const waterBody = features[cells.f[toCell]];
+      if (iteration < 180) {
-      if (waterBody.type === "lake") {
+        for (const l of lakes) {
-        if (!waterBody.river || fromFlux > waterBody.enteringFlux) {
+          if (l.closed) continue;
-          waterBody.river = river;
+          const minHeight = d3.min(l.shoreline.map(s => h[s]));
-          waterBody.enteringFlux = fromFlux;
+          if (minHeight >= 100 || l.height > minHeight) continue;
+
+          if (iteration > 150) {
+            l.shoreline.forEach(i => (h[i] = cells.h[i]));
+            l.height = d3.min(l.shoreline.map(s => h[s])) - 1;
+            l.closed = true;
+            continue;
+          }
+
+          depressions++;
+          l.height = minHeight + 0.2;
         }
-        waterBody.flux = waterBody.flux + fromFlux;
-        waterBody.inlets ? waterBody.inlets.push(river) : waterBody.inlets = [river];
-      }
-    } else {
-      // propagate flux and add next river segment
-      cells.fl[toCell] += fromFlux;
-      riversData.push({river, cell: toCell, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
-    }
-  }
-
-  function defineRivers() {
-    cells.r = new Uint16Array(cells.i.length); // re-initiate rivers array
-    pack.rivers = []; // rivers data
-    const riverPaths = [];
-
-    for (let r = 1; r <= riverNext; r++) {
-      const riverSegments = riversData.filter(d => d.river === r);
-      if (riverSegments.length < 3) continue;
-
-      for (const segment of riverSegments) {
-        const i = segment.cell;
-        if (cells.r[i]) continue;
-        if (cells.h[i] < 20) continue;
-        cells.r[i] = r;
       }
 
-      const source = riverSegments[0].cell;
+      for (const i of land) {
-      const mouth = riverSegments[riverSegments.length-2].cell;
+        const minHeight = d3.min(cells.c[i].map(c => height(c)));
+        if (minHeight >= 100 || h[i] > minHeight) continue;
 
-      const widthFactor = rn(.8 + Math.random() * .4, 1); // river width modifier [.8, 1.2]
+        depressions++;
-      const sourceWidth = cells.h[source] >= 20 ? .1 : rn(Math.min(Math.max((cells.fl[source] / 500) ** .4, .5), 1.7), 2);
+        h[i] = minHeight + 0.1;
+      }
 
-      const riverMeandered = addMeandering(riverSegments, sourceWidth * 10, .5);
+      prevDepressions !== null && progress.push(depressions - prevDepressions);
-      const [path, length, offset] = getPath(riverMeandered, widthFactor, sourceWidth);
+      prevDepressions = depressions;
-      riverPaths.push([path, r]);
-
-      const parent = riverSegments[0].parent || 0;
-      const width = rn(offset ** 2, 2); // mounth width in km
-      const discharge = last(riverSegments).flux; // in m3/s
-      pack.rivers.push({i:r, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent});
     }
 
-    // draw rivers
+    if (!depressions) return;
-    rivers.html(riverPaths.map(d => `<path id="river${d[1]}" d="${d[0]}"/>`).join(""));
+    WARN && console.warn(`Unresolved depressions: ${depressions}. Edit heightmap to fix`);
-  }
+    //const flow = cells.i.length < 65535 ? new Uint16Array(cells.i.length) : new Uint32Array(cells.i.length);
-}
+    //flow[i] = min;
+    //debug.append("path").attr("class", "arrow").attr("d", `M${cells.p[i][0]},${cells.p[i][1]}L${cells.p[min][0]},${cells.p[min][1]}`);
+  };
 
-// depression filling algorithm (for a correct water flux modeling)
+  // add more river points on 1/3 and 2/3 of length
-const resolveDepressions = function(h) {
+  const addMeandering = function (segments, width = 1, meandering = 0.5) {
-  const {cells, features} = pack;
+    const riverMeandered = []; // to store enhanced segments
-  const ITERATIONS = 150;
 
-  const lakes = features.filter(f => f.type === "lake");
+    for (let s = 0; s < segments.length; s++, width++) {
-  lakes.forEach(l => {
+      const sX = segments[s].x,
-    const uniqueCells = new Set();
+        sY = segments[s].y; // segment start coordinates
-    l.vertices.forEach(v => pack.vertices.c[v].forEach(c => cells.h[c] >= 20 && uniqueCells.add(c)));
+      const c = pack.cells.conf[segments[s].cell] || 0; // if segment is river confluence
-    l.shoreline = [...uniqueCells];
+      riverMeandered.push([sX, sY, c]);
-  });
 
-  const land = cells.i.filter(i => h[i] >= 20 && !cells.b[i]); // exclude near-border cells
+      if (s + 1 === segments.length) break; // do not meander last segment
-  land.sort((a,b) => h[b] - h[a]); // highest cells go first
 
-  let depressions = Infinity;
+      const eX = segments[s + 1].x,
-  for (let l = 0; depressions && l < ITERATIONS; l++) {
+        eY = segments[s + 1].y; // segment end coordinates
-    depressions = 0;
+      const angle = Math.atan2(eY - sY, eX - sX);
+      const sin = Math.sin(angle),
+        cos = Math.cos(angle);
 
-    for (const l of lakes) {
+      const meander = meandering + 1 / width + Math.random() * Math.max(meandering - width / 100, 0);
-      const minHeight = d3.min(l.shoreline.map(s => h[s]));
+      const dist2 = (eX - sX) ** 2 + (eY - sY) ** 2; // square distance between segment start and end
-      if (minHeight >= 100 || l.height > minHeight) continue;
+
-      l.height = minHeight + 1;
+      if (width < 10 && (dist2 > 64 || (dist2 > 36 && segments.length < 6))) {
-      depressions++;
+        // if dist2 is big or river is small add extra points at 1/3 and 2/3 of segment
+        const p1x = (sX * 2 + eX) / 3 + -sin * meander;
+        const p1y = (sY * 2 + eY) / 3 + cos * meander;
+        const p2x = (sX + eX * 2) / 3 + sin * meander;
+        const p2y = (sY + eY * 2) / 3 + cos * meander;
+        riverMeandered.push([p1x, p1y], [p2x, p2y]);
+      } else if (dist2 > 25 || segments.length < 6) {
+        // if dist is medium or river is small add 1 extra middlepoint
+        const p1x = (sX + eX) / 2 + -sin * meander;
+        const p1y = (sY + eY) / 2 + cos * meander;
+        riverMeandered.push([p1x, p1y]);
+      }
     }
 
-    for (const i of land) {
+    return riverMeandered;
-      const minHeight = d3.min(cells.c[i].map(c => cells.t[c] > 0 ? h[c] : pack.features[cells.f[c]].height || h[c]));
+  };
-      if (minHeight >= 100 || h[i] > minHeight) continue;
-      h[i] = minHeight + 1;
-      depressions++;
-    }
-  }
 
-  depressions && ERROR && console.error("Heightmap is depressed. Issues with rivers expected. Remove depressed areas to resolve");
+  const getPath = function (points, widthFactor = 1, sourceWidth = 0.1) {
-}
+    let offset,
+      extraOffset = sourceWidth; // starting river width (to make river source visible)
+    const riverLength = points.reduce((s, v, i, p) => s + (i ? Math.hypot(v[0] - p[i - 1][0], v[1] - p[i - 1][1]) : 0), 0); // summ of segments length
+    const widening = 1000 + riverLength * 30;
+    const riverPointsLeft = [],
+      riverPointsRight = []; // store points on both sides to build a valid polygon
+    const last = points.length - 1;
+    const factor = riverLength / points.length;
 
-// add more river points on 1/3 and 2/3 of length
+    // first point
-const addMeandering = function(segments, width = 1, meandering = .5) {
+    let x = points[0][0],
-  const riverMeandered = []; // to store enhanced segments
+      y = points[0][1],
-
+      c;
-  for (let s = 0; s < segments.length; s++, width++) {
+    let angle = Math.atan2(y - points[1][1], x - points[1][0]);
-    const sX = segments[s].x, sY = segments[s].y; // segment start coordinates
+    let sin = Math.sin(angle),
-    const c = pack.cells.conf[segments[s].cell] || 0; // if segment is river confluence
+      cos = Math.cos(angle);
-    riverMeandered.push([sX, sY, c]);
+    let xLeft = x + -sin * extraOffset,
-
+      yLeft = y + cos * extraOffset;
-    if (s+1 === segments.length) break; // do not meander last segment
-
-    const eX = segments[s+1].x, eY = segments[s+1].y; // segment end coordinates
-    const angle = Math.atan2(eY - sY, eX - sX);
-    const sin = Math.sin(angle), cos = Math.cos(angle);
-
-    const meander = meandering + 1 / width + Math.random() * Math.max(meandering - width / 100, 0);
-    const dist2 = (eX - sX) ** 2 + (eY - sY) ** 2; // square distance between segment start and end
-
-    if (width < 10 && (dist2 > 64 || (dist2 > 36 && segments.length < 6))) {
-      // if dist2 is big or river is small add extra points at 1/3 and 2/3 of segment
-      const p1x = (sX * 2 + eX) / 3 + -sin * meander;
-      const p1y = (sY * 2 + eY) / 3 + cos * meander;
-      const p2x = (sX + eX * 2) / 3 + sin * meander;
-      const p2y = (sY + eY * 2) / 3 + cos * meander;
-      riverMeandered.push([p1x, p1y], [p2x, p2y]);
-    } else if (dist2 > 25 || segments.length < 6) {
-      // if dist is medium or river is small add 1 extra middlepoint
-      const p1x = (sX + eX) / 2 + -sin * meander;
-      const p1y = (sY + eY) / 2 + cos * meander;
-      riverMeandered.push([p1x, p1y]);
-    }
-
-  }
-
-  return riverMeandered;
-}
-
-const getPath = function(points, widthFactor = 1, sourceWidth = .1) {
-  let offset, extraOffset = sourceWidth; // starting river width (to make river source visible)
-  const riverLength = points.reduce((s, v, i, p) => s + (i ? Math.hypot(v[0] - p[i-1][0], v[1] - p[i-1][1]) : 0), 0); // summ of segments length
-  const widening = 1000 + riverLength * 30;
-  const riverPointsLeft = [], riverPointsRight = []; // store points on both sides to build a valid polygon
-  const last = points.length - 1;
-  const factor = riverLength / points.length;
-
-  // first point
-  let x = points[0][0], y = points[0][1], c;
-  let angle = Math.atan2(y - points[1][1], x - points[1][0]);
-  let sin = Math.sin(angle), cos = Math.cos(angle);
-  let xLeft = x + -sin * extraOffset, yLeft = y + cos * extraOffset;
-  riverPointsLeft.push([xLeft, yLeft]);
-  let xRight = x + sin * extraOffset, yRight = y + -cos * extraOffset;
-  riverPointsRight.unshift([xRight, yRight]);
-
-  // middle points
-  for (let p = 1; p < last; p++) {
-    x = points[p][0], y = points[p][1], c = points[p][2] || 0;
-    const xPrev = points[p-1][0], yPrev = points[p - 1][1];
-    const xNext = points[p+1][0], yNext = points[p + 1][1];
-    angle = Math.atan2(yPrev - yNext, xPrev - xNext);
-    sin = Math.sin(angle), cos = Math.cos(angle);
-    offset = (Math.atan(Math.pow(p * factor, 2) / widening) / 2 * widthFactor) + extraOffset;
-    const confOffset = Math.atan(c * 5 / widening);
-    extraOffset += confOffset;
-    xLeft = x + -sin * offset, yLeft = y + cos * (offset + confOffset);
     riverPointsLeft.push([xLeft, yLeft]);
-    xRight = x + sin * offset, yRight = y + -cos * offset;
+    let xRight = x + sin * extraOffset,
+      yRight = y + -cos * extraOffset;
     riverPointsRight.unshift([xRight, yRight]);
-  }
 
-  // end point
+    // middle points
-  x = points[last][0], y = points[last][1], c = points[last][2];
+    for (let p = 1; p < last; p++) {
-  if (c) extraOffset += Math.atan(c * 10 / widening); // add extra width on river confluence
+      (x = points[p][0]), (y = points[p][1]), (c = points[p][2] || 0);
-  angle = Math.atan2(points[last-1][1] - y, points[last-1][0] - x);
+      const xPrev = points[p - 1][0],
-  sin = Math.sin(angle), cos = Math.cos(angle);
+        yPrev = points[p - 1][1];
-  xLeft = x + -sin * offset, yLeft = y + cos * offset;
+      const xNext = points[p + 1][0],
-  riverPointsLeft.push([xLeft, yLeft]);
+        yNext = points[p + 1][1];
-  xRight = x + sin * offset, yRight = y + -cos * offset;
+      angle = Math.atan2(yPrev - yNext, xPrev - xNext);
-  riverPointsRight.unshift([xRight, yRight]);
+      (sin = Math.sin(angle)), (cos = Math.cos(angle));
+      offset = (Math.atan(Math.pow(p * factor, 2) / widening) / 2) * widthFactor + extraOffset;
+      const confOffset = Math.atan((c * 5) / widening);
+      extraOffset += confOffset;
+      (xLeft = x + -sin * offset), (yLeft = y + cos * (offset + confOffset));
+      riverPointsLeft.push([xLeft, yLeft]);
+      (xRight = x + sin * offset), (yRight = y + -cos * offset);
+      riverPointsRight.unshift([xRight, yRight]);
+    }
 
-  // generate polygon path and return
+    // end point
-  lineGen.curve(d3.curveCatmullRom.alpha(0.1));
+    (x = points[last][0]), (y = points[last][1]), (c = points[last][2]);
-  const right = lineGen(riverPointsRight);
+    if (c) extraOffset += Math.atan((c * 10) / widening); // add extra width on river confluence
-  let left = lineGen(riverPointsLeft);
+    angle = Math.atan2(points[last - 1][1] - y, points[last - 1][0] - x);
-  left = left.substring(left.indexOf("C"));
+    (sin = Math.sin(angle)), (cos = Math.cos(angle));
-  return [round(right + left, 2), rn(riverLength, 2), offset];
+    (xLeft = x + -sin * offset), (yLeft = y + cos * offset);
-}
+    riverPointsLeft.push([xLeft, yLeft]);
+    (xRight = x + sin * offset), (yRight = y + -cos * offset);
+    riverPointsRight.unshift([xRight, yRight]);
 
-const specify = function() {
+    // generate polygon path and return
-  const rivers = pack.rivers;
+    lineGen.curve(d3.curveCatmullRom.alpha(0.1));
-  if (!rivers.length) return;
+    const right = lineGen(riverPointsRight);
-  Math.random = aleaPRNG(seed);
+    let left = lineGen(riverPointsLeft);
-  const tresholdElement = Math.ceil(rivers.length * .15);
+    left = left.substring(left.indexOf("C"));
-  const smallLength = rivers.map(r => r.length || 0).sort((a, b) => a-b)[tresholdElement];
+    return [round(right + left, 2), rn(riverLength, 2), offset];
-  const smallType = {"Creek":9, "River":3, "Brook":3, "Stream":1}; // weighted small river types
+  };
 
-  for (const r of rivers) {
+  const specify = function () {
-    r.basin = getBasin(r.i);
+    const rivers = pack.rivers;
-    r.name = getName(r.mouth);
+    if (!rivers.length) return;
-    const small = r.length < smallLength;
+    Math.random = aleaPRNG(seed);
-    r.type = r.parent && !(r.i%6) ? small ? "Branch" : "Fork" : small ? rw(smallType) : "River";
+    const tresholdElement = Math.ceil(rivers.length * 0.15);
-  }
+    const smallLength = rivers.map(r => r.length || 0).sort((a, b) => a - b)[tresholdElement];
-}
+    const smallType = {Creek: 9, River: 3, Brook: 3, Stream: 1}; // weighted small river types
 
-const getName = function(cell) {
+    for (const r of rivers) {
-  return Names.getCulture(pack.cells.culture[cell]);
+      r.basin = getBasin(r.i);
-}
+      r.name = getName(r.mouth);
+      const small = r.length < smallLength;
+      r.type = r.parent && !(r.i % 6) ? (small ? "Branch" : "Fork") : small ? rw(smallType) : "River";
+    }
+  };
 
-// remove river and all its tributaries
+  const getName = function (cell) {
-const remove = function(id) {
+    return Names.getCulture(pack.cells.culture[cell]);
-  const cells = pack.cells;
+  };
-  const riversToRemove = pack.rivers.filter(r => r.i === id || r.parent === id || r.basin === id).map(r => r.i);
-  riversToRemove.forEach(r => rivers.select("#river"+r).remove());
-  cells.r.forEach((r, i) => {
-    if (!r || !riversToRemove.includes(r)) return;
-    cells.r[i] = 0;
-    cells.fl[i] = grid.cells.prec[cells.g[i]];
-    cells.conf[i] = 0;
-  });
-  pack.rivers = pack.rivers.filter(r => !riversToRemove.includes(r.i));
-}
 
-const getBasin = function(r) {
+  // remove river and all its tributaries
-  const parent = pack.rivers.find(river => river.i === r)?.parent;
+  const remove = function (id) {
-  if (!parent || r === parent) return r;
+    const cells = pack.cells;
-  return getBasin(parent);
+    const riversToRemove = pack.rivers.filter(r => r.i === id || r.parent === id || r.basin === id).map(r => r.i);
-}
+    riversToRemove.forEach(r => rivers.select("#river" + r).remove());
+    cells.r.forEach((r, i) => {
+      if (!r || !riversToRemove.includes(r)) return;
+      cells.r[i] = 0;
+      cells.fl[i] = grid.cells.prec[cells.g[i]];
+      cells.conf[i] = 0;
+    });
+    pack.rivers = pack.rivers.filter(r => !riversToRemove.includes(r.i));
+  };
 
-return {generate, resolveDepressions, addMeandering, getPath, specify, getName, getBasin, remove};
+  const getBasin = function (r) {
+    const parent = pack.rivers.find(river => river.i === r)?.parent;
+    if (!parent || r === parent) return r;
+    return getBasin(parent);
+  };
 
-})));
+  return {generate, resolveDepressions, addMeandering, getPath, specify, getName, getBasin, remove};
+});

modules/ui/tools.js

@@ -1,44 +1,57 @@
 // module to control the Tools options (click to edit, to re-geenerate, tp add)
 "use strict";
 
-toolsContent.addEventListener("click", function(event) {
+toolsContent.addEventListener("click", function (event) {
-  if (customization) {tip("Please exit the customization mode first", false, "warning"); return;}
+  if (customization) {
+    tip("Please exit the customization mode first", false, "warning");
+    return;
+  }
   if (event.target.tagName !== "BUTTON") return;
   const button = event.target.id;
 
   // Click to open Editor buttons
-  if (button === "editHeightmapButton") editHeightmap(); else
+  if (button === "editHeightmapButton") editHeightmap();
-  if (button === "editBiomesButton") editBiomes(); else
+  else if (button === "editBiomesButton") editBiomes();
-  if (button === "editStatesButton") editStates(); else
+  else if (button === "editStatesButton") editStates();
-  if (button === "editProvincesButton") editProvinces(); else
+  else if (button === "editProvincesButton") editProvinces();
-  if (button === "editDiplomacyButton") editDiplomacy(); else
+  else if (button === "editDiplomacyButton") editDiplomacy();
-  if (button === "editCulturesButton") editCultures(); else
+  else if (button === "editCulturesButton") editCultures();
-  if (button === "editReligions") editReligions(); else
+  else if (button === "editReligions") editReligions();
-  if (button === "editEmblemButton") openEmblemEditor(); else
+  else if (button === "editEmblemButton") openEmblemEditor();
-  if (button === "editNamesBaseButton") editNamesbase(); else
+  else if (button === "editNamesBaseButton") editNamesbase();
-  if (button === "editUnitsButton") editUnits(); else
+  else if (button === "editUnitsButton") editUnits();
-  if (button === "editNotesButton") editNotes(); else
+  else if (button === "editNotesButton") editNotes();
-  if (button === "editZonesButton") editZones(); else
+  else if (button === "editZonesButton") editZones();
-  if (button === "overviewBurgsButton") overviewBurgs(); else
+  else if (button === "overviewBurgsButton") overviewBurgs();
-  if (button === "overviewRiversButton") overviewRivers(); else
+  else if (button === "overviewRiversButton") overviewRivers();
-  if (button === "overviewMilitaryButton") overviewMilitary(); else
+  else if (button === "overviewMilitaryButton") overviewMilitary();
-  if (button === "overviewCellsButton") viewCellDetails();
+  else if (button === "overviewCellsButton") viewCellDetails();
 
   // Click to Regenerate buttons
   if (event.target.parentNode.id === "regenerateFeature") {
-    if (sessionStorage.getItem("regenerateFeatureDontAsk")) {processFeatureRegeneration(event, button); return;}
+    if (sessionStorage.getItem("regenerateFeatureDontAsk")) {
+      processFeatureRegeneration(event, button);
+      return;
+    }
 
-    alertMessage.innerHTML = `Regeneration will remove all the custom changes for the element.<br><br>Are you sure you want to proceed?`
+    alertMessage.innerHTML = `Regeneration will remove all the custom changes for the element.<br><br>Are you sure you want to proceed?`;
-    $("#alert").dialog({resizable: false, title: "Regenerate element",
+    $("#alert").dialog({
+      resizable: false,
+      title: "Regenerate element",
       buttons: {
-        Proceed: function() {processFeatureRegeneration(event, button); $(this).dialog("close");},
+        Proceed: function () {
-        Cancel: function() {$(this).dialog("close");}
+          processFeatureRegeneration(event, button);
+          $(this).dialog("close");
+        },
+        Cancel: function () {
+          $(this).dialog("close");
+        }
       },
-      open: function() {
+      open: function () {
         const pane = $(this).dialog("widget").find(".ui-dialog-buttonpane");
         $('<span><input id="dontAsk" class="checkbox" type="checkbox"><label for="dontAsk" class="checkbox-label dontAsk"><i>do not ask again</i></label><span>').prependTo(pane);
       },
-      close: function() {
+      close: function () {
         const box = $(this).dialog("widget").find(".checkbox")[0];
         if (!box) return;
         if (box.checked) sessionStorage.setItem("regenerateFeatureDontAsk", true);
@@ -48,29 +61,35 @@ toolsContent.addEventListener("click", function(event) {
   }
 
   // Click to Add buttons
-  if (button === "addLabel") toggleAddLabel(); else
+  if (button === "addLabel") toggleAddLabel();
-  if (button === "addBurgTool") toggleAddBurg(); else
+  else if (button === "addBurgTool") toggleAddBurg();
-  if (button === "addRiver") toggleAddRiver(); else
+  else if (button === "addRiver") toggleAddRiver();
-  if (button === "addRoute") toggleAddRoute(); else
+  else if (button === "addRoute") toggleAddRoute();
-  if (button === "addMarker") toggleAddMarker();
+  else if (button === "addMarker") toggleAddMarker();
 });
 
 function processFeatureRegeneration(event, button) {
-  if (button === "regenerateStateLabels") {BurgsAndStates.drawStateLabels(); if (!layerIsOn("toggleLabels")) toggleLabels();} else
+  if (button === "regenerateStateLabels") {
-  if (button === "regenerateReliefIcons") {ReliefIcons(); if (!layerIsOn("toggleRelief")) toggleRelief();} else
+    BurgsAndStates.drawStateLabels();
-  if (button === "regenerateRoutes") {Routes.regenerate(); if (!layerIsOn("toggleRoutes")) toggleRoutes();} else
+    if (!layerIsOn("toggleLabels")) toggleLabels();
-  if (button === "regenerateRivers") regenerateRivers(); else
+  } else if (button === "regenerateReliefIcons") {
-  if (button === "regeneratePopulation") recalculatePopulation(); else
+    ReliefIcons();
-  if (button === "regenerateStates") regenerateStates(); else
+    if (!layerIsOn("toggleRelief")) toggleRelief();
-  if (button === "regenerateProvinces") regenerateProvinces(); else
+  } else if (button === "regenerateRoutes") {
-  if (button === "regenerateBurgs") regenerateBurgs(); else
+    Routes.regenerate();
-  if (button === "regenerateEmblems") regenerateEmblems(); else
+    if (!layerIsOn("toggleRoutes")) toggleRoutes();
-  if (button === "regenerateReligions") regenerateReligions(); else
+  } else if (button === "regenerateRivers") regenerateRivers();
-  if (button === "regenerateCultures") regenerateCultures(); else
+  else if (button === "regeneratePopulation") recalculatePopulation();
-  if (button === "regenerateMilitary") regenerateMilitary(); else
+  else if (button === "regenerateStates") regenerateStates();
-  if (button === "regenerateIce") regenerateIce(); else
+  else if (button === "regenerateProvinces") regenerateProvinces();
-  if (button === "regenerateMarkers") regenerateMarkers(event); else
+  else if (button === "regenerateBurgs") regenerateBurgs();
-  if (button === "regenerateZones") regenerateZones(event);
+  else if (button === "regenerateEmblems") regenerateEmblems();
+  else if (button === "regenerateReligions") regenerateReligions();
+  else if (button === "regenerateCultures") regenerateCultures();
+  else if (button === "regenerateMilitary") regenerateMilitary();
+  else if (button === "regenerateIce") regenerateIce();
+  else if (button === "regenerateMarkers") regenerateMarkers(event);
+  else if (button === "regenerateZones") regenerateZones(event);
 }
 
 async function openEmblemEditor() {
@@ -106,10 +125,10 @@ function recalculatePopulation() {
     if (!b.i || b.removed || b.lock) return;
     const i = b.cell;
 
-    b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i] / 2) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3);
+    b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i] / 2) / 8 + b.i / 1000 + (i % 100) / 1000, 0.1), 3);
     if (b.capital) b.population = b.population * 1.3; // increase capital population
     if (b.port) b.population = b.population * 1.3; // increase port population
-    b.population = rn(b.population * gauss(2,3,.6,20,3), 3);
+    b.population = rn(b.population * gauss(2, 3, 0.6, 20, 3), 3);
   });
 }
 
@@ -126,14 +145,19 @@ function regenerateStates() {
   }
 
   // burg local ids sorted by a bit randomized population:
-  const sorted = burgs.map((b, i) => [i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]);
+  const sorted = burgs
+    .map((b, i) => [i, b.population * Math.random()])
+    .sort((a, b) => b[1] - a[1])
+    .map(b => b[0]);
   const capitalsTree = d3.quadtree();
 
   // turn all old capitals into towns
-  burgs.filter(b => b.capital).forEach(b => {
+  burgs
-    moveBurgToGroup(b.i, "towns");
+    .filter(b => b.capital)
-    b.capital = 0;
+    .forEach(b => {
-  });
+      moveBurgToGroup(b.i, "towns");
+      b.capital = 0;
+    });
 
   // remove emblems
   document.querySelectorAll("[id^=stateCOA]").forEach(el => el.remove());
@@ -145,7 +169,7 @@ function regenerateStates() {
   // if desired states number is 0
   if (regionsInput.value == 0) {
     tip(`Cannot generate zero states. Please check the <i>States Number</i> option`, false, "warn");
-    pack.states = pack.states.slice(0,1); // remove all except of neutrals
+    pack.states = pack.states.slice(0, 1); // remove all except of neutrals
     pack.states[0].diplomacy = []; // clear diplomacy
     pack.provinces = [0]; // remove all provinces
     pack.cells.state = new Uint16Array(pack.cells.i.length); // reset cells data
@@ -165,10 +189,12 @@ function regenerateStates() {
   pack.states = d3.range(count).map(i => {
     if (!i) return {i, name: neutral};
 
-    let capital = null, x = 0, y = 0;
+    let capital = null,
+      x = 0,
+      y = 0;
     for (const i of sorted) {
       capital = burgs[i];
-      x = capital.x, y = capital.y;
+      (x = capital.x), (y = capital.y);
       if (capitalsTree.find(x, y, spacing) === undefined) break;
       spacing = Math.max(spacing - 1, 1);
     }
@@ -178,17 +204,17 @@ function regenerateStates() {
     moveBurgToGroup(capital.i, "cities");
 
     const culture = capital.culture;
-    const basename = capital.name.length < 9 && capital.cell%5 === 0 ? capital.name : Names.getCulture(culture, 3, 6, "", 0);
+    const basename = capital.name.length < 9 && capital.cell % 5 === 0 ? capital.name : Names.getCulture(culture, 3, 6, "", 0);
     const name = Names.getState(basename, culture);
     const nomadic = [1, 2, 3, 4].includes(pack.cells.biome[capital.cell]);
     const type = nomadic ? "Nomadic" : pack.cultures[culture].type === "Nomadic" ? "Generic" : pack.cultures[culture].type;
     const expansionism = rn(Math.random() * powerInput.value + 1, 1);
 
     const cultureType = pack.cultures[culture].type;
-    const coa = COA.generate(capital.coa, .3, null, cultureType);
+    const coa = COA.generate(capital.coa, 0.3, null, cultureType);
     coa.shield = capital.coa.shield;
 
-    return {i, name, type, capital:capital.i, center:capital.cell, culture, expansionism, coa};
+    return {i, name, type, capital: capital.i, center: capital.cell, culture, expansionism, coa};
   });
 
   BurgsAndStates.expandStates();
@@ -199,8 +225,10 @@ function regenerateStates() {
   BurgsAndStates.generateDiplomacy();
   BurgsAndStates.defineStateForms();
   BurgsAndStates.generateProvinces(true);
-  if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
+  if (!layerIsOn("toggleStates")) toggleStates();
-  if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();
+  else drawStates();
+  if (!layerIsOn("toggleBorders")) toggleBorders();
+  else drawBorders();
   BurgsAndStates.drawStateLabels();
   Military.generate();
   if (layerIsOn("toggleEmblems")) drawEmblems(); // redrawEmblems
@@ -224,43 +252,52 @@ function regenerateProvinces() {
 }
 
 function regenerateBurgs() {
-  const cells = pack.cells, states = pack.states, Lockedburgs = pack.burgs.filter(b =>b.lock);
+  const cells = pack.cells,
+    states = pack.states,
+    Lockedburgs = pack.burgs.filter(b => b.lock);
   rankCells();
   cells.burg = new Uint16Array(cells.i.length);
-  const burgs = pack.burgs = [0]; // clear burgs array
+  const burgs = (pack.burgs = [0]); // clear burgs array
-  states.filter(s => s.i).forEach(s => s.capital = 0); // clear state capitals
+  states.filter(s => s.i).forEach(s => (s.capital = 0)); // clear state capitals
-  pack.provinces.filter(p => p.i).forEach(p => p.burg = 0); // clear province capitals
+  pack.provinces.filter(p => p.i).forEach(p => (p.burg = 0)); // clear province capitals
   const burgsTree = d3.quadtree();
 
   const score = new Int16Array(cells.s.map(s => s * Math.random())); // cell score for capitals placement
   const sorted = cells.i.filter(i => score[i] > 0 && cells.culture[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes
-  const burgsCount = manorsInput.value == 1000 ? rn(sorted.length / 5 / (grid.points.length / 10000) ** .8) + states.length : +manorsInput.value + states.length;
+  const burgsCount = manorsInput.value == 1000 ? rn(sorted.length / 5 / (grid.points.length / 10000) ** 0.8) + states.length : +manorsInput.value + states.length;
-  const spacing = (graphWidth + graphHeight) / 150 / (burgsCount ** .7 / 66); // base min distance between towns
+  const spacing = (graphWidth + graphHeight) / 150 / (burgsCount ** 0.7 / 66); // base min distance between towns
 
   //clear locked list since ids will change
   //burglock.selectAll("text").remove();
-  for (let j=0; j < Lockedburgs.length; j++) {
+  for (let j = 0; j < Lockedburgs.length; j++) {
     const id = burgs.length;
     const oldBurg = Lockedburgs[j];
     oldBurg.i = id;
     burgs.push(oldBurg);
     burgsTree.add([oldBurg.x, oldBurg.y]);
     cells.burg[oldBurg.cell] = id;
-    if (oldBurg.capital) {states[oldBurg.state].capital = id; states[oldBurg.state].center = oldBurg.cell;}
+    if (oldBurg.capital) {
+      states[oldBurg.state].capital = id;
+      states[oldBurg.state].center = oldBurg.cell;
+    }
     //burglock.append("text").attr("data-id", id);
   }
 
-  for (let i=0; i < sorted.length && burgs.length < burgsCount; i++) {
+  for (let i = 0; i < sorted.length && burgs.length < burgsCount; i++) {
     const id = burgs.length;
     const cell = sorted[i];
-    const x = cells.p[cell][0], y = cells.p[cell][1];
+    const x = cells.p[cell][0],
+      y = cells.p[cell][1];
 
-    const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform
+    const s = spacing * gauss(1, 0.3, 0.2, 2, 2); // randomize to make the placement not uniform
     if (burgsTree.find(x, y, s) !== undefined) continue; // to close to existing burg
 
     const state = cells.state[cell];
     const capital = state && !states[state].capital; // if state doesn't have capital, make this burg a capital, no capital for neutral lands
-    if (capital) {states[state].capital = id; states[state].center = cell;}
+    if (capital) {
+      states[state].capital = id;
+      states[state].center = cell;
+    }
 
     const culture = cells.culture[cell];
     const name = Names.getCulture(culture);
@@ -270,16 +307,20 @@ function regenerateBurgs() {
   }
 
   // add a capital at former place for states without added capitals
-  states.filter(s => s.i && !s.removed && !s.capital).forEach(s => {
+  states
-    const burg = addBurg([cells.p[s.center][0], cells.p[s.center][1]]); // add new burg
+    .filter(s => s.i && !s.removed && !s.capital)
-    s.capital = burg;
+    .forEach(s => {
-    s.center = pack.burgs[burg].cell;
+      const burg = addBurg([cells.p[s.center][0], cells.p[s.center][1]]); // add new burg
-    pack.burgs[burg].capital = 1;
+      s.capital = burg;
-    pack.burgs[burg].state = s.i;
+      s.center = pack.burgs[burg].cell;
-    moveBurgToGroup(burg, "cities");
+      pack.burgs[burg].capital = 1;
-  });
+      pack.burgs[burg].state = s.i;
+      moveBurgToGroup(burg, "cities");
+    });
 
-  pack.features.forEach(f => {if (f.port) f.port = 0}); // reset features ports counter
+  pack.features.forEach(f => {
+    if (f.port) f.port = 0;
+  }); // reset features ports counter
   BurgsAndStates.specifyBurgs();
   BurgsAndStates.defineBurgFeatures();
   BurgsAndStates.drawBurgs();
@@ -313,10 +354,10 @@ function regenerateEmblems() {
     if (!burg.i || burg.removed) return;
     const state = pack.states[burg.state];
 
-    let kinship = state ? .25 : 0;
+    let kinship = state ? 0.25 : 0;
-    if (burg.capital) kinship += .1;
+    if (burg.capital) kinship += 0.1;
-    else if (burg.port) kinship -= .1;
+    else if (burg.port) kinship -= 0.1;
-    if (state && burg.culture !== state.culture) kinship -= .25;
+    if (state && burg.culture !== state.culture) kinship -= 0.25;
     burg.coa = COA.generate(state ? state.coa : null, kinship, null, burg.type);
     burg.coa.shield = COA.getShield(burg.culture, state ? burg.state : 0);
   });
@@ -327,16 +368,16 @@ function regenerateEmblems() {
 
     let dominion = false;
     if (!province.burg) {
-      dominion = P(.2);
+      dominion = P(0.2);
-      if (province.formName === "Colony") dominion = P(.95); else
+      if (province.formName === "Colony") dominion = P(0.95);
-      if (province.formName === "Island") dominion = P(.6); else
+      else if (province.formName === "Island") dominion = P(0.6);
-      if (province.formName === "Islands") dominion = P(.5); else
+      else if (province.formName === "Islands") dominion = P(0.5);
-      if (province.formName === "Territory") dominion = P(.4); else
+      else if (province.formName === "Territory") dominion = P(0.4);
-      if (province.formName === "Land") dominion = P(.3);
+      else if (province.formName === "Land") dominion = P(0.3);
     }
 
     const nameByBurg = province.burg && province.name.slice(0, 3) === parent.name.slice(0, 3);
-    const kinship = dominion ? 0 : nameByBurg ? .8 : .4;
+    const kinship = dominion ? 0 : nameByBurg ? 0.8 : 0.4;
     const culture = pack.cells.culture[province.center];
     const type = BurgsAndStates.getType(province.center, parent.port);
     province.coa = COA.generate(parent.coa, kinship, dominion, type);
@@ -348,7 +389,8 @@ function regenerateEmblems() {
 
 function regenerateReligions() {
   Religions.generate();
-  if (!layerIsOn("toggleReligions")) toggleReligions(); else drawReligions();
+  if (!layerIsOn("toggleReligions")) toggleReligions();
+  else drawReligions();
 }
 
 function regenerateCultures() {
@@ -356,7 +398,8 @@ function regenerateCultures() {
   Cultures.expand();
   BurgsAndStates.updateCultures();
   Religions.updateCultures();
-  if (!layerIsOn("toggleCultures")) toggleCultures(); else drawCultures();
+  if (!layerIsOn("toggleCultures")) toggleCultures();
+  else drawCultures();
   refreshAllEditors();
 }
 
@@ -373,15 +416,18 @@ function regenerateIce() {
 }
 
 function regenerateMarkers(event) {
-  if (isCtrlClick(event)) prompt("Please provide markers number multiplier", {default:1, step:.01, min:0, max:100}, v => addNumberOfMarkers(v));
+  if (isCtrlClick(event)) prompt("Please provide markers number multiplier", {default: 1, step: 0.01, min: 0, max: 100}, v => addNumberOfMarkers(v));
-  else addNumberOfMarkers(gauss(1, .5, .3, 5, 2));
+  else addNumberOfMarkers(gauss(1, 0.5, 0.3, 5, 2));
 
   function addNumberOfMarkers(number) {
     // remove existing markers and assigned notes
-    markers.selectAll("use").each(function() {
+    markers
-      const index = notes.findIndex(n => n.id === this.id);
+      .selectAll("use")
-      if (index != -1) notes.splice(index, 1);
+      .each(function () {
-    }).remove();
+        const index = notes.findIndex(n => n.id === this.id);
+        if (index != -1) notes.splice(index, 1);
+      })
+      .remove();
 
     addMarkers(number);
     if (!layerIsOn("toggleMarkers")) toggleMarkers();
@@ -389,8 +435,8 @@ function regenerateMarkers(event) {
 }
 
 function regenerateZones(event) {
-  if (isCtrlClick(event)) prompt("Please provide zones number multiplier", {default:1, step:.01, min:0, max:100}, v => addNumberOfZones(v));
+  if (isCtrlClick(event)) prompt("Please provide zones number multiplier", {default: 1, step: 0.01, min: 0, max: 100}, v => addNumberOfZones(v));
-  else addNumberOfZones(gauss(1, .5, .6, 5, 2));
+  else addNumberOfZones(gauss(1, 0.5, 0.6, 5, 2));
 
   function addNumberOfZones(number) {
     zones.selectAll("g").remove(); // remove existing zones
@@ -408,10 +454,13 @@ function unpressClickToAddButton() {
 
 function toggleAddLabel() {
   const pressed = document.getElementById("addLabel").classList.contains("pressed");
-  if (pressed) {unpressClickToAddButton(); return;}
+  if (pressed) {
+    unpressClickToAddButton();
+    return;
+  }
 
   addFeature.querySelectorAll("button.pressed").forEach(b => b.classList.remove("pressed"));
-  addLabel.classList.add('pressed');
+  addLabel.classList.add("pressed");
   closeDialogs(".stable");
   viewbox.style("cursor", "crosshair").on("click", addLabelOnClick);
   tip("Click on map to place label. Hold Shift to add multiple", true);
@@ -428,10 +477,7 @@ function addLabelOnClick() {
   const id = getNextId("label");
 
   let group = labels.select("#addedLabels");
-  if (!group.size()) group = labels.append("g").attr("id", "addedLabels")
+  if (!group.size()) group = labels.append("g").attr("id", "addedLabels").attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", 18).attr("data-size", 18).attr("filter", null);
-    .attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a")
-    .attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC")
-    .attr("font-size", 18).attr("data-size", 18).attr("filter", null);
 
   const example = group.append("text").attr("x", 0).attr("x", 0).text(name);
   const width = example.node().getBBox().width;
@@ -439,13 +485,22 @@ function addLabelOnClick() {
   example.remove();
 
   group.classed("hidden", false);
-  group.append("text").attr("id", id)
+  group
-    .append("textPath").attr("xlink:href", "#textPath_"+id).attr("startOffset", "50%").attr("font-size", "100%")
+    .append("text")
-    .append("tspan").attr("x", x).text(name);
+    .attr("id", id)
+    .append("textPath")
+    .attr("xlink:href", "#textPath_" + id)
+    .attr("startOffset", "50%")
+    .attr("font-size", "100%")
+    .append("tspan")
+    .attr("x", x)
+    .text(name);
 
-  defs.select("#textPaths")
+  defs
-    .append("path").attr("id", "textPath_"+id)
+    .select("#textPaths")
-    .attr("d", `M${point[0]-width},${point[1]} h${width*2}`);
+    .append("path")
+    .attr("id", "textPath_" + id)
+    .attr("d", `M${point[0] - width},${point[1]} h${width * 2}`);
 
   if (d3.event.shiftKey === false) unpressClickToAddButton();
 }
@@ -466,7 +521,7 @@ function toggleAddRiver() {
   }
 
   addFeature.querySelectorAll("button.pressed").forEach(b => b.classList.remove("pressed"));
-  addRiver.classList.add('pressed');
+  addRiver.classList.add("pressed");
   document.getElementById("addNewRiver").classList.add("pressed");
   closeDialogs(".stable");
   viewbox.style("cursor", "crosshair").on("click", addRiverOnClick);
@@ -486,22 +541,27 @@ function addRiverOnClick() {
 
   // height with added t value to make map less depressed
   const h = Array.from(cells.h)
-    .map((h, i) => h < 20 || cells.t[i] < 1 ? h : h + cells.t[i] / 100)
+    .map((h, i) => (h < 20 || cells.t[i] < 1 ? h : h + cells.t[i] / 100))
-    .map((h, i) => h < 20 || cells.t[i] < 1 ? h : h + d3.mean(cells.c[i].map(c => cells.t[c])) / 10000);
+    .map((h, i) => (h < 20 || cells.t[i] < 1 ? h : h + d3.mean(cells.c[i].map(c => cells.t[c])) / 10000));
-  Rivers.resolveDepressions(h);
+  Rivers.resolveDepressions(h, 200);
 
   while (i) {
     cells.r[i] = river;
-    const x = cells.p[i][0], y = cells.p[i][1];
+    const x = cells.p[i][0],
-    dataRiver.push({x, y, cell:i});
+      y = cells.p[i][1];
+    dataRiver.push({x, y, cell: i});
 
     const min = cells.c[i][d3.scan(cells.c[i], (a, b) => h[a] - h[b])]; // downhill cell
-    if (h[i] <= h[min]) {tip(`Cell ${i} is depressed, river cannot flow further`, false, "error"); return;}
+    if (h[i] <= h[min]) {
-    const tx = cells.p[min][0], ty = cells.p[min][1];
+      tip(`Cell ${i} is depressed, river cannot flow further`, false, "error");
+      return;
+    }
+    const tx = cells.p[min][0],
+      ty = cells.p[min][1];
 
     if (h[min] < 20) {
       // pour to water body
-      dataRiver.push({x: tx, y: ty, cell:i});
+      dataRiver.push({x: tx, y: ty, cell: i});
       break;
     }
 
@@ -526,19 +586,22 @@ function addRiverOnClick() {
     }
 
     // extend old river
-    rivers.select("#river"+r).remove();
+    rivers.select("#river" + r).remove();
-    cells.i.filter(i => cells.r[i] === river).forEach(i => cells.r[i] = r);
+    cells.i.filter(i => cells.r[i] === river).forEach(i => (cells.r[i] = r));
-    riverCells.forEach(i => cells.r[i] = 0);
+    riverCells.forEach(i => (cells.r[i] = 0));
     river = r;
     cells.fl[min] = cells.fl[i] + grid.cells.prec[cells.g[min]];
     i = min;
   }
 
-  const points = Rivers.addMeandering(dataRiver, 1, .5);
+  const points = Rivers.addMeandering(dataRiver, 1, 0.5);
-  const widthFactor = rn(.8 + Math.random() * .4, 1); // river width modifier [.8, 1.2]
+  const widthFactor = rn(0.8 + Math.random() * 0.4, 1); // river width modifier [.8, 1.2]
-  const sourceWidth = .1;
+  const sourceWidth = 0.1;
   const [path, length, offset] = Rivers.getPath(points, widthFactor, sourceWidth);
-  rivers.append("path").attr("d", path).attr("id", "river"+river);
+  rivers
+    .append("path")
+    .attr("d", path)
+    .attr("id", "river" + river);
 
   // add new river to data or change extended river attributes
   const r = pack.rivers.find(r => r.i === river);
@@ -555,10 +618,10 @@ function addRiverOnClick() {
     const source = dataRiver[0].cell;
     const width = rn(offset ** 2, 2); // mounth width in km
     const name = Rivers.getName(mouth);
-    const smallLength = pack.rivers.map(r => r.length||0).sort((a,b) => a-b)[Math.ceil(pack.rivers.length * .15)];
+    const smallLength = pack.rivers.map(r => r.length || 0).sort((a, b) => a - b)[Math.ceil(pack.rivers.length * 0.15)];
-    const type = length < smallLength ? rw({"Creek":9, "River":3, "Brook":3, "Stream":1}) : "River";
+    const type = length < smallLength ? rw({Creek: 9, River: 3, Brook: 3, Stream: 1}) : "River";
 
-    pack.rivers.push({i:river, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, basin, name, type});
+    pack.rivers.push({i: river, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, basin, name, type});
   }
 
   if (d3.event.shiftKey === false) {
@@ -570,10 +633,13 @@ function addRiverOnClick() {
 
 function toggleAddRoute() {
   const pressed = document.getElementById("addRoute").classList.contains("pressed");
-  if (pressed) {unpressClickToAddButton(); return;}
+  if (pressed) {
+    unpressClickToAddButton();
+    return;
+  }
 
   addFeature.querySelectorAll("button.pressed").forEach(b => b.classList.remove("pressed"));
-  addRoute.classList.add('pressed');
+  addRoute.classList.add("pressed");
   closeDialogs(".stable");
   viewbox.style("cursor", "crosshair").on("click", addRouteOnClick);
   tip("Click on map to add a first control point", true);
@@ -590,10 +656,13 @@ function addRouteOnClick() {
 
 function toggleAddMarker() {
   const pressed = document.getElementById("addMarker").classList.contains("pressed");
-  if (pressed) {unpressClickToAddButton(); return;}
+  if (pressed) {
+    unpressClickToAddButton();
+    return;
+  }
 
   addFeature.querySelectorAll("button.pressed").forEach(b => b.classList.remove("pressed"));
-  addMarker.classList.add('pressed');
+  addMarker.classList.add("pressed");
   closeDialogs(".stable");
   viewbox.style("cursor", "crosshair").on("click", addMarkerOnClick);
   tip("Click on map to add a marker. Hold Shift to add multiple", true);
@@ -602,27 +671,44 @@ function toggleAddMarker() {
 
 function addMarkerOnClick() {
   const point = d3.mouse(this);
-  const x = rn(point[0], 2), y = rn(point[1], 2);
+  const x = rn(point[0], 2),
+    y = rn(point[1], 2);
   const id = getNextId("markerElement");
 
   const selected = markerSelectGroup.value;
-  const valid = selected && d3.select("#defs-markers").select("#"+selected).size();
+  const valid =
-  const symbol = valid ? "#"+selected : "#marker0";
+    selected &&
+    d3
+      .select("#defs-markers")
+      .select("#" + selected)
+      .size();
+  const symbol = valid ? "#" + selected : "#marker0";
   const added = markers.select("[data-id='" + symbol + "']").size();
   let desired = valid && added ? markers.select("[data-id='" + symbol + "']").attr("data-size") : 1;
   if (isNaN(desired)) desired = 1;
   const size = desired * 5 + 25 / scale;
 
-  markers.append("use").attr("id", id).attr("xlink:href", symbol).attr("data-id", symbol)
+  markers
-    .attr("data-x", x).attr("data-y", y).attr("x", x - size / 2).attr("y", y - size)
+    .append("use")
-    .attr("data-size", desired).attr("width", size).attr("height", size);
+    .attr("id", id)
+    .attr("xlink:href", symbol)
+    .attr("data-id", symbol)
+    .attr("data-x", x)
+    .attr("data-y", y)
+    .attr("x", x - size / 2)
+    .attr("y", y - size)
+    .attr("data-size", desired)
+    .attr("width", size)
+    .attr("height", size);
 
   if (d3.event.shiftKey === false) unpressClickToAddButton();
 }
 
 function viewCellDetails() {
   $("#cellInfo").dialog({
-    resizable: false, width: "22em", title: "Cell Details",
+    resizable: false,
+    width: "22em",
+    title: "Cell Details",
     position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}
   });
 }