From acd9cfdd694b3b59841ee4613e31a12a9d17bbde Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 11 Sep 2021 21:18:08 +0300
Subject: [PATCH] move markers into a separate module

---
 index.html                     |   7 +-
 main.js                        | 201 +----------------------------
 modules/load.js                |   2 +-
 modules/markers-generator.js   | 226 +++++++++++++++++++++++++++++++++
 modules/ui/heightmap-editor.js |   2 +-
 modules/ui/tools.js            |   2 +-
 6 files changed, 234 insertions(+), 206 deletions(-)
 create mode 100644 modules/markers-generator.js

diff --git a/index.html b/index.html
index 1864d8d0..272f9876 100644
--- a/index.html
+++ b/index.html
@@ -241,15 +241,15 @@
   <div id="optionsContainer" style="opacity:0">
 
     <div id="collapsible">
-      <button id="optionsTrigger" data-t="tipOptionsTrigger" data-tip="Click to show options pane. Shortcut: Tab" class="options glow" onclick="showOptions(event)" style="padding:.6em .45em">►</button>
+      <button id="optionsTrigger" data-t="tipOptionsTrigger" data-tip="Click to show the Menu. Shortcut: Tab" class="options glow" onclick="showOptions(event)" style="padding:.6em .45em">►</button>
       <button id="regenerate" data-t="tipRegenerate" data-tip="Click to generate a new map. Shortcut: F2" onclick="regeneratePrompt()" class="options" style="display: none"><t data-t="newMap">New Map!</t></button>
     </div>
 
     <div id="options" style="display:none">
-      <div class="drag-trigger" data-t="optionsDragTrigger" data-tip="Drag to move options pane"></div>
+      <div class="drag-trigger" data-t="optionsDragTrigger" data-tip="Drag to move the Menu"></div>
 
       <div class="tab">
-        <button id="optionsHide" data-t="optionsHide" data-tip="Click to hide options pane. Shortcut: Tab to close this or Esc to close all dialogs" class="options" onclick="hideOptions(event)">◄</button>
+        <button id="optionsHide" data-t="optionsHide" data-tip="Click to hide the Menu. Shortcut: Tab or Esc" class="options" onclick="hideOptions(event)">◄</button>
         <button id="layersTab" data-t="layersTab" data-tip="Click to change map layers" class="options active"><t data-t="layers">Layers</t></button>
         <button id="styleTab" data-t="styleTab" data-tip="Click to open style editor" class="options"><t data-t="style">Style</t></button>
         <button id="optionsTab" data-t="optionsTab" data-tip="Click to change generation and UI options" class="options"><t data-t="options">Options</t></button>
@@ -4260,6 +4260,7 @@
   <script src="modules/routes-generator.js"></script>
   <script src="modules/religions-generator.js"></script>
   <script src="modules/military-generator.js"></script>
+  <script src="modules/markers-generator.js"></script>
   <script src="modules/coa-generator.js"></script>
   <script src="libs/polylabel.min.js"></script>
   <script src="libs/lineclip.min.js"></script>
