Merge pull request #125 from ONSvisual/120-line-with-area-y-domain-ca…

…lculation Fixing y-domain calculations
ONSvisual · Sep 1, 2023 · 5928387 · 5928387
2 parents d9470a5 + 3952766
commit 5928387
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/line-chart-with-area/config.js b/line-chart-with-area/config.js
@@ -31,7 +31,7 @@ config = {
 		// "lineCurveType": "curveCatmullRom" // Catmull-Rom spline curve
 		// "lineCurveType": "curveMonotoneX" // Monotone spline curve
 
-		"xDomain": "auto",
+		"yDomain": [0,7],
 		// either "auto" or an array for the x domain e.g. [0,2000]
 		"xAxisTickFormat": {
 			"sm": "%b %y",

diff --git a/line-chart-with-area/script.js b/line-chart-with-area/script.js
@@ -50,12 +50,16 @@ function drawGraphic() {
 
 	const y = d3
 		.scaleLinear()
-		.domain([
-			0,
-			d3.max(graphic_data, (d) => Math.max(...fulldataKeys.map((c) => d[c])))
-		])
-		// .nice()
 		.range([height, 0]);
+
+	if (config.essential.yDomain == "auto") {
+		y.domain(
+			[d3.min(graphic_data, (d) => Math.min(...fulldataKeys.map((c) => d[c]))),
+			d3.max(graphic_data, (d) => Math.max(...fulldataKeys.map((c) => d[c])))]
+		)
+	} else {
+		y.domain(config.essential.yDomain)
+	}
 	//console.log(`yAxis defined`);
 
 
@@ -249,7 +253,7 @@ function drawGraphic() {
 		.attr('transform', `translate(0, 0)`)
 		.append('text')
 		.attr('x', -margin.left + 10)
-		.attr('y', 0)
+		.attr('y', -10)
 		.attr('class', 'axis--label')
 		.text(config.essential.yAxisLabel)
 		.attr('text-anchor', 'start');