From 50a9411882f31c859dbc6fb7f88fa74e3d8156b2 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Wed, 10 May 2023 04:17:04 +0400 Subject: [PATCH] feat: add xy to markers geojson export --- index.html | 2 +- modules/io/export.js | 29 ++++++++++++++++++++++++----- versioning.js | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 1ff2c55d..77c1dc52 100644 --- a/index.html +++ b/index.html @@ -7923,7 +7923,7 @@ - + diff --git a/modules/io/export.js b/modules/io/export.js index fded29db..7cd5eccf 100644 --- a/modules/io/export.js +++ b/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); @@ -315,7 +333,8 @@ async function getMapURL(type, options = {}) { clone.remove(); - const serialized = `` + new XMLSerializer().serializeToString(cloneEl); + const serialized = + `` + 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 +480,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}; }); diff --git a/versioning.js b/versioning.js index 64ad10bd..d89e3f94 100644 --- a/versioning.js +++ b/versioning.js @@ -1,7 +1,7 @@ "use strict"; // version and caching control -const version = "1.89.15"; // generator version, update each time +const version = "1.89.16"; // generator version, update each time { document.title += " v" + version;