Update for urbanization value

This commit is contained in:
Legendsmith 2019-10-08 21:01:00 +11:00
parent 8e36532142
commit 87d0eaf897
2 changed files with 4 additions and 4 deletions

View file

@ -761,7 +761,7 @@ function editProvinces() {
function downloadProvincesData() { function downloadProvincesData() {
const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
let data = "Id,Province,Form,State,Color,Capital,Area "+unit+",Population,Rural Population,Urban Population\n"; // headers let data = "Id,Province,Form,State,Color,Capital,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers
body.querySelectorAll(":scope > div").forEach(function(el) { body.querySelectorAll(":scope > div").forEach(function(el) {
let key = parseInt(el.dataset.id) let key = parseInt(el.dataset.id)
@ -774,7 +774,7 @@ function editProvinces() {
data += el.dataset.area + ","; data += el.dataset.area + ",";
data += el.dataset.population + ","; data += el.dataset.population + ",";
data += `${Math.round(pack.provinces[key].rural*populationRate.value)},` data += `${Math.round(pack.provinces[key].rural*populationRate.value)},`
data += `${Math.round(pack.provinces[key].urban*populationRate.value)}\n` data += `${Math.round(pack.provinces[key].urban*populationRate.value * urbanization.value)}\n`
}); });
const dataBlob = new Blob([data], {type: "text/plain"}); const dataBlob = new Blob([data], {type: "text/plain"});

View file

@ -869,7 +869,7 @@ function editStates() {
function downloadStatesData() { function downloadStatesData() {
const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
let data = "Id,State,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Population,Rural Population,Urban Population\n"; // headers let data = "Id,State,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers
body.querySelectorAll(":scope > div").forEach(function(el) { body.querySelectorAll(":scope > div").forEach(function(el) {
let key = parseInt(el.dataset.id) let key = parseInt(el.dataset.id)
@ -885,7 +885,7 @@ function editStates() {
data += el.dataset.area + ","; data += el.dataset.area + ",";
data += el.dataset.population + ","; data += el.dataset.population + ",";
data += `${Math.round(pack.states[key].rural*populationRate.value)},`; data += `${Math.round(pack.states[key].rural*populationRate.value)},`;
data += `${Math.round(pack.states[key].urban*populationRate.value)}\n`; data += `${Math.round(pack.states[key].urban*populationRate.value * urbanization.value)}\n`;
}); });
const dataBlob = new Blob([data], {type: "text/plain"}); const dataBlob = new Blob([data], {type: "text/plain"});