Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into urquhart-routes

modules/ui/editors.js

@@ -1225,7 +1225,7 @@ function refreshAllEditors() {
 // dynamically loaded editors
 async function editStates() {
   if (customization) return;
-  const Editor = await import("../dynamic/editors/states-editor.js?v=1.96.06");
+  const Editor = await import("../dynamic/editors/states-editor.js?v=1.97.06");
   Editor.open();
 }
 

modules/ui/elevation-profile.js

@@ -82,8 +82,8 @@ function showElevationProfile(data, routeLen, isRiver) {
   draw();
 
   function downloadCSV() {
-    let data =
-      "Point,X,Y,Cell,Height,Height value,Population,Burg,Burg population,Biome,Biome color,Culture,Culture color,Religion,Religion color,Province,Province color,State,State color\n"; // headers
+    let csv =
+      "Id,x,y,lat,lon,Cell,Height,Height value,Population,Burg,Burg population,Biome,Biome color,Culture,Culture color,Religion,Religion color,Province,Province color,State,State color\n"; // headers
 
     for (let k = 0; k < chartData.points.length; k++) {
       let cell = chartData.cell[k];
@@ -96,35 +96,39 @@ function showElevationProfile(data, routeLen, isRiver) {
       let pop = pack.cells.pop[cell];
       let h = pack.cells.h[cell];
 
-      data += k + 1 + ",";
-      data += chartData.points[k][0] + ",";
-      data += chartData.points[k][1] + ",";
-      data += cell + ",";
-      data += getHeight(h) + ",";
-      data += h + ",";
-      data += rn(pop * populationRate) + ",";
+      csv += k + 1 + ",";
+      const [x, y] = pack.cells.p[data[k]];
+      csv += x + ",";
+      csv += y + ",";
+      const lat = getLatitude(y, 2);
+      const lon = getLongitude(x, 2);
+      csv += lat + ",";
+      csv += lon + ",";
+      csv += cell + ",";
+      csv += getHeight(h) + ",";
+      csv += h + ",";
+      csv += rn(pop * populationRate) + ",";
       if (burg) {
-        data += pack.burgs[burg].name + ",";
-        data += pack.burgs[burg].population * populationRate * urbanization + ",";
+        csv += pack.burgs[burg].name + ",";
+        csv += pack.burgs[burg].population * populationRate * urbanization + ",";
       } else {
-        data += ",0,";
+        csv += ",0,";
       }
-      data += biomesData.name[biome] + ",";
-      data += biomesData.color[biome] + ",";
-      data += pack.cultures[culture].name + ",";
-      data += pack.cultures[culture].color + ",";
-      data += pack.religions[religion].name + ",";
-      data += pack.religions[religion].color + ",";
-      data += pack.provinces[province].name + ",";
-      data += pack.provinces[province].color + ",";
-      data += pack.states[state].name + ",";
-      data += pack.states[state].color + ",";
-
-      data = data + "\n";
+      csv += biomesData.name[biome] + ",";
+      csv += biomesData.color[biome] + ",";
+      csv += pack.cultures[culture].name + ",";
+      csv += pack.cultures[culture].color + ",";
+      csv += pack.religions[religion].name + ",";
+      csv += pack.religions[religion].color + ",";
+      csv += pack.provinces[province].name + ",";
+      csv += pack.provinces[province].color + ",";
+      csv += pack.states[state].name + ",";
+      csv += pack.states[state].color + ",";
+      csv += "\n";
     }
 
     const name = getFileName("elevation profile") + ".csv";
-    downloadFile(data, name);
+    downloadFile(csv, name);
   }
 
   function draw() {

modules/ui/notes-editor.js

@@ -64,7 +64,7 @@ function editNotes(id, name) {
 
   async function initEditor() {
     if (!window.tinymce) {
-      const url = "https://cdn.tiny.cloud/1/4i6a79ymt2y0cagke174jp3meoi28vyecrch12e5puyw3p9a/tinymce/5/tinymce.min.js";
+      const url = "https://azgaar.github.io/Fantasy-Map-Generator/libs/tinymce/tinymce.min.js";
       try {
         await import(url);
       } catch (error) {
@@ -79,11 +79,13 @@ function editNotes(id, name) {
     }
 
     if (window.tinymce) {
+      window.tinymce._setBaseUrl("https://azgaar.github.io/Fantasy-Map-Generator/libs/tinymce");
       tinymce.init({
+        license_key: "gpl",
         selector: "#notesLegend",
         height: "90%",
         menubar: false,
-        plugins: `autolink lists link charmap print code fullscreen image link media table paste hr wordcount`,
+        plugins: `autolink lists link charmap code fullscreen image link media table wordcount`,
         toolbar: `code | undo redo | removeformat | bold italic strikethrough | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | fontselect fontsizeselect | blockquote hr charmap | print fullscreen`,
         media_alt_source: false,
         media_poster: false,

modules/ui/options.js

@@ -119,9 +119,9 @@ function updateOutputToFollowInput(ev) {
 
 // Option listeners
 const optionsContent = byId("optionsContent");
-optionsContent.addEventListener("input", function (event) {
-  const id = event.target.id;
-  const value = event.target.value;
+
+optionsContent.addEventListener("input", event => {
+  const {id, value} = event.target;
   if (id === "mapWidthInput" || id === "mapHeightInput") mapSizeInputChange();
   else if (id === "pointsInput") changeCellsDensity(+value);
   else if (id === "culturesSet") changeCultureSet();
@@ -133,10 +133,8 @@ optionsContent.addEventListener("input", function (event) {
   else if (id === "transparencyInput") changeDialogsTheme(themeColorInput.value, value);
 });
 
-optionsContent.addEventListener("change", function (event) {
-  const id = event.target.id;
-  const value = event.target.value;
-
+optionsContent.addEventListener("change", event => {
+  const {id, value} = event.target;
   if (id === "zoomExtentMin" || id === "zoomExtentMax") changeZoomExtent(value);
   else if (id === "optionsSeed") generateMapWithSeed("seed change");
   else if (id === "uiSizeInput" || id === "uiSizeOutput") changeUiSize(value);
@@ -146,8 +144,8 @@ optionsContent.addEventListener("change", function (event) {
   else if (id === "stateLabelsModeInput") options.stateLabelsMode = value;
 });
 
-optionsContent.addEventListener("click", function (event) {
-  const id = event.target.id;
+optionsContent.addEventListener("click", event => {
+  const {id} = event.target;
   if (id === "restoreDefaultCanvasSize") restoreDefaultCanvasSize();
   else if (id === "optionsMapHistory") showSeedHistoryDialog();
   else if (id === "optionsCopySeed") copyMapURL();
@@ -327,6 +325,7 @@ const cellsDensityMap = {
 };
 
 function changeCellsDensity(value) {
+  pointsInput.value = value;
   const cells = cellsDensityMap[value] || 1000;
   pointsInput.dataset.cells = cells;
   pointsOutputFormatted.value = getCellsDensityValue(cells);
@@ -536,6 +535,7 @@ function applyStoredOptions() {
     const key = localStorage.key(i);
 
     if (key === "speakerVoice") continue;
+
     const input = byId(key + "Input") || byId(key);
     const output = byId(key + "Output");
 
@@ -544,6 +544,8 @@ function applyStoredOptions() {
     if (output) output.value = value;
     lock(key);
 
+    if (key === "points") changeCellsDensity(+value);
+
     // add saved style presets to options
     if (key.slice(0, 5) === "style") applyOption(stylePreset, key, key.slice(5));
   }
@@ -581,6 +583,7 @@ function randomizeOptions() {
   const randomize = new URL(window.location.href).searchParams.get("options") === "default"; // ignore stored options
 
   // 'Options' settings
+  if (randomize || !locked("points")) changeCellsDensity(4); // reset to default, no need to randomize
   if (randomize || !locked("template")) randomizeHeightmapTemplate();
   if (randomize || !locked("regions")) regionsInput.value = regionsOutput.value = gauss(18, 5, 2, 30);
   if (randomize || !locked("provinces")) provincesInput.value = provincesOutput.value = gauss(20, 10, 20, 100);
@@ -774,7 +777,7 @@ function showExportPane() {
 }
 
 async function exportToJson(type) {
-  const {exportToJson} = await import("../dynamic/export-json.js?v=1.96.00");
+  const {exportToJson} = await import("../dynamic/export-json.js?v=1.97.08");
   exportToJson(type);
 }
 

modules/ui/world-configurator.js

@@ -113,9 +113,11 @@ function editWorld() {
 
     function toKilometer(v) {
       if (unit === "km") return v;
-      else if (unit === "mi") return v * 1.60934;
-      else if (unit === "lg") return v * 5.556;
-      else if (unit === "vr") return v * 1.0668;
+      if (unit === "mi") return v * 1.60934;
+      if (unit === "lg") return v * 4.828;
+      if (unit === "vr") return v * 1.0668;
+      if (unit === "nmi") return v * 1.852;
+      if (unit === "nlg") return v * 5.556;
       return 0; // 0 if distanceUnitInput is a custom unit
     }