From 1a5a5509a711fb1166bc91247f1a0d5c6a904ce7 Mon Sep 17 00:00:00 2001 From: Ralph Behrens Date: Wed, 6 Jan 2021 14:19:03 +0100 Subject: [PATCH 1/2] Update code-city.js The calculation of baseHeight and gd (see function addHouse) could lead to a division through zero. The proposed changes ensures that both parameters are at least valid. --- src/code-city/code-city.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/code-city/code-city.js b/src/code-city/code-city.js index 6f91ddf..7f05ce2 100644 --- a/src/code-city/code-city.js +++ b/src/code-city/code-city.js @@ -95,7 +95,13 @@ void main() { \ var h = 1000; var gw = Math.max(0, (d.dx - 2 * houseMargin)*w) / 500; var gh = Math.max(0, (d.dy - 2 * houseMargin)*h) / 500; - var baseHeight = Math.sqrt((d.height-minimumHeight)/(maximumHeight-minimumHeight)); + + var minimum_baseHeight = 0.1; + var baseHeight = minimum_baseHeight; + + if(maximumHeight > minimumHeight) + baseHeight = Math.sqrt((d.height-minimumHeight)/(maximumHeight-minimumHeight)); + var gd = unitHeight * (d.children ? 0.05 : baseHeight)*130.0; var gx = ((d.x + d.dx/2)*w ) / 500 - 1; From d96c6155a6b08ae886d0f7e0e80c92e07b31fd4f Mon Sep 17 00:00:00 2001 From: Ralph Behrens Date: Fri, 8 Jan 2021 16:30:11 +0100 Subject: [PATCH 2/2] Update code-city.js --- src/code-city/code-city.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code-city/code-city.js b/src/code-city/code-city.js index 7f05ce2..2ae68b3 100644 --- a/src/code-city/code-city.js +++ b/src/code-city/code-city.js @@ -100,7 +100,7 @@ void main() { \ var baseHeight = minimum_baseHeight; if(maximumHeight > minimumHeight) - baseHeight = Math.sqrt((d.height-minimumHeight)/(maximumHeight-minimumHeight)); + baseHeight = Math.max(minimum_baseHeight, Math.sqrt((d.height-minimumHeight)/(maximumHeight-minimumHeight))); var gd = unitHeight * (d.children ? 0.05 : baseHeight)*130.0;