Added my own colour name code to palettes.js

poptimal.js

@@ -12,7 +12,7 @@ const xlinkns = "http://www.w3.org/1999/xlink";
 const svgns = "http://www.w3.org/2000/svg";
 
 import {RADIUS_OPTS, DotMaker} from './src/components/dots.js';
-import {PALETTES, colour_to_text} from './src/components/palettes.js';
+import {PALETTES, ColourNamer} from './src/components/palettes.js';
 
 const CELL = 10;
 const MAG = 2;
@@ -39,9 +39,9 @@ function randomise_params() {
 }
 
 
-function image_description(params) {
+function image_description(namer, params) {
-	const bgc = colour_to_text(params.background);
+	const bgc = namer.colour_to_text(params.background);
-	const dotc = params.patterns.map((p) => colour_to_text(p.colour));
+	const dotc = params.patterns.map((p) => namer.colour_to_text(p.colour));
 	const a = bgc.match(/^[aeiou]/) ? 'an' : 'a';
 	return `A pattern of ${dotc[0]} and ${dotc[1]} dots on ${a} ${bgc} background`;
 
@@ -130,22 +130,19 @@ async function main() {
 		.default('s', 1200)
 		.default('c', 'config.json').argv;
 
-	if( argv.t ) {
-		const blue = d3.rgb(0, 0, 255);
-		const name = await colour_to_text(blue, "./rgb.txt");
-		console.log(name);
-		process.exit();
-	}
-
 	const cfjson = await promises.readFile(argv.c);
   	const cf = JSON.parse(cfjson);
 
+	const namer = new ColourNamer();
+	await namer.load_colours(cf['colours']);
+
+
   	const fn = argv.o || String(Date.now()) + '.png';
 
   	const imgfile = cf['working_dir'] + '/' + fn;
 
 	const params = randomise_params();
-	const alt_text = image_description(params);
+	const alt_text = image_description(namer, params);
 
 	const svg = poptimal_svg(params);
 	const opts = {

rgb.txt

@@ -0,0 +1,169 @@
+255 250 250 snow
+248 248 255 ghost white
+245 245 245 white smoke
+220 220 220 gainsboro
+255 250 240 floral white
+253 245 230 old lace
+250 240 230 linen
+250 235 215 antique white
+255 239 213 papaya whip
+255 235 205 blanched almond
+255 228 196 bisque
+255 218 185 peach puff
+255 222 173 navajo white
+255 228 181 moccasin
+255 248 220 cornsilk
+255 255 240 ivory
+255 250 205 lemon chiffon
+255 245 238 seashell
+240 255 240 honeydew
+245 255 250 mint cream
+240 255 255 azure
+240 248 255 alice blue
+230 230 250 lavender
+255 240 245 lavender blush
+255 228 225 misty rose
+255 255 255 white
+105 105 105 dim grey
+112 128 144 slate grey
+119 136 153 light slate grey
+190 190 190 grey
+211 211 211 light grey
+100 149 237 cornflower blue
+106 90 205 slate blue
+123 104 238 medium slate blue
+132 112 255 light slate blue
+135 206 235 sky blue
+135 206 250 light sky blue
+176 196 222 light steel blue
+173 216 230 light blue
+176 224 230 powder blue
+175 238 238 pale turquoise
+224 255 255 light cyan
+102 205 170 medium aquamarine
+127 255 212 aquamarine
+143 188 143 dark sea green
+152 251 152 pale green
+124 252 0 lawn green
+127 255 0 chartreuse
+173 255 47 green yellow
+154 205 50 yellow green
+107 142 35 olive drab
+189 183 107 dark khaki
+240 230 140 khaki
+238 232 170 pale goldenrod
+250 250 210 light goldenrod yellow
+255 255 224 light yellow
+255 255 0 yellow
+255 215 0 gold
+238 221 130 light goldenrod
+218 165 32 goldenrod
+184 134 11 dark goldenrod
+188 143 143 rosy brown
+205 92 92 indian red
+139 69 19 saddle brown
+160 82 45 sienna
+205 133 63 peru
+222 184 135 burlywood
+245 245 220 beige
+245 222 179 wheat
+244 164 96 sandy brown
+210 180 140 tan
+210 105 30 chocolate
+178 34 34 firebrick
+165 42 42 brown
+233 150 122 dark salmon
+250 128 114 salmon
+255 160 122 light salmon
+255 165 0 orange
+255 140 0 dark orange
+255 127 80 coral
+240 128 128 light coral
+255 99 71 tomato
+255 69 0 orange red
+255 0 0 red
+255 105 180 hot pink
+255 20 147 deep pink
+255 192 203 pink
+255 182 193 light pink
+219 112 147 pale violet red
+176 48 96 maroon
+199 21 133 medium violet red
+208 32 144 violet red
+255 0 255 magenta
+238 130 238 violet
+221 160 221 plum
+218 112 214 orchid
+186 85 211 medium orchid
+153 50 204 dark orchid
+148 0 211 dark violet
+138 43 226 blue violet
+160 32 240 purple
+147 112 219 medium purple
+216 191 216 thistle
+102 102 102 60% grey
+105 105 105 59% grey
+107 107 107 58% grey
+110 110 110 57% grey
+112 112 112 56% grey
+115 115 115 55% grey
+117 117 117 54% grey
+120 120 120 53% grey
+122 122 122 52% grey
+125 125 125 51% grey
+127 127 127 50% grey
+130 130 130 49% grey
+133 133 133 48% grey
+135 135 135 47% grey
+138 138 138 46% grey
+140 140 140 45% grey
+143 143 143 44% grey
+145 145 145 43% grey
+148 148 148 42% grey
+150 150 150 41% grey
+153 153 153 40% grey
+156 156 156 39% grey
+158 158 158 38% grey
+161 161 161 37% grey
+163 163 163 36% grey
+166 166 166 35% grey
+168 168 168 34% grey
+171 171 171 33% grey
+173 173 173 32% grey
+176 176 176 31% grey
+179 179 179 30% grey
+181 181 181 29% grey
+184 184 184 28% grey
+186 186 186 27% grey
+189 189 189 26% grey
+191 191 191 25% grey
+194 194 194 24% grey
+196 196 196 23% grey
+199 199 199 22% grey
+201 201 201 21% grey
+204 204 204 20% grey
+207 207 207 19% grey
+209 209 209 18% grey
+212 212 212 17% grey
+214 214 214 16% grey
+217 217 217 15% grey
+219 219 219 14% grey
+222 222 222 13% grey
+224 224 224 12% grey
+227 227 227 11% grey
+229 229 229 10% grey
+232 232 232 9% grey
+235 235 235 8% grey
+237 237 237 7% grey
+240 240 240 6% grey
+242 242 242 5% grey
+245 245 245 4% grey
+247 247 247 3% grey
+250 250 250 2% grey
+252 252 252 1% grey
+169 169 169 dark grey
+0 0 139 dark blue
+0 139 139 dark cyan
+139 0 139 dark magenta
+139 0 0 dark red
+144 238 144 light green

src/components/palettes.js

@@ -78,33 +78,36 @@ function palette_cmy() {
 	return shuffle(cols);
 }
 
-async function parse_colours(colourfile) {
+class ColourNamer {
-	const colourBuff = await promises.readFile(colourfile);
+	constructor() {
-	const colours = colourBuff.toString();
+		this.colmap = new Map();
-	const colmap = new Map();
+	}
-	const seen = new Set(); 
+
-	colours.split(/\n/).map((l) => {
+	async load_colours(colourfile) {
-		const m = l.match(/(\d+)\s+(\d+)\s+(\d+)\s+(.*)/);
+		const colourBuff = await promises.readFile(colourfile);
-		if( m ) {
+		const colours = colourBuff.toString();
-			const sig = `${m[1]},${m[2]},${m[3]}`;
+		const seen = new Set(); 
-			if( !seen.has(sig) ) {
+		colours.split(/\n/).map((l) => {
-				colmap.set(m[4], d3.rgb(m[1], m[2], m[3]));
+			const m = l.match(/(\d+)\s+(\d+)\s+(\d+)\s+(.*)/);
-				seen.add(sig);
+			if( m ) {
+				const sig = `${m[1]},${m[2]},${m[3]}`;
+				if( !seen.has(sig) ) {
+					this.colmap.set(m[4], d3.rgb(m[1], m[2], m[3]));
+					seen.add(sig);
+				}
 			}
+		});
+	}
+
+	colour_to_text(d3color) {
+		const diffs = []
+		for( const [ name, colour] of this.colmap) {
+			diffs.push({name: name, dist: d3cd.differenceCie76(colour, d3color)});
 		}
-	});
+		diffs.sort((a, b) => a.dist - b.dist);
-	return colmap;
+		return diffs[0].name;
+	}
 }
 
-async function colour_to_text(d3color, colourfile) {
-	const colours = await parse_colours(colourfile);
-	const diffs = []
-	for( const [ name, colour] of colours) {
-		diffs.push({name: name, dist: d3cd.differenceCie76(colour, d3color)});
-	}
-	diffs.sort((a, b) => a.dist - b.dist);
-	return diffs[0].name;
-} 
 
-
+export { PALETTES, ColourNamer }
-export { PALETTES, colour_to_text }