@ca-plant-list/ca-plant-list 0.4.18 → 0.4.19

package/data/inattaxonphotos.csv

@@ -4044,6 +4044,10 @@ Oxalis pes-caprae,6503168,jpeg,cc-by-nc,James Bailey
 Oxalis pilosa,8865145,jpg,cc-by-nc,Carol Blaney
 Oxalis pilosa,8865151,jpg,cc-by-nc,Carol Blaney
 Oxalis pilosa,8865149,jpg,cc-by-nc,Carol Blaney
+Oxalis smalliana,218331103,jpeg,cc-by-nc,Sadie Hickey
+Oxalis smalliana,353081201,jpg,cc-by-nc,ardouglas
+Oxalis smalliana,218331090,jpeg,cc-by-nc,Sadie Hickey
+Oxalis smalliana,294594629,jpeg,cc-by,Ed Alverson
 Packera breweri,37358638,jpg,cc-by-nc,Stacie Wolny
 Packera breweri,16970444,jpg,cc-by-nc,Stacie Wolny
 Packera breweri,37358664,jpg,cc-by-nc,Stacie Wolny

package/data/text/Polypodium-calirhiza.md

@@ -0,0 +1 @@
+Frond narrows at base (not triangle shaped). Sori not sunken.

package/data/text/Polypodium-scouleri.md

@@ -0,0 +1 @@
+Frond not hairy on center rib. Frond brittle.

package/lib/basepagerenderer.js

