@ca-plant-list/ca-plant-list 0.3.3 → 0.3.4

package/data/glossary/calyx.md

@@ -0,0 +1 @@
+The collection of [sepals](./sepal.html) on a flower.

package/data/glossary/pedicel.md

@@ -0,0 +1 @@
+A stalk supporting a single flower.

package/data/glossary/sepal.md

@@ -0,0 +1 @@
+A leaf-like or petal-like part of the flower, generally just below the petals.

package/data/synonyms.csv

@@ -25,7 +25,6 @@ Achnatherum lemmonii subsp. lemmonii,Stipa lemmonii var. lemmonii
 Acmispon strigosus var. hirtellus,Acmispon strigosus
 Acroptilon repens,Rhaponticum repens
 Actaea rubra subsp. arguta,Actaea rubra
-Adelinia grandis,Adelinia grandis,INAT
 Adiantum boreale,Adiantum aleuticum
 Adiantum pedatum subsp. calderi,Adiantum aleuticum
 Adiantum pedatum var. aleuticum,Adiantum aleuticum

package/data/taxa.csv

@@ -22,7 +22,8 @@ Acmispon americanus var. americanus,Spanish-clover,N,91832,11269,57053,"white,pi
 Acmispon brachycarpus,woolly trefoil,N,91705,11276,57047
 Acmispon denticulatus,meadow trefoil,N,91708,11279,60194
 Acmispon glaber var. glaber,California broom,N,91825,11282,58900,yellow,3,8
-Acmispon junceus var. biolettii,,N,91830,11290,80314
+Acmispon junceus var. biolettii,,N,91830,11290,80314,yellow,4,7
+Acmispon junceus var. junceus,,N,91831,11291,80315,yellow,4,7
 Acmispon parviflorus,least trefoil,N,91717,11299,57048
 Acmispon strigosus,,N,91722,11305,75281
 Acmispon wrangelianus,common trefoil,N,82483,11306,57050
@@ -108,8 +109,8 @@ Anthoxanthum occidentale,,N,13521,11332,75474
 Anthriscus caucalis,bur-chervil,X,13523,396,52846,white
 Antirrhinum kelloggii,,N,13568,401,165675
 Antirrhinum majus,snapdragon,X,13557,404,48969
-Antirrhinum thompsonii,Sierra snapdragon,N,108978,14286,168306
-Antirrhinum vexillocalyculatum subsp. vexillocalyculatum,,N,88873,10499,840919
+Antirrhinum thompsonii,Sierra snapdragon,N,108978,14286,168306,pink,4,8
+Antirrhinum vexillocalyculatum subsp. vexillocalyculatum,,N,88873,10499,840919,purple,6,8
 Aphanes occidentalis,,N,13608,420,866483
 Aphyllon californicum subsp. jepsonii,,N,103325,13438,802459
 Aphyllon epigalium subsp. epigalium,,N,103327,13527,809377
@@ -265,16 +266,16 @@ Callitriche heterophylla var. bolanderi,,N,55448,1257,60158
 Callitriche longipedunculata,,N,16691,11443,75936
 Callitriche marginata,water-starwort,N,16692,1259,58093
 Callitriche trochlearis,,N,16702,1261,69994
-Calochortus albus,white globe lily,N,16710,1264,51315,white
-Calochortus argillosus,clay mariposa lily,N,76542,1268,64330,"white,pink"
+Calochortus albus,white globe lily,N,16710,1264,51315,white,4,6
+Calochortus argillosus,clay mariposa lily,N,76542,1268,64330,"white,pink",4,6
 Calochortus clavatus var. pallidus,,N,55455,1275,58360
 Calochortus invenustus,,N,16733,1284,64432
 Calochortus leichtlinii,,N,16735,1288,52542
-Calochortus luteus,yellow mariposa lily,N,16737,1290,51077,yellow
+Calochortus luteus,yellow mariposa lily,N,16737,1290,51077,yellow,4,6
 Calochortus pulchellus,Mt. Diablo fairy lantern,N,16755,1303,47326,,,,50,1B.2,,,S2,G2
 Calochortus splendens,,N,16759,1306,58361
