Merge pull request #139 from ONSvisual/Code-fixes

Code fixes
ONSvisual · Sep 20, 2023 · 3eca52c · 3eca52c
2 parents bd46f8c + 4d5122c
commit 3eca52c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/line-chart-with-area/config.js b/line-chart-with-area/config.js
@@ -30,7 +30,7 @@ config = {
 		// "lineCurveType": "curveCardinal", // Cardinal spline curve
 		// "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": {
@@ -50,13 +50,13 @@ config = {
 		},
 		"margin": {
 			"sm": {
-				"top": 15,
+				"top": 30,
 				"right": 30,
 				"bottom": 50,
 				"left": 30
 			},
 			"md": {
-				"top": 15,
+				"top": 30,
 				"right": 100,
 				"bottom": 50,
 				"left": 30

diff --git a/line-chart-with-area/script.js b/line-chart-with-area/script.js
@@ -2,6 +2,7 @@
 
 let graphic = d3.select('#graphic');
 //console.log(`Graphic selected: ${graphic}`);
+let legend = d3.selectAll('#legend')
 let pymChild = null;
 
 function drawGraphic() {
@@ -34,6 +35,7 @@ function drawGraphic() {
 	// Remove any existing chart elements
 	graphic.selectAll('*').remove();
 	//console.log(`Removed existing chart elements`);
+	legend.selectAll('*').remove();
 
 	// Get categories from the keys used in the stack generator
 	// const categories = Object.keys(graphic_data[0]).filter((k) => k !== 'date');
@@ -56,14 +58,20 @@ function drawGraphic() {
 
 	let x;
 
+
+
 	if (xDataType == 'date') {
 	  x = d3.scaleTime()
 	  .domain(d3.extent(graphic_data, (d) => d.date))
 	  .range([0, width]);
-	} else {
+	} else if (config.essential.xDomain == "auto"){
 	  x = d3.scaleLinear()
 	  .domain(d3.extent(graphic_data, (d) => +d.date))
 	  .range([0, width]);
+	} else {
+		x = d3.scaleLinear()
+		.domain(config.essential.xDomain)
+		.range([0, width]);
 	}
 	//console.log(`x defined`);
 

diff --git a/scatter-plot/config.js b/scatter-plot/config.js
@@ -9,7 +9,7 @@ config={
     "accessibleSummary":"Here is the screenreader text describing the chart.",
     "xDomain":"auto",
     "yDomain":"auto",
-    // either "auto" or an array for the x domain e.g. [0,100]
+    // either "auto" or an array for the x/y domain e.g. [0,100]
     "xAxisLabel":"x axis label",
     "yAxisLabel":"y axis label",
     "xAxisFormat":".0%",

diff --git a/scatter-plot/script.js b/scatter-plot/script.js
@@ -87,10 +87,10 @@ legenditem
   }
 
 
-  if(config.essential.xDomain=="auto"){
+  if(config.essential.yDomain=="auto"){
     y.domain([0, d3.max(graphic_data,function(d){return d.yvalue})]);
   }else{
-    y.domain(config.essential.xDomain)
+    y.domain(config.essential.yDomain)
   }
 
   svg