@@ -6,8 +6,8 @@ import { GlossaryPages } from "./web/glossarypages.js";
 class BasePageRenderer {
     /**
      * @param {string} outputDir
-     * @param {Taxa} taxa
-     * @param {TaxaCol[]} [familyCols]
+     * @param {import("./taxa.js").Taxa} taxa
+     * @param {import("./htmltaxon.js").TaxaColDef[]} [familyCols]
      */
     static renderBasePages(outputDir, taxa, familyCols) {
         const siteGenerator = new Jekyll(outputDir);
@@ -30,7 +30,7 @@ class BasePageRenderer {
 
     /**
      * @param {string} outputDir
-     * @param {Taxa} taxa
+     * @param {import("./taxa.js").Taxa} taxa
      */
     static renderTools(outputDir, taxa) {
         const names = [];

package/lib/ebook/images.js

@@ -23,7 +23,7 @@ class Images {
     }
 
     /**
-     * @param {Taxon[]} taxa
+     * @param {import("../taxon.js").Taxon[]} taxa
      */
     async createImages(taxa) {
         const meter = new ProgressMeter("processing photos", taxa.length);
@@ -102,7 +102,7 @@ class Images {
     }
 
     /**
-     * @param {Photo} photo
+     * @param {import("../photo.js").Photo} photo
      * @returns {string}
      */
     getCompressedFilePath(photo) {
@@ -110,7 +110,7 @@ class Images {
     }
 
     /**
-     * @param {Photo} photo
+     * @param {import("../photo.js").Photo} photo
      * @returns {string}
      */
     getCompressedImageName(photo) {
@@ -118,8 +118,8 @@ class Images {
     }
 
     /**
-     * @param {Taxon} taxon
-     * @returns {Photo[]}
+     * @param {import("../taxon.js").Taxon} taxon
+     * @returns {import("../photo.js").Photo[]}
      */
     static getTaxonPhotos(taxon) {
         const photos = taxon

package/lib/ebook/pages/page_list_species.js

@@ -8,7 +8,7 @@ class PageListSpecies extends EBookPage {
     /**
      *
      * @param {string} outputDir
-     * @param {Taxon[]} taxa
+     * @param {import("../../taxon.js").Taxon[]} taxa
      * @param {string} filename
      * @param {string} title
      */

package/lib/ebook/pages/taxonpage.js

@@ -13,7 +13,7 @@ class TaxonPage extends EBookPage {
 
     /**
      * @param {string} outputDir
-     * @param {Taxon} taxon
+     * @param {import("../../taxon.js").Taxon} taxon
      * @param {Images} images
      */
     constructor(outputDir, taxon, images) {
@@ -69,7 +69,7 @@ class TaxonPage extends EBookPage {
                 src: `i/${this.#images.getCompressedImageName(photo)}`,
                 style: "max-width:" + dimensions.width + "px",
             });
-            const caption = `${photo.rights === "CC0" ? "By" : "(c)"} ${photo.rightsHolder} ${photo.rights && `(${photo.rights})`}`;
+            const caption = photo.getAttribution();
             if (caption) {
                 img += XHTML.textElement("figcaption", caption);
             }

package/lib/ebook/plantbook.js

@@ -18,7 +18,7 @@ class PlantBook extends EBook {
     /**
      * @param {string} outputDir
      * @param {Config} config
-     * @param {Taxa} taxa
+     * @param {import("../taxa.js").Taxa} taxa
      */
     constructor(outputDir, config, taxa) {
         super(

package/lib/families.js

@@ -19,7 +19,7 @@ class Family {
     }
 
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      */
     addTaxon(taxon) {
         if (!this.#data.taxa) {
@@ -68,7 +68,7 @@ class Families {
 
     getFamilies() {
         return Object.values(this.#families).sort((a, b) =>
-            a.getName().localeCompare(b.getName())
+            a.getName().localeCompare(b.getName()),
         );
     }
 
@@ -81,7 +81,7 @@ class Families {
 
     /**
      * @param {string} outputDir
-     * @param {TaxaCol[]} taxaColumns
+     * @param {import("./htmltaxon.js").TaxaColDef[]} [taxaColumns]
      */
     renderPages(outputDir, taxaColumns) {
         new PageFamilyList(outputDir, this.#families).render(taxaColumns);
@@ -109,7 +109,7 @@ class PageFamilyList extends GenericPage {
     }
 
     /**
-     * @param {TaxaCol[]} taxaColumns
+     * @param {import("./htmltaxon.js").TaxaColDef[]} [taxaColumns]
      */
     render(taxaColumns) {
         let html = this.getDefaultIntro();
@@ -121,13 +121,13 @@ class PageFamilyList extends GenericPage {
 
             // Render the section page.
             new PageSection(this.getOutputDir(), name, taxa).render(
-                taxaColumns
+                taxaColumns,
             );
 
             // Render the link.
             const href = "./" + name + ".html";
             sectionLinks.push(
-                HTML.getLink(href, name) + " (" + taxa.length + ")"
+                HTML.getLink(href, name) + " (" + taxa.length + ")",
             );
         }
         html += HTML.wrap("ul", HTML.arrayToLI(sectionLinks), {
@@ -150,7 +150,7 @@ class PageFamilyList extends GenericPage {
             }
             let cols = HTML.wrap(
                 "td",
-                HTML.getLink("./" + family.getFileName(), family.getName())
+                HTML.getLink("./" + family.getFileName(), family.getName()),
             );
             cols += HTML.wrap("td", taxa.length, { class: "right" });
             html += HTML.wrap("tr", cols);
@@ -176,7 +176,7 @@ class PageFamily extends GenericPage {
     }
 
     /**
-     * @param {TaxaCol[]} columns
+     * @param {import("./htmltaxon.js").TaxaColDef[]} [columns]
      */
     render(columns) {
         let html = this.getDefaultIntro();
@@ -184,7 +184,7 @@ class PageFamily extends GenericPage {
         html += HTML.wrap(
             "div",
             Jepson.getEFloraLink(this.#family.getJepsonID()),
-            { class: "section" }
+            { class: "section" },
         );
 
         html += HTMLTaxon.getTaxaTable(this.#family.getTaxa(), columns);
@@ -199,7 +199,7 @@ class PageSection extends GenericPage {
     /**
      * @param {string} outputDir
      * @param {string} name
-     * @param {Taxon[]} taxa
+     * @param {import("./taxon.js").Taxon[]} taxa
      */
     constructor(outputDir, name, taxa) {
         super(outputDir, name, name);
@@ -207,7 +207,7 @@ class PageSection extends GenericPage {
     }
 
     /**
-     * @param {TaxaCol[]} [columns]
+     * @param {import("./htmltaxon.js").TaxaColDef[]} [columns]
      */
     render(columns) {
         let html = this.getDefaultIntro();
@@ -219,12 +219,12 @@ class PageSection extends GenericPage {
 }
 
 class Sections {
-    /** @type {Object<string,Taxon[]>} */
+    /** @type {Object<string,import("./taxon.js").Taxon[]>} */
     static #sections = {};
 
     /**
      * @param {string} name
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      */
     static addTaxon(name, taxon) {
         let section = this.#sections[name];

package/lib/genera.js

@@ -15,7 +15,7 @@ class Genera {
     }
 
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      */
     addTaxon(taxon) {
         const genusName = taxon.getGenusName();

package/lib/htmltaxon.js

@@ -6,7 +6,15 @@ import { RarePlants } from "./rareplants.js";
 import { TextUtils } from "./textutils.js";
 
 /**
- * @type {Record<string,{title:string,data:function (Taxon):string}>}
+ * @typedef {{
+    class?: string;
+    data: (taxon: import("./taxon.js").Taxon) => string;
+    title: string;
+     }} TaxaColDef
+ */
+
+/**
+ * @type {Record<string,TaxaColDef>}
  */
 const TAXA_LIST_COLS = {
     CESA: {
@@ -39,6 +47,7 @@ const TAXA_LIST_COLS = {
     },
 };
 
+/** @type {TaxaColDef[]} */
 const DEFAULT_TAXA_COLUMNS = [
     TAXA_LIST_COLS.SPECIES,
     TAXA_LIST_COLS.COMMON_NAME,
@@ -46,7 +55,7 @@ const DEFAULT_TAXA_COLUMNS = [
 
 class HTMLTaxon {
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      * @returns {string|undefined}
      */
     static getCalscapeLink(taxon) {
@@ -88,7 +97,7 @@ class HTMLTaxon {
     }
 
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      * @param {string} classNames
      * @param {boolean} [includeColorLink=true]
      */
@@ -129,7 +138,7 @@ class HTMLTaxon {
     }
 
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      * @returns {string}
      */
     static getFooterHTML(taxon) {
@@ -142,7 +151,7 @@ class HTMLTaxon {
     }
 
     /**
-     * @param {Taxon} taxon
+     * @param {import("./taxon.js").Taxon} taxon
      */
     static getLink(taxon) {
         return (
@@ -182,8 +191,8 @@ class HTMLTaxon {
     }
 
     /**
-     * @param {Taxon[]} taxa
-     * @param {TaxaCol[]} [columns]
+     * @param {import("./taxon.js").Taxon[]} taxa
+     * @param {TaxaColDef[]} [columns]
      */
     static getTaxaTable(taxa, columns = DEFAULT_TAXA_COLUMNS) {
         let html = "<table><thead>";

package/lib/index.d.ts

@@ -79,6 +79,16 @@ export class Jekyll {
     static include(fileName: string): string;
 }
 
+type PhotoRights = "CC0" | "CC BY" | "CC BY-NC" | "C" | null;
+
+export class Photo {
+    getAttribution(): string;
+    getExt(): string;
+    getId(): number;
+    getSourceUrl(): string;
+    getUrl(): string;
+}
+
 export class Program {
     static getIncludeList(dataDir: string): string[];
     static getProgram(): Command;
@@ -101,14 +111,19 @@ export class Taxon {
     getBaseFileName(): string;
     getCalfloraID(): string;
     getCalfloraTaxonLink(): string;
+    getCESA(): string | undefined;
+    getCNDDBRank(): string | undefined;
     getCommonNames(): string[];
     getFamily(): Family;
+    getFESA(): string | undefined;
     getGenus(): Genus;
     getGenusName(): string;
+    getGlobalRank(): string | undefined;
     getINatID(): string;
     getINatTaxonLink(): string;
     getJepsonID(): string;
     getName(): string;
+    getPhotos(): Photo[];
     getRPIRankAndThreat(): string;
     getRPITaxonLink(): string;
     getSynonyms(): string[];

package/lib/pagerenderer.js

@@ -7,259 +7,262 @@ import { HTML } from "./html.js";
 import { HTMLTaxon, TAXA_LIST_COLS } from "./htmltaxon.js";
 
 const ENDANGERED_COLS = [
-  TAXA_LIST_COLS.SPECIES,
-  TAXA_LIST_COLS.COMMON_NAME,
-  TAXA_LIST_COLS.CESA,
-  TAXA_LIST_COLS.FESA,
+    TAXA_LIST_COLS.SPECIES,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CESA,
+    TAXA_LIST_COLS.FESA,
 ];
 const RPI_COLUMNS = [
-  TAXA_LIST_COLS.SPECIES_BARE,
-  TAXA_LIST_COLS.COMMON_NAME,
-  TAXA_LIST_COLS.CNPS_RANK,
+    TAXA_LIST_COLS.SPECIES_BARE,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CNPS_RANK,
 ];
 
 class PageRenderer extends BasePageRenderer {
-  /**
-   * @param {string} outputDir
-   * @param {import('./config.js').Config} config
-   * @param {Taxa} taxa
-   */
-  static render(outputDir, config, taxa) {
-    super.renderBasePages(outputDir, taxa);
+    /**
+     * @param {string} outputDir
+     * @param {import('./config.js').Config} config
+     * @param {import("./taxa.js").Taxa} taxa
+     */
+    static render(outputDir, config, taxa) {
+        super.renderBasePages(outputDir, taxa);
 
-    this.renderLists(outputDir, config, taxa);
+        this.renderLists(outputDir, config, taxa);
 
-    const taxonList = taxa.getTaxonList();
-    for (const taxon of taxonList) {
-      new PageTaxon(outputDir, config, taxon).render();
+        const taxonList = taxa.getTaxonList();
+        for (const taxon of taxonList) {
+            new PageTaxon(outputDir, config, taxon).render();
+        }
     }
-  }
 
-  /**
-   * @param {string} outputDir
-   * @param {Config} config
-   * @param {Taxa} taxa
-   */
-  static renderLists(outputDir, config, taxa) {
     /**
-     * @param {ListInfo[]} listInfo
-     * @param {Object<string,string>} attributes
-     * @param {TaxaCol[]} [columns]
-     * @returns {string}
+     * @param {string} outputDir
+     * @param {import('./config.js').Config} config
+     * @param {import("./taxa.js").Taxa} taxa
      */
-    function getListArray(listInfo, attributes = {}, columns) {
-      const listArray = [];
-      for (const list of listInfo) {
-        const listTaxa = [];
-        const calfloraTaxa = [];
-        const iNatTaxa = [];
-        for (const taxon of taxa.getTaxonList()) {
-          if (list.include(taxon)) {
-            listTaxa.push(taxon);
-            calfloraTaxa.push(taxon.getCalfloraName());
-            iNatTaxa.push(taxon.getINatName());
-          }
-        }
+    static renderLists(outputDir, config, taxa) {
+        /**
+         * @param {ListInfo[]} listInfo
+         * @param {Object<string,string>} attributes
+         * @param {import("./htmltaxon.js").TaxaColDef[]} [columns]
+         * @returns {string}
+         */
+        function getListArray(listInfo, attributes = {}, columns) {
+            const listArray = [];
+            for (const list of listInfo) {
+                const listTaxa = [];
+                const calfloraTaxa = [];
+                const iNatTaxa = [];
+                for (const taxon of taxa.getTaxonList()) {
+                    if (list.include(taxon)) {
+                        listTaxa.push(taxon);
+                        calfloraTaxa.push(taxon.getCalfloraName());
+                        iNatTaxa.push(taxon.getINatName());
+                    }
+                }
 
-        if (listTaxa.length === 0) {
-          continue;
-        }
+                if (listTaxa.length === 0) {
+                    continue;
+                }
 
-        Files.write(
-          outputDir + "/calflora_" + list.filename + ".txt",
-          calfloraTaxa.join("\n")
-        );
-        Files.write(
-          outputDir + "/inat_" + list.filename + ".txt",
-          iNatTaxa.join("\n")
-        );
+                Files.write(
+                    outputDir + "/calflora_" + list.filename + ".txt",
+                    calfloraTaxa.join("\n"),
+                );
+                Files.write(
+                    outputDir + "/inat_" + list.filename + ".txt",
+                    iNatTaxa.join("\n"),
+                );
 
-        const cols = columns ? columns : list.columns;
-        new PageTaxonList(outputDir, list.name, list.filename).render(
-          listTaxa,
-          cols
-        );
+                const cols = columns ? columns : list.columns;
+                new PageTaxonList(outputDir, list.name, list.filename).render(
+                    listTaxa,
+                    cols,
+                );
 
-        // Check for sublists.
-        const subListHTML = list.listInfo
-          ? getListArray(list.listInfo, { class: "indent" }, cols)
-          : "";
+                // Check for sublists.
+                const subListHTML = list.listInfo
+                    ? getListArray(list.listInfo, { class: "indent" }, cols)
+                    : "";
 
-        listArray.push(
-          HTML.getLink("./" + list.filename + ".html", list.name) +
-            " (" +
-            listTaxa.length +
-            ")" +
-            subListHTML
-        );
-      }
+                listArray.push(
+                    HTML.getLink("./" + list.filename + ".html", list.name) +
+                        " (" +
+                        listTaxa.length +
+                        ")" +
+                        subListHTML,
+                );
+            }
 
-      return renderList(listArray, attributes);
-    }
+            return renderList(listArray, attributes);
+        }
 
-    /**
-     * @param {string[]} listsHTML
-     * @param {Object<string,string>} attributes
-     */
-    function renderList(listsHTML, attributes = {}) {
-      return HTML.wrap("ul", HTML.arrayToLI(listsHTML), attributes);
-    }
+        /**
+         * @param {string[]} listsHTML
+         * @param {Object<string,string>} attributes
+         */
+        function renderList(listsHTML, attributes = {}) {
+            return HTML.wrap("ul", HTML.arrayToLI(listsHTML), attributes);
+        }
 
-    /**
-     * @param {string} title
-     * @param {string} listsHTML
-     */
-    function renderSection(title, listsHTML) {
-      let html = '<div class="section nobullet">';
-      html += HTML.textElement("h2", title);
-      html += listsHTML;
-      html += "</div>";
-      return html;
-    }
+        /**
+         * @param {string} title
+         * @param {string} listsHTML
+         */
+        function renderSection(title, listsHTML) {
+            let html = '<div class="section nobullet">';
+            html += HTML.textElement("h2", title);
+            html += listsHTML;
+            html += "</div>";
+            return html;
+        }
 
-    /** @typedef {{name:string,filename:string,include:function(Taxon):boolean,columns?:TaxaCol[],listInfo?:ListInfo[]}} ListInfo */
-    /** @type {{title:string,listInfo:ListInfo[]}[]} */
-    const sections = [
-      {
-        title: "All Species",
-        listInfo: [
-          {
-            name: config.getLabel("native", "Native"),
-            filename: "list_native",
-            include: (t) => t.isNative(),
-          },
-          {
-            name: config.getLabel("introduced", "Introduced"),
-            filename: "list_introduced",
-            include: (t) => !t.isNative(),
-          },
-          {
-            name: "All Plants",
-            filename: "list_all",
-            include: () => true,
-          },
-        ],
-      },
-      {
-        title: "Rare Plants",
-        listInfo: [
-          {
-            name: "CNPS Ranked Plants",
-            filename: "list_rpi",
-            include: (t) => t.getRPIRank() !== undefined,
-            columns: RPI_COLUMNS,
-            listInfo: [
-              {
-                name: RarePlants.getRPIRankDescription("1A"),
-                filename: "list_rpi_1a",
-                include: (t) => t.getRPIRank() === "1A",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("1B"),
-                filename: "list_rpi_1b",
-                include: (t) => t.getRPIRank() === "1B",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("2A"),
-                filename: "list_rpi_2a",
-                include: (t) => t.getRPIRank() === "2A",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("2B"),
-                filename: "list_rpi_2b",
-                include: (t) => t.getRPIRank() === "2B",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("3"),
-                filename: "list_rpi_3",
-                include: (t) => t.getRPIRank() === "3",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("4"),
-                filename: "list_rpi_4",
-                include: (t) => t.getRPIRank() === "4",
-              },
-            ],
-          },
-          {
-            name: "Endangered Species",
-            filename: "list_endangered",
-            include: (t) =>
-              t.getCESA() !== undefined || t.getFESA() !== undefined,
-            columns: ENDANGERED_COLS,
-          },
-        ],
-      },
-    ];
+        /** @typedef {{name:string,filename:string,include:function(import("./taxon.js").Taxon):boolean,columns?:import("./htmltaxon.js").TaxaColDef[],listInfo?:ListInfo[]}} ListInfo */
+        /** @type {{title:string,listInfo:ListInfo[]}[]} */
+        const sections = [
+            {
+                title: "All Species",
+                listInfo: [
+                    {
+                        name: config.getLabel("native", "Native"),
+                        filename: "list_native",
+                        include: (t) => t.isNative(),
+                    },
+                    {
+                        name: config.getLabel("introduced", "Introduced"),
+                        filename: "list_introduced",
+                        include: (t) => !t.isNative(),
+                    },
+                    {
+                        name: "All Plants",
+                        filename: "list_all",
+                        include: () => true,
+                    },
+                ],
+            },
+            {
+                title: "Rare Plants",
+                listInfo: [
+                    {
+                        name: "CNPS Ranked Plants",
+                        filename: "list_rpi",
+                        include: (t) => t.getRPIRank() !== undefined,
+                        columns: RPI_COLUMNS,
+                        listInfo: [
+                            {
+                                name: RarePlants.getRPIRankDescription("1A"),
+                                filename: "list_rpi_1a",
+                                include: (t) => t.getRPIRank() === "1A",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("1B"),
+                                filename: "list_rpi_1b",
+                                include: (t) => t.getRPIRank() === "1B",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("2A"),
+                                filename: "list_rpi_2a",
+                                include: (t) => t.getRPIRank() === "2A",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("2B"),
+                                filename: "list_rpi_2b",
+                                include: (t) => t.getRPIRank() === "2B",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("3"),
+                                filename: "list_rpi_3",
+                                include: (t) => t.getRPIRank() === "3",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("4"),
+                                filename: "list_rpi_4",
+                                include: (t) => t.getRPIRank() === "4",
+                            },
+                        ],
+                    },
+                    {
+                        name: "Endangered Species",
+                        filename: "list_endangered",
+                        include: (t) =>
+                            t.getCESA() !== undefined ||
+                            t.getFESA() !== undefined,
+                        columns: ENDANGERED_COLS,
+                    },
+                ],
+            },
+        ];
 
-    let html = '<div class="wrapper">';
-    for (const section of sections) {
-      const listHTML = getListArray(section.listInfo);
+        let html = '<div class="wrapper">';
+        for (const section of sections) {
+            const listHTML = getListArray(section.listInfo);
 
-      if (listHTML.length > 0) {
-        html += renderSection(section.title, listHTML);
-      }
-    }
-    html += renderSection(
-      "Taxonomy",
-      renderList([HTML.getLink("./list_families.html", "Plant Families")])
-    );
+            if (listHTML.length > 0) {
+                html += renderSection(section.title, listHTML);
+            }
+        }
+        html += renderSection(
+            "Taxonomy",
+            renderList([
+                HTML.getLink("./list_families.html", "Plant Families"),
+            ]),
+        );
 
-    html += "</div>";
+        html += "</div>";
 
-    // Write lists to includes directory so it can be inserted into pages.
-    Files.write(outputDir + "/_includes/plantlists.html", html);
-  }
+        // Write lists to includes directory so it can be inserted into pages.
+        Files.write(outputDir + "/_includes/plantlists.html", html);
+    }
 }
 
 class PageTaxonList extends GenericPage {
-  /**
-   * @param {string} outputDir
-   * @param {string} title
-   * @param {string} baseName
-   */
-  constructor(outputDir, title, baseName) {
-    super(outputDir, title, baseName);
-  }
+    /**
+     * @param {string} outputDir
+     * @param {string} title
+     * @param {string} baseName
+     */
+    constructor(outputDir, title, baseName) {
+        super(outputDir, title, baseName);
+    }
 
-  /**
-   *
-   * @param {Taxon[]} taxa
-   * @param {TaxaCol[]|undefined} columns
-   */
-  render(taxa, columns) {
-    let html = this.getDefaultIntro();
+    /**
+     *
+     * @param {import("./taxon.js").Taxon[]} taxa
+     * @param {import("./htmltaxon.js").TaxaColDef[]|undefined} columns
+     */
+    render(taxa, columns) {
+        let html = this.getDefaultIntro();
 
-    html += '<div class="wrapper">';
+        html += '<div class="wrapper">';
 
-    html += '<div class="section">';
-    html += HTMLTaxon.getTaxaTable(taxa, columns);
-    html += "</div>";
+        html += '<div class="section">';
+        html += HTMLTaxon.getTaxaTable(taxa, columns);
+        html += "</div>";
 
-    html += '<div class="section nobullet">';
-    html += HTML.textElement("h2", "Download");
-    html += "<ul>";
-    html +=
-      "<li>" +
-      HTML.getLink(
-        "./calflora_" + this.getBaseFileName() + ".txt",
-        "Calflora List"
-      ) +
-      "</li>";
-    html +=
-      "<li>" +
-      HTML.getLink(
-        "./inat_" + this.getBaseFileName() + ".txt",
-        "iNaturalist List"
-      ) +
-      "</li>";
-    html += "</ul>";
-    html += "</div>";
+        html += '<div class="section nobullet">';
+        html += HTML.textElement("h2", "Download");
+        html += "<ul>";
+        html +=
+            "<li>" +
+            HTML.getLink(
+                "./calflora_" + this.getBaseFileName() + ".txt",
+                "Calflora List",
+            ) +
+            "</li>";
+        html +=
+            "<li>" +
+            HTML.getLink(
+                "./inat_" + this.getBaseFileName() + ".txt",
+                "iNaturalist List",
+            ) +
+            "</li>";
+        html += "</ul>";
+        html += "</div>";
 
-    html += "</div>";
+        html += "</div>";
 
-    this.writeFile(html);
-  }
+        this.writeFile(html);
+    }
 }
 
 export { PageRenderer };

package/lib/photo.js

@@ -1,44 +1,74 @@
-const CC0 = "CC0";
-const CC_BY = "CC BY";
-const CC_BY_NC = "CC BY-NC";
-const COPYRIGHT = "C";
+/**
+ * @typedef {"CC0" | "CC BY" | "CC BY-NC" | "C" | null} PhotoRights
+ * @typedef { "cc-by-nc-sa"
+    | "cc-by-nc"
+    | "cc-by-nc-nd"
+    | "cc-by"
+    | "cc-by-sa"
+    | "cc-by-nd"
+    | "pd"
+    | "gdfl"
+    | "cc0"} InatLicenseCode
+ */
 
-class Photo {
-    /** @type {string?} */
-    #url;
-    /** @type {string?} */
-    rightsHolder;
-    /** @type {null | typeof COPYRIGHT | typeof CC_BY | typeof CC_BY_NC | typeof CC0} */
-    rights;
+export class Photo {
+    #id;
+    #ext;
+    #rightsHolder;
+    /** @type {PhotoRights} */
+    #rights;
 
     /**
-     * @param {string?} url
-     * @param {string?} rightsHolder
-     * @param {null | typeof COPYRIGHT | typeof CC_BY | typeof CC_BY_NC | typeof CC0} rights
+     * @param {number} id
+     * @param {string} ext
+     * @param {InatLicenseCode} licenseCode
+     * @param {string} rightsHolder
      */
-    constructor( url, rightsHolder, rights ) {
-        this.#url = url;
-        this.rightsHolder = rightsHolder;
-        this.rights = rights;
+    constructor(id, ext, licenseCode, rightsHolder) {
+        this.#id = id;
+        this.#ext = ext;
+        this.#rightsHolder = rightsHolder;
+        if (licenseCode === "cc0") this.#rights = "CC0";
+        else if (licenseCode === "cc-by") this.#rights = "CC BY";
+        else if (licenseCode === "cc-by-nc") this.#rights = "CC BY-NC";
+        else this.#rights = "C";
     }
 
-    getUrl() {
-        return this.#url;
+    /**
+     * @returns {string}
+     */
+    getAttribution() {
+        if (this.#rights === "CC0") {
+            if (this.#rightsHolder) {
+                return `By ${this.#rightsHolder} (${this.#rights})`;
+            }
+            return this.#rights;
+        }
+        if (this.#rightsHolder) {
+            return `(c) ${this.#rightsHolder} (${this.#rights})`;
+        }
+        return `(c) (${this.#rights})`;
+    }
+
+    getExt() {
+        return this.#ext;
+    }
+
+    getId() {
+        return this.#id;
     }
 
     /**
-     * Return URL of page from whence this photo came
-     * @return {string?}
+     * @returns {string} The URL of the iNaturalist page with details about the image.
      */
     getSourceUrl() {
-        return null;
+        return `https://www.inaturalist.org/photos/${this.#id}`;
     }
-}
 
-export {
-    CC0,
-    CC_BY,
-    CC_BY_NC,
-    COPYRIGHT,
-    Photo
-};
+    /**
+     * @returns {string} The URL to retrieve the image file.
+     */
+    getUrl() {
+        return `https://inaturalist-open-data.s3.amazonaws.com/photos/${this.#id}/medium.${this.#ext}`;
+    }
+}

package/lib/taxa.js

@@ -7,10 +7,10 @@ import { Genera } from "./genera.js";
 import { Taxon } from "./taxon.js";
 import { Families } from "./families.js";
 import { FlowerColor } from "./flowercolor.js";
-import { InatPhoto } from "./inat_photo.js";
 import { TaxaCSV } from "./tools/taxacsv.js";
 import { ErrorLog } from "./errorlog.js";
 import { Program } from "./program.js";
+import { Photo } from "./photo.js";
 
 const FLOWER_COLORS = [
     { name: "white", color: "white" },
@@ -138,7 +138,7 @@ class Taxa {
                 continue;
             }
             taxon.addPhoto(
-                new InatPhoto(
+                new Photo(
                     csvPhoto.id,
                     csvPhoto.ext,
                     csvPhoto.licenseCode,

package/lib/taxon.js

@@ -35,12 +35,12 @@ class Taxon {
     #rankGlobal;
     /** @type {string[]} */
     #synonyms = [];
-    /** @type {Photo[]} */
+    /** @type {import("./photo.js").Photo[]}*/
     #photos = [];
 
     /**
      * @param {TaxonData} data
-     * @param {Genera} genera
+     * @param {import("./genera.js").Genera} genera
      */
     constructor(data, genera) {
         this.#genera = genera;
@@ -98,12 +98,15 @@ class Taxon {
     }
 
     /**
-     * @param {InatPhoto} photo
+     * @param {import("./photo.js").Photo} photo
      */
     addPhoto(photo) {
         this.#photos = this.#photos.concat([photo]);
     }
 
+    /**
+     * @returns {import("./photo.js").Photo[]}
+     */
     getPhotos() {
         return this.#photos;
     }

package/lib/tools/rpi.js

@@ -12,7 +12,7 @@ class RPI {
 
     /**
      * @param {string} toolsDataDir
-     * @param {Taxa} taxa
+     * @param {import("../taxa.js").Taxa} taxa
      * @param {Config} config
      * @param {import("../exceptions.js").Exceptions} exceptions
      * @param {ErrorLog} errorLog
@@ -202,8 +202,7 @@ class RPI {
     }
 
     /**
-     *
-     * @param {Taxa} taxa
+     * @param {import("../taxa.js").Taxa} taxa
      * @param {Config} config
      * @param {import("../exceptions.js").Exceptions} exceptions
      * @param {ErrorLog} errorLog
@@ -367,7 +366,7 @@ class RPI {
 
     /**
      * @param {string} toolsDataDir
-     * @param {Taxa} taxa
+     * @param {import("../taxa.js").Taxa} taxa
      * @param {import("../exceptions.js").Exceptions} exceptions
      * @param {ErrorLog} errorLog
      */

package/lib/web/pagetaxon.js

@@ -11,8 +11,8 @@ class PageTaxon extends GenericPage {
 
     /**
      * @param {string} outputDir
-     * @param {Config} config
-     * @param {Taxon} taxon
+     * @param {import("../config.js").Config} config
+     * @param {import("../taxon.js").Taxon} taxon
      */
     constructor(outputDir, config, taxon) {
         super(outputDir, taxon.getName(), taxon.getBaseFileName());
@@ -189,7 +189,7 @@ class PageTaxon extends GenericPage {
 
         html += HTMLTaxon.getFooterHTML(this.#taxon);
 
-        const photos = this.#taxon.getPhotos().slice( 0, 5 );
+        const photos = this.#taxon.getPhotos().slice(0, 5);
         if (photos.length > 0) {
             let photosHtml = "";
             for (const photo of photos) {
@@ -202,9 +202,7 @@ class PageTaxon extends GenericPage {
               />
             </a>
             <figcaption>
-              ${photo.rights === "CC0" ? "By" : "(c)"}
-              ${photo.rightsHolder}
-              ${photo.rights && `(${photo.rights})`}
+              ${photo.getAttribution()}
             </figcaption>
           </figure>
         `;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.4.18",
+    "version": "0.4.19",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -22,8 +22,9 @@
     },
     "types": "./lib/index.d.ts",
     "scripts": {
-        "check": "npm run eslint && npm run tsc",
+        "check": "npm run eslint && npm run tsc && npm run jest",
         "eslint": "npx eslint",
+        "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js tests",
         "prettier": "npx prettier -l .",
         "tsc": "npx tsc"
     },
@@ -51,10 +52,12 @@
     "devDependencies": {
         "@types/archiver": "^6.0.2",
         "@types/cli-progress": "^3.11.6",
+        "@types/jest": "^29.5.14",
         "@types/markdown-it": "^14.1.2",
         "@types/node": "^22.10.3",
         "@types/unzipper": "^0.10.9",
         "eslint": "^9.17.0",
+        "jest": "^29.7.0",
         "prettier": "^3.4.2",
         "typescript": "^5.7.2"
     }

package/types/classes.d.ts

@@ -23,7 +23,6 @@ declare class ErrorLog {
 declare class Families {
     getFamilies(): Family[];
     getFamily(name: string): Family;
-    renderPages(outputDir: string, cols?: TaxaCol[]): void;
 }
 
 declare class Family {
@@ -41,7 +40,6 @@ declare class FlowerColor {
 }
 
 declare class Genera {
-    addTaxon(taxon: Taxon): void;
     getGenus(name: string): Genus;
 }
 
@@ -87,15 +85,8 @@ declare class Taxa {
     isSubset(): boolean;
 }
 
-declare class TaxaCol {
-    class?: string;
-    data: (taxon: Taxon) => string;
-    title: string;
-}
-
 type StatusCode = "N" | "NC" | "U" | "X";
 declare class Taxon {
-    constructor(data: TaxonData, genera: Genera, meta: any);
     getBaseFileName(): string;
     getBloomEnd(): number | undefined;
     getBloomStart(): number | undefined;
@@ -104,8 +95,6 @@ declare class Taxon {
     getCalfloraTaxonLink(): string | undefined;
     getCalscapeCommonName(): string | undefined;
     getCalscapeName(): string;
-    getCESA(): string | undefined;
-    getCNDDBRank(): string | undefined;
     getCommonNames(): string[];
     getFamily(): Family;
     getFESA(): string | undefined;
@@ -125,7 +114,6 @@ declare class Taxon {
     getJepsonID(): string;
     getLifeCycle(): string;
     getName(): string;
-    getPhotos(): Photo[];
     getRPIID(): string | undefined;
     getRPIRank(): string;
     getRPIRankAndThreat(): string;
@@ -160,21 +148,6 @@ declare class TaxonData {
 
 type PhotoRights = "CC0" | "CC BY" | "CC BY-NC" | "C" | null;
 
-declare class Photo {
-    url?: string;
-    rightsHolder: null | string;
-    rights?: PhotoRights;
-    getExt(): string;
-    getId(): number;
-    getUrl(): string;
-    getSourceUrl(): string;
-}
-
-declare class InatPhoto extends Photo {
-    inatPhotoId: number;
-    ext: string;
-}
-
 type InatPhotoInfo = {
     id: string;
     ext: string;
@@ -219,7 +192,7 @@ declare class InatApiTaxon {
 declare class InatApiObservation {
     observation_photos: {
         photo: InatApiPhoto;
-    }[]
+    }[];
 }
 
 declare class InatObsPhotosCommandLineOptions extends CommandLineOptions {

package/lib/inat_photo.js

@@ -1,43 +0,0 @@
-import { CC0, CC_BY, CC_BY_NC, COPYRIGHT, Photo } from "./photo.js";
-
-class InatPhoto extends Photo {
-    /** @type {number} */
-    inatPhotoId;
-    /** @type {string} */
-    ext;
-
-    /**
-     * @param {number} id
-     * @param {string} ext
-     * @param {InatLicenseCode} licenseCode
-     * @param {string} attrName
-     */
-    constructor(id, ext, licenseCode, attrName) {
-        /** @type {typeof COPYRIGHT | typeof CC_BY | typeof CC_BY_NC | typeof CC0} */
-        let rights = COPYRIGHT;
-        if (licenseCode === "cc0") rights = CC0;
-        else if (licenseCode === "cc-by") rights = CC_BY;
-        else if (licenseCode === "cc-by-nc") rights = CC_BY_NC;
-        super(null, attrName, rights);
-        this.inatPhotoId = id;
-        this.ext = ext;
-    }
-
-    getExt() {
-        return this.ext;
-    }
-
-    getId() {
-        return this.inatPhotoId;
-    }
-
-    getUrl() {
-        return `https://inaturalist-open-data.s3.amazonaws.com/photos/${this.inatPhotoId}/medium.${this.ext}`;
-    }
-
-    getSourceUrl() {
-        return `https://www.inaturalist.org/photos/${this.inatPhotoId}`;
-    }
-}
-
-export { InatPhoto };