backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2026-04-01 13:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: replace currentLabelData with direct calls to getLabelData in editLabel function

Browse source
This commit is contained in:
StempunkDev 2026-02-19 19:13:11 +01:00
parent c22e6eb0c5
commit 32e70496da
1 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

58
public/modules/ui/labels-editor.js
View file

@ -1,5 +1,4 @@
"use strict"; "use strict";
let currentLabelData = null;
// Helper: extract control points from an SVG path element // Helper: extract control points from an SVG path element
function extractPathPoints(pathElement) { function extractPathPoints(pathElement) {
@ -61,9 +60,6 @@ function editLabel() {
elSelected = d3.select(text).call(d3.drag().on("start", dragLabel)).classed("draggable", true); elSelected = d3.select(text).call(d3.drag().on("start", dragLabel)).classed("draggable", true);
viewbox.on("touchmove mousemove", showEditorTips); viewbox.on("touchmove mousemove", showEditorTips);
// Resolve label data from the data model
currentLabelData = getLabelData(text);
$("#labelEditor").dialog({ $("#labelEditor").dialog({
title: "Edit Label", title: "Edit Label",
resizable: false, resizable: false,
@ -136,17 +132,18 @@ function editLabel() {
} }
function updateValues(textPath) { function updateValues(textPath) {
if (currentLabelData && currentLabelData.type === "custom") { const labelData = getLabelData(elSelected.node());
if (labelData && labelData.type === "custom") {
// Custom labels: read all values from data model // Custom labels: read all values from data model
byId("labelText").value = currentLabelData.text || ""; byId("labelText").value = labelData.text || "";
byId("labelStartOffset").value = currentLabelData.startOffset || 50; byId("labelStartOffset").value = labelData.startOffset || 50;
byId("labelRelativeSize").value = currentLabelData.fontSize || 100; byId("labelRelativeSize").value = labelData.fontSize || 100;
byId("labelLetterSpacingSize").value = currentLabelData.letterSpacing || 0; byId("labelLetterSpacingSize").value = labelData.letterSpacing || 0;
} else { } else {
// State labels and fallback: read from SVG, use data model fontSize if available // State labels and fallback: read from SVG, use data model fontSize if available
byId("labelText").value = [...textPath.querySelectorAll("tspan")].map(tspan => tspan.textContent).join("|"); byId("labelText").value = [...textPath.querySelectorAll("tspan")].map(tspan => tspan.textContent).join("|");
byId("labelStartOffset").value = parseFloat(textPath.getAttribute("startOffset")) || 50; byId("labelStartOffset").value = parseFloat(textPath.getAttribute("startOffset")) || 50;
byId("labelRelativeSize").value = (currentLabelData && currentLabelData.fontSize) || parseFloat(textPath.getAttribute("font-size")) || 100; byId("labelRelativeSize").value = (labelData && labelData.fontSize) || parseFloat(textPath.getAttribute("font-size")) || 100;
let letterSpacingSize = textPath.getAttribute("letter-spacing") ? textPath.getAttribute("letter-spacing") : 0; let letterSpacingSize = textPath.getAttribute("letter-spacing") ? textPath.getAttribute("letter-spacing") : 0;
byId("labelLetterSpacingSize").value = parseFloat(letterSpacingSize); byId("labelLetterSpacingSize").value = parseFloat(letterSpacingSize);
} }
@ -197,7 +194,8 @@ function editLabel() {
path.setAttribute("d", d); path.setAttribute("d", d);
debug.select("#controlPoints > path").attr("d", d); debug.select("#controlPoints > path").attr("d", d);
// Sync path control points back to data model // Sync path control points back to data model
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { pathPoints: points }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { pathPoints: points });
} }
function clickControlPoint() { function clickControlPoint() {
@ -252,7 +250,8 @@ function editLabel() {
const transform = `translate(${dx + x},${dy + y})`; const transform = `translate(${dx + x},${dy + y})`;
elSelected.attr("transform", transform); elSelected.attr("transform", transform);
debug.select("#controlPoints").attr("transform", transform); debug.select("#controlPoints").attr("transform", transform);
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { transform }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { transform });
}); });
} }
@ -271,8 +270,9 @@ function editLabel() {
function changeGroup() { function changeGroup() {
byId(this.value).appendChild(elSelected.node()); byId(this.value).appendChild(elSelected.node());
if (currentLabelData && currentLabelData.type === "custom") { const labelData = getLabelData(elSelected.node());
Labels.updateLabel(currentLabelData.i, { group: this.value }); if (labelData && labelData.type === "custom") {
Labels.updateLabel(labelData.i, { group: this.value });
} }
} }
@ -327,8 +327,9 @@ function editLabel() {
byId("labelGroupSelect").options.add(new Option(group, group, false, true)); byId("labelGroupSelect").options.add(new Option(group, group, false, true));
byId(group).appendChild(elSelected.node()); byId(group).appendChild(elSelected.node());
// Update data model group for the moved label // Update data model group for the moved label
if (currentLabelData && currentLabelData.type === "custom") { const labelData = getLabelData(elSelected.node());
Labels.updateLabel(currentLabelData.i, { group }); if (labelData && labelData.type === "custom") {
Labels.updateLabel(labelData.i, { group });
} }
toggleNewGroupInput(); toggleNewGroupInput();
@ -393,7 +394,8 @@ function editLabel() {
} else el.innerHTML = `<tspan x="0">${lines}</tspan>`; } else el.innerHTML = `<tspan x="0">${lines}</tspan>`;
// Update data model // Update data model
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { text: input }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { text: input });
if (elSelected.attr("id").slice(0, 10) === "stateLabel") if (elSelected.attr("id").slice(0, 10) === "stateLabel")
tip("Use States Editor to change an actual state name, not just a label", false, "warning"); tip("Use States Editor to change an actual state name, not just a label", false, "warning");
@ -401,8 +403,9 @@ function editLabel() {
function generateRandomName() { function generateRandomName() {
let name = ""; let name = "";
if (currentLabelData && currentLabelData.type === "state") { const labelData = getLabelData(elSelected.node());
const culture = pack.states[currentLabelData.stateId].culture; if (labelData && labelData.type === "state") {
const culture = pack.states[labelData.stateId].culture;
name = Names.getState(Names.getCulture(culture, 4, 7, ""), culture); name = Names.getState(Names.getCulture(culture, 4, 7, ""), culture);
} else { } else {
const box = elSelected.node().getBBox(); const box = elSelected.node().getBBox();
@ -441,20 +444,23 @@ function editLabel() {
function changeStartOffset() { function changeStartOffset() {
elSelected.select("textPath").attr("startOffset", this.value + "%"); elSelected.select("textPath").attr("startOffset", this.value + "%");
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { startOffset: +this.value }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { startOffset: +this.value });
tip("Label offset: " + this.value + "%"); tip("Label offset: " + this.value + "%");
} }
function changeRelativeSize() { function changeRelativeSize() {
elSelected.select("textPath").attr("font-size", this.value + "%"); elSelected.select("textPath").attr("font-size", this.value + "%");
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { fontSize: +this.value }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { fontSize: +this.value });
tip("Label relative size: " + this.value + "%"); tip("Label relative size: " + this.value + "%");
changeText(); changeText();
} }
function changeLetterSpacingSize() { function changeLetterSpacingSize() {
elSelected.select("textPath").attr("letter-spacing", this.value + "px"); elSelected.select("textPath").attr("letter-spacing", this.value + "px");
if (currentLabelData) Labels.updateLabel(currentLabelData.i, { letterSpacing: +this.value }); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.updateLabel(labelData.i, { letterSpacing: +this.value });
tip("Label letter-spacing size: " + this.value + "px"); tip("Label letter-spacing size: " + this.value + "px");
changeText(); changeText();
} }
@ -466,9 +472,10 @@ function editLabel() {
path.attr("d", `M${c[0] - bbox.width},${c[1]}h${bbox.width * 2}`); path.attr("d", `M${c[0] - bbox.width},${c[1]}h${bbox.width * 2}`);
drawControlPointsAndLine(); drawControlPointsAndLine();
// Sync aligned path to data model // Sync aligned path to data model
if (currentLabelData) { const labelData = getLabelData(elSelected.node());
if (labelData) {
const pathEl = byId("textPath_" + elSelected.attr("id")); const pathEl = byId("textPath_" + elSelected.attr("id"));
Labels.updateLabel(currentLabelData.i, { pathPoints: extractPathPoints(pathEl) }); Labels.updateLabel(labelData.i, { pathPoints: extractPathPoints(pathEl) });
} }
} }
@ -486,7 +493,8 @@ function editLabel() {
buttons: { buttons: {
Remove: function () { Remove: function () {
$(this).dialog("close"); $(this).dialog("close");
if (currentLabelData) Labels.removeLabel(currentLabelData.i); const labelData = getLabelData(elSelected.node());
if (labelData) Labels.removeLabel(labelData.i);
defs.select("#textPath_" + elSelected.attr("id")).remove(); defs.select("#textPath_" + elSelected.attr("id")).remove();
elSelected.remove(); elSelected.remove();
$("#labelEditor").dialog("close"); $("#labelEditor").dialog("close");