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

Fix: robust error handling, no error for 0.

Browse source
This commit is contained in:
GoteGuru 2022-04-07 22:51:36 +00:00
parent e2a6b16c6c
commit 312f640107
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/submap.js
View file

@ -140,7 +140,10 @@ window.Submap = (function () {
stage("Resampling culture, state and religion map.") stage("Resampling culture, state and religion map.")
for(const [id, gridCellId] of cells.g.entries()) { for(const [id, gridCellId] of cells.g.entries()) {
const oldGridId = reverseGridMap[gridCellId]; const oldGridId = reverseGridMap[gridCellId];
if (!oldGridId) throw new Error("Old grid Id must be defined!") if (oldGridId === undefined) {
console.error('Can not find old cell id', reverseGridMap, 'in', gridCellId);
continue;
}
// find old parent's children // find old parent's children
const oldChildren = oldCells.i.filter(oid=>oldCells.g[oid]==oldGridId); const oldChildren = oldCells.i.filter(oid=>oldCells.g[oid]==oldGridId);
let oldid; // matching cell on the original map let oldid; // matching cell on the original map
@ -175,12 +178,12 @@ window.Submap = (function () {
} }
const [oldpx, oldpy] = oldCells.p[oid]; const [oldpx, oldpy] = oldCells.p[oid];
const nd = distance(projection(oldpx, oldpy, false)); const nd = distance(projection(oldpx, oldpy, false));
if (!nd) { if (isNaN(nd)) {
console.error("no distance!", nd, "old point", oldpx, oldpy) console.error("Distance is not a number!", "Old point:", oldpx, oldpy);
} }
if (nd < d) [d, oldid] = [nd, oid]; if (nd < d) [d, oldid] = [nd, oid];
}) })
if (!oldid) { if (oldid === undefined) {
console.warn("Warning, no match for", id, "(parent:", gridCellId, ")"); console.warn("Warning, no match for", id, "(parent:", gridCellId, ")");
continue; continue;
} }