diff --git a/modules/ui/burgs-overview.js b/modules/ui/burgs-overview.js index c570b3c7..d8847131 100644 --- a/modules/ui/burgs-overview.js +++ b/modules/ui/burgs-overview.js @@ -447,15 +447,17 @@ function overviewBurgs() { } function downloadBurgsData() { - let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation (" + heightUnit.value + "),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers + let data = "Id,Burg,Province,Province Full Name,State,State Full Name,Culture,Religion,Population,Longitude,Latitude,Elevation (" + heightUnit.value + "),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers const valid = pack.burgs.filter(b => b.i && !b.removed); // all valid burgs valid.forEach(b => { data += b.i + ","; data += b.name + ","; const province = pack.cells.province[b.cell]; + data += province ? pack.provinces[province].name + "," : ","; data += province ? pack.provinces[province].fullName + "," : ","; - data += b.state ? pack.states[b.state].fullName + "," : pack.states[b.state].name + ","; + data += pack.states[b.state].name + ","; + data += pack.states[b.state].fullName + ","; data += pack.cultures[b.culture].name + ","; data += pack.religions[pack.cells.religion[b.cell]].name + ","; data += rn(b.population * populationRate * urbanization) + ","; diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js index b5790ec0..7987a56b 100644 --- a/modules/ui/provinces-editor.js +++ b/modules/ui/provinces-editor.js @@ -934,20 +934,22 @@ function editProvinces() { function downloadProvincesData() { const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; - let data = "Id,Province,Form,State,Color,Capital,Area " + unit + ",Total Population,Rural Population,Urban Population\n"; // headers + let data = "Id,Province,Full Name,Form,State,Color,Capital,Area " + unit + ",Total Population,Rural Population,Urban Population\n"; // headers body.querySelectorAll(":scope > div").forEach(function (el) { - let key = parseInt(el.dataset.id); + const key = parseInt(el.dataset.id); + const provincePack = pack.provinces[key]; data += el.dataset.id + ","; data += el.dataset.name + ","; + data += provincePack.fullName + ","; data += el.dataset.form + ","; data += el.dataset.state + ","; data += el.dataset.color + ","; data += el.dataset.capital + ","; data += el.dataset.area + ","; data += el.dataset.population + ","; - data += `${Math.round(pack.provinces[key].rural * populationRate)},`; - data += `${Math.round(pack.provinces[key].urban * populationRate * urbanization)}\n`; + data += `${Math.round(provincePack.rural * populationRate)},`; + data += `${Math.round(provincePack.urban * populationRate * urbanization)}\n`; }); const name = getFileName("Provinces") + ".csv"; diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js index b7952453..68b35a77 100644 --- a/modules/ui/states-editor.js +++ b/modules/ui/states-editor.js @@ -1028,12 +1028,13 @@ function editStates() { function downloadStatesData() { const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; - let data = "Id,State,Form,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area " + unit + ",Total Population,Rural Population,Urban Population\n"; // headers - + let data = "Id,State,Full Name,Form,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area " + unit + ",Total Population,Rural Population,Urban Population\n"; // headers body.querySelectorAll(":scope > div").forEach(function (el) { const key = parseInt(el.dataset.id); + const statePack = pack.states[key]; data += el.dataset.id + ","; data += el.dataset.name + ","; + data += (statePack.fullName ? statePack.fullName : "") + ","; data += el.dataset.form + ","; data += el.dataset.color + ","; data += el.dataset.capital + ","; @@ -1044,8 +1045,8 @@ function editStates() { data += el.dataset.burgs + ","; data += el.dataset.area + ","; data += el.dataset.population + ","; - data += `${Math.round(pack.states[key].rural * populationRate)},`; - data += `${Math.round(pack.states[key].urban * populationRate * urbanization)}\n`; + data += `${Math.round(statePack.rural * populationRate)},`; + data += `${Math.round(statePack.urban * populationRate * urbanization)}\n`; }); const name = getFileName("States") + ".csv";