-Calochortus umbellatus,Oakland star-tulip,N,16769,1311,51054,,,,55,4.2,,,S3?,G3?
-Calochortus venustus,,N,16772,1313,53902,"white,red"
+Calochortus umbellatus,Oakland star-tulip,N,16769,1311,51054,white,,,55,4.2,,,S3?,G3?
+Calochortus venustus,butterfly mariposa lily,N,16772,1313,53902,"white,red",5,7
 Caltha palustris,marsh-marigold,X,16802,8708,56224
 Calycadenia multiglandulosa,,N,1875,1324,56863
 Calycadenia truncata,rosin weed,N,1884,1328,62567
@@ -402,13 +403,13 @@ Cicuta douglasii,water hemlock,N,19447,2109,76338
 Cicuta maculata var. bolanderi,water hemlock,N,56538,2111,60118,,,,2178,2B.1,,,S2?,G5T4T5
 Cirsium andrewsii,Franciscan thistle,N,2094,2116,55294,,,,479,1B.2,,,S3,G3
 Cirsium brevistylum,Indian thistle,N,2110,2119,52993
-Cirsium cymosum var. cymosum,peregrine thistle,N,85528,11529,80584
+Cirsium cymosum var. cymosum,peregrine thistle,N,85528,11529,80584,white,4,7
 Cirsium douglasii var. douglasii,swamp thistle,N,7046,2127,80586
 Cirsium fontinale var. campylon,Hamilton thistle,N,77400,2129,59750,,,,480,1B.2,,,S2,G2T2
 Cirsium occidentale var. californicum,California thistle,N,77401,2140,52622
 Cirsium occidentale var. coulteri,,N,81843,11531,80593
 Cirsium occidentale var. occidentale,cobweb thistle,N,7069,2143,52623
-Cirsium occidentale var. venustum,venus thistle,N,56557,2144,52624
+Cirsium occidentale var. venustum,venus thistle,N,56557,2144,52624,red,5,7
 Cirsium quercetorum,brownie thistle,N,2232,2146,60954
 Cirsium remotifolium var. odontolepis,,N,7076,11533,80596
 Cirsium vulgare,bull thistle,X,2285,2151,52989
@@ -443,7 +444,7 @@ Clintonia andrewsiana,,N,19850,2265,51647
 Collinsia bartsiifolia var. bartsiifolia,,N,56710,2272,80607
 Collinsia bartsiifolia var. davidsonii,,N,56711,2273,58330
 Collinsia bartsiifolia var. stricta,,N,56713,9818,80608
-Collinsia heterophylla,Chinese houses,N,19994,2280,47325
+Collinsia heterophylla var. heterophylla,Chinese houses,N,19994,2280,47325,"white,purple",3,6
 Collinsia parviflora,blue-eyed mary,N,20000,2285,59013
 Collinsia sparsiflora var. collina,,N,56722,2290,57290
 Collinsia sparsiflora var. sparsiflora,,N,56723,2291,64295
@@ -1002,15 +1003,15 @@ Lepidium strictum,,N,30566,4710,58865
 Lepidospartum squamatum,California broomsage,N,3776,4718,58010
 Leptochloa fusca subsp. fascicularis,bearded sprangletop,N,80525,11795,1377298
 Leptochloa fusca subsp. uninervia,Mexican sprangletop,N,80527,11796,1377299
-Leptosiphon ambiguus,serpentine linanthus,N,80953,8945,58970,,,,1717,4.2,,,S4,G4
-Leptosiphon androsaceus,,N,81151,9556,58969
+Leptosiphon ambiguus,serpentine linanthus,N,80953,8945,58970,pink,4,5,1717,4.2,,,S4,G4
+Leptosiphon androsaceus,,N,81151,9556,58969,"white,pink",4,6
 Leptosiphon aureus,,N,84733,10055,854272,,,,1716,4.2,,,S4?,G4?
-Leptosiphon bicolor,bicolored linanthus,N,81148,9559,64245
+Leptosiphon bicolor,bicolored linanthus,N,81148,9559,64245,"pink,white",3,6
 Leptosiphon bolanderi,,N,81742,9560,77682
-Leptosiphon ciliatus,whisker brush,N,81150,10056,77684
-Leptosiphon grandiflorus,large-flowered linanthus,N,80378,8948,77688,,,,1718,4.2,,,S3S4,G3G4
+Leptosiphon ciliatus,whisker brush,N,81150,10056,77684,"pink,white",3,7
+Leptosiphon grandiflorus,large-flowered linanthus,N,80378,8948,77688,"white,pink",4,7,1718,4.2,,,S3S4,G3G4
 Leptosiphon liniflorus,,N,80375,9565,64244
-Leptosiphon parviflorus,,N,80366,9571,58965
+Leptosiphon parviflorus,,N,80366,9571,58965,"white,yellow,pink",3,6
 Leptosiphon pygmaeus subsp. continentalis,,N,80364,9572,79984
 Leptosyne calliopsidea,,N,89031,10950,77707
 Leptosyne hamiltonii,Mt. Hamilton coreopsis,N,30648,10953,77710,,,,510,1B.2,,,S2,G2
@@ -1269,8 +1270,8 @@ Pennisetum clandestinum,Kikuyu grass,X,36818,6132,60298
 Pennisetum setaceum,fountain grass,X,36827,6133,430581
 Pennisetum villosum,,X,36829,6134,430578
 Penstemon centranthifolius,scarlet bugler,N,36894,6146,56752
-Penstemon heterophyllus var. heterophyllus,chaparral penstemon,N,75906,6178,51852
-Penstemon heterophyllus var. purdyi,foothill penstemon,N,76773,6179,81205
+Penstemon heterophyllus var. heterophyllus,chaparral penstemon,N,75906,6178,51852,purple,4,7
+Penstemon heterophyllus var. purdyi,foothill penstemon,N,76773,6179,81205,purple,5,6
 Pentachaeta alsinoides,tiny pygmy daisy,N,4273,6225,58844
 Pentachaeta exilis subsp. exilis,meager pygmy daisy,N,6171,6230,58846
 Pentagramma triangularis,goldback fern,N,77119,6234,52676
@@ -1326,6 +1327,7 @@ Pickeringia montana var. montana,chaparral pea,N,63765,6497,58908
 Pilularia americana,pillwort,N,38232,6501,57885
 Pinus attenuata,knobcone pine,N,38257,6504,64047
 Pinus coulteri,Coulter pine,N,38266,6512,67330
+Pinus ponderosa var. pacifica,Ponderosa pine,N,93845,,48461
 Pinus radiata,Monterey pine,N,38300,6523,53421,,,,1378,1B.1,,,S1,G1
 Pinus sabiniana,"gray pine,foothill pine",N,38304,6524,58772
 Piperia elegans subsp. elegans,coast piperia,N,74709,8857,840643
@@ -1469,7 +1471,7 @@ Ranunculus aquatilis var. aquatilis,,N,73500,10676,81320
 Ranunculus aquatilis var. diffusus,water buttercup,N,80687,11969,486980
 Ranunculus californicus,California buttercup,N,40867,7032,52173,yellow
 Ranunculus canus var. canus,,N,73506,11972,81324
-Ranunculus hebecarpus,,N,40898,7044,57239
+Ranunculus hebecarpus,pubescent-fruited buttercup,N,40898,7044,57239,green,3,5
 Ranunculus lobbii,Lobb's buttercup,N,40925,7046,68424,,,,1414,4.2,,,S3,G4
 Ranunculus muricatus,spiny buttercup,X,40938,7048,57240
 Ranunculus occidentalis var. occidentalis,,N,64947,11979,81335
@@ -1817,6 +1819,7 @@ Vinca major,greater periwinkle,X,48131,8280,53326
 Viola adunca subsp. adunca,western blue violet,N,79074,11116,53339
 Viola douglasii,Douglas violet,N,48202,8288,79508,yellow,2,7
 Viola glabella,stream violet,N,48214,8289,71113
+Viola ocellata,western heart's ease,N,48259,,61782,white,3,7
 Viola pedunculata,johnny-jump-up,N,48273,8300,50825,yellow,2,4
 Viola purpurea subsp. purpurea,mountain violet,N,53409,8312,80281,yellow
 Viola purpurea subsp. quercetorum,,N,53410,8313,80282,yellow,2,7

package/data/text/Calochortus-argillosus.md

@@ -0,0 +1 @@
+Nectary crescent-shaped and densely hairy. Generally a dark reddish spot surrounded by pale yellow at base of petals (above nectary).

package/data/text/Calochortus-luteus.md

@@ -0,0 +1 @@
+Petals deep yellow, usually with brown streaking. Nectary generally crescent-shaped.

package/data/text/Calochortus-venustus.md

@@ -0,0 +1 @@
+Nectary almost square. Generally a dark reddish spot at base of petals (above nectary) and a paler spot above.

package/data/text/Claytonia-parviflora.md

@@ -0,0 +1 @@
+Basal leaf blades at least 3 times longer than wide; base tapered gradually to petiole.

package/data/text/Claytonia-perfoliata.md

@@ -0,0 +1 @@
+Basal leaf blades less than 3 times longer than wide; base not tapered gradually to petiole.

package/data/text/Collinsia-heterophylla-var-heterophylla.md

@@ -0,0 +1 @@
+Flower whorls dense. [Pedicels](./g/pedicel.html) on lower flowers shorter than [calyx](./g/calyx.html).

package/data/text/Leptosiphon-ambiguus.md

@@ -0,0 +1 @@
+Flowers pedicelled. Sepals just below lobes (throat is short). Throat of tube usually purple.

package/data/text/Leptosiphon-androsaceus.md

@@ -0,0 +1 @@
+Flowers pedicelled. Corolla tube at least twice as long as [calyx](./g/calyx.html). Corolla lobes 8-14 mm. Calyx membrane much narrower than lobes. Calyx hairs sparse or not present (except on margins).

package/data/text/Leptosiphon-bicolor.md

@@ -1 +1 @@
-Flowers pedicelled. Corolla tube at least twice as long as calyx. Calyx membrane much narrower than lobes.
+Flowers pedicelled. Corolla tube at least twice as long as [calyx](./g/calyx.html); threadlike - no sepals at base of lobes. Corolla lobes less than 4 mm. Calyx membrane much narrower than lobes. Calyx hairs sparse or not present (except on margins).

package/data/text/Leptosiphon-parviflorus.md

@@ -0,0 +1 @@
+Corolla lobes at least 4 mm long, corolla tube at least 14 mm. Calyx hairs dense.

package/lib/basepagerenderer.js

@@ -1,5 +1,4 @@
 import { Config } from "./config.js";
-import { Families } from "./families.js";
 import { Files } from "./files.js";
 import { Jekyll } from "./jekyll.js";
 import { Taxa } from "./taxa.js";
@@ -23,7 +22,7 @@ class BasePageRenderer {
         // Copy illustrations.
         siteGenerator.copyIllustrations(Taxa.getFlowerColors());
 
-        Families.renderPages(outputDir, familyCols);
+        taxa.getFamilies().renderPages(outputDir, familyCols);
 
         new GlossaryPages(siteGenerator).renderPages();
 

package/lib/ebook/pages/page_list_families.js

@@ -1,27 +1,33 @@
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
+// eslint-disable-next-line no-unused-vars
 import { Families } from "../../families.js";
 
 class PageListFamilies extends EBookPage {
+    #families;
 
-    constructor( outputDir ) {
-        super( outputDir + "/list_families.html", "All Families" );
+    /**
+     * @param {string} outputDir
+     * @param {Families} families
+     */
+    constructor(outputDir, families) {
+        super(outputDir + "/list_families.html", "All Families");
+        this.#families = families;
     }
 
     renderPageBody() {
-
-        const html = XHTML.textElement( "h1", this.getTitle() );
+        const html = XHTML.textElement("h1", this.getTitle());
 
         const links = [];
-        for ( const family of Families.getFamilies() ) {
-            if ( !family.getTaxa() ) {
+        for (const family of this.#families.getFamilies()) {
+            if (!family.getTaxa()) {
                 continue;
             }
-            links.push( XHTML.getLink( family.getFileName(), family.getName() ) );
+            links.push(XHTML.getLink(family.getFileName(), family.getName()));
         }
 
-        return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
+        return html + XHTML.wrap("ol", XHTML.arrayToLI(links));
     }
 }
 
-export { PageListFamilies };
+export { PageListFamilies };

package/lib/ebook/plantbook.js

@@ -1,4 +1,3 @@
-import { Families } from "@ca-plant-list/ca-plant-list";
 import { EBook } from "./ebook.js";
 import { EBookSiteGenerator } from "./ebooksitegenerator.js";
 import { GlossaryPages } from "./glossarypages.js";
@@ -12,89 +11,124 @@ import { TOCPage } from "./pages/tocpage.js";
 import { Taxa } from "../taxa.js";
 
 class PlantBook extends EBook {
-
     #taxa;
     #glossary;
     #images;
 
-    constructor( outputDir, config, taxa ) {
-
+    /**
+     *
+     * @param {string} outputDir
+     * @param {*} config
+     * @param {Taxa} taxa
+     */
+    constructor(outputDir, config, taxa) {
         super(
             outputDir,
-            config.getConfigValue( "ebook", "filename" ),
-            config.getConfigValue( "ebook", "pub_id" ),
-            config.getConfigValue( "ebook", "title" )
+            config.getConfigValue("ebook", "filename"),
+            config.getConfigValue("ebook", "pub_id"),
+            config.getConfigValue("ebook", "title")
         );
 
         this.#taxa = taxa;
-        const generator = new EBookSiteGenerator( this.getContentDir() );
-        this.#glossary = new GlossaryPages( generator );
-        this.#images = new Images( generator, this.getContentDir(), taxa );
-
+        const generator = new EBookSiteGenerator(this.getContentDir());
+        this.#glossary = new GlossaryPages(generator);
+        this.#images = new Images(generator, this.getContentDir(), taxa);
     }
 
     async createPages() {
-
         const contentDir = this.getContentDir();
 
-        await this.#images.createImages( contentDir );
+        await this.#images.createImages();
 
-        console.log( "creating taxon pages" );
+        console.log("creating taxon pages");
         const taxonList = this.#taxa.getTaxonList();
-        for ( const taxon of taxonList ) {
+        for (const taxon of taxonList) {
             const name = taxon.getName();
-            new TaxonPage( contentDir, taxon, this.#images.getTaxonImages( name ) ).create();
+            new TaxonPage(
+                contentDir,
+                taxon,
+                this.#images.getTaxonImages(name)
+            ).create();
         }
 
         // Create lists.
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            new PageListFlowerColor( contentDir, this.#taxa.getFlowerColor( colorName ) ).create();
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            new PageListFlowerColor(
+                contentDir,
+                this.#taxa.getFlowerColor(colorName)
+            ).create();
         }
 
-        PageListFlowers.createPages( contentDir, this.#taxa );
+        PageListFlowers.createPages(contentDir, this.#taxa);
 
-        new PageListFamilies( contentDir ).create();
-        for ( const family of Families.getFamilies() ) {
+        new PageListFamilies(contentDir, this.#taxa.getFamilies()).create();
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
             const name = family.getName();
-            new PageListSpecies( contentDir, taxa, name + ".html", name ).create();
+            new PageListSpecies(
+                contentDir,
+                taxa,
+                name + ".html",
+                name
+            ).create();
         }
-        new PageListSpecies( contentDir, taxonList, "list_species.html", "All Species" ).create();
+        new PageListSpecies(
+            contentDir,
+            taxonList,
+            "list_species.html",
+            "All Species"
+        ).create();
 
         this.#glossary.renderPages();
 
-        new TOCPage( contentDir ).create();
+        new TOCPage(contentDir).create();
     }
 
     renderManifestEntries() {
-
         let xml = "";
 
         // Add lists.
-        xml += "<item id=\"lspecies\" href=\"list_species.html\" media-type=\"application/xhtml+xml\" />";
-        xml += "<item id=\"lfamilies\" href=\"list_families.html\" media-type=\"application/xhtml+xml\" />";
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            const color = this.#taxa.getFlowerColor( colorName );
-            xml += "<item id=\"l" + color.getColorName() + "\" href=\"" + color.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+        xml +=
+            '<item id="lspecies" href="list_species.html" media-type="application/xhtml+xml" />';
+        xml +=
+            '<item id="lfamilies" href="list_families.html" media-type="application/xhtml+xml" />';
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            const color = this.#taxa.getFlowerColor(colorName);
+            xml +=
+                '<item id="l' +
+                color.getColorName() +
+                '" href="' +
+                color.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         // Add family pages.
-        for ( const family of Families.getFamilies() ) {
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
-            xml += "<item id=\"fam" + family.getName() + "\" href=\"" + family.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+            xml +=
+                '<item id="fam' +
+                family.getName() +
+                '" href="' +
+                family.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         // Add taxon pages.
         const taxa = this.#taxa.getTaxonList();
-        for ( let index = 0; index < taxa.length; index++ ) {
-            const taxon = taxa[ index ];
-            xml += "<item id=\"t" + index + "\" href=\"" + taxon.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+        for (let index = 0; index < taxa.length; index++) {
+            const taxon = taxa[index];
+            xml +=
+                '<item id="t' +
+                index +
+                '" href="' +
+                taxon.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         xml += PageListFlowers.getManifestEntries();
@@ -108,27 +142,27 @@ class PlantBook extends EBook {
         let xml = "";
 
         // Add lists.
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            const color = this.#taxa.getFlowerColor( colorName );
-            xml += "<itemref idref=\"l" + color.getColorName() + "\"/>";
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            const color = this.#taxa.getFlowerColor(colorName);
+            xml += '<itemref idref="l' + color.getColorName() + '"/>';
         }
         xml += PageListFlowers.getSpineEntries();
 
-        xml += "<itemref idref=\"lfamilies\"/>";
-        xml += "<itemref idref=\"lspecies\"/>";
+        xml += '<itemref idref="lfamilies"/>';
+        xml += '<itemref idref="lspecies"/>';
 
         // Add families.
-        for ( const family of Families.getFamilies() ) {
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
-            xml += "<itemref idref=\"fam" + family.getName() + "\"/>";
+            xml += '<itemref idref="fam' + family.getName() + '"/>';
         }
 
         // Add taxa.
-        for ( let index = 0; index < this.#taxa.getTaxonList().length; index++ ) {
-            xml += "<itemref idref=\"t" + index + "\"/>";
+        for (let index = 0; index < this.#taxa.getTaxonList().length; index++) {
+            xml += '<itemref idref="t' + index + '"/>';
         }
 
         xml += this.#glossary.getSpineEntries();
@@ -137,4 +171,4 @@ class PlantBook extends EBook {
     }
 }
 
-export { PlantBook };
+export { PlantBook };

package/lib/families.js

@@ -57,9 +57,9 @@ class Family {
 }
 
 class Families {
-    static #families;
+    #families;
 
-    static {
+    constructor() {
         const dataDir = Config.getPackageDir() + "/data";
 
         this.#families = JSON.parse(Files.read(dataDir + "/families.json"));
@@ -68,7 +68,7 @@ class Families {
         }
     }
 
-    static getFamilies() {
+    getFamilies() {
         return Object.values(this.#families).sort((a, b) =>
             a.getName().localeCompare(b.getName())
         );
@@ -77,7 +77,7 @@ class Families {
     /**
      * @param {string} familyName
      */
-    static getFamily(familyName) {
+    getFamily(familyName) {
         return this.#families[familyName];
     }
 
@@ -85,7 +85,7 @@ class Families {
      * @param {string} outputDir
      * @param {import("./index.js").TaxaCol[]} taxaColumns
      */
-    static renderPages(outputDir, taxaColumns) {
+    renderPages(outputDir, taxaColumns) {
         new PageFamilyList(outputDir, this.#families).render(taxaColumns);
 
         const names = Object.keys(this.#families);
@@ -209,9 +209,6 @@ class PageSection extends GenericPage {
         this.#taxa = taxa;
     }
 
-    /**
-     * @param {import("./index.js").TaxaCol[]} columns
-     */
     render(columns) {
         let html = this.getDefaultIntro();
 

package/lib/genera.js

@@ -1,62 +1,76 @@
 import { Config } from "./config.js";
 import { Families } from "./families.js";
 import { Files } from "./files.js";
+// eslint-disable-next-line no-unused-vars
+import { Taxon } from "./taxon.js";
 
 class Genera {
+    #families;
+    #genera;
 
-    static #genera;
-
-    static {
+    /**
+     * @param {Families} families
+     */
+    constructor(families) {
         const dataDir = Config.getPackageDir() + "/data";
-        this.#genera = JSON.parse( Files.read( dataDir + "/genera.json" ) );
+        this.#genera = JSON.parse(Files.read(dataDir + "/genera.json"));
+        this.#families = families;
     }
 
-    static addTaxon( taxon ) {
-
+    /**
+     * @param {Taxon} taxon
+     */
+    addTaxon(taxon) {
         const genusName = taxon.getGenusName();
-        const genusData = this.#genera[ genusName ];
-        if ( !genusData ) {
-            console.log( taxon.getName() + " genus not found" );
+        const genusData = this.#genera[genusName];
+        if (!genusData) {
+            console.log(taxon.getName() + " genus not found");
             return;
         }
 
-        if ( genusData.taxa === undefined ) {
+        if (genusData.taxa === undefined) {
             genusData.taxa = [];
         }
-        genusData.taxa.push( taxon );
+        genusData.taxa.push(taxon);
 
-        const family = this.getFamily( genusName );
-        if ( !family ) {
-            console.log( taxon.getName() + " family not found" );
+        const family = this.getFamily(genusName);
+        if (!family) {
+            console.log(taxon.getName() + " family not found");
             return;
         }
-        family.addTaxon( taxon );
+        family.addTaxon(taxon);
     }
 
-    static getGenus( genusName ) {
-        return new Genus( this.#genera[ genusName ] );
+    /**
+     * @param {string} genusName
+     */
+    getGenus(genusName) {
+        return new Genus(this.#genera[genusName]);
     }
 
-    static getFamily( genusName ) {
-        const genus = this.#genera[ genusName ];
-        if ( genus ) {
-            return Families.getFamily( genus.family );
+    /**
+     * @param {string} genusName
+     */
+    getFamily(genusName) {
+        const genus = this.#genera[genusName];
+        if (genus) {
+            return this.#families.getFamily(genus.family);
         }
     }
-
 }
 
 class Genus {
-
     #data;
 
-    constructor( data ) {
+    constructor(data) {
         this.#data = data;
     }
 
     getTaxa() {
-        return this.#data.taxa.sort( ( a, b ) => a.getName().localeCompare( b.getName() ) );
+        return this.#data.taxa.sort((a, b) =>
+            a.getName().localeCompare(b.getName())
+        );
     }
 }
 
-export { Genera };
+export { Genera };

package/lib/index.js

@@ -5,7 +5,7 @@
  * calrecnum:string;
  * CESA:string;
  * CRPR:string;
- * common_name:string;
+ * "common name":string;
  * FESA:string;
  * flower_color:string;
  * GRank:string;

package/lib/taxa.js

@@ -2,7 +2,8 @@ import { Config } from "./config.js";
 import { HTML } from "./html.js";
 import { CSV } from "./csv.js";
 import { RarePlants } from "./rareplants.js";
-import { ErrorLog, Taxon } from "./index.js";
+import { ErrorLog, Families, Taxon } from "./index.js";
+import { Genera } from "./genera.js";
 
 const FLOWER_COLORS = [
     { name: "white", color: "white" },
@@ -12,6 +13,7 @@ const FLOWER_COLORS = [
     { name: "yellow", color: "yellow" },
     { name: "blue", color: "blue" },
     { name: "purple", color: "purple" },
+    { name: "green", color: "green" },
 ];
 
 /**
@@ -85,6 +87,7 @@ class FlowerColor {
 }
 
 class Taxa {
+    #families;
     #errorLog;
     /** @type {Object<string,Taxon>} */
     #taxa = {};
@@ -123,6 +126,8 @@ class Taxa {
 
         const dataDir = Config.getPackageDir() + "/data";
 
+        this.#families = new Families();
+
         const taxaCSV = CSV.parseFile(dataDir, "taxa.csv");
         this.#loadTaxa(
             taxaCSV,
@@ -186,6 +191,10 @@ class Taxa {
         return html;
     }
 
+    getFamilies() {
+        return this.#families;
+    }
+
     /**
      * @param {string} name
      */
@@ -257,6 +266,7 @@ class Taxa {
      * @param {boolean} showFlowerErrors
      */
     #loadTaxa(taxaCSV, inclusionList, taxaMeta, taxonClass, showFlowerErrors) {
+        const genera = new Genera(this.#families);
         for (const row of taxaCSV) {
             const name = row["taxon_name"];
 
@@ -276,7 +286,7 @@ class Taxa {
             if (status !== undefined) {
                 row["status"] = status;
             }
-            const taxon = new taxonClass(row, taxaMeta[name]);
+            const taxon = new taxonClass(row, genera, taxaMeta[name]);
             this.#taxa[name] = taxon;
             const colors = taxon.getFlowerColors();
             if (colors) {

package/lib/taxon.js

@@ -1,6 +1,7 @@
 import { HTML } from "./index.js";
-import { Genera } from "./genera.js";
 import { RarePlants } from "./rareplants.js";
+// eslint-disable-next-line no-unused-vars
+import { Genera } from "./genera.js";
 
 const TAXA_COLNAMES = {
     BLOOM_START: "bloom_start",
@@ -10,6 +11,8 @@ const TAXA_COLNAMES = {
 };
 
 class Taxon {
+    /** @type {Genera} */
+    #genera;
     #name;
     #genus;
     #commonNames;
@@ -35,8 +38,10 @@ class Taxon {
 
     /**
      * @param {import("./index.js").TaxonData} data
+     * @param {Genera} genera
      */
-    constructor(data) {
+    constructor(data, genera) {
+        this.#genera = genera;
         const name = data["taxon_name"];
         const commonNames = data["common name"];
         const cesa = data["CESA"];
@@ -66,7 +71,7 @@ class Taxon {
         this.#fesa = fesa ? fesa : undefined;
         this.#rankCNDDB = rankCNDDB ? rankCNDDB : undefined;
         this.#rankGlobal = rankGlobal ? rankGlobal : undefined;
-        Genera.addTaxon(this);
+        genera.addTaxon(this);
     }
 
     /**
@@ -144,7 +149,7 @@ class Taxon {
     }
 
     getFamily() {
-        return Genera.getFamily(this.#genus);
+        return this.#genera.getFamily(this.#genus);
     }
 
     getFESA() {
@@ -160,7 +165,7 @@ class Taxon {
     }
 
     getGenus() {
-        return Genera.getGenus(this.#genus);
+        return this.#genera.getGenus(this.#genus);
     }
 
     getGenusName() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {

package/scripts/build-ebook.js

@@ -31,6 +31,9 @@ class BookCommand extends CommandProcessor {
     }
 }
 
+/**
+ * @param {TaxaProcessor} tp
+ */
 async function commandRunner(tp) {
     const options = tp.getOptions();
     const ebook = new PlantBook(