diff --git a/main.js b/main.js
index 9e490980..df5b8f55 100644
--- a/main.js
+++ b/main.js
@@ -619,7 +619,7 @@ function generate() {
     Lakes.generateName();
 
     Military.generate();
-    addMarkers();
+    Markers.generate();
     addZones();
     Names.getMapName();
 
@@ -1436,205 +1436,6 @@ function rankCells() {
   TIME && console.timeEnd("rankCells");
 }
 
-// generate some markers
-function addMarkers(number = 1) {
-  if (!number) return;
-  TIME && console.time("addMarkers");
-  const cells = pack.cells,
-    states = pack.states;
-
-  void (function addVolcanoes() {
-    let mounts = Array.from(cells.i)
-      .filter(i => cells.h[i] > 70)
-      .sort((a, b) => cells.h[b] - cells.h[a]);
-    let count = mounts.length < 10 ? 0 : Math.ceil((mounts.length / 300) * number);
-    if (count) addMarker("volcano", "🌋", 52, 50, 13);
-
-    while (count && mounts.length) {
-      const cell = mounts.splice(biased(0, mounts.length - 1, 5), 1);
-      const x = cells.p[cell][0],
-        y = cells.p[cell][1];
-      const id = appendMarker(cell, "volcano");
-      const proper = Names.getCulture(cells.culture[cell]);
-      const name = P(0.3) ? "Mount " + proper : Math.random() > 0.3 ? proper + " Volcano" : proper;
-      notes.push({id, name, legend: `Active volcano. Height: ${getFriendlyHeight([x, y])}`});
-      count--;
-    }
-  })();
-
-  void (function addHotSprings() {
-    let springs = Array.from(cells.i)
-      .filter(i => cells.h[i] > 50)
-      .sort((a, b) => cells.h[b] - cells.h[a]);
-    let count = springs.length < 30 ? 0 : Math.ceil((springs.length / 1000) * number);
-    if (count) addMarker("hot_springs", "♨️", 50, 52, 12.5);
-
-    while (count && springs.length) {
-      const cell = springs.splice(biased(1, springs.length - 1, 3), 1);
-      const id = appendMarker(cell, "hot_springs");
-      const proper = Names.getCulture(cells.culture[cell]);
-      const temp = convertTemperature(gauss(30, 15, 20, 100));
-      notes.push({id, name: proper + " Hot Springs", legend: `A hot springs area. Temperature: ${temp}`});
-      count--;
-    }
-  })();
-
-  void (function addMines() {
-    let hills = Array.from(cells.i).filter(i => cells.h[i] > 47 && cells.burg[i]);
-    let count = !hills.length ? 0 : Math.ceil((hills.length / 7) * number);
-    if (!count) return;
-
-    addMarker("mine", "⛏️", 48, 50, 13.5);
-    const resources = {salt: 5, gold: 2, silver: 4, copper: 2, iron: 3, lead: 1, tin: 1};
-
-    while (count && hills.length) {
-      const cell = hills.splice(Math.floor(Math.random() * hills.length), 1);
-      const id = appendMarker(cell, "mine");
-      const resource = rw(resources);
-      const burg = pack.burgs[cells.burg[cell]];
-      const name = `${burg.name} — ${resource} mining town`;
-      const population = rn(burg.population * populationRate * urbanization);
-      const legend = `${burg.name} is a mining town of ${population} people just nearby the ${resource} mine`;
-      notes.push({id, name, legend});
-      count--;
-    }
-  })();
-
-  void (function addBridges() {
-    const meanRoad = d3.mean(cells.road.filter(r => r));
-    const meanFlux = d3.mean(cells.fl.filter(fl => fl));
-
-    let bridges = Array.from(cells.i)
-      .filter(i => cells.burg[i] && cells.h[i] >= 20 && cells.r[i] && cells.fl[i] > meanFlux && cells.road[i] > meanRoad)
-      .sort((a, b) => cells.road[b] + cells.fl[b] / 10 - (cells.road[a] + cells.fl[a] / 10));
-
-    let count = !bridges.length ? 0 : Math.ceil((bridges.length / 12) * number);
-    if (count) addMarker("bridge", "🌉", 50, 50, 14);
-
-    while (count && bridges.length) {
-      const cell = bridges.splice(0, 1);
-      const id = appendMarker(cell, "bridge");
-      const burg = pack.burgs[cells.burg[cell]];
-      const river = pack.rivers.find(r => r.i === pack.cells.r[cell]);
-      const riverName = river ? `${river.name} ${river.type}` : "river";
-      const name = river && P(0.2) ? river.name : burg.name;
-      notes.push({id, name: `${name} Bridge`, legend: `A stone bridge over the ${riverName} near ${burg.name}`});
-      count--;
-    }
-  })();
-
-  void (function addInns() {
-    const maxRoad = d3.max(cells.road) * 0.9;
-    let taverns = Array.from(cells.i).filter(i => cells.crossroad[i] && cells.h[i] >= 20 && cells.road[i] > maxRoad);
-    if (!taverns.length) return;
-    const count = Math.ceil(4 * number);
-    addMarker("inn", "🍻", 50, 50, 14.5);
-
-    const color = ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"];
-    const animal = ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Wolf", "Wolverine", "Camel", "Falcon", "Hound", "Ox"];
-    const adj = ["New", "Good", "High", "Old", "Great", "Big", "Major", "Happy", "Main", "Huge", "Far", "Beautiful", "Fair", "Prime", "Ancient", "Golden", "Proud", "Lucky", "Fat", "Honest", "Giant", "Distant", "Friendly", "Loud", "Hungry", "Magical", "Superior", "Peaceful", "Frozen", "Divine", "Favorable", "Brave", "Sunny", "Flying"];
-
-    for (let i = 0; i < taverns.length && i < count; i++) {
-      const cell = taverns.splice(Math.floor(Math.random() * taverns.length), 1);
-      const id = appendMarker(cell, "inn");
-      const type = P(0.3) ? "inn" : "tavern";
-      const name = P(0.5) ? ra(color) + " " + ra(animal) : P(0.6) ? ra(adj) + " " + ra(animal) : ra(adj) + " " + capitalize(type);
-      notes.push({id, name: "The " + name, legend: `A big and famous roadside ${type}`});
-    }
-  })();
-
-  void (function addLighthouses() {
-    const lands = cells.i.filter(i => cells.harbor[i] > 6 && cells.c[i].some(c => cells.h[c] < 20 && cells.road[c]));
-    const lighthouses = Array.from(lands).map(i => [i, cells.v[i][cells.c[i].findIndex(c => cells.h[c] < 20 && cells.road[c])]]);
-    if (lighthouses.length) addMarker("lighthouse", "🚨", 50, 50, 16);
-    const count = Math.ceil(4 * number);
-
-    for (let i = 0; i < lighthouses.length && i < count; i++) {
-      const cell = lighthouses[i][0],
-        vertex = lighthouses[i][1];
-      const id = appendMarker(cell, "lighthouse");
-      const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
-      notes.push({id, name: getAdjective(proper) + " Lighthouse" + name, legend: `A lighthouse to keep the navigation safe`});
-    }
-  })();
-
-  void (function addWaterfalls() {
-    const waterfalls = cells.i.filter(i => cells.r[i] && cells.h[i] > 70);
-    if (waterfalls.length) addMarker("waterfall", "⟱", 50, 54, 16.5);
-    const count = Math.ceil(3 * number);
-
-    for (let i = 0; i < waterfalls.length && i < count; i++) {
-      const cell = waterfalls[i];
-      const id = appendMarker(cell, "waterfall");
-      const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
-      notes.push({id, name: getAdjective(proper) + " Waterfall" + name, legend: `An extremely beautiful waterfall`});
-    }
-  })();
-
-  void (function addBattlefields() {
-    let battlefields = Array.from(cells.i).filter(i => cells.state[i] && cells.pop[i] > 2 && cells.h[i] < 50 && cells.h[i] > 25);
-    let count = battlefields.length < 100 ? 0 : Math.ceil((battlefields.length / 500) * number);
-    if (count) addMarker("battlefield", "⚔️", 50, 52, 12);
-
-    while (count && battlefields.length) {
-      const cell = battlefields.splice(Math.floor(Math.random() * battlefields.length), 1);
-      const id = appendMarker(cell, "battlefield");
-      const campaign = ra(states[cells.state[cell]].campaigns);
-      const date = generateDate(campaign.start, campaign.end);
-      const name = Names.getCulture(cells.culture[cell]) + " Battlefield";
-      const legend = `A historical battle of the ${campaign.name}. \r\nDate: ${date} ${options.era}`;
-      notes.push({id, name, legend});
-      count--;
-    }
-  })();
-
-  function addMarker(id, icon, x, y, size) {
-    const markers = svg.select("#defs-markers");
-    if (markers.select("#marker_" + id).size()) return;
-
-    const symbol = markers
-      .append("symbol")
-      .attr("id", "marker_" + id)
-      .attr("viewBox", "0 0 30 30");
-    symbol.append("path").attr("d", "M6,19 l9,10 L24,19").attr("fill", "#000000").attr("stroke", "none");
-    symbol.append("circle").attr("cx", 15).attr("cy", 15).attr("r", 10).attr("fill", "#ffffff").attr("stroke", "#000000").attr("stroke-width", 1);
-    symbol
-      .append("text")
-      .attr("x", x + "%")
-      .attr("y", y + "%")
-      .attr("fill", "#000000")
-      .attr("stroke", "#3200ff")
-      .attr("stroke-width", 0)
-      .attr("font-size", size + "px")
-      .attr("dominant-baseline", "central")
-      .text(icon);
-  }
-
-  function appendMarker(cell, type) {
-    const x = cells.p[cell][0],
-      y = cells.p[cell][1];
-    const id = getNextId("markerElement");
-    const name = "#marker_" + type;
-
-    markers
-      .append("use")
-      .attr("id", id)
-      .attr("xlink:href", name)
-      .attr("data-id", name)
-      .attr("data-x", x)
-      .attr("data-y", y)
-      .attr("x", x - 15)
-      .attr("y", y - 30)
-      .attr("data-size", 1)
-      .attr("width", 30)
-      .attr("height", 30);
-
-    return id;
-  }
-
-  TIME && console.timeEnd("addMarkers");
-}
-
 // regenerate some zones
 function addZones(number = 1) {
   TIME && console.time("addZones");
diff --git a/modules/load.js b/modules/load.js
index c19f8151..44892a47 100644
--- a/modules/load.js
+++ b/modules/load.js
@@ -460,7 +460,7 @@ function parseLoadedData(data) {
         zones.attr("opacity", 0.6).attr("stroke", null).attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt");
         addZones();
         if (!markers.selectAll("*").size()) {
-          addMarkers();
+          Markers.generate();
           turnButtonOn("toggleMarkers");
         }
 
diff --git a/modules/markers-generator.js b/modules/markers-generator.js
new file mode 100644
index 00000000..c2bc6d7e
--- /dev/null
+++ b/modules/markers-generator.js
@@ -0,0 +1,226 @@
+"use strict";
+
+window.Markers = (function () {
+  const generate = (number = 1) => {
+    if (number === 0) return;
+    TIME && console.time("addMarkers");
+
+    addVolcanoes(number);
+    addHotSprings(number);
+    addMines(number);
+    addBridges(number);
+    addInns(number);
+    addLighthouses(number);
+    addWaterfalls(number);
+    addBattlefields(number);
+
+    TIME && console.timeEnd("addMarkers");
+  };
+
+  function addVolcanoes(number) {
+    const {cells} = pack;
+
+    let mounts = Array.from(cells.i)
+      .filter(i => cells.h[i] > 70)
+      .sort((a, b) => cells.h[b] - cells.h[a]);
+    let count = mounts.length < 10 ? 0 : Math.ceil((mounts.length / 300) * number);
+    if (count) addMarker("volcano", "🌋", 52, 50, 13);
+
+    while (count && mounts.length) {
+      const cell = mounts.splice(biased(0, mounts.length - 1, 5), 1);
+      const x = cells.p[cell][0],
+        y = cells.p[cell][1];
+      const id = appendMarker(cell, "volcano");
+      const proper = Names.getCulture(cells.culture[cell]);
+      const name = P(0.3) ? "Mount " + proper : Math.random() > 0.3 ? proper + " Volcano" : proper;
+      notes.push({id, name, legend: `Active volcano. Height: ${getFriendlyHeight([x, y])}`});
+      count--;
+    }
+  }
+
+  function addHotSprings(number) {
+    const {cells} = pack;
+
+    let springs = Array.from(cells.i)
+      .filter(i => cells.h[i] > 50)
+      .sort((a, b) => cells.h[b] - cells.h[a]);
+    let count = springs.length < 30 ? 0 : Math.ceil((springs.length / 1000) * number);
+    if (count) addMarker("hot_springs", "♨️", 50, 52, 12.5);
+
+    while (count && springs.length) {
+      const cell = springs.splice(biased(1, springs.length - 1, 3), 1);
+      const id = appendMarker(cell, "hot_springs");
+      const proper = Names.getCulture(cells.culture[cell]);
+      const temp = convertTemperature(gauss(30, 15, 20, 100));
+      notes.push({id, name: proper + " Hot Springs", legend: `A hot springs area. Temperature: ${temp}`});
+      count--;
+    }
+  }
+
+  function addMines(number) {
+    const {cells} = pack;
+
+    let hills = Array.from(cells.i).filter(i => cells.h[i] > 47 && cells.burg[i]);
+    let count = !hills.length ? 0 : Math.ceil((hills.length / 7) * number);
+    if (!count) return;
+
+    addMarker("mine", "⛏️", 48, 50, 13.5);
+    const resources = {salt: 5, gold: 2, silver: 4, copper: 2, iron: 3, lead: 1, tin: 1};
+
+    while (count && hills.length) {
+      const cell = hills.splice(Math.floor(Math.random() * hills.length), 1);
+      const id = appendMarker(cell, "mine");
+      const resource = rw(resources);
+      const burg = pack.burgs[cells.burg[cell]];
+      const name = `${burg.name} — ${resource} mining town`;
+      const population = rn(burg.population * populationRate * urbanization);
+      const legend = `${burg.name} is a mining town of ${population} people just nearby the ${resource} mine`;
+      notes.push({id, name, legend});
+      count--;
+    }
+  }
+
+  function addBridges(number) {
+    const {cells} = pack;
+
+    const meanRoad = d3.mean(cells.road.filter(r => r));
+    const meanFlux = d3.mean(cells.fl.filter(fl => fl));
+
+    let bridges = Array.from(cells.i)
+      .filter(i => cells.burg[i] && cells.h[i] >= 20 && cells.r[i] && cells.fl[i] > meanFlux && cells.road[i] > meanRoad)
+      .sort((a, b) => cells.road[b] + cells.fl[b] / 10 - (cells.road[a] + cells.fl[a] / 10));
+
+    let count = !bridges.length ? 0 : Math.ceil((bridges.length / 12) * number);
+    if (count) addMarker("bridge", "🌉", 50, 50, 14);
+
+    while (count && bridges.length) {
+      const cell = bridges.splice(0, 1);
+      const id = appendMarker(cell, "bridge");
+      const burg = pack.burgs[cells.burg[cell]];
+      const river = pack.rivers.find(r => r.i === pack.cells.r[cell]);
+      const riverName = river ? `${river.name} ${river.type}` : "river";
+      const name = river && P(0.2) ? river.name : burg.name;
+      notes.push({id, name: `${name} Bridge`, legend: `A stone bridge over the ${riverName} near ${burg.name}`});
+      count--;
+    }
+  }
+
+  function addInns(number) {
+    const {cells} = pack;
+
+    const maxRoad = d3.max(cells.road) * 0.9;
+    let taverns = Array.from(cells.i).filter(i => cells.crossroad[i] && cells.h[i] >= 20 && cells.road[i] > maxRoad);
+    if (!taverns.length) return;
+    const count = Math.ceil(4 * number);
+    addMarker("inn", "🍻", 50, 50, 14.5);
+
+    const color = ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"];
+    const animal = ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Wolf", "Wolverine", "Camel", "Falcon", "Hound", "Ox"];
+    const adj = ["New", "Good", "High", "Old", "Great", "Big", "Major", "Happy", "Main", "Huge", "Far", "Beautiful", "Fair", "Prime", "Ancient", "Golden", "Proud", "Lucky", "Fat", "Honest", "Giant", "Distant", "Friendly", "Loud", "Hungry", "Magical", "Superior", "Peaceful", "Frozen", "Divine", "Favorable", "Brave", "Sunny", "Flying"];
+
+    for (let i = 0; i < taverns.length && i < count; i++) {
+      const cell = taverns.splice(Math.floor(Math.random() * taverns.length), 1);
+      const id = appendMarker(cell, "inn");
+      const type = P(0.3) ? "inn" : "tavern";
+      const name = P(0.5) ? ra(color) + " " + ra(animal) : P(0.6) ? ra(adj) + " " + ra(animal) : ra(adj) + " " + capitalize(type);
+      notes.push({id, name: "The " + name, legend: `A big and famous roadside ${type}`});
+    }
+  }
+
+  function addLighthouses(number) {
+    const {cells} = pack;
+
+    const lands = cells.i.filter(i => cells.harbor[i] > 6 && cells.c[i].some(c => cells.h[c] < 20 && cells.road[c]));
+    const lighthouses = Array.from(lands).map(i => [i, cells.v[i][cells.c[i].findIndex(c => cells.h[c] < 20 && cells.road[c])]]);
+    if (lighthouses.length) addMarker("lighthouse", "🚨", 50, 50, 16);
+    const count = Math.ceil(4 * number);
+
+    for (let i = 0; i < lighthouses.length && i < count; i++) {
+      const [cell, vertex] = lighthouses[i];
+      const id = appendMarker(cell, "lighthouse");
+      const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
+      notes.push({id, name: getAdjective(proper) + " Lighthouse" + name, legend: `A lighthouse to keep the navigation safe`});
+    }
+  }
+
+  function addWaterfalls(number) {
+    const {cells} = pack;
+
+    const waterfalls = cells.i.filter(i => cells.r[i] && cells.h[i] > 70);
+    if (waterfalls.length) addMarker("waterfall", "⟱", 50, 54, 16.5);
+    const count = Math.ceil(3 * number);
+
+    for (let i = 0; i < waterfalls.length && i < count; i++) {
+      const cell = waterfalls[i];
+      const id = appendMarker(cell, "waterfall");
+      const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
+      notes.push({id, name: getAdjective(proper) + " Waterfall" + name, legend: `An extremely beautiful waterfall`});
+    }
+  }
+
+  function addBattlefields(number) {
+    const {cells, states} = pack;
+
+    let battlefields = Array.from(cells.i).filter(i => cells.state[i] && cells.pop[i] > 2 && cells.h[i] < 50 && cells.h[i] > 25);
+    let count = battlefields.length < 100 ? 0 : Math.ceil((battlefields.length / 500) * number);
+    if (count) addMarker("battlefield", "⚔️", 50, 52, 12);
+
+    while (count && battlefields.length) {
+      const cell = battlefields.splice(Math.floor(Math.random() * battlefields.length), 1);
+      const id = appendMarker(cell, "battlefield");
+      const campaign = ra(states[cells.state[cell]].campaigns);
+      const date = generateDate(campaign.start, campaign.end);
+      const name = Names.getCulture(cells.culture[cell]) + " Battlefield";
+      const legend = `A historical battle of the ${campaign.name}. \r\nDate: ${date} ${options.era}`;
+      notes.push({id, name, legend});
+      count--;
+    }
+  }
+
+  function addMarker(id, icon, x, y, size) {
+    const markers = svg.select("#defs-markers");
+    if (markers.select("#marker_" + id).size()) return;
+
+    const symbol = markers
+      .append("symbol")
+      .attr("id", "marker_" + id)
+      .attr("viewBox", "0 0 30 30");
+    symbol.append("path").attr("d", "M6,19 l9,10 L24,19").attr("fill", "#000000").attr("stroke", "none");
+    symbol.append("circle").attr("cx", 15).attr("cy", 15).attr("r", 10).attr("fill", "#ffffff").attr("stroke", "#000000").attr("stroke-width", 1);
+    symbol
+      .append("text")
+      .attr("x", x + "%")
+      .attr("y", y + "%")
+      .attr("fill", "#000000")
+      .attr("stroke", "#3200ff")
+      .attr("stroke-width", 0)
+      .attr("font-size", size + "px")
+      .attr("dominant-baseline", "central")
+      .text(icon);
+  }
+
+  function appendMarker(cell, type) {
+    const {cells} = pack;
+
+    const [x, y] = cells.p[cell];
+    const id = getNextId("markerElement");
+    const name = "#marker_" + type;
+
+    markers
+      .append("use")
+      .attr("id", id)
+      .attr("xlink:href", name)
+      .attr("data-id", name)
+      .attr("data-x", x)
+      .attr("data-y", y)
+      .attr("x", x - 15)
+      .attr("y", y - 30)
+      .attr("data-size", 1)
+      .attr("width", 30)
+      .attr("height", 30);
+
+    return id;
+  }
+
+  return {generate};
+})();
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 739e9a24..436c44f4 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -216,7 +216,7 @@ function editHeightmap() {
     Lakes.generateName();
 
     Military.generate();
-    addMarkers();
+    Markers.generate();
     addZones();
     TIME && console.timeEnd("regenerateErasedData");
     INFO && console.groupEnd("Edit Heightmap");
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index 81edffe8..3880f2bb 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -427,7 +427,7 @@ function regenerateMarkers(event) {
       })
       .remove();
 
-    addMarkers(number);
+    Markers.generate();
     if (!layerIsOn("toggleMarkers")) toggleMarkers();
   }
 }