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

marker - fix auto-update for complex cases

Browse source
This commit is contained in:
Azgaar 2021-10-08 11:11:42 +03:00
parent 33bf699c0d
commit eed79ca96c
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/load.js
View file

@ -875,16 +875,23 @@ function parseLoadedData(data) {
const defs = document.getElementById("defs-markers"); const defs = document.getElementById("defs-markers");
const markersGroup = document.getElementById("markers"); const markersGroup = document.getElementById("markers");
const markerElements = markersGroup.querySelectorAll("use"); const markerElements = markersGroup.querySelectorAll("use");
const rescale = +markersGroup.getAttribute("rescale");
pack.markers = Array.from(markerElements).map((el, i) => { pack.markers = Array.from(markerElements).map((el, i) => {
const id = el.getAttribute("id"); const id = el.getAttribute("id");
const note = notes.find(note => note.id === id); const note = notes.find(note => note.id === id);
if (note) note.id = `marker${i}`; if (note) note.id = `marker${i}`;
const x = rn(+el.dataset.x, 1); let x = +el.dataset.x;
const y = rn(+el.dataset.y, 1); let y = +el.dataset.y;
const transform = el.getAttribute("transform");
if (transform) {
const [dx, dy] = parseTransform(transform);
if (dx) x += +dx;
if (dy) y += +dy;
}
const cell = findCell(x, y); const cell = findCell(x, y);
const size = rn(el.dataset.size * 30, 1); const size = rn(rescale ? el.dataset.size * 30 : el.getAttribute("width"), 1);
const href = el.href.baseVal; const href = el.href.baseVal;
const type = href.replace("#marker_", ""); const type = href.replace("#marker_", "");
@ -906,6 +913,7 @@ function parseLoadedData(data) {
if (!isNaN(dy) && dy !== 50) marker.dy = dy; if (!isNaN(dy) && dy !== 50) marker.dy = dy;
if (fill && fill !== "#ffffff") marker.fill = fill; if (fill && fill !== "#ffffff") marker.fill = fill;
if (stroke && stroke !== "#000000") marker.stroke = stroke; if (stroke && stroke !== "#000000") marker.stroke = stroke;
if (circle.getAttribute("opacity") === "0") marker.pin = "no";
return marker; return marker;
}); });