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

fix: if group is missing, recreate all labels or icons

Browse source
This commit is contained in:
Azgaar 2026-01-09 22:50:58 +01:00
parent 753db70283
commit fa8fd58259
6 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
index.html
View file

@ -8563,7 +8563,7 @@
<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.107.4"></script> <script defer src="modules/io/save.js?v=1.107.4"></script>
<script defer src="modules/io/load.js?v=1.109.3"></script> <script defer src="modules/io/load.js?v=1.109.4"></script>
<script defer src="modules/io/cloud.js?v=1.106.0"></script> <script defer src="modules/io/cloud.js?v=1.106.0"></script>
<script defer src="modules/io/export.js?v=1.108.13"></script> <script defer src="modules/io/export.js?v=1.108.13"></script>
@ -8576,8 +8576,8 @@
<script defer src="modules/renderers/draw-emblems.js?v=1.104.0"></script> <script defer src="modules/renderers/draw-emblems.js?v=1.104.0"></script>
<script defer src="modules/renderers/draw-military.js?v=1.108.5"></script> <script defer src="modules/renderers/draw-military.js?v=1.108.5"></script>
<script defer src="modules/renderers/draw-state-labels.js?v=1.108.1"></script> <script defer src="modules/renderers/draw-state-labels.js?v=1.108.1"></script>
<script defer src="modules/renderers/draw-burg-labels.js?v=1.108.1"></script> <script defer src="modules/renderers/draw-burg-labels.js?v=1.109.4"></script>
<script defer src="modules/renderers/draw-burg-icons.js?v=1.104.0"></script> <script defer src="modules/renderers/draw-burg-icons.js?v=1.109.4"></script>
<script defer src="modules/renderers/draw-relief-icons.js?v=1.108.4"></script> <script defer src="modules/renderers/draw-relief-icons.js?v=1.108.4"></script>
</body> </body>
</html> </html>

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

@ -977,14 +977,6 @@ export function resolveVersionConflicts(mapVersion) {
// v1.109.0 added customizable burg groups and icons // v1.109.0 added customizable burg groups and icons
options.burgs = {groups: []}; options.burgs = {groups: []};
// default groups were 'cities' and 'towns'
const iconGroups = burgIcons.selectAll("g");
const citiesGroup = burgIcons.select("#cities");
const townsGroup = burgIcons.select("#towns");
if (!iconGroups.size() || (iconGroups.size() === 2 && citiesGroup.size() && townsGroup.size())) {
// it looks the loaded map has old default groups
options.burgs.groups = Burgs.getDefaultGroups();
} else {
burgIcons.selectAll("circle, use").each(function () { burgIcons.selectAll("circle, use").each(function () {
const group = this.parentNode.id; const group = this.parentNode.id;
const id = this.id.replace(/^burg/, ""); const id = this.id.replace(/^burg/, "");
@ -1018,7 +1010,6 @@ export function resolveVersionConflicts(mapVersion) {
burgLabels.selectAll("g").each(function () { burgLabels.selectAll("g").each(function () {
if (!this.dataset.dy) this.dataset.dy = -0.4; if (!this.dataset.dy) this.dataset.dy = -0.4;
}); });
}
const anchorSymbol = byId("icon-anchor"); const anchorSymbol = byId("icon-anchor");
if (anchorSymbol) { if (anchorSymbol) {

2
modules/io/load.js
View file

@ -472,7 +472,7 @@ async function parseLoadedData(data, mapVersion) {
{ {
// dynamically import and run auto-update script // dynamically import and run auto-update script
const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.109.3"); const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.109.4");
resolveVersionConflicts(mapVersion); resolveVersionConflicts(mapVersion);
} }

8
modules/renderers/draw-burg-icons.js
View file

@ -31,11 +31,13 @@ function drawBurgIcons() {
} }
function drawBurgIcon(burg) { function drawBurgIcon(burg) {
removeBurgIcon(burg.i);
const iconGroup = burgIcons.select("#" + burg.group); const iconGroup = burgIcons.select("#" + burg.group);
if (iconGroup.empty()) return; if (iconGroup.empty()) {
drawBurgIcons();
return; // redraw all icons if group is missing
}
removeBurgIcon(burg.i);
const icon = iconGroup.attr("data-icon") || "#icon-circle"; const icon = iconGroup.attr("data-icon") || "#icon-circle";
burgIcons burgIcons
.select("#" + burg.group) .select("#" + burg.group)

9
modules/renderers/draw-burg-labels.js
View file

@ -33,13 +33,16 @@ function drawBurgLabels() {
} }
function drawBurgLabel(burg) { function drawBurgLabel(burg) {
removeBurgLabel(burg.i);
const labelGroup = burgLabels.select("#" + burg.group); const labelGroup = burgLabels.select("#" + burg.group);
if (labelGroup.empty()) return; if (labelGroup.empty()) {
drawBurgLabels();
return; // redraw all labels if group is missing
}
const dx = labelGroup.attr("data-dx") || 0; const dx = labelGroup.attr("data-dx") || 0;
const dy = labelGroup.attr("data-dy") || 0; const dy = labelGroup.attr("data-dy") || 0;
removeBurgLabel(burg.i);
labelGroup labelGroup
.append("text") .append("text")
.attr("text-rendering", "optimizeSpeed") .attr("text-rendering", "optimizeSpeed")

2
versioning.js
View file

@ -13,7 +13,7 @@
* Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2 * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
*/ */
const VERSION = "1.109.3"; const VERSION = "1.109.4";
if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function"); if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
{ {