From 2d5d008fe864fc00cf16618f3184a1eee940e490 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Tue, 28 May 2019 21:41:21 +0300 Subject: [PATCH] v 0.8.24b --- modules/routes-generator.js | 2 +- modules/save-and-load.js | 6 +++++- modules/ui/biomes-editor.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/routes-generator.js b/modules/routes-generator.js index 3afe47fb..783943ca 100644 --- a/modules/routes-generator.js +++ b/modules/routes-generator.js @@ -59,7 +59,7 @@ const getSearoutes = function() { console.time("generateSearoutes"); - const cells = pack.cells, allPorts = pack.burgs.filter(b => b.port != 0 && !b.removed); + const cells = pack.cells, allPorts = pack.burgs.filter(b => b.port > 0 && !b.removed); if (allPorts.length < 2) return []; const bodies = new Set(allPorts.map(b => b.port)); // features with ports let from = [], exit = null, path = [], paths = []; // array to store path segments diff --git a/modules/save-and-load.js b/modules/save-and-load.js index 16e2e012..57fb3c93 100644 --- a/modules/save-and-load.js +++ b/modules/save-and-load.js @@ -361,13 +361,17 @@ function parseLoadedData(data) { if (borders.style("display") !== "none" && borders.selectAll("*").size()) turnButtonOn("toggleBorders"); else turnButtonOff("toggleBorders"); if (routes.style("display") !== "none" && routes.selectAll("path").size()) turnButtonOn("toggleRoutes"); else turnButtonOff("toggleRoutes"); if (temperature.selectAll("*").size()) turnButtonOn("toggleTemp"); else turnButtonOff("toggleTemp"); - if (population.select("#rural").selectAll("*").size()) turnButtonOn("togglePopulation"); else turnButtonOff("togglePopulation"); if (prec.selectAll("circle").size()) turnButtonOn("togglePrec"); else turnButtonOff("togglePrec"); if (labels.style("display") !== "none") turnButtonOn("toggleLabels"); else turnButtonOff("toggleLabels"); if (icons.style("display") !== "none") turnButtonOn("toggleIcons"); else turnButtonOff("toggleIcons"); if (markers.style("display") !== "none") turnButtonOn("toggleMarkers"); else turnButtonOff("toggleMarkers"); if (ruler.style("display") !== "none") turnButtonOn("toggleRulers"); else turnButtonOff("toggleRulers"); if (scaleBar.style("display") !== "none") turnButtonOn("toggleScaleBar"); else turnButtonOff("toggleScaleBar"); + + // special case for population bars + const populationIsOn = population.selectAll("line").size(); + if (populationIsOn) drawPopulation(); + if (populationIsOn) turnButtonOn("togglePopulation"); else turnButtonOff("togglePopulation"); }() void function restoreRulersEvents() { diff --git a/modules/ui/biomes-editor.js b/modules/ui/biomes-editor.js index 70ac2f52..6b5ea8e8 100644 --- a/modules/ui/biomes-editor.js +++ b/modules/ui/biomes-editor.js @@ -182,7 +182,7 @@ function editBiomes() { const url = window.URL.createObjectURL(dataBlob); const link = document.createElement("a"); document.body.appendChild(link); - link.download = "states_data" + Date.now() + ".csv"; + link.download = "biomes_data" + Date.now() + ".csv"; link.href = url; link.click(); window.setTimeout(function() {window.URL.revokeObjectURL(url);}, 2000);