@ca-plant-list/ca-plant-list 0.2.10 → 0.2.12

package/data/taxa.csv

@@ -1061,24 +1061,24 @@ Ludwigia palustris,,N,31651,5083,60221
 Ludwigia peploides subsp. montevidensis,water-primrose,X,51358,5085,61049
 Ludwigia peploides subsp. peploides,,X,51359,5086,61046
 Lunaria annua,moonwort,X,31676,5091,55886
-Lupinus affinis,,N,31690,5095,77846
-Lupinus albifrons var. albifrons,bush lupine,N,61188,5099,53418
+Lupinus affinis,,N,31690,5095,77846,blue,3,5
+Lupinus albifrons var. albifrons,bush lupine,N,61188,5099,53418,blue,3,6
 Lupinus albifrons var. collinus,,N,61189,5100,61795
-Lupinus arboreus,yellow bush lupine,N,31731,5106,61010
+Lupinus arboreus,yellow bush lupine,N,31731,5106,61010,yellow,4,7
 Lupinus benthamii,spider lupine,N,31791,5117,59565
-Lupinus bicolor,miniature lupine,N,31793,5118,50614,blue
+Lupinus bicolor,miniature lupine,N,31793,5118,50614,blue,3,6
 Lupinus chamissonis,beach blue lupine,N,31831,5125,61011
 Lupinus concinnus,Bajada lupine,N,31835,5129,58901
-Lupinus formosus var. formosus,"summer lupine,western lupine",N,61315,5148,61822,blue
+Lupinus formosus var. formosus,"summer lupine,western lupine",N,61315,5148,61822,blue,4,9
 Lupinus latifolius var. dudleyi,,N,76660,5161,81063
-Lupinus latifolius var. latifolius,wood lupine,N,75772,5162,64242,blue
+Lupinus latifolius var. latifolius,"broadleaf lupine,wood lupine",N,75772,5162,64242,blue,4,9
 Lupinus littoralis var. variicolor,,N,80538,14304
 Lupinus luteolus,butter lupine,N,31956,5176,77875
-Lupinus microcarpus var. densiflorus,,N,76668,5184,241537,"yellow,white"
-Lupinus microcarpus var. microcarpus,chick lupine,N,75776,5186,58159,"pink,blue"
-Lupinus nanus,sky lupine,N,31978,5189,50612,blue
+Lupinus microcarpus var. densiflorus,,N,76668,5184,241537,"yellow,white",4,6
+Lupinus microcarpus var. microcarpus,chick lupine,N,75776,5186,58159,"pink,blue",3,6
+Lupinus nanus,sky lupine,N,31978,5189,50612,blue,3,6
 Lupinus pachylobus,big pod lupine,N,31998,5196,50613
-Lupinus succulentus,arroyo lupine,N,32095,5217,56759,blue
+Lupinus succulentus,arroyo lupine,N,32095,5217,56759,blue,2,5
 Luzula comosa var. comosa,wood rush,N,72790,11810,81079
 Luzula subsessilis,,N,32171,11815,77901
 Lychnis coronaria,rose campion,X,32177,5229,485191
@@ -1237,11 +1237,11 @@ Oenothera xenogaura,,X,89232,11890,545863
 Olea europaea,olive,X,35090,5912,57140
 Osmorhiza berteroi,wood cicely,N,35560,10164,53166
 Osmorhiza brachypoda,California cicely,N,35564,6000,58793
-Oxalis corniculata,creeping wood sorrel,X,35609,6010,53168
-Oxalis incarnata,crimson wood sorrel,X,35636,6012,61776
-Oxalis oregana,redwood sorrel,N,35641,6015,47757
-Oxalis pes-caprae,Bermuda-buttercup,X,35642,6016,53169
-Oxalis pilosa,hairy wood sorrel,N,35601,11895,78300
+Oxalis corniculata,creeping wood sorrel,X,35609,6010,53168,yellow,1,12
+Oxalis incarnata,crimson wood sorrel,X,35636,6012,61776,"white,pink",3,6
+Oxalis oregana,redwood sorrel,N,35641,6015,47757,"white,pink",2,8
+Oxalis pes-caprae,Bermuda-buttercup,X,35642,6016,53169,yellow,1,5
+Oxalis pilosa,hairy wood sorrel,N,35601,11895,78300,yellow,2,9
 Packera breweri,Brewer groundsel,N,77383,9613,56983
 Panicum acuminatum,Pacific panic grass,N,35923,6044,128949
 Panicum capillare,witchgrass,N,36094,6048,78337
