backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 03:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding gzip compression for improving storage use and backward compatibility. (#984)

Browse source 
* Basic gzip an gunzip on load and save.

* refactor file save type to .gz and update the data in ui.

---------

Co-authored-by: Azgaar <maxganiev@yandex.com>
This commit is contained in:
Efruz Yıldırır 2023-08-15 11:26:01 +03:00 • committed by GitHub
parent 5fba7d60f4
commit ef24e3ea1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 111 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

39
index.html
View file

@ -2329,8 +2329,8 @@
<div id="sticked"> <div id="sticked">
<button id="newMapButton" data-tip="Generate a new map based on options" data-shortcut="F2">New Map</button> <button id="newMapButton" data-tip="Generate a new map based on options" data-shortcut="F2">New Map</button>
<button id="exportButton" data-tip="Select format to download image or export map data">Export</button> <button id="exportButton" data-tip="Select format to download image or export map data">Export</button>
<button id="saveButton" data-tip="Save fully-functional map in .map format">Save</button> <button id="saveButton" data-tip="Save fully-functional map in .gz format">Save</button>
<button id="loadButton" data-tip="Load fully-functional map in .map format">Load</button> <button id="loadButton" data-tip="Load fully-functional map in .gz or .map format">Load</button>
<button id="zoomReset" data-tip="Reset map zoom" data-shortcut="0 (zero)">Reset Zoom</button> <button id="zoomReset" data-tip="Reset map zoom" data-shortcut="0 (zero)">Reset Zoom</button>
</div> </div>
</div> </div>
@ -5884,10 +5884,10 @@
<div id="saveMapData" style="display: none" class="dialog"> <div id="saveMapData" style="display: none" class="dialog">
<div style="margin-top: 0.3em"> <div style="margin-top: 0.3em">
<strong>Save map to</strong> <strong>Save map to</strong>
<button onclick="dowloadMap()" data-tip="Download .map file to your local disk" data-shortcut="Ctrl + S"> <button onclick="downloadMap()" data-tip="Download .gz file to your local disk" data-shortcut="Ctrl + S">
machine machine
</button> </button>
<button onclick="saveToDropbox()" data-tip="Save .map file to your Dropbox" data-shortcut="Ctrl + C"> <button onclick="saveToDropbox()" data-tip="Save .gz file to your Dropbox" data-shortcut="Ctrl + C">
dropbox dropbox
</button> </button>
<button <button
@ -5899,8 +5899,8 @@
</button> </button>
</div> </div>
<p> <p>
Maps are saved in <i>.map</i> format, that can be loaded back via the <i>Load</i> in menu. There is no way to Maps are saved in <i>.gz</i> format, that can be loaded back via the <i>Load</i> in menu. There is no way to
restore the progress if file is lost. Please keep old <i>.map</i> files on your machine or cloud storage as restore the progress if file is lost. Please keep old <i>.gz or .map</i> files on your machine or cloud storage as
backups. backups.
</p> </p>
</div> </div>
@ -5908,8 +5908,8 @@
<div id="loadMapData" style="display: none" class="dialog"> <div id="loadMapData" style="display: none" class="dialog">
<div> <div>
<strong>Load map from</strong> <strong>Load map from</strong>
<button onclick="mapToLoad.click()" data-tip="Load .map file from your local disk">machine</button> <button onclick="mapToLoad.click()" data-tip="Load .gz or .map file from your local disk">machine</button>
<button onclick="loadURL()" data-tip="Load .map file from URL (server should allow CORS)">URL</button> <button onclick="loadURL()" data-tip="Load .gz or .map file from URL (server should allow CORS)">URL</button>
<button onclick="quickLoad()" data-tip="Load map from browser storage (if saved before)">storage</button> <button onclick="quickLoad()" data-tip="Load map from browser storage (if saved before)">storage</button>
</div> </div>
<div id="loadFromDropbox"> <div id="loadFromDropbox">
@ -5926,7 +5926,7 @@
<select id="loadFromDropboxSelect" style="width: 22em"></select> <select id="loadFromDropboxSelect" style="width: 22em"></select>
<div id="loadFromDropboxButtons" style="margin-bottom: 0.6em"> <div id="loadFromDropboxButtons" style="margin-bottom: 0.6em">
<button onclick="loadFromDropbox()" data-tip="Load .map file from your Dropbox">Load</button> <button onclick="loadFromDropbox()" data-tip="Load .gz or .map file from your Dropbox">Load</button>
<button <button
onclick="createSharableDropboxLink()" onclick="createSharableDropboxLink()"
data-tip="Select file and create a link to share with your friends" data-tip="Select file and create a link to share with your friends"
@ -5995,7 +5995,7 @@
<div id="resampleDialog" style="display: none" class="dialog"> <div id="resampleDialog" style="display: none" class="dialog">
<div style="width: 34em; max-width: 80vw; font-weight: bold; padding: 6px"> <div style="width: 34em; max-width: 80vw; font-weight: bold; padding: 6px">
This operation is destructive and irreversible. It will create a completely new map based on the current one. 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!
</div> </div>
<div <div
@ -6116,10 +6116,10 @@
data-main="Сlick the arrow button for options. Zoom in to see the map in details" data-main="Сlick the arrow button for options. Zoom in to see the map in details"
></div> ></div>
<div id="mapOverlay" style="display: none">Drop a .map file to open</div> <div id="mapOverlay" style="display: none">Drop a .gz or .map file to open</div>
<div id="fileInputs" style="display: none"> <div id="fileInputs" style="display: none">
<input type="file" accept=".map" id="mapToLoad" /> <input type="file" accept=".map,.gz" id="mapToLoad" />
<input type="file" accept=".txt,.csv" id="burgsListToLoad" /> <input type="file" accept=".txt,.csv" id="burgsListToLoad" />
<input type="file" accept=".txt" id="legendsToLoad" /> <input type="file" accept=".txt" id="legendsToLoad" />
<input type="file" accept="image/*" id="imageToLoad" /> <input type="file" accept="image/*" id="imageToLoad" />
@ -7930,7 +7930,7 @@
<script src="utils/graphUtils.js?v=1.90.01"></script> <script src="utils/graphUtils.js?v=1.90.01"></script>
<script src="utils/nodeUtils.js"></script> <script src="utils/nodeUtils.js"></script>
<script src="utils/numberUtils.js?v=1.89.08"></script> <script src="utils/numberUtils.js?v=1.89.08"></script>
<script src="utils/polyfills.js"></script> <script src="utils/polyfills.js?v=1.93.00"></script>
<script src="utils/probabilityUtils.js?v=1.88.00"></script> <script src="utils/probabilityUtils.js?v=1.88.00"></script>
<script src="utils/stringUtils.js"></script> <script src="utils/stringUtils.js"></script>
<script src="utils/languageUtils.js"></script> <script src="utils/languageUtils.js"></script>
@ -7963,15 +7963,15 @@
<script src="modules/ui/stylePresets.js?v=1.89.11"></script> <script src="modules/ui/stylePresets.js?v=1.89.11"></script>
<script src="modules/ui/general.js?v=1.87.03"></script> <script src="modules/ui/general.js?v=1.87.03"></script>
<script src="modules/ui/options.js?v=1.91.00"></script> <script src="modules/ui/options.js?v=1.93.00"></script>
<script src="main.js?v=1.92.00"></script> <script src="main.js?v=1.93.00"></script>
<script defer src="modules/relief-icons.js"></script> <script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js"></script> <script defer src="modules/ui/style.js"></script>
<script defer src="modules/ui/editors.js?v=1.92.00"></script> <script defer src="modules/ui/editors.js?v=1.92.00"></script>
<script defer src="modules/ui/tools.js?v=1.92.00"></script> <script defer src="modules/ui/tools.js?v=1.92.00"></script>
<script defer src="modules/ui/world-configurator.js?v=1.91.05"></script> <script defer src="modules/ui/world-configurator.js?v=1.91.05"></script>
<script defer src="modules/ui/heightmap-editor.js?v=1.92.00"></script> <script defer src="modules/ui/heightmap-editor.js?v=1.93.00"></script>
<script defer src="modules/ui/provinces-editor.js?v=1.92.00"></script> <script defer src="modules/ui/provinces-editor.js?v=1.92.00"></script>
<script defer src="modules/ui/biomes-editor.js?v=1.91.05"></script> <script defer src="modules/ui/biomes-editor.js?v=1.91.05"></script>
<script defer src="modules/ui/namesbase-editor.js?v=1.89.26"></script> <script defer src="modules/ui/namesbase-editor.js?v=1.89.26"></script>
@ -8001,13 +8001,12 @@
<script defer src="modules/ui/markers-editor.js"></script> <script defer src="modules/ui/markers-editor.js"></script>
<script defer src="modules/ui/3d.js?v=1.89.36"></script> <script defer src="modules/ui/3d.js?v=1.89.36"></script>
<script defer src="modules/ui/submap.js?v=1.92.00"></script> <script defer src="modules/ui/submap.js?v=1.92.00"></script>
<script defer src="modules/ui/hotkeys.js?v=1.88.00"></script> <script defer src="modules/ui/hotkeys.js?v=1.93.00"></script>
<script defer src="modules/coa-renderer.js?v=1.91.00"></script> <script defer src="modules/coa-renderer.js?v=1.91.00"></script>
<script defer src="libs/rgbquant.min.js"></script> <script defer src="libs/rgbquant.min.js"></script>
<script defer src="libs/jquery.ui.touch-punch.min.js"></script> <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
<script defer src="modules/io/save.js?v=1.93.00"></script>
<script defer src="modules/io/save.js?v=1.91.04"></script> <script defer src="modules/io/load.js?v=1.93.00"></script>
<script defer src="modules/io/load.js?v=1.92.05"></script>
<script defer src="modules/io/cloud.js"></script> <script defer src="modules/io/cloud.js"></script>
<script defer src="modules/io/export.js?v=1.89.36"></script> <script defer src="modules/io/export.js?v=1.89.36"></script>
<script defer src="modules/io/formats.js"></script> <script defer src="modules/io/formats.js"></script>

10
main.js
View file

@ -270,7 +270,7 @@ async function checkLoadParameters() {
const url = new URL(window.location.href); const url = new URL(window.location.href);
const params = url.searchParams; 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")) { if (params.get("maplink")) {
WARN && console.warn("Load map from URL"); WARN && console.warn("Load map from URL");
const maplink = params.get("maplink"); const maplink = params.get("maplink");
@ -574,9 +574,9 @@ void (function addDragToUpload() {
overlay.style.display = "none"; overlay.style.display = "none";
if (e.dataTransfer.items == null || e.dataTransfer.items.length !== 1) return; // no files or more than one if (e.dataTransfer.items == null || e.dataTransfer.items.length !== 1) return; // no files or more than one
const file = e.dataTransfer.items[0].getAsFile(); const file = e.dataTransfer.items[0].getAsFile();
if (file.name.indexOf(".map") == -1) { if (!file.name.endsWith(".map") && !file.name.endsWith(".gz")) {
// not a .map file // not a .gz/.map file
alertMessage.innerHTML = "Please upload a <b>.map</b> file you have previously downloaded"; alertMessage.innerHTML = "Please upload a <b>.gz or .map</b> file you have previously downloaded";
$("#alert").dialog({ $("#alert").dialog({
resizable: false, resizable: false,
title: "Invalid file format", title: "Invalid file format",
@ -596,7 +596,7 @@ void (function addDragToUpload() {
if (closeDialogs) closeDialogs(); if (closeDialogs) closeDialogs();
uploadMap(file, () => { uploadMap(file, () => {
overlay.style.display = "none"; overlay.style.display = "none";
overlay.innerHTML = "Drop a .map file to open"; overlay.innerHTML = "Drop a .gz or .map file to open";
}); });
}); });
})(); })();

2
modules/dynamic/auto-update.js
View file

@ -1,6 +1,6 @@
"use strict"; "use strict";
// update old .map version to the current one // update old .gz/.map version to the current one
export function resolveVersionConflicts(version) { export function resolveVersionConflicts(version) {
if (version < 1) { if (version < 1) {
// v1.0 added a new religions layer // v1.0 added a new religions layer

59
modules/io/load.js
View file

@ -1,6 +1,5 @@
"use strict"; "use strict";
// Functions to load and parse .map files // Functions to load and parse .gz/.map files
async function quickLoad() { async function quickLoad() {
const blob = await ldb.get("lastMap"); const blob = await ldb.get("lastMap");
if (blob) loadMapPrompt(blob); if (blob) loadMapPrompt(blob);
@ -77,7 +76,7 @@ function loadMapPrompt(blob) {
function loadMapFromURL(maplink, random) { function loadMapFromURL(maplink, random) {
const URL = decodeURIComponent(maplink); const URL = decodeURIComponent(maplink);
fetch(URL, {method: "GET", mode: "cors"}) fetch(URL, { method: "GET", mode: "cors" })
.then(response => { .then(response => {
if (response.ok) return response.blob(); if (response.ok) return response.blob();
throw new Error("Cannot load map from URL"); throw new Error("Cannot load map from URL");
@ -91,9 +90,8 @@ function loadMapFromURL(maplink, random) {
function showUploadErrorMessage(error, URL, random) { function showUploadErrorMessage(error, URL, random) {
ERROR && console.error(error); ERROR && console.error(error);
alertMessage.innerHTML = /* html */ `Cannot load map from the ${link(URL, "link provided")}. ${ alertMessage.innerHTML = /* html */ `Cannot load map from the ${link(URL, "link provided")}. ${random ? `A new random map is generated. ` : ""
random ? `A new random map is generated. ` : "" } Please ensure the
} Please ensure the
linked file is reachable and CORS is allowed on server side`; linked file is reachable and CORS is allowed on server side`;
$("#alert").dialog({ $("#alert").dialog({
title: "Loading error", title: "Loading error",
@ -112,11 +110,11 @@ function uploadMap(file, callback) {
const currentVersion = parseFloat(version); const currentVersion = parseFloat(version);
const fileReader = new FileReader(); const fileReader = new FileReader();
fileReader.onload = function (fileLoadedEvent) { fileReader.onloadend = async function (fileLoadedEvent) {
if (callback) callback(); if (callback) callback();
document.getElementById("coas").innerHTML = ""; // remove auto-generated emblems document.getElementById("coas").innerHTML = ""; // remove auto-generated emblems
const result = fileLoadedEvent.target.result; 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 isInvalid = !mapData || isNaN(mapVersion) || mapData.length < 26 || !mapData[5];
const isUpdated = mapVersion === currentVersion; const isUpdated = mapVersion === currentVersion;
@ -131,18 +129,37 @@ function uploadMap(file, callback) {
if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion); if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion);
}; };
fileReader.readAsText(file, "UTF-8"); fileReader.readAsArrayBuffer(file);
} }
async function uncompressMapData(compressedMapData) {
function parseLoadedResult(result) { console.log("trying to uncompress:", compressedMapData);
try { 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 // data can be in FMG internal format or base64 encoded
const isDelimited = result.substr(0, 10).includes("|"); const isDelimited = resultAsString.substring(0, 10).includes("|");
const decoded = isDelimited ? result : decodeURIComponent(atob(result)); const decoded = isDelimited ? resultAsString : decodeURIComponent(atob(resultAsString));
const mapData = decoded.split("\r\n"); const mapData = decoded.split("\r\n");
const mapVersion = parseFloat(mapData[0].split("|")[0] || mapData[0]); const mapVersion = parseFloat(mapData[0].split("|")[0] || mapData[0]);
return [mapData, mapVersion]; return [mapData, mapVersion];
} catch (error) { } catch (error) {
const uncompressedData = await uncompressMapData(result);
if (uncompressedData !== null) {
return parseLoadedResult(uncompressedData);
}
ERROR && console.error(error); ERROR && console.error(error);
return [null, null]; return [null, null];
} }
@ -153,7 +170,7 @@ function showUploadMessage(type, mapData, mapVersion) {
let message, title, canBeLoaded; let message, title, canBeLoaded;
if (type === "invalid") { if (type === "invalid") {
message = `The file does not look like a valid <i>.map</i> file.<br>Please check the data format`; message = `The file does not look like a valid <i>.gz or .map</i> file.<br>Please check the data format`;
title = "Invalid file"; title = "Invalid file";
canBeLoaded = false; canBeLoaded = false;
} else if (type === "ancient") { } else if (type === "ancient") {
@ -177,7 +194,7 @@ function showUploadMessage(type, mapData, mapVersion) {
if (canBeLoaded) parseLoadedData(mapData); if (canBeLoaded) parseLoadedData(mapData);
} }
}; };
$("#alert").dialog({title, buttons}); $("#alert").dialog({ title, buttons });
} }
async function parseLoadedData(data) { async function parseLoadedData(data) {
@ -246,9 +263,9 @@ async function parseLoadedData(data) {
if (data[34]) { if (data[34]) {
const usedFonts = JSON.parse(data[34]); const usedFonts = JSON.parse(data[34]);
usedFonts.forEach(usedFont => { usedFonts.forEach(usedFont => {
const {family: usedFamily, unicodeRange: usedRange, variant: usedVariant} = usedFont; const { family: usedFamily, unicodeRange: usedRange, variant: usedVariant } = usedFont;
const defaultFont = fonts.find( const defaultFont = fonts.find(
({family, unicodeRange, variant}) => ({ family, unicodeRange, variant }) =>
family === usedFamily && unicodeRange === usedRange && variant === usedVariant family === usedFamily && unicodeRange === usedRange && variant === usedVariant
); );
if (!defaultFont) fonts.push(usedFont); if (!defaultFont) fonts.push(usedFont);
@ -331,7 +348,7 @@ async function parseLoadedData(data) {
void (function parseGridData() { void (function parseGridData() {
grid = JSON.parse(data[6]); 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.cells = cells;
grid.vertices = vertices; grid.vertices = vertices;
@ -349,7 +366,7 @@ async function parseLoadedData(data) {
pack.cultures = JSON.parse(data[13]); pack.cultures = JSON.parse(data[13]);
pack.states = JSON.parse(data[14]); pack.states = JSON.parse(data[14]);
pack.burgs = JSON.parse(data[15]); 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.provinces = data[30] ? JSON.parse(data[30]) : [0];
pack.rivers = data[32] ? JSON.parse(data[32]) : []; pack.rivers = data[32] ? JSON.parse(data[32]) : [];
pack.markers = data[35] ? JSON.parse(data[35]) : []; pack.markers = data[35] ? JSON.parse(data[35]) : [];
@ -375,7 +392,7 @@ async function parseLoadedData(data) {
const e = d.split("|"); const e = d.split("|");
if (!e.length) return; if (!e.length) return;
const b = e[5].split(",").length > 2 || !nameBases[i] ? e[5] : nameBases[i].b; 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"); $(this).dialog("close");
} }
}, },
position: {my: "center", at: "center", of: "svg"} position: { my: "center", at: "center", of: "svg" }
}); });
} }
} }

39
modules/io/save.js
View file

@ -1,5 +1,5 @@
"use strict"; "use strict";
// functions to save project as .map file // functions to save project as .gz file
// prepare map data for saving // prepare map data for saving
function getMapData() { function getMapData() {
@ -116,18 +116,27 @@ function getMapData() {
].join("\r\n"); ].join("\r\n");
return mapData; 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) if (customization)
return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error"); return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
closeDialogs("#alert"); closeDialogs("#alert");
const mapData = getMapData(); const mapData = await compressMapData(getMapData());
const blob = new Blob([mapData], {type: "text/plain"}); const blob = new Blob([mapData], {type: "text/plain"});
const URL = window.URL.createObjectURL(blob); const URL = window.URL.createObjectURL(blob);
const link = document.createElement("a"); const link = document.createElement("a");
link.download = getFileName() + ".map"; link.download = getFileName() + ".gz";
link.href = URL; link.href = URL;
link.click(); link.click();
tip(`${link.download} is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000); tip(`${link.download} is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
@ -138,14 +147,14 @@ async function saveToDropbox() {
if (customization) if (customization)
return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error"); return tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error");
closeDialogs("#alert"); closeDialogs("#alert");
const mapData = getMapData(); const mapData = await compressMapData(getMapData());
const filename = getFileName() + ".map"; const filename = getFileName() + ".gz";
try { try {
await Cloud.providers.dropbox.save(filename, mapData); await Cloud.providers.dropbox.save(filename, mapData);
tip("Map is saved to your Dropbox", true, "success", 8000); tip("Map is saved to your Dropbox", true, "success", 8000);
} catch (msg) { } catch (msg) {
ERROR && console.error(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); if (customization) return tip("Autosave: map cannot be saved in edit mode", false, "warning", 2000);
tip("Autosave: saving map...", false, "warning", 3000); tip("Autosave: saving map...", false, "warning", 3000);
const mapData = getMapData(); const mapData = await compressMapData(getMapData());
const blob = new Blob([mapData], {type: "text/plain"}); const blob = new Blob([mapData], {type: "text/plain"});
await ldb.set("lastMap", blob); await ldb.set("lastMap", blob);
INFO && console.log("Autosaved at", new Date().toLocaleTimeString()); INFO && console.log("Autosaved at", new Date().toLocaleTimeString());
@ -176,22 +185,22 @@ async function quickSave() {
if (customization) if (customization)
return tip("Map cannot be saved when edit mode is active, please exit the mode first", false, "error"); 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"}); const blob = new Blob([mapData], {type: "text/plain"});
await 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); tip("Map is saved to browser memory. Please also save as .gz file to secure progress", true, "success", 2000);
} }
const saveReminder = function () { const saveReminder = function () {
if (localStorage.getItem("noReminder")) return; if (localStorage.getItem("noReminder")) return;
const message = [ const message = [
"Please don't forget to save your work as a .map file", "Please don't forget to save your work as a .gz file",
"Please remember to save work as a .map file", "Please remember to save work as a .gz file",
"Saving in .map format will ensure your data won't be lost in case of issues", "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", "Safety is number one priority. Please save the map",
"Don't forget to save your map on a regular basis!", "Don't forget to save your map on a regular basis!",
"Just a gentle reminder for you to save the map", "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" "Don't want to be reminded about need to save? Press CTRL+Q"
]; ];
const interval = 15 * 60 * 1000; // remind every 15 minutes const interval = 15 * 60 * 1000; // remind every 15 minutes

2
modules/ui/heightmap-editor.js
View file

@ -28,7 +28,7 @@ function editHeightmap(options) {
<p><i>Erase</i> mode also allows you Convert an Image into a heightmap or use Template Editor.</p> <p><i>Erase</i> mode also allows you Convert an Image into a heightmap or use Template Editor.</p>
<p>You can <i>keep</i> the data, but you won't be able to change the coastline.</p> <p>You can <i>keep</i> the data, but you won't be able to change the coastline.</p>
<p>Try <i>risk</i> mode to change the coastline and keep the data. The data will be restored as much as possible, but it can cause unpredictable errors.</p> <p>Try <i>risk</i> mode to change the coastline and keep the data. The data will be restored as much as possible, but it can cause unpredictable errors.</p>
<p>Please <span class="pseudoLink" onclick="dowloadMap();">save the map</span> before editing the heightmap!</p> <p>Please <span class="pseudoLink" onclick="downloadMap();">save the map</span> before editing the heightmap!</p>
<p style="margin-bottom: 0">Check out ${link( <p style="margin-bottom: 0">Check out ${link(
"https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-customization", "https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-customization",
"wiki" "wiki"

2
modules/ui/hotkeys.js
View file

@ -32,7 +32,7 @@ function handleKeyup(event) {
else if (code === "Delete") removeElementOnKey(); else if (code === "Delete") removeElementOnKey();
else if (code === "KeyO" && document.getElementById("canvas3d")) toggle3dOptions(); else if (code === "KeyO" && document.getElementById("canvas3d")) toggle3dOptions();
else if (ctrl && code === "KeyQ") toggleSaveReminder(); 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 === "KeyC") saveToDropbox();
else if (ctrl && code === "KeyZ" && undo?.offsetParent) undo.click(); else if (ctrl && code === "KeyZ" && undo?.offsetParent) undo.click();
else if (ctrl && code === "KeyY" && redo?.offsetParent) redo.click(); else if (ctrl && code === "KeyY" && redo?.offsetParent) redo.click();

4
modules/ui/options.js
View file

@ -844,8 +844,8 @@ async function connectToDropbox() {
function loadURL() { function loadURL() {
const pattern = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/; 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:
<input id="mapURL" type="url" style="width: 24em" placeholder="https://e-cloud.com/test.map"> <input id="mapURL" type="url" style="width: 24em" placeholder="https://e-cloud.com/test.gz">
<br><i>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</i>`; <br><i>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</i>`;
alertMessage.innerHTML = inner; alertMessage.innerHTML = inner;
$("#alert").dialog({ $("#alert").dialog({

17
utils/polyfills.js
View file

@ -14,3 +14,20 @@ if (Array.prototype.flat === undefined) {
return this.reduce((acc, val) => (Array.isArray(val) ? acc.concat(val.flat()) : acc.concat(val)), []); 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()
}
}
}

5
versioning.js
View file

@ -1,7 +1,7 @@
"use strict"; "use strict";
// version and caching control // 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; 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 discord = "https://discordapp.com/invite/X7E84HU";
const patreon = "https://www.patreon.com/azgaar"; const patreon = "https://www.patreon.com/azgaar";
alertMessage.innerHTML = /* html */ `The Fantasy Map Generator is updated up to version <strong>${version}</strong>. This version is compatible with <a href="${changelog}" target="_blank">previous versions</a>, loaded <i>.map</i> files will be auto-updated. alertMessage.innerHTML = /* html */ `The Fantasy Map Generator is updated up to version <strong>${version}</strong>. This version is compatible with <a href="${changelog}" target="_blank">previous versions</a>, loaded <i>.gz or .map</i> files will be auto-updated.
${storedVersion ? "<span>Reload the page to fetch fresh code.</span>" : ""} ${storedVersion ? "<span>Reload the page to fetch fresh code.</span>" : ""}
<ul> <ul>
<strong>Latest changes:</strong> <strong>Latest changes:</strong>
<li>Map save file extension is changed to .gz, .map files are still loadable</li>
<li>New label placement algorithm for states</li> <li>New label placement algorithm for states</li>
<li>North and South Poles temperature can be set independently</li> <li>North and South Poles temperature can be set independently</li>
<li>More than 70 new heraldic charges</li> <li>More than 70 new heraldic charges</li>