Skip to content

Commit cc55635

Browse files
committed
remove references to old getColor function
1 parent c8334b5 commit cc55635

File tree

2 files changed

+1
-95
lines changed

2 files changed

+1
-95
lines changed

src/wrappers/components/data-vis/line-chart/LineChartWrapper.svelte

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -239,21 +239,7 @@
239239
description:
240240
"Parameters that are specific to particular lines. Takes priority over `basicLineParams` and tieredLineParams",
241241
functionElements: {
242-
functionAsString: `function (key, el) {
243-
return {
244-
pathStrokeColor: ["primary", "hover", "clicked"].includes(key)
245-
? getColor(
246-
el[series],
247-
[
248-
"E07000224",
249-
"E07000225",
250-
"E07000226",
251-
"E07000228",
252-
].indexOf(el[series]),
253-
)
254-
: null,
255-
};
256-
}`,
242+
functionAsString: ``,
257243
},
258244
value: function (tier, el) {
259245
return {
@@ -268,32 +254,6 @@
268254
(!clickedSeries &&
269255
hoveredTier === "primary" &&
270256
tier === "primary"),
271-
pathStrokeColor: ["primary", "hover", "clicked"].includes(tier)
272-
? getColor(
273-
el[series],
274-
[
275-
"E07000224",
276-
"E07000225",
277-
"E07000226",
278-
"E07000228",
279-
englandMedian,
280-
similarAreas,
281-
].indexOf(el[series]),
282-
)
283-
: null,
284-
markerFill: ["primary", "hover", "clicked"].includes(tier)
285-
? getColor(
286-
el[series],
287-
[
288-
"E07000224",
289-
"E07000225",
290-
"E07000226",
291-
"E07000228",
292-
englandMedian,
293-
similarAreas,
294-
].indexOf(el[series]),
295-
)
296-
: null,
297257
};
298258
},
299259
},
@@ -448,34 +408,6 @@
448408
activeMarkerId = marker;
449409
},
450410
},
451-
{
452-
name: "getColor",
453-
category: "customisingLines",
454-
functionElements: {
455-
functionAsString: `function (series, i) {
456-
let colorsArray = [colors.coral, colors.fuschia, colors.purple];
457-
458-
return (
459-
{
460-
[englandMedian]: colors.lightblue,
461-
[selectedAreaCode]: colors.teal,
462-
[similarAreas]: colors.darkblue,
463-
}[series] ?? colorsArray[i % colorsArray.length]
464-
);
465-
};`,
466-
},
467-
value: function (series, i) {
468-
let colorsArray = colors;
469-
470-
return (
471-
{
472-
[englandMedian]: colors.burntSienna,
473-
[selectedAreaCode]: colors.coral,
474-
[similarAreas]: colors.slatePurple,
475-
}[series] ?? colorsArray[i % colorsArray.length]
476-
);
477-
},
478-
},
479411
480412
{
481413
name: "paddingTop",
@@ -722,18 +654,6 @@
722654
clicked: { opacity: 1 },
723655
});
724656
725-
let getColor = function (series, i) {
726-
let colorsArray = colors;
727-
728-
return (
729-
{
730-
[englandMedian]: colors.lightblue,
731-
[selectedAreaCode]: colors.teal,
732-
[similarAreas]: colors.darkblue,
733-
}[series] ?? colorsArray[i % colorsArray.length]
734-
);
735-
};
736-
737657
let xFunction = $derived(function (number) {
738658
return scaleLinear()
739659
.domain([2015, 2022])
@@ -780,7 +700,6 @@
780700
lineFunction,
781701
lineChartData,
782702
tieredLineParams,
783-
getColor,
784703
basicLineParams,
785704
nothingSelected,
786705
globalTierRules,

src/wrappers/components/data-vis/line-chart/LinesWrapper.svelte

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@
5353
}
5454
};
5555
56-
function getColor(areaCode, lookupObj, i) {
57-
return (
58-
lookupObj[areaCode] ?? colorPalette.base[i % colorPalette.base.length]
59-
);
60-
}
61-
6256
/**
6357
* ! More documentation is provided on the component library's user guide page.
6458
*/
@@ -644,13 +638,6 @@
644638
.map((el) => ({
645639
...el,
646640
includeMarkers: key === "primary" ? true : false,
647-
pathStrokeColor: ["primary", "hover", "clicked"].includes(key)
648-
? getColor(
649-
el.areaCode,
650-
lookupObj,
651-
getValue("primaryLines").indexOf(el.areaCode),
652-
)
653-
: null,
654641
}));
655642
return acc;
656643
}, {}),

0 commit comments

Comments
 (0)