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

v1.5.81 - svg coa load fix

Browse source
This commit is contained in:
Azgaar 2021-03-01 02:46:41 +03:00
parent 49b9895b0b
commit 2f70df6c59
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/save-and-load.js
View file

@ -1104,9 +1104,9 @@ function parseLoadedData(data) {
for (const river of pack.rivers) { for (const river of pack.rivers) {
const el = document.getElementById("river"+river.i); const el = document.getElementById("river"+river.i);
if (el) { if (el) {
river.widthFactor = +el.getAttribute("data-width");
el.removeAttribute("data-width"); el.removeAttribute("data-width");
el.removeAttribute("data-increment"); el.removeAttribute("data-increment");
river.widthFactor = +this.getAttribute("data-width");
river.discharge = pack.cells.fl[river.mouth] || 1; river.discharge = pack.cells.fl[river.mouth] || 1;
river.width = rn(river.length / 100, 2); river.width = rn(river.length / 100, 2);
river.sourceWidth = .1; river.sourceWidth = .1;

8
modules/ui/emblems-editor.js
View file

@ -238,7 +238,6 @@ function editEmblem(type, id, el) {
const svg = `<svg id="${id}" xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 200 200"><image x="0" y="0" width="200" height="200" href="${result}"/></svg>`; const svg = `<svg id="${id}" xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 200 200"><image x="0" y="0" width="200" height="200" href="${result}"/></svg>`;
defs.insertAdjacentHTML("beforeend", svg); defs.insertAdjacentHTML("beforeend", svg);
} else { } else {
const el = document.createElement("html"); const el = document.createElement("html");
el.innerHTML = result; el.innerHTML = result;
@ -250,14 +249,13 @@ function editEmblem(type, id, el) {
}); });
}); });
const g = el.querySelector("g"); const svg = el.querySelector("svg");
if (!svg) {
if (!g) {
tip("The file should be prepated for load to FMG. Please use Armoria or other relevant tools", false, "error"); tip("The file should be prepated for load to FMG. Please use Armoria or other relevant tools", false, "error");
return; return;
} }
const newEmblem = defs.appendChild(g); const newEmblem = defs.appendChild(svg);
newEmblem.id = id; newEmblem.id = id;
newEmblem.setAttribute("width", 200); newEmblem.setAttribute("width", 200);
newEmblem.setAttribute("height", 200); newEmblem.setAttribute("height", 200);