- Maps are saved in .map format, that can be loaded back via the Load in menu. There is no way to
- restore the progress if file is lost. Please keep old .map files on your machine or cloud storage as
+ Maps are saved in .gz format, that can be loaded back via the Load in menu. There is no way to
+ restore the progress if file is lost. Please keep old .gz or .map files on your machine or cloud storage as
backups.
This operation is destructive and irreversible. It will create a completely new map based on the current one.
- Don't forget to save the current project as a .map file first!
+ Don't forget to save the current project as a .gz file first!
-
Drop a .map file to open
+
Drop a .gz or .map file to open
-
+
@@ -7930,7 +7930,7 @@
-
+
@@ -7963,15 +7963,15 @@
-
-
+
+
-
+
@@ -8001,13 +8001,12 @@
-
+
-
-
-
+
+
diff --git a/main.js b/main.js
index 4c40de43..ab36463b 100644
--- a/main.js
+++ b/main.js
@@ -270,7 +270,7 @@ async function checkLoadParameters() {
const url = new URL(window.location.href);
const params = url.searchParams;
- // of there is a valid maplink, try to load .map file from URL
+ // of there is a valid maplink, try to load .gz/.map file from URL
if (params.get("maplink")) {
WARN && console.warn("Load map from URL");
const maplink = params.get("maplink");
@@ -574,9 +574,9 @@ void (function addDragToUpload() {
overlay.style.display = "none";
if (e.dataTransfer.items == null || e.dataTransfer.items.length !== 1) return; // no files or more than one
const file = e.dataTransfer.items[0].getAsFile();
- if (file.name.indexOf(".map") == -1) {
- // not a .map file
- alertMessage.innerHTML = "Please upload a .map file you have previously downloaded";
+ if (!file.name.endsWith(".map") && !file.name.endsWith(".gz")) {
+ // not a .gz/.map file
+ alertMessage.innerHTML = "Please upload a .gz or .map file you have previously downloaded";
$("#alert").dialog({
resizable: false,
title: "Invalid file format",
@@ -596,7 +596,7 @@ void (function addDragToUpload() {
if (closeDialogs) closeDialogs();
uploadMap(file, () => {
overlay.style.display = "none";
- overlay.innerHTML = "Drop a .map file to open";
+ overlay.innerHTML = "Drop a .gz or .map file to open";
});
});
})();
diff --git a/modules/dynamic/auto-update.js b/modules/dynamic/auto-update.js
index 44f84283..99ff277a 100644
--- a/modules/dynamic/auto-update.js
+++ b/modules/dynamic/auto-update.js
@@ -1,6 +1,6 @@
"use strict";
-// update old .map version to the current one
+// update old .gz/.map version to the current one
export function resolveVersionConflicts(version) {
if (version < 1) {
// v1.0 added a new religions layer
diff --git a/modules/io/load.js b/modules/io/load.js
index 33d7eea4..ce662d0a 100644
--- a/modules/io/load.js
+++ b/modules/io/load.js
@@ -1,6 +1,5 @@
"use strict";
-// Functions to load and parse .map files
-
+// Functions to load and parse .gz/.map files
async function quickLoad() {
const blob = await ldb.get("lastMap");
if (blob) loadMapPrompt(blob);
@@ -77,7 +76,7 @@ function loadMapPrompt(blob) {
function loadMapFromURL(maplink, random) {
const URL = decodeURIComponent(maplink);
- fetch(URL, {method: "GET", mode: "cors"})
+ fetch(URL, { method: "GET", mode: "cors" })
.then(response => {
if (response.ok) return response.blob();
throw new Error("Cannot load map from URL");
@@ -91,9 +90,8 @@ function loadMapFromURL(maplink, random) {
function showUploadErrorMessage(error, URL, random) {
ERROR && console.error(error);
- alertMessage.innerHTML = /* html */ `Cannot load map from the ${link(URL, "link provided")}. ${
- random ? `A new random map is generated. ` : ""
- } Please ensure the
+ alertMessage.innerHTML = /* html */ `Cannot load map from the ${link(URL, "link provided")}. ${random ? `A new random map is generated. ` : ""
+ } Please ensure the
linked file is reachable and CORS is allowed on server side`;
$("#alert").dialog({
title: "Loading error",
@@ -112,11 +110,11 @@ function uploadMap(file, callback) {
const currentVersion = parseFloat(version);
const fileReader = new FileReader();
- fileReader.onload = function (fileLoadedEvent) {
+ fileReader.onloadend = async function (fileLoadedEvent) {
if (callback) callback();
document.getElementById("coas").innerHTML = ""; // remove auto-generated emblems
const result = fileLoadedEvent.target.result;
- const [mapData, mapVersion] = parseLoadedResult(result);
+ const [mapData, mapVersion] = await parseLoadedResult(result);
const isInvalid = !mapData || isNaN(mapVersion) || mapData.length < 26 || !mapData[5];
const isUpdated = mapVersion === currentVersion;
@@ -131,18 +129,37 @@ function uploadMap(file, callback) {
if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion);
};
- fileReader.readAsText(file, "UTF-8");
+ fileReader.readAsArrayBuffer(file);
}
-
-function parseLoadedResult(result) {
+async function uncompressMapData(compressedMapData) {
+ console.log("trying to uncompress:", compressedMapData);
try {
+ const uncompressedStream = new Blob([compressedMapData]).stream().pipeThrough(new DecompressionStream("gzip"));
+ let uncompressedData = [];
+ for await (const chunk of uncompressedStream) {
+ uncompressedData = uncompressedData.concat(Array.from(chunk));
+ }
+ return new Uint8Array(uncompressedData);
+ }
+ catch (error) {
+ console.error(error);
+ return null;
+ }
+}
+async function parseLoadedResult(result) {
+ try {
+ const resultAsString = new TextDecoder().decode(result);
// data can be in FMG internal format or base64 encoded
- const isDelimited = result.substr(0, 10).includes("|");
- const decoded = isDelimited ? result : decodeURIComponent(atob(result));
+ const isDelimited = resultAsString.substring(0, 10).includes("|");
+ const decoded = isDelimited ? resultAsString : decodeURIComponent(atob(resultAsString));
const mapData = decoded.split("\r\n");
const mapVersion = parseFloat(mapData[0].split("|")[0] || mapData[0]);
return [mapData, mapVersion];
} catch (error) {
+ const uncompressedData = await uncompressMapData(result);
+ if (uncompressedData !== null) {
+ return parseLoadedResult(uncompressedData);
+ }
ERROR && console.error(error);
return [null, null];
}
@@ -153,7 +170,7 @@ function showUploadMessage(type, mapData, mapVersion) {
let message, title, canBeLoaded;
if (type === "invalid") {
- message = `The file does not look like a valid .map file. Please check the data format`;
+ message = `The file does not look like a valid .gz or .map file. Please check the data format`;
title = "Invalid file";
canBeLoaded = false;
} else if (type === "ancient") {
@@ -177,7 +194,7 @@ function showUploadMessage(type, mapData, mapVersion) {
if (canBeLoaded) parseLoadedData(mapData);
}
};
- $("#alert").dialog({title, buttons});
+ $("#alert").dialog({ title, buttons });
}
async function parseLoadedData(data) {
@@ -246,9 +263,9 @@ async function parseLoadedData(data) {
if (data[34]) {
const usedFonts = JSON.parse(data[34]);
usedFonts.forEach(usedFont => {
- const {family: usedFamily, unicodeRange: usedRange, variant: usedVariant} = usedFont;
+ const { family: usedFamily, unicodeRange: usedRange, variant: usedVariant } = usedFont;
const defaultFont = fonts.find(
- ({family, unicodeRange, variant}) =>
+ ({ family, unicodeRange, variant }) =>
family === usedFamily && unicodeRange === usedRange && variant === usedVariant
);
if (!defaultFont) fonts.push(usedFont);
@@ -331,7 +348,7 @@ async function parseLoadedData(data) {
void (function parseGridData() {
grid = JSON.parse(data[6]);
- const {cells, vertices} = calculateVoronoi(grid.points, grid.boundary);
+ const { cells, vertices } = calculateVoronoi(grid.points, grid.boundary);
grid.cells = cells;
grid.vertices = vertices;
@@ -349,7 +366,7 @@ async function parseLoadedData(data) {
pack.cultures = JSON.parse(data[13]);
pack.states = JSON.parse(data[14]);
pack.burgs = JSON.parse(data[15]);
- pack.religions = data[29] ? JSON.parse(data[29]) : [{i: 0, name: "No religion"}];
+ pack.religions = data[29] ? JSON.parse(data[29]) : [{ i: 0, name: "No religion" }];
pack.provinces = data[30] ? JSON.parse(data[30]) : [0];
pack.rivers = data[32] ? JSON.parse(data[32]) : [];
pack.markers = data[35] ? JSON.parse(data[35]) : [];
@@ -375,7 +392,7 @@ async function parseLoadedData(data) {
const e = d.split("|");
if (!e.length) return;
const b = e[5].split(",").length > 2 || !nameBases[i] ? e[5] : nameBases[i].b;
- nameBases[i] = {name: e[0], min: e[1], max: e[2], d: e[3], m: e[4], b};
+ nameBases[i] = { name: e[0], min: e[1], max: e[2], d: e[3], m: e[4], b };
});
}
})();
@@ -624,7 +641,7 @@ async function parseLoadedData(data) {
$(this).dialog("close");
}
},
- position: {my: "center", at: "center", of: "svg"}
+ position: { my: "center", at: "center", of: "svg" }
});
}
}
diff --git a/modules/io/save.js b/modules/io/save.js
index 97cf7c09..d5f2a939 100644
--- a/modules/io/save.js
+++ b/modules/io/save.js
@@ -1,5 +1,5 @@
"use strict";
-// functions to save project as .map file
+// functions to save project as .gz file
// prepare map data for saving
function getMapData() {
@@ -116,18 +116,27 @@ function getMapData() {
].join("\r\n");
return mapData;
}
+async function compressMapData(mapData){
+ const compressedStream = new Blob([mapData]).stream().pipeThrough(new CompressionStream("gzip"));
+ let compressedData = [];
+ for await (const chunk of compressedStream){
+ compressedData = compressedData.concat(Array.from(chunk));
+ }
+ return new Uint8Array(compressedData);
+}
-// Download .map file
-function dowloadMap() {
+
+// Download .gz file
+async function downloadMap() {
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 mapData = await compressMapData(getMapData());
const blob = new Blob([mapData], {type: "text/plain"});
const URL = window.URL.createObjectURL(blob);
const link = document.createElement("a");
- link.download = getFileName() + ".map";
+ link.download = getFileName() + ".gz";
link.href = URL;
link.click();
tip(`${link.download} is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
@@ -138,14 +147,14 @@ async function saveToDropbox() {
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";
+ const mapData = await compressMapData(getMapData());
+ const filename = getFileName() + ".gz";
try {
await Cloud.providers.dropbox.save(filename, mapData);
tip("Map is saved to your Dropbox", true, "success", 8000);
} catch (msg) {
ERROR && console.error(msg);
- tip("Cannot save .map to your Dropbox", true, "error", 8000);
+ tip("Cannot save .gz to your Dropbox", true, "error", 8000);
}
}
@@ -162,7 +171,7 @@ async function initiateAutosave() {
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 mapData = await compressMapData(getMapData());
const blob = new Blob([mapData], {type: "text/plain"});
await ldb.set("lastMap", blob);
INFO && console.log("Autosaved at", new Date().toLocaleTimeString());
@@ -176,22 +185,22 @@ 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 mapData = await compressMapData(getMapData());
const blob = new Blob([mapData], {type: "text/plain"});
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);
+ tip("Map is saved to browser memory. Please also save as .gz file to secure progress", true, "success", 2000);
}
const saveReminder = function () {
if (localStorage.getItem("noReminder")) return;
const message = [
- "Please don't forget to save your work as a .map file",
- "Please remember to save work as a .map file",
- "Saving in .map format will ensure your data won't be lost in case of issues",
+ "Please don't forget to save your work as a .gz file",
+ "Please remember to save work as a .gz file",
+ "Saving in .gz format will ensure your data won't be lost in case of issues",
"Safety is number one priority. Please save the map",
"Don't forget to save your map on a regular basis!",
"Just a gentle reminder for you to save the map",
- "Please don't forget to save your progress (saving as .map is the best option)",
+ "Please don't forget to save your progress (saving as .gz is the best option)",
"Don't want to be reminded about need to save? Press CTRL+Q"
];
const interval = 15 * 60 * 1000; // remind every 15 minutes
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 41031786..1bb53ab8 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -28,7 +28,7 @@ function editHeightmap(options) {
Erase mode also allows you Convert an Image into a heightmap or use Template Editor.
You can keep the data, but you won't be able to change the coastline.
Try risk mode to change the coastline and keep the data. The data will be restored as much as possible, but it can cause unpredictable errors.
-
Please save the map before editing the heightmap!
+
Please save the map before editing the heightmap!
Check out ${link(
"https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-customization",
"wiki"
diff --git a/modules/ui/hotkeys.js b/modules/ui/hotkeys.js
index f7443469..5f03cb2d 100644
--- a/modules/ui/hotkeys.js
+++ b/modules/ui/hotkeys.js
@@ -32,7 +32,7 @@ function handleKeyup(event) {
else if (code === "Delete") removeElementOnKey();
else if (code === "KeyO" && document.getElementById("canvas3d")) toggle3dOptions();
else if (ctrl && code === "KeyQ") toggleSaveReminder();
- else if (ctrl && code === "KeyS") dowloadMap();
+ else if (ctrl && code === "KeyS") downloadMap();
else if (ctrl && code === "KeyC") saveToDropbox();
else if (ctrl && code === "KeyZ" && undo?.offsetParent) undo.click();
else if (ctrl && code === "KeyY" && redo?.offsetParent) redo.click();
diff --git a/modules/ui/options.js b/modules/ui/options.js
index ce3b3561..ff2003a1 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -844,8 +844,8 @@ async function connectToDropbox() {
function loadURL() {
const pattern = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
- const inner = `Provide URL to a .map file:
-
+ const inner = `Provide URL to a .gz or .map file:
+
Please note server should allow CORS for file to be loaded. If CORS is not allowed, save file to Dropbox and provide a direct link`;
alertMessage.innerHTML = inner;
$("#alert").dialog({
diff --git a/utils/polyfills.js b/utils/polyfills.js
index 369e647f..fc567c1e 100644
--- a/utils/polyfills.js
+++ b/utils/polyfills.js
@@ -14,3 +14,20 @@ if (Array.prototype.flat === undefined) {
return this.reduce((acc, val) => (Array.isArray(val) ? acc.concat(val.flat()) : acc.concat(val)), []);
};
}
+
+// polyfill readable stream iterator: https://bugs.chromium.org/p/chromium/issues/detail?id=929585#c10
+if(ReadableStream.prototype[Symbol.asyncIterator] === undefined){
+ ReadableStream.prototype[Symbol.asyncIterator] = async function* () {
+ const reader = this.getReader()
+ try {
+ while (true) {
+ const {done, value} = await reader.read()
+ if (done) return
+ yield value
+ }
+ }
+ finally {
+ reader.releaseLock()
+ }
+ }
+}
\ No newline at end of file
diff --git a/versioning.js b/versioning.js
index 67c0b12c..7d07e077 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
"use strict";
// version and caching control
-const version = "1.92.05"; // generator version, update each time
+const version = "1.93.00"; // generator version, update each time
{
document.title += " v" + version;
@@ -23,11 +23,12 @@ const version = "1.92.05"; // generator version, update each time
const discord = "https://discordapp.com/invite/X7E84HU";
const patreon = "https://www.patreon.com/azgaar";
- alertMessage.innerHTML = /* html */ `The Fantasy Map Generator is updated up to version ${version}. This version is compatible with previous versions, loaded .map files will be auto-updated.
+ alertMessage.innerHTML = /* html */ `The Fantasy Map Generator is updated up to version ${version}. This version is compatible with previous versions, loaded .gz or .map files will be auto-updated.
${storedVersion ? "Reload the page to fetch fresh code." : ""}
Latest changes:
+
Map save file extension is changed to .gz, .map files are still loadable
New label placement algorithm for states
North and South Poles temperature can be set independently