refactor(es modules): continue migration

modules/ui/3d.js

@@ -1,4 +1,4 @@
-"use strict";
+import {tip} from "/src/scripts/tooltips";
 
 window.ThreeD = (function () {
   const options = {
@@ -242,7 +242,11 @@ window.ThreeD = (function () {
     context2d.fillStyle = color;
     context2d.fillText(text, 0, size * quality);
 
-    return textureToSprite(context2d.canvas.toDataURL(), context2d.canvas.width / quality, context2d.canvas.height / quality);
+    return textureToSprite(
+      context2d.canvas.toDataURL(),
+      context2d.canvas.width / quality,
+      context2d.canvas.height / quality
+    );
   }
 
   function get3dCoords(baseX, baseY) {
@@ -297,8 +301,20 @@ window.ThreeD = (function () {
 
     const city_icon_material = new THREE.MeshPhongMaterial({color: cityOptions.iconColor});
     const town_icon_material = new THREE.MeshPhongMaterial({color: townOptions.iconColor});
-    const city_icon_geometry = new THREE.CylinderGeometry(cityOptions.iconSize * 2, cityOptions.iconSize * 2, cityOptions.iconSize, 16, 1);
-    const town_icon_geometry = new THREE.CylinderGeometry(townOptions.iconSize * 2, townOptions.iconSize * 2, townOptions.iconSize, 16, 1);
+    const city_icon_geometry = new THREE.CylinderGeometry(
+      cityOptions.iconSize * 2,
+      cityOptions.iconSize * 2,
+      cityOptions.iconSize,
+      16,
+      1
+    );
+    const town_icon_geometry = new THREE.CylinderGeometry(
+      townOptions.iconSize * 2,
+      townOptions.iconSize * 2,
+      townOptions.iconSize,
+      16,
+      1
+    );
     const line_material = new THREE.LineBasicMaterial({color: cityOptions.iconColor});
 
     // burg labels
@@ -464,7 +480,10 @@ window.ThreeD = (function () {
 
     // scene
     scene = new THREE.Scene();
-    scene.background = new THREE.TextureLoader().load("https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png", render);
+    scene.background = new THREE.TextureLoader().load(
+      "https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png",
+      render
+    );
 
     // Renderer
     Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true});

modules/ui/battle-screen.js

@@ -1,4 +1,5 @@
 import {last} from "/src/utils/arrayUtils";
+import {tip} from "/src/scripts/tooltips";
 
 export class Battle {
   constructor(attacker, defender) {

modules/ui/biomes-editor.js

@@ -1,6 +1,6 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editBiomes() {
   if (customization) return;

modules/ui/burg-editor.js

@@ -1,5 +1,5 @@
 import {findCell} from "/src/utils/graphUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editBurg(id) {
   if (customization) return;

modules/ui/burgs-overview.js

@@ -1,6 +1,6 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function overviewBurgs() {
   if (customization) return;

modules/ui/coastline-editor.js

@@ -1,4 +1,5 @@
 import {getPackPolygon} from "/src/utils/graphUtils";
+import {tip} from "/src/scripts/tooltips";
 
 export function editCoastline(node = d3.event.target) {
   if (customization) return;

modules/ui/diplomacy-editor.js

@@ -1,6 +1,6 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editDiplomacy() {
   if (customization) return;

modules/ui/editors.js

@@ -1,6 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
 import {byId} from "/src/utils/shorthands";
+import {tip} from "/src/scripts/tooltips";
 
 // clear elSelected variable
 export function unselect() {

modules/ui/emblems-editor.js

@@ -1,4 +1,5 @@
 import {clearMainTip} from "/src/scripts/tooltips";
+import {tip} from "/src/scripts/tooltips";
 
 export function editEmblem(type, id, el) {
   if (customization) return;

modules/ui/heightmap-editor.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findGridCell, findGridAll, findCell, getPackPolygon, getGridPolygon} from "/src/utils/graphUtils";
 import {last, createTypedArray} from "/src/utils/arrayUtils";
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 import {byId} from "/src/utils/shorthands";
 
 export function editHeightmap(options) {

modules/ui/ice-editor.js

@@ -1,5 +1,5 @@
 import {findGridCell, getGridPolygon} from "/src/utils/graphUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editIce() {
   if (customization) return;

modules/ui/labels-editor.js

@@ -1,5 +1,5 @@
 import {findCell} from "/src/utils/graphUtils";
-import {showMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip} from "/src/scripts/tooltips";
 
 export function editLabel() {
   if (customization) return;

modules/ui/lakes-editor.js

@@ -1,4 +1,5 @@
 import {getPackPolygon} from "/src/utils/graphUtils";
+import {tip} from "/src/scripts/tooltips";
 
 export function editLake() {
   if (customization) return;

modules/ui/layers.js

@@ -3,6 +3,7 @@ import {invokeActiveZooming} from "../activeZooming";
 import {getGridPolygon} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
 import {stored, store} from "/src/utils/shorthands";
+import {tip} from "/src/scripts/tooltips";
 import {byId} from "/src/utils/shorthands";
 
 let presets = {};

modules/ui/military-overview.js

@@ -1,5 +1,6 @@
-"use strict";
-function overviewMilitary() {
+import {tip} from "/src/scripts/tooltips";
+
+export function overviewMilitary() {
   if (customization) return;
   closeDialogs("#militaryOverview, .stable");
   if (!layerIsOn("toggleStates")) toggleStates();

modules/ui/namesbase-editor.js

@@ -1,4 +1,5 @@
 import {unique} from "/src/utils/arrayUtils";
+import {tip} from "/src/scripts/tooltips";
 
 export function editNamesbase() {
   if (customization) return;

modules/ui/notes-editor.js

@@ -1,6 +1,6 @@
-"use strict";
+import {tip} from "/src/scripts/tooltips";
 
-function editNotes(id, name) {
+export function editNotes(id, name) {
   // elements
   const notesLegend = document.getElementById("notesLegend");
   const notesName = document.getElementById("notesName");

modules/ui/options.js

@@ -1,7 +1,7 @@
 import {applyOption} from "./general";
 import {last} from "/src/utils/arrayUtils";
 import {lock, locked} from "/src/scripts/options/lock";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 import {byId, stored} from "/src/utils/shorthands";
 
 $("#optionsContainer").draggable({handle: ".drag-trigger", snap: "svg", snapMode: "both"});

modules/ui/provinces-editor.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findAll, findCell, getPackPolygon, isLand} from "/src/utils/graphUtils";
 import {unique} from "/src/utils/arrayUtils";
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editProvinces() {
   if (customization) return;

modules/ui/regiment-editor.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editRegiment(selector) {
   if (customization) return;

modules/ui/regiments-overview.js

@@ -1,6 +1,6 @@
 import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function overviewRegiments(state) {
   if (customization) return;

modules/ui/relief-editor.js

@@ -1,6 +1,6 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editReliefIcon() {
   if (customization) return;

modules/ui/rivers-creator.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {getPackPolygon, findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function createRiver() {
   if (customization) return;

modules/ui/rivers-editor.js

@@ -1,5 +1,5 @@
 import {findCell, getPackPolygon} from "/src/utils/graphUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editRiver(id) {
   if (customization) return;

modules/ui/routes-editor.js

@@ -1,4 +1,4 @@
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editRoute(onClick) {
   if (customization) return;

modules/ui/style.js

@@ -1,5 +1,4 @@
-// UI module to control the style
-"use strict";
+import {tip} from "/src/scripts/tooltips";
 
 // add available filters to lists
 {

modules/ui/stylePresets.js

@@ -1,5 +1,4 @@
-"use strict";
-// UI module to control the style presets
+import {tip} from "/src/scripts/tooltips";
 
 const systemPresets = [
   "default",

modules/ui/temperature-graph.js

@@ -1,6 +1,6 @@
-"use strict";
+import {tip} from "/src/scripts/tooltips";
 
-function showBurgTemperatureGraph(id) {
+export function showBurgTemperatureGraph(id) {
   const b = pack.burgs[id];
   const lat = mapCoordinates.latN - (b.y / graphHeight) * mapCoordinates.latT;
   const burgTemp = grid.cells.temp[pack.cells.g[b.cell]];
@@ -48,7 +48,10 @@ function showBurgTemperatureGraph(id) {
   // Standard deviation for average temperature for the year from [0, 1] to [min, max]
   const yearSig = lstOut[0] * 62.9466411977018 + 0.28613807855649165;
   // Standard deviation for the difference between the minimum and maximum temperatures for the year
-  const yearDelTmpSig = lstOut[1] * 13.541688670361175 + 0.1414213562373084 > yearSig ? yearSig : lstOut[1] * 13.541688670361175 + 0.1414213562373084;
+  const yearDelTmpSig =
+    lstOut[1] * 13.541688670361175 + 0.1414213562373084 > yearSig
+      ? yearSig
+      : lstOut[1] * 13.541688670361175 + 0.1414213562373084;
   // Expected value for the difference between the minimum and maximum temperatures for the year
   const yearDelTmpMu = lstOut[2] * 15.266666666666667 + 0.6416666666666663;
 
@@ -67,7 +70,20 @@ function showBurgTemperatureGraph(id) {
   const year = new Date().getFullYear(); // use current year
   const startDate = new Date(year, 0, 1);
   const endDate = new Date(year, 11, 31);
-  const months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+  const months = [
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December"
+  ];
 
   const xscale = d3.scaleTime().domain([startDate, endDate]).range([0, chartWidth]);
   const yscale = d3.scaleLinear().domain([minT, maxT]).range([chartHeight, 0]);
@@ -91,7 +107,11 @@ function showBurgTemperatureGraph(id) {
   });
 
   drawGraph();
-  $("#alert").dialog({title: "Annual temperature in " + b.name, width: "auto", position: {my: "center", at: "center", of: "svg"}});
+  $("#alert").dialog({
+    title: "Annual temperature in " + b.name,
+    width: "auto",
+    position: {my: "center", at: "center", of: "svg"}
+  });
 
   function drawGraph() {
     alertMessage.innerHTML = "";
@@ -109,11 +129,26 @@ function showBurgTemperatureGraph(id) {
     const legendX = n => (chartWidth * n) / 4;
     const legendTextX = n => legendX(n) + 10;
     legend.append("circle").attr("cx", legendX(1)).attr("cy", legendY).attr("r", 4).style("fill", "red");
-    legend.append("text").attr("x", legendTextX(1)).attr("y", legendY).attr("alignment-baseline", "central").text("Day temperature");
+    legend
+      .append("text")
+      .attr("x", legendTextX(1))
+      .attr("y", legendY)
+      .attr("alignment-baseline", "central")
+      .text("Day temperature");
     legend.append("circle").attr("cx", legendX(2)).attr("cy", legendY).attr("r", 4).style("fill", "orange");
-    legend.append("text").attr("x", legendTextX(2)).attr("y", legendY).attr("alignment-baseline", "central").text("Mean temperature");
+    legend
+      .append("text")
+      .attr("x", legendTextX(2))
+      .attr("y", legendY)
+      .attr("alignment-baseline", "central")
+      .text("Mean temperature");
     legend.append("circle").attr("cx", legendX(3)).attr("cy", legendY).attr("r", 4).style("fill", "blue");
-    legend.append("text").attr("x", legendTextX(3)).attr("y", legendY).attr("alignment-baseline", "central").text("Night temperature");
+    legend
+      .append("text")
+      .attr("x", legendTextX(3))
+      .attr("y", legendY)
+      .attr("alignment-baseline", "central")
+      .text("Night temperature");
 
     const xGrid = d3.axisBottom(xscale).ticks().tickSize(-chartHeight);
     const yGrid = d3.axisLeft(yscale).ticks(5).tickSize(-chartWidth);
@@ -146,9 +181,24 @@ function showBurgTemperatureGraph(id) {
     axis.select("path.domain").attr("d", `M0.5,0.5 H${chartWidth + 0.5}`);
 
     const curves = chart.append("g").attr("fill", "none").style("stroke-width", 2.5);
-    curves.append("path").attr("d", getCurve(tempMean)).attr("data-type", "daily").attr("stroke", "orange").on("mousemove", printVal);
-    curves.append("path").attr("d", getCurve(tempMin)).attr("data-type", "night").attr("stroke", "blue").on("mousemove", printVal);
-    curves.append("path").attr("d", getCurve(tempMax)).attr("data-type", "day").attr("stroke", "red").on("mousemove", printVal);
+    curves
+      .append("path")
+      .attr("d", getCurve(tempMean))
+      .attr("data-type", "daily")
+      .attr("stroke", "orange")
+      .on("mousemove", printVal);
+    curves
+      .append("path")
+      .attr("d", getCurve(tempMin))
+      .attr("data-type", "night")
+      .attr("stroke", "blue")
+      .on("mousemove", printVal);
+    curves
+      .append("path")
+      .attr("d", getCurve(tempMax))
+      .attr("data-type", "day")
+      .attr("stroke", "red")
+      .on("mousemove", printVal);
 
     function printVal() {
       const [x, y] = d3.mouse(this);

modules/ui/tools.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
 import {last} from "/src/utils/arrayUtils";
-import {clearMainTip} from "/src/scripts/tooltips";
+import {tip, clearMainTip} from "/src/scripts/tooltips";
 
 // module to control the Tools options (click to edit, to re-geenerate, tp add)
 

modules/ui/units-editor.js

@@ -1,5 +1,6 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findCell} from "/src/utils/graphUtils";
+import {tip} from "/src/scripts/tooltips";
 
 export function editUnits() {
   closeDialogs("#unitsEditor, .stable");

modules/ui/world-configurator.js

@@ -1,4 +1,6 @@
-function editWorld() {
+import {tip} from "/src/scripts/tooltips";
+
+export function editWorld() {
   if (customization) return;
   $("#worldConfigurator").dialog({
     title: "Configure World",

modules/ui/zones-editor.js

@@ -1,7 +1,7 @@
 import {restoreDefaultEvents} from "/src/scripts/events";
 import {findAll, findCell, getPackPolygon} from "/src/utils/graphUtils";
 import {unique} from "/src/utils/arrayUtils";
-import {showMainTip, clearMainTip} from "/src/scripts/tooltips";
+import {tip, showMainTip, clearMainTip} from "/src/scripts/tooltips";
 
 export function editZones() {
   closeDialogs();