@@ -1322,7 +1322,7 @@ Pilularia americana,pillwort,N,38232,6501,57885
 Pinus attenuata,knobcone pine,N,38257,6504,64047
 Pinus coulteri,Coulter pine,N,38266,6512,67330
 Pinus radiata,Monterey pine,N,38300,6523,53421,,,,1378,1B.1,,,S1,G1
-Pinus sabiniana,gray or foothill pine,N,38304,6524,58772
+Pinus sabiniana,"gray pine,foothill pine",N,38304,6524,58772
 Piperia elegans subsp. elegans,coast piperia,N,74709,8857,840643
 Piperia elongata,wood rein-orchid,N,38354,6532,551466
 Piperia michaelii,Michael's rein-orchid,N,38358,6534,840639,,,,1380,4.2,,,S3,G3

package/data/text/Arctostaphylos-auriculata.md

@@ -0,0 +1 @@
+No burl. Height 1-4.5 meters. Endemic to Mt. Diablo area.

package/data/text/Arctostaphylos-crustacea-subsp-crustacea.md

@@ -0,0 +1 @@
+Burl prominent. Height 1-3 meters. Petiole 2-5mm.

package/data/text/Arctostaphylos-glandulosa-subsp-glandulosa.md

@@ -0,0 +1 @@
+Durl hemispheric. Height 1-4 meters; shrub or erect. Petiole 5-10mm.

package/data/text/Arctostaphylos-glauca.md

@@ -0,0 +1 @@
+No burl. Height 1-8 meters, erect.

package/data/text/Arctostaphylos-manzanita-subsp-laevigata.md

@@ -0,0 +1 @@
+No burl. Height 2-8 meters.

package/data/text/Arctostaphylos-manzanita-subsp-manzanita.md

@@ -0,0 +1 @@
+No burl. Height 2-8 meters. Petiole 6-12mm.

package/data/text/Arctostaphylos-pallida.md

@@ -0,0 +1 @@
+No burl. Height 2-4 meters, erect. Petiole < 2mm, clasping branches

package/data/text/Oxalis incarnata.md

@@ -0,0 +1 @@
+Stems often with bulblets. Sepals less than 6 mm, tips with 2 orange tubercles.

package/data/text/Oxalis-corniculata.md

@@ -0,0 +1 @@
+Petals less than 8mm. Stem rooting at nodes. Often red at base of petals.

package/data/text/Oxalis-oregana.md

@@ -0,0 +1 @@
+No bulbs.

package/data/text/Oxalis-pilosa.md

@@ -0,0 +1 @@
+Petals 8-12mm. Stem generally not rooting at nodes.

package/data/text/Trillium-chloropetalum.md

@@ -0,0 +1 @@
+Tissue between anther sacs purple. Ovaries purple.

package/jekyll/assets/css/main.css

@@ -69,10 +69,6 @@ span.native {
     font-weight: bold;
 }
 
-span.rare {
-    font-weight: bold;
-}
-
 span.rare::before {
     content: "\2606";
 }

package/lib/basepagerenderer.js

@@ -5,7 +5,7 @@ import { GlossaryPages } from "./web/glossarypages.js";
 
 class BasePageRenderer {
 
-    static render( outputDir, Taxa, familyCols ) {
+    static render( outputDir, taxa, familyCols ) {
 
         // Copy static files
         Files.rmDir( outputDir );
@@ -20,14 +20,14 @@ class BasePageRenderer {
 
         new GlossaryPages( outputDir ).renderPages();
 
-        this.renderTools( outputDir, Taxa );
+        this.renderTools( outputDir, taxa );
 
     }
 
-    static renderTools( outputDir, Taxa ) {
+    static renderTools( outputDir, taxa ) {
 
         const names = [];
-        for ( const taxon of Taxa.getTaxa() ) {
+        for ( const taxon of taxa.getTaxa() ) {
             const row = [];
             row.push( taxon.getName() );
             const cn = taxon.getCommonNames().join( ", " );

package/lib/dataloader.js

@@ -1,7 +1,5 @@
 import { CSV } from "./csv.js";
 import { Taxa } from "./taxa.js";
-import { Families } from "./families.js";
-import { Exceptions } from "./exceptions.js";
 import { Files } from "./files.js";
 
 const OPTION_DEFS = [
@@ -14,11 +12,6 @@ class DataLoader {
         return OPTION_DEFS;
     }
 
-    static init( taxaDir ) {
-        Exceptions.init( taxaDir );
-        Families.init();
-    }
-
     static load( options ) {
 
         function getIncludeList() {
@@ -40,9 +33,7 @@ class DataLoader {
 
         console.log( "loading data" );
 
-        this.init( taxaDir );
-
-        Taxa.init( getIncludeList() );
+        return new Taxa( getIncludeList() );
 
     }
 

package/lib/ebook/images.js

@@ -3,18 +3,20 @@ import path from "node:path";
 
 import sharp from "sharp";
 
-import { Config, CSV, Files, Taxa } from "@ca-plant-list/ca-plant-list";
+import { Config, CSV, Files } from "@ca-plant-list/ca-plant-list";
 
 import { Image } from "./image.js";
 import { EBook } from "./ebook.js";
 
 class Images {
 
+    #taxa;
     #contentDir;
     #images = {};
 
-    constructor( contentDir ) {
+    constructor( contentDir, taxa ) {
         this.#contentDir = contentDir;
+        this.#taxa = taxa;
     }
 
     async createImages() {
@@ -29,7 +31,7 @@ class Images {
         for ( const row of rows ) {
 
             const name = row[ "taxon_name" ];
-            const taxon = Taxa.getTaxon( name );
+            const taxon = this.#taxa.getTaxon( name );
             if ( !taxon ) {
                 continue;
             }

package/lib/ebook/pages/page_list_flowers.js

@@ -2,16 +2,15 @@ import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
 import { DateUtils } from "../../dateutils.js";
 import { EBook } from "../ebook.js";
-import { Taxa } from "../../taxa.js";
 
 const FN_FLOWER_TIME_INDEX = "fm.html";
 
 class PageListFlowers {
 
-    static createPages( contentDir ) {
+    static createPages( contentDir, taxa ) {
         new PageListFlowerTimeIndex( contentDir ).create();
         for ( let m1 = 1; m1 < 13; m1++ ) {
-            new PageListFlowerTime( contentDir, m1 ).create();
+            new PageListFlowerTime( contentDir, taxa, m1 ).create();
         }
     }
 
@@ -70,14 +69,16 @@ class PageListFlowerTimeIndex extends EBookPage {
 
 class PageListFlowerTime extends EBookPage {
 
+    #taxa;
     #m1;
     #m2;
 
-    constructor( outputDir, month ) {
+    constructor( outputDir, taxa, month ) {
         super(
             outputDir + "/" + PageListFlowerTime.getFileNameBloomTime( month ),
             "Flowering in " + DateUtils.getMonthName( month ) + " - " + DateUtils.getMonthName( month % 12 + 1 )
         );
+        this.#taxa = taxa;
         this.#m1 = month;
         this.#m2 = month % 12 + 1;
     }
@@ -92,7 +93,7 @@ class PageListFlowerTime extends EBookPage {
 
         const range = [ this.#m1, this.#m2 ];
         const links = [];
-        for ( const taxon of Taxa.getTaxa() ) {
+        for ( const taxon of this.#taxa.getTaxa() ) {
             const m1 = taxon.getBloomStart();
             const m2 = taxon.getBloomEnd();
             if ( m1 && DateUtils.monthRangesOverlap( range, [ m1, m2 ] ) ) {

package/lib/ebook/plantbook.js

@@ -1,4 +1,4 @@
-import { Families, Taxa } from "@ca-plant-list/ca-plant-list";
+import { Families } from "@ca-plant-list/ca-plant-list";
 import { EBook } from "./ebook.js";
 import { GlossaryPages } from "./glossarypages.js";
 import { Images } from "./images.js";
@@ -13,10 +13,11 @@ import { FLOWER_COLOR_NAMES } from "../taxa.js";
 
 class PlantBook extends EBook {
 
+    #taxa;
     #glossary;
     #images;
 
-    constructor() {
+    constructor( taxa ) {
 
         super(
             "output",
@@ -25,8 +26,9 @@ class PlantBook extends EBook {
             Config.getConfigValue( "ebook", "title" )
         );
 
+        this.#taxa = taxa;
         this.#glossary = new GlossaryPages();
-        this.#images = new Images( this.getContentDir() );
+        this.#images = new Images( this.getContentDir(), taxa );
 
     }
 
@@ -35,18 +37,18 @@ class PlantBook extends EBook {
         const contentDir = this.getContentDir();
 
         console.log( "creating taxon pages" );
-        const taxa = Taxa.getTaxa();
-        for ( const taxon of taxa ) {
+        const taxonList = this.#taxa.getTaxa();
+        for ( const taxon of taxonList ) {
             const name = taxon.getName();
             new TaxonPage( contentDir, taxon, this.#images[ name ] ).create();
         }
 
         // Create lists.
         for ( const colorName of FLOWER_COLOR_NAMES ) {
-            new PageListFlowerColor( contentDir, Taxa.getFlowerColor( colorName ) ).create();
+            new PageListFlowerColor( contentDir, this.#taxa.getFlowerColor( colorName ) ).create();
         }
 
-        PageListFlowers.createPages( contentDir );
+        PageListFlowers.createPages( contentDir, this.#taxa );
 
         new PageListFamilies( contentDir ).create();
         for ( const family of Families.getFamilies() ) {
@@ -57,7 +59,7 @@ class PlantBook extends EBook {
             const name = family.getName();
             new PageListSpecies( contentDir, taxa, name + ".html", name ).create();
         }
-        new PageListSpecies( contentDir, taxa, "list_species.html", "All Species" ).create();
+        new PageListSpecies( contentDir, taxonList, "list_species.html", "All Species" ).create();
 
         await this.#images.createImages( contentDir );
         this.#glossary.createPages( contentDir );
@@ -73,7 +75,7 @@ class PlantBook extends EBook {
         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 FLOWER_COLOR_NAMES ) {
-            const color = Taxa.getFlowerColor( colorName );
+            const color = this.#taxa.getFlowerColor( colorName );
             xml += "<item id=\"l" + color.getColorName() + "\" href=\"" + color.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
         }
 
@@ -87,7 +89,7 @@ class PlantBook extends EBook {
         }
 
         // Add taxon pages.
-        const taxa = Taxa.getTaxa();
+        const taxa = this.#taxa.getTaxa();
         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\" />";
@@ -105,7 +107,7 @@ class PlantBook extends EBook {
 
         // Add lists.
         for ( const colorName of FLOWER_COLOR_NAMES ) {
-            const color = Taxa.getFlowerColor( colorName );
+            const color = this.#taxa.getFlowerColor( colorName );
             xml += "<itemref idref=\"l" + color.getColorName() + "\"/>";
         }
         xml += PageListFlowers.getSpineEntries();
@@ -123,7 +125,7 @@ class PlantBook extends EBook {
         }
 
         // Add taxa.
-        for ( let index = 0; index < Taxa.getTaxa().length; index++ ) {
+        for ( let index = 0; index < this.#taxa.getTaxa().length; index++ ) {
             xml += "<itemref idref=\"t" + index + "\"/>";
         }
 

package/lib/exceptions.js

@@ -3,13 +3,30 @@ import { Files } from "./files.js";
 
 class Exceptions {
 
-    static #exceptions = {};
+    #exceptions = {};
 
-    static getExceptions() {
+    constructor( dir ) {
+
+        function readConfig( fileName ) {
+            return JSON.parse( Files.read( fileName ) );
+        }
+
+        // Read default configuration.
+        this.#exceptions = readConfig( Config.getPackageDir() + "/data/exceptions.json" );
+
+        // Add/overwrite with local configuration.
+        const localExceptions = readConfig( dir + "/exceptions.json" );
+        for ( const [ k, v ] of Object.entries( localExceptions ) ) {
+            this.#exceptions[ k ] = v;
+        }
+
+    }
+
+    getExceptions() {
         return Object.entries( this.#exceptions );
     }
 
-    static getValue( name, cat, subcat, defaultValue ) {
+    getValue( name, cat, subcat, defaultValue ) {
         const taxonData = this.#exceptions[ name ];
         if ( taxonData ) {
             const catData = taxonData[ cat ];
@@ -21,7 +38,7 @@ class Exceptions {
         return defaultValue;
     }
 
-    static hasException( name, cat, subcat ) {
+    hasException( name, cat, subcat ) {
         const taxonData = this.#exceptions[ name ];
         if ( taxonData ) {
             const catData = taxonData[ cat ];
@@ -32,23 +49,6 @@ class Exceptions {
         return false;
     }
 
-    static init( dir ) {
-
-        function readConfig( fileName ) {
-            return JSON.parse( Files.read( fileName ) );
-        }
-
-        // Read default configuration.
-        this.#exceptions = readConfig( Config.getPackageDir() + "/data/exceptions.json" );
-
-        // Add/overwrite with local configuration.
-        const localExceptions = readConfig( dir + "/exceptions.json" );
-        for ( const [ k, v ] of Object.entries( localExceptions ) ) {
-            this.#exceptions[ k ] = v;
-        }
-
-    }
-
 }
 
 export { Exceptions };

package/lib/families.js

@@ -4,21 +4,56 @@ import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
 import { Files } from "./files.js";
 import { Config } from "./config.js";
-import { Genera } from "./genera.js";
 
-class Families {
+class Family {
 
-    static #families;
+    #name;
+    #data;
 
-    static getFamilies() {
-        return Object.values( this.#families ).sort( ( a, b ) => a.getName().localeCompare( b.getName() ) );
+    constructor( name, data ) {
+        this.#name = name;
+        this.#data = data;
     }
 
-    static getFamily( familyName ) {
-        return this.#families[ familyName ];
+    addTaxon( taxon ) {
+        if ( !this.#data.taxa ) {
+            this.#data.taxa = [];
+        }
+        this.#data.taxa.push( taxon );
+        Sections.addTaxon( this.getSectionName(), taxon );
+    }
+
+    getBaseFileName() {
+        return this.getName();
+    }
+
+    getFileName( ext = "html" ) {
+        return this.getBaseFileName() + "." + ext;
     }
 
-    static init() {
+    getJepsonID() {
+        return this.#data.id;
+    }
+
+    getName() {
+        return this.#name;
+    }
+
+    getSectionName() {
+        return this.#data.section;
+    }
+
+    getTaxa() {
+        return this.#data.taxa;
+    }
+
+}
+
+class Families {
+
+    static #families;
+
+    static {
 
         const dataDir = Config.getPackageDir() + "/data";
 
@@ -27,8 +62,14 @@ class Families {
             this.#families[ k ] = new Family( k, v );
         }
 
-        Genera.init( dataDir );
+    }
 
+    static getFamilies() {
+        return Object.values( this.#families ).sort( ( a, b ) => a.getName().localeCompare( b.getName() ) );
+    }
+
+    static getFamily( familyName ) {
+        return this.#families[ familyName ];
     }
 
     static renderPages( outputDir, taxaColumns ) {
@@ -145,50 +186,6 @@ class PageSection extends GenericPage {
     }
 }
 
-class Family {
-
-    #name;
-    #data;
-
-    constructor( name, data ) {
-        this.#name = name;
-        this.#data = data;
-    }
-
-    addTaxon( taxon ) {
-        if ( !this.#data.taxa ) {
-            this.#data.taxa = [];
-        }
-        this.#data.taxa.push( taxon );
-        Sections.addTaxon( this.getSectionName(), taxon );
-    }
-
-    getBaseFileName() {
-        return this.getName();
-    }
-
-    getFileName( ext = "html" ) {
-        return this.getBaseFileName() + "." + ext;
-    }
-
-    getJepsonID() {
-        return this.#data.id;
-    }
-
-    getName() {
-        return this.#name;
-    }
-
-    getSectionName() {
-        return this.#data.section;
-    }
-
-    getTaxa() {
-        return this.#data.taxa;
-    }
-
-}
-
 class Sections {
 
     static #sections = {};

package/lib/genera.js

@@ -1,3 +1,4 @@
+import { Config } from "./config.js";
 import { Families } from "./families.js";
 import { Files } from "./files.js";
 
@@ -5,6 +6,11 @@ class Genera {
 
     static #genera;
 
+    static {
+        const dataDir = Config.getPackageDir() + "/data";
+        this.#genera = JSON.parse( Files.read( dataDir + "/genera.json" ) );
+    }
+
     static addTaxon( taxon ) {
 
         const genusName = taxon.getGenusName();
@@ -38,10 +44,6 @@ class Genera {
         }
     }
 
-    static init( dataDir ) {
-        this.#genera = JSON.parse( Files.read( dataDir + "/genera.json" ) );
-    }
-
 }
 
 class Genus {

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export class BasePageRenderer {
-    static render(outputDir: any, Taxa: any, familyCols: any): void;
-    static renderTools(outputDir: any, Taxa: any): void;
+    static render(outputDir: any, taxa: any, familyCols: any): void;
+    static renderTools(outputDir: any, taxa: any): void;
 }
 export class Config {
     static "__#1@#config": {};
@@ -24,9 +24,9 @@ export class DataLoader {
         type: StringConstructor;
         defaultValue: string;
     }[];
-    static init(taxaDir: any): void;
-    static load(options: any): void;
+    static load(options: any): Taxa;
 }
+import { Taxa } from "./taxa.js";
 export class DateUtils {
     static getMonthName(monthNum: any): string;
     static monthRangesOverlap(r1: any, r2: any): any;
@@ -37,17 +37,16 @@ export class ErrorLog {
     static write(fileName: any): void;
 }
 export class Exceptions {
-    static "__#21@#exceptions": {};
-    static getExceptions(): [string, any][];
-    static getValue(name: any, cat: any, subcat: any, defaultValue: any): any;
-    static hasException(name: any, cat: any, subcat: any): boolean;
-    static init(dir: any): void;
+    constructor(dir: any);
+    getExceptions(): [string, any][];
+    getValue(name: any, cat: any, subcat: any, defaultValue: any): any;
+    hasException(name: any, cat: any, subcat: any): boolean;
+    #private;
 }
 export class Families {
-    static "__#12@#families": any;
+    static "__#13@#families": any;
     static getFamilies(): any[];
     static getFamily(familyName: any): any;
-    static init(): void;
     static renderPages(outputDir: any, taxaColumns: any): void;
 }
 export class Files {
@@ -75,7 +74,6 @@ export class Genera {
     static addTaxon(taxon: any): void;
     static getGenus(genusName: any): Genus;
     static getFamily(genusName: any): any;
-    static init(dataDir: any): void;
 }
 declare class Genus {
     constructor(data: any);
@@ -170,19 +168,15 @@ export class RarePlants {
 }
 export const FLOWER_COLOR_NAMES: string[];
 export class Taxa {
-    static "__#11@#taxa": {};
-    static "__#11@#flower_colors": {};
-    static "__#11@#sortedTaxa": any;
     static getHTMLTable(taxa: any, columns?: {
         title: string;
         data: (t: any) => any;
     }[]): string;
-    static getFlowerColor(name: any): any;
-    static getTaxa(): any;
-    static getTaxon(name: any): any;
-    static init(inclusionList: any, taxaMeta?: {}, taxonClass?: typeof Taxon, extraTaxa?: any[], extraSynonyms?: any[]): void;
-    static "__#11@#loadSyns"(synCSV: any, inclusionList: any): void;
-    static "__#11@#loadTaxa"(taxaCSV: any, inclusionList: any, taxaMeta: any, taxonClass: any): void;
+    constructor(inclusionList: any, taxaMeta?: {}, taxonClass?: typeof Taxon, extraTaxa?: any[], extraSynonyms?: any[]);
+    getFlowerColor(name: any): any;
+    getTaxa(): any[];
+    getTaxon(name: any): any;
+    #private;
 }
 export namespace TAXA_LIST_COLS {
     namespace CESA {

package/lib/pagerenderer.js

@@ -11,37 +11,37 @@ const RPI_COLUMNS = [ TAXA_LIST_COLS.SPECIES_BARE, TAXA_LIST_COLS.COMMON_NAME, T
 
 class PageRenderer extends BasePageRenderer {
 
-    static render( outputDir ) {
+    static render( outputDir, taxa ) {
 
-        super.render( outputDir, Taxa );
+        super.render( outputDir, taxa );
 
-        this.renderLists( outputDir );
+        this.renderLists( outputDir, taxa );
 
-        const taxa = Taxa.getTaxa();
-        for ( const taxon of taxa ) {
+        const taxonList = taxa.getTaxa();
+        for ( const taxon of taxonList ) {
             new PageTaxon( outputDir, taxon ).render();
         }
 
     }
 
-    static renderLists( outputDir ) {
+    static renderLists( outputDir, taxa ) {
 
         function getListArray( listInfo, attributes = {}, columns ) {
 
             const listArray = [];
             for ( const list of listInfo ) {
-                const taxa = [];
+                const listTaxa = [];
                 const calfloraTaxa = [];
                 const iNatTaxa = [];
-                for ( const taxon of Taxa.getTaxa() ) {
+                for ( const taxon of taxa.getTaxa() ) {
                     if ( list.include( taxon ) ) {
-                        taxa.push( taxon );
+                        listTaxa.push( taxon );
                         calfloraTaxa.push( taxon.getCalfloraName() );
                         iNatTaxa.push( taxon.getINatName() );
                     }
                 }
 
-                if ( taxa.length === 0 ) {
+                if ( listTaxa.length === 0 ) {
                     continue;
                 }
 
@@ -49,12 +49,12 @@ class PageRenderer extends BasePageRenderer {
                 Files.write( outputDir + "/inat_" + list.filename + ".txt", iNatTaxa.join( "\n" ) );
 
                 const cols = columns ? columns : list.columns;
-                new PageTaxonList( outputDir, list.name, list.filename ).render( taxa, cols );
+                new PageTaxonList( outputDir, list.name, list.filename ).render( listTaxa, cols );
 
                 // Check for sublists.
                 const subListHTML = list.listInfo ? getListArray( list.listInfo, { class: "indent" }, cols ) : "";
 
-                listArray.push( HTML.getLink( "./" + list.filename + ".html", list.name ) + " (" + taxa.length + ")" + subListHTML );
+                listArray.push( HTML.getLink( "./" + list.filename + ".html", list.name ) + " (" + listTaxa.length + ")" + subListHTML );
             }
 
             return renderList( listArray, attributes );

package/lib/taxa.js

@@ -65,14 +65,34 @@ class FlowerColor {
 
 class Taxa {
 
-    static #taxa = {};
-    static #flower_colors = {};
-    static #sortedTaxa;
+    #taxa = {};
+    #flower_colors = {};
+    #sortedTaxa;
 
-    static {
+    constructor( inclusionList, taxaMeta = {}, taxonClass = Taxon, extraTaxa = [], extraSynonyms = [] ) {
         for ( const color of FLOWER_COLOR_NAMES ) {
             this.#flower_colors[ color ] = new FlowerColor( color );
         }
+
+        const dataDir = Config.getPackageDir() + "/data";
+
+        const taxaCSV = CSV.parseFile( dataDir, "taxa.csv" );
+        this.#loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass );
+        this.#loadTaxa( extraTaxa, inclusionList, taxaMeta, taxonClass );
+
+        // Make sure everything in the inclusionList has been loaded.
+        for ( const name of Object.keys( inclusionList ) ) {
+            if ( !this.getTaxon( name ) ) {
+                ErrorLog.log( name, "not found in taxon list" );
+            }
+        }
+
+        this.#sortedTaxa = Object.values( this.#taxa ).sort( ( a, b ) => a.getName().localeCompare( b.getName() ) );
+
+        const synCSV = CSV.parseFile( dataDir, "synonyms.csv" );
+        this.#loadSyns( synCSV, inclusionList );
+        this.#loadSyns( extraSynonyms, inclusionList );
+
     }
 
     static getHTMLTable( taxa, columns = DEFAULT_COLUMNS ) {
@@ -103,42 +123,19 @@ class Taxa {
         return html;
     }
 
-    static getFlowerColor( name ) {
+    getFlowerColor( name ) {
         return this.#flower_colors[ name ];
     }
 
-    static getTaxa() {
+    getTaxa() {
         return this.#sortedTaxa;
     }
 
-    static getTaxon( name ) {
+    getTaxon( name ) {
         return this.#taxa[ name ];
     }
 
-    static init( inclusionList, taxaMeta = {}, taxonClass = Taxon, extraTaxa = [], extraSynonyms = [] ) {
-
-        const dataDir = Config.getPackageDir() + "/data";
-
-        const taxaCSV = CSV.parseFile( dataDir, "taxa.csv" );
-        this.#loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass );
-        this.#loadTaxa( extraTaxa, inclusionList, taxaMeta, taxonClass );
-
-        // Make sure everything in the inclusionList has been loaded.
-        for ( const name of Object.keys( inclusionList ) ) {
-            if ( !this.getTaxon( name ) ) {
-                ErrorLog.log( name, "not found in taxon list" );
-            }
-        }
-
-        this.#sortedTaxa = Object.values( this.#taxa ).sort( ( a, b ) => a.getName().localeCompare( b.getName() ) );
-
-        const synCSV = CSV.parseFile( dataDir, "synonyms.csv" );
-        this.#loadSyns( synCSV, inclusionList );
-        this.#loadSyns( extraSynonyms, inclusionList );
-
-    }
-
-    static #loadSyns( synCSV, inclusionList ) {
+    #loadSyns( synCSV, inclusionList ) {
         for ( const syn of synCSV ) {
             const currName = syn[ "Current" ];
             const taxon = this.getTaxon( currName );
@@ -153,7 +150,7 @@ class Taxa {
         }
     }
 
-    static #loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass ) {
+    #loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass ) {
         for ( const row of taxaCSV ) {
 
             const name = row[ "taxon_name" ];

package/lib/taxon.js

@@ -149,12 +149,14 @@ class Taxon {
     getHTMLLink( href = true, includeRPI = true ) {
         href = href ? ( "./" + this.getFileName() ) : undefined;
         let className = this.isNative() ? "native" : "non-native";
+        let isRare = false;
         if ( includeRPI && this.isRare() ) {
-            className = "rare";
+            isRare = true;
+            className += " rare";
         }
         const attributes = { class: className };
         const link = HTML.wrap( "span", HTML.getLink( href, this.getName() ), attributes );
-        if ( className === "rare" ) {
+        if ( isRare ) {
             return HTML.getToolTip( link, this.getRPIRankAndThreatTooltip(), { icon: false } );
         }
         return link;

package/package.json

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

package/scripts/build-ebook.js

@@ -6,7 +6,5 @@ import { DataLoader } from "../lib/dataloader.js";
 
 const options = commandLineArgs( DataLoader.getOptionDefs() );
 
-DataLoader.load( options );
-
-const ebook = new PlantBook();
+const ebook = new PlantBook( DataLoader.load( options ) );
 await ebook.create();

package/scripts/build-site.js

@@ -9,7 +9,6 @@ const options = commandLineArgs( DataLoader.getOptionDefs() );
 
 const OUTPUT_DIR = "./output";
 
-DataLoader.load( options );
-PageRenderer.render( OUTPUT_DIR );
+PageRenderer.render( OUTPUT_DIR, DataLoader.load( options ) );
 
 ErrorLog.write( OUTPUT_DIR + "/errors.tsv" );