From 87d0eaf8974ccba11e65c528453f2ff2193e4fda Mon Sep 17 00:00:00 2001 From: Legendsmith Date: Tue, 8 Oct 2019 21:01:00 +1100 Subject: [PATCH] Update for urbanization value --- modules/ui/provinces-editor.js | 4 ++-- modules/ui/states-editor.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js index 2610ccca..2feef3f1 100644 --- a/modules/ui/provinces-editor.js +++ b/modules/ui/provinces-editor.js @@ -761,7 +761,7 @@ function editProvinces() { function downloadProvincesData() { 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) { let key = parseInt(el.dataset.id) @@ -774,7 +774,7 @@ function editProvinces() { data += el.dataset.area + ","; data += el.dataset.population + ","; 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"}); diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js index be3114a0..a0e03c1b 100644 --- a/modules/ui/states-editor.js +++ b/modules/ui/states-editor.js @@ -869,7 +869,7 @@ function editStates() { function downloadStatesData() { 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) { let key = parseInt(el.dataset.id) @@ -885,7 +885,7 @@ function editStates() { data += el.dataset.area + ","; data += el.dataset.population + ","; 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"});