pull master

modules/io/export.js

@@ -10,7 +10,12 @@ async function saveSVG() {
   link.href = url;
   link.click();
 
-  tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check. You can set image scale in options`, true, "success", 5000);
+  tip(
+    `${link.download} is saved. Open "Downloads" screen (crtl + J) to check. You can set image scale in options`,
+    true,
+    "success",
+    5000
+  );
   TIME && console.timeEnd("saveSVG");
 }
 
@@ -36,7 +41,12 @@ async function savePNG() {
       window.setTimeout(function () {
         canvas.remove();
         window.URL.revokeObjectURL(link.href);
-        tip(`${link.download} is saved. Open "Downloads" screen (crtl + J) to check. You can set image scale in options`, true, "success", 5000);
+        tip(
+          `${link.download} is saved. Open "Downloads" screen (crtl + J) to check. You can set image scale in options`,
+          true,
+          "success",
+          5000
+        );
       }, 1000);
     });
   };
@@ -140,7 +150,15 @@ async function saveTiles() {
 
 // parse map svg to object url
 async function getMapURL(type, options = {}) {
-  const {debug = false, globe = false, noLabels = false, noWater = false, noScaleBar = false, noIce = false, fullMap = false} = options;
+  const {
+    debug = false,
+    globe = false,
+    noLabels = false,
+    noWater = false,
+    noScaleBar = false,
+    noIce = false,
+    fullMap = false
+  } = options;
 
   if (fullMap) drawScaleBar(1);
 
@@ -222,12 +240,14 @@ async function getMapURL(type, options = {}) {
   if (location.hostname && cloneEl.getElementById("oceanicPattern")) {
     const el = cloneEl.getElementById("oceanicPattern");
     const url = el.getAttribute("href");
-    await new Promise(resolve => {
-      getBase64(url, base64 => {
-        el.setAttribute("href", base64);
-        resolve();
+    if (url) {
+      await new Promise(resolve => {
+        getBase64(url, base64 => {
+          el.setAttribute("href", base64);
+          resolve();
+        });
       });
-    });
+    }
   }
 
   // add relief icons
@@ -315,7 +335,8 @@ async function getMapURL(type, options = {}) {
 
   clone.remove();
 
-  const serialized = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>` + new XMLSerializer().serializeToString(cloneEl);
+  const serialized =
+    `<?xml version="1.0" encoding="UTF-8" standalone="no"?>` + new XMLSerializer().serializeToString(cloneEl);
   const blob = new Blob([serialized], {type: "image/svg+xml;charset=utf-8"});
   const url = window.URL.createObjectURL(blob);
   window.setTimeout(() => window.URL.revokeObjectURL(url), 5000);
@@ -461,7 +482,7 @@ function saveGeoJSON_Markers() {
     const coordinates = getCoordinates(x, y, 4);
     const id = `marker${i}`;
     const note = notes.find(note => note.id === id);
-    const properties = {id, type, icon, ...note, size, fill, stroke};
+    const properties = {id, type, icon, x, y, ...note, size, fill, stroke};
     return {type: "Feature", geometry: {type: "Point", coordinates}, properties};
   });
 

modules/io/load.js

@@ -1,15 +1,13 @@
 "use strict";
 // Functions to load and parse .map files
 
-function quickLoad() {
-  ldb.get("lastMap", blob => {
-    if (blob) {
-      loadMapPrompt(blob);
-    } else {
-      tip("No map stored. Save map to storage first", true, "error", 2000);
-      ERROR && console.error("No map stored");
-    }
-  });
+async function quickLoad() {
+  const blob = await ldb.get("lastMap");
+  if (blob) loadMapPrompt(blob);
+  else {
+    tip("No map stored. Save map to browser storage first", true, "error", 2000);
+    ERROR && console.error("No map stored");
+  }
 }
 
 async function loadFromDropbox() {

modules/io/save.js

@@ -3,8 +3,6 @@
 
 // prepare map data for saving
 function getMapData() {
-  TIME && console.time("createMapData");
-
   const date = new Date();
   const dateString = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
   const license = "File can be loaded in azgaar.github.io/Fantasy-Map-Generator";
@@ -116,13 +114,13 @@ function getMapData() {
     fonts,
     markers
   ].join("\r\n");
-  TIME && console.timeEnd("createMapData");
   return mapData;
 }
 
 // Download .map file
 function dowloadMap() {
-  if (customization) return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
+  if (customization)
+    return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
   closeDialogs("#alert");
 
   const mapData = getMapData();
@@ -137,7 +135,8 @@ function dowloadMap() {
 }
 
 async function saveToDropbox() {
-  if (customization) return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
+  if (customization)
+    return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
   closeDialogs("#alert");
   const mapData = getMapData();
   const filename = getFileName() + ".map";
@@ -150,12 +149,36 @@ async function saveToDropbox() {
   }
 }
 
-function quickSave() {
-  if (customization) return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
+async function initiateAutosave() {
+  const MINUTE = 60000; // munite in milliseconds
+  let lastSavedAt = Date.now();
+
+  async function autosave() {
+    const timeoutMinutes = byId("autosaveIntervalOutput").valueAsNumber;
+    if (!timeoutMinutes) return;
+
+    const diffInMinutes = (Date.now() - lastSavedAt) / MINUTE;
+    if (diffInMinutes < timeoutMinutes) return;
+    if (customization) return tip("Autosave: map cannot be saved in edit mode", false, "warning", 2000);
+
+    tip("Autosave: saving map...", false, "warning", 3000);
+    const mapData = getMapData();
+    const blob = new Blob([mapData], {type: "text/plain"});
+    await ldb.set("lastMap", blob);
+    console.log("Autosaved at", new Date().toLocaleTimeString());
+    lastSavedAt = Date.now();
+  }
+
+  setInterval(autosave, MINUTE / 2);
+}
+
+async function quickSave() {
+  if (customization)
+    return tip("Map cannot be saved when edit mode is active, please exit the mode first", false, "error");
 
   const mapData = getMapData();
   const blob = new Blob([mapData], {type: "text/plain"});
-  if (blob) ldb.set("lastMap", blob); // auto-save map
+  await ldb.set("lastMap", blob); // auto-save map
   tip("Map is saved to browser memory. Please also save as .map file to secure progress", true, "success", 2000);
 }