@ca-plant-list/ca-plant-list 0.4.33 → 0.4.36

package/lib/ebook/pages/taxonpage.js

@@ -8,16 +8,19 @@ import { Images } from "../images.js";
 import imageSize from "image-size";
 
 class TaxonPage extends EBookPage {
+    #config;
     #taxon;
     #images;
 
     /**
      * @param {string} outputDir
+     * @param {Config} config
      * @param {import("../../taxonomy/taxon.js").Taxon} taxon
      * @param {Images} images
      */
-    constructor(outputDir, taxon, images) {
+    constructor(outputDir, config, taxon, images) {
         super(outputDir + "/" + taxon.getFileName(), taxon.getName());
+        this.#config = config;
         this.#taxon = taxon;
         this.#images = images;
     }
@@ -40,19 +43,26 @@ class TaxonPage extends EBookPage {
         const name = this.#taxon.getName();
         let html = XHTML.textElement("h1", name);
 
+        // Show header with common name, native status, and family.
+        let header = "";
+
+        const cn = this.#taxon.getCommonNames();
+        if (cn && cn.length > 0) {
+            header += XHTML.textElement("div", cn.join(", "));
+        }
+
         const family = this.#taxon.getFamily();
-        html += XHTML.wrap(
+        header += XHTML.wrap(
             "div",
             XHTML.getLink(family.getFileName(), family.getName()),
-            { class: "section" },
         );
 
-        const cn = this.#taxon.getCommonNames();
-        if (cn && cn.length > 0) {
-            html += XHTML.textElement("div", cn.join(", "), {
-                class: "section",
-            });
-        }
+        header += XHTML.textElement(
+            "div",
+            this.#taxon.getStatusDescription(this.#config),
+        );
+
+        html += XHTML.wrap("div", header, "section hdr");
 
         html += HTMLTaxon.getFlowerInfo(this.#taxon, "section flr");
 

package/lib/ebook/plantbook.js

@@ -11,16 +11,19 @@ import { TaxonPage } from "./pages/taxonpage.js";
 import { TOCPage } from "./pages/tocpage.js";
 
 class PlantBook extends EBook {
+    #config;
     #taxa;
     #glossary;
     #images;
+    #maxTaxa;
 
     /**
      * @param {string} outputDir
      * @param {import("../config.js").Config} config
      * @param {import("../types.js").Taxa} taxa
+     * @param {number|undefined} maxTaxa
      */
-    constructor(outputDir, config, taxa) {
+    constructor(outputDir, config, taxa, maxTaxa) {
         super(
             outputDir,
             getRequiredConfigValue(config, "filename"),
@@ -28,16 +31,21 @@ class PlantBook extends EBook {
             getRequiredConfigValue(config, "title"),
         );
 
+        this.#config = config;
         this.#taxa = taxa;
         const generator = new EBookSiteGenerator(config, this.getContentDir());
         this.#glossary = new GlossaryPages(generator);
         this.#images = new Images(generator, this.getContentDir(), taxa);
+        this.#maxTaxa = maxTaxa;
     }
 
     async createPages() {
         const contentDir = this.getContentDir();
 
-        const taxonList = this.#taxa.getTaxonList();
+        const allTaxa = this.#taxa.getTaxonList();
+        const taxonList = this.#maxTaxa
+            ? allTaxa.slice(0, this.#maxTaxa)
+            : allTaxa;
 
         await this.#images.createImages(taxonList);
 
@@ -45,9 +53,15 @@ class PlantBook extends EBook {
             "creating taxon pages",
             taxonList.length,
         );
+
         for (let index = 0; index < taxonList.length; index++) {
             const taxon = taxonList[index];
-            new TaxonPage(contentDir, taxon, this.#images).create();
+            new TaxonPage(
+                contentDir,
+                this.#config,
+                taxon,
+                this.#images,
+            ).create();
             meter.update(index + 1);
         }
         meter.stop();

package/lib/externalsites.js

@@ -30,6 +30,18 @@ export class ExternalSites {
         return new URL("https://www.calflora.org/app/taxon?crn=" + calfloraID);
     }
 
+    /**
+     * @param {import("./types.js").Taxon} taxon
+     * @returns {URL|undefined}
+     */
+    static getCalIPCRefLink(taxon) {
+        const calipcID = taxon.getCalIPCID();
+        if (!calipcID) {
+            return;
+        }
+        return new URL(`https://www.cal-ipc.org/plants/profile/${calipcID}/`);
+    }
+
     /**
      * @param {import("./types.js").Taxon} taxon
      * @returns {URL|undefined}

package/lib/htmltaxon.js

@@ -74,6 +74,10 @@ const REFLINKS = {
         label: "Calflora",
         href: (taxon) => ExternalSites.getCalfloraRefLink(taxon),
     },
+    calipc: {
+        label: "Cal-IPC",
+        href: (taxon) => ExternalSites.getCalIPCRefLink(taxon),
+    },
     calscape: {
         label: "Calscape",
         href: (taxon) => ExternalSites.getCalscapeLink(taxon),
@@ -248,12 +252,19 @@ class HTMLTaxon {
      * @returns {string}
      */
     static getFooterHTML(taxon) {
-        const footerTextPath = path.join(
+        const footerTextPathCommon = path.join(
             Config.getPackageDir(),
             "/data/text/",
             `${taxon.getBaseFileName()}.footer.md`,
         );
-        return HTMLFragments.getMarkdownSection(footerTextPath);
+        const footerTextPathLocal = path.join(
+            "./data/footers/",
+            `${taxon.getBaseFileName()}.md`,
+        );
+        return (
+            HTMLFragments.getMarkdownSection(footerTextPathCommon) +
+            HTMLFragments.getMarkdownSection(footerTextPathLocal)
+        );
     }
 
     /**

package/lib/index.d.ts

@@ -8,6 +8,7 @@ type PhotoRights = "CC0" | "CC BY" | "CC BY-NC" | "C" | null;
 
 type RefSourceCode =
     | "calflora"
+    | "calipc"
     | "calscape"
     | "cch"
     | "fna"
@@ -40,6 +41,7 @@ export type TaxonData = TaxonomyData & {
     CRPR: string;
     FESA: string;
     fna: string;
+    calipc: string;
     flower_color: string;
     GRank: string;
     "inat id": string;
@@ -229,6 +231,7 @@ export class Taxa<T> {
         extraTaxa?: TaxonOverrides[],
         extraSynonyms?: Record<string, string>[],
     );
+    static getIncludeList(dataDir: string): true | Record<string, TaxonData>;
     getTaxon(name: string): T;
     getTaxonList(): T[];
 }

package/lib/markdown.js

@@ -2,7 +2,7 @@ import markdownIt from "markdown-it";
 import { Files } from "./files.js";
 
 export class Markdown {
-    static #md = new markdownIt({ xhtmlOut: true });
+    static #md = new markdownIt({ html: true, xhtmlOut: true });
 
     /**
      * @param {string} filePath

package/lib/program.js

@@ -1,7 +1,4 @@
 import { Command } from "commander";
-import { Files } from "./files.js";
-import { CSV } from "./csv.js";
-import path from "node:path";
 
 /**
  * @typedef {{
@@ -12,29 +9,6 @@ import path from "node:path";
  */
 
 class Program {
-    /**
-     * @param {string} dataDir
-     */
-    static getIncludeList(dataDir) {
-        // Read inclusion list.
-        const includeFileName = "taxa_include.csv";
-        const includeFilePath = dataDir + "/" + includeFileName;
-        if (!Files.exists(includeFilePath)) {
-            console.log(includeFilePath + " not found; loading all taxa");
-            return true;
-        }
-
-        /** @type {import("./index.js").TaxonData[]} */
-        // @ts-ignore
-        const includeCSV = CSV.readFile(path.join(dataDir, includeFileName));
-        /** @type {Object<string,import("./index.js").TaxonData>} */
-        const include = {};
-        for (const row of includeCSV) {
-            include[row["taxon_name"]] = row;
-        }
-        return include;
-    }
-
     static getProgram() {
         const program = new Command();
         program

package/lib/sitegenerator.js

@@ -56,16 +56,16 @@ export class SiteGenerator {
                 Config.getPackageDir() + "/data/illustrations/inkscape";
             const entries = Files.getDirEntries(srcDir);
             for (const entry of entries) {
-                const srcFile = Files.join(srcDir, entry);
+                const srcFile = path.join(srcDir, entry);
                 const srcSVG = Files.read(srcFile);
                 const result = optimize(srcSVG, {
-                    plugins: ["preset-default", "removeDimensions"],
+                    enable: ["removeDimensions"],
                 });
-                Files.write(Files.join(outputDir, entry), result.data);
+                Files.write(path.join(outputDir, entry), result.data);
             }
         }
 
-        const outputDir = Files.join(this.#baseDir, "i");
+        const outputDir = path.join(this.#baseDir, "i");
         Files.mkdir(outputDir);
 
         optimizeSVG(outputDir);

package/lib/taxonomy/taxa.js

@@ -9,8 +9,8 @@ import { Families } from "./families.js";
 import { FlowerColor } from "../flowercolor.js";
 import { TaxaCSV } from "../tools/taxacsv.js";
 import { ErrorLog } from "../errorlog.js";
-import { Program } from "../program.js";
 import { Photo } from "../photo.js";
+import { Files } from "../files.js";
 
 /**
  * @typedef {{Current: string;Former: string;Type: string;}} SynonymData
@@ -28,7 +28,7 @@ const FLOWER_COLORS = [
     { name: "brown", color: "brown" },
 ];
 
-class Taxa {
+export class Taxa {
     #families;
     #errorLog;
     /** @type {Object<string,Taxon>} */
@@ -152,6 +152,29 @@ class Taxa {
         );
     }
 
+    /**
+     * @param {string} dataDir
+     * @returns {true|Object<string,import("../index.js").TaxonData>}
+     */
+    static getIncludeList(dataDir) {
+        // Read inclusion list.
+        const includeFileName = "taxa_include.csv";
+        const includeFilePath = dataDir + "/" + includeFileName;
+        if (!Files.exists(includeFilePath)) {
+            console.log(includeFilePath + " not found; loading all taxa");
+            return true;
+        }
+
+        /** @type {import("../index.js").TaxonData[]} */
+        const includeCSV = CSV.readFile(path.join(dataDir, includeFileName));
+        /** @type {Object<string,import("../index.js").TaxonData>} */
+        const include = {};
+        for (const row of includeCSV) {
+            include[row["taxon_name"]] = row;
+        }
+        return include;
+    }
+
     /**
      * @param {string} name
      */
@@ -193,7 +216,7 @@ class Taxa {
             taxa = await taxaLoaderClass.TaxaLoader.loadTaxa(options, errorLog);
         } else {
             taxa = new Taxa(
-                Program.getIncludeList(options.datadir),
+                Taxa.getIncludeList(options.datadir),
                 errorLog,
                 options.showFlowerErrors,
             );
@@ -297,5 +320,3 @@ class Taxa {
         }
     }
 }
-
-export { Taxa };

package/lib/taxonomy/taxon.js

@@ -13,6 +13,7 @@ class Taxon extends Taxonomy {
     #cch2id;
     #fnaName;
     #calscapeCN;
+    #calipcID;
     #lifeCycle;
     #flowerColors;
     #bloomStart;
@@ -51,6 +52,7 @@ class Taxon extends Taxonomy {
         this.#iNatID = data["inat id"];
         this.#cch2id = data.cch2_id;
         this.#fnaName = data.fna ?? "";
+        this.#calipcID = data.calipc ?? "";
         this.#calscapeCN =
             data.calscape_cn === "" ? undefined : data.calscape_cn;
         this.#lifeCycle = data.life_cycle;
@@ -118,12 +120,20 @@ class Taxon extends Taxonomy {
         return this.#bloomStart;
     }
 
+    getCalfloraID() {
+        return this.#calRecNum;
+    }
+
     getCalfloraName() {
         return this.getName().replace(" subsp.", " ssp.").replace("×", "X");
     }
 
-    getCalfloraID() {
-        return this.#calRecNum;
+    getCalIPCID() {
+        return this.#calipcID;
+    }
+
+    getCalIPCName() {
+        return this.getName().replace(" subsp.", " ssp.");
     }
 
     getCalscapeCommonName() {

package/lib/tools/calflora.js

@@ -70,12 +70,10 @@ export class Calflora {
         );
 
         /** @type {CalfloraData[]} */
-        // @ts-ignore
         const csvActive = CSV.readFile(
             path.join(toolsDataPath, calfloraDataFileNameActive),
         );
         /** @type {CalfloraData[]} */
-        // @ts-ignore
         const csvCounties = CSV.readFile(
             path.join(toolsDataPath, calfloraDataFileNameCounties),
         );

package/lib/tools/calipc.js

@@ -0,0 +1,111 @@
+import * as path from "path";
+import { Files } from "../files.js";
+import { TaxaCSV } from "./taxacsv.js";
+import { scrape } from "@htmltools/scrape";
+
+export class CalIPC {
+    /**
+     * @param {string} toolsDataDir
+     * @param {string} dataDir
+     * @param {import("../types.js").Taxa} taxa
+     * @param {import("../exceptions.js").Exceptions} exceptions
+     * @param {import("../errorlog.js").ErrorLog} errorLog
+     * @param {boolean} update
+     */
+    static async analyze(
+        toolsDataDir,
+        dataDir,
+        taxa,
+        exceptions,
+        errorLog,
+        update,
+    ) {
+        const toolsDataPath = toolsDataDir + "/calipc";
+        // Create data directory if it's not there.
+        Files.mkdir(toolsDataPath);
+
+        const calipcFileName = path.join(toolsDataPath, "inventory.html");
+        if (!Files.exists(calipcFileName)) {
+            console.info("retrieving " + calipcFileName);
+            await Files.fetch(
+                "https://www.cal-ipc.org/plants/inventory/",
+                calipcFileName,
+            );
+        }
+
+        const parsed = scrape.parseFile(calipcFileName);
+        const links = scrape.getSubtrees(parsed, (e) => {
+            if (e.tagName !== "td") {
+                return false;
+            }
+            const className = scrape.getAttr(e, "class");
+            return className === "it-latin";
+        });
+
+        /** @type {Map<string,string>} */
+        const calipcTaxa = new Map();
+        for (const link of links) {
+            const name = scrape.getTextContent(link);
+            const url = scrape.getAttr(link.children[0], "href");
+            if (!url) {
+                console.warn(`Cal-IPC url not found for ${name}`);
+                continue;
+            }
+            const id = url.match(/\/profile\/(.*)\//);
+            if (!id) {
+                console.warn(`Cal-IPC url mismatch for ${url}`);
+                continue;
+            }
+            calipcTaxa.set(name, id[1]);
+        }
+
+        const idsToUpdate = new Map();
+
+        for (const taxon of taxa.getTaxonList()) {
+            const name = taxon.getName();
+            if (name.includes(" unknown")) {
+                continue;
+            }
+            const calipcName = taxon.getCalIPCName();
+            const calipcData = calipcTaxa.get(calipcName);
+            if (!calipcData) {
+                continue;
+            }
+
+            // Check native status.
+            if (taxon.isCANative()) {
+                errorLog.log(name, "is native but listed in Cal-IPC");
+            }
+
+            if (calipcData !== taxon.getCalIPCID()) {
+                errorLog.log(
+                    name,
+                    "Cal-IPC ID in Cal-IPC is different than taxa.csv",
+                    calipcData,
+                    taxon.getCalIPCID(),
+                );
+                idsToUpdate.set(name, calipcData);
+            }
+        }
+
+        if (update) {
+            this.#updateIds(dataDir, idsToUpdate);
+        }
+    }
+
+    /**
+     * @param {string} dataDir
+     * @param {Map<string,string>} idsToUpdate
+     */
+    static #updateIds(dataDir, idsToUpdate) {
+        const taxa = new TaxaCSV(dataDir);
+        for (const taxonData of taxa.getTaxa()) {
+            const id = idsToUpdate.get(taxonData.taxon_name);
+            if (!id) {
+                continue;
+            }
+            taxonData["calipc"] = id;
+        }
+        taxa.write();
+    }
+}

package/lib/tools/taxacsv.js

@@ -5,16 +5,17 @@ const HEADERS = [
     "taxon_name",
     "common name",
     "status",
+    "life_cycle",
+    "flower_color",
+    "bloom_start",
+    "bloom_end",
     "jepson id",
     "calrecnum",
     "inat id",
     "cch2_id",
     "fna",
     "calscape_cn",
-    "life_cycle",
-    "flower_color",
-    "bloom_start",
-    "bloom_end",
+    "calipc",
     "RPI ID",
     "CRPR",
     "CESA",

package/lib/utils/eleventyGenerator.js

@@ -66,6 +66,8 @@ export class EleventyGenerator extends SiteGenerator {
                     const passThroughPatterns = [
                         "assets",
                         "i",
+                        "calflora_list_*.txt",
+                        "inat_list_*.txt",
                         "errors.tsv",
                         ...generator.getPassThroughPatterns(),
                     ];

package/lib/utils/inat-tools.js

@@ -69,7 +69,11 @@ export function convertToCSVPhoto(apiPhoto) {
  */
 async function fetchInatTaxa(inatTaxonIDs) {
     const url = `https://api.inaturalist.org/v2/taxa/${inatTaxonIDs.join(",")}?fields=(taxon_photos:(photo:(medium_url:!t,attribution:!t,license_code:!t)))`;
-    const resp = await fetch(url);
+    const resp = await getResponse(url);
+    if (resp instanceof Error) {
+        console.error(`unable to fetch taxa: ${resp.message}`);
+        return [];
+    }
     if (!resp.ok) {
         const error = await resp.text();
         throw new Error(`Failed to fetch taxa from iNat: ${error}`);
@@ -163,7 +167,7 @@ export async function getObsPhotosForTaxa(taxaToUpdate, locationOptions) {
             continue;
         }
 
-        // Just get the CC-licensed ones, 5 per taxon should be fine (max is 20 on iNat). Whether or not
+        // Just get the CC-licensed ones, 5 per taxon should be fine (max is 20 on iNat).
         const rawPhotoInfo = observations
             .map((obs) =>
                 obs.observation_photos.map((op) => {
@@ -182,7 +186,7 @@ export async function getObsPhotosForTaxa(taxaToUpdate, locationOptions) {
             if (!obj) {
                 continue;
             }
-            processedPhotoInfo.push(obj);
+            processedPhotoInfo.push({ obsId: photo.obsId.toString(), ...obj });
         }
         photos.set(taxon.getName(), processedPhotoInfo);
 
@@ -270,7 +274,7 @@ function getAttribution(rawAttribution) {
 
 let lastQueryTime = Date.now();
 /**
- * @param {URL} url
+ * @param {URL|string} url
  * @returns {Promise<Response|Error>}
  */
 async function getResponse(url) {

package/lib/web/pageTaxon.js

@@ -35,6 +35,7 @@ export class PageTaxon extends GenericPage {
         HTMLTaxon.addRefLink(links, this.#taxon, "fna");
         HTMLTaxon.addRefLink(links, this.#taxon, "cch");
         HTMLTaxon.addRefLink(links, this.#taxon, "calscape");
+        HTMLTaxon.addRefLink(links, this.#taxon, "calipc");
         return links;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.4.33",
+    "version": "0.4.36",
     "description": "Tools to create files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -40,14 +40,14 @@
         "@htmltools/scrape": "^0.1.1",
         "archiver": "^5.3.1",
         "cli-progress": "^3.12.0",
-        "commander": "^13.1.0",
+        "commander": "^14.0.1",
         "csv-parse": "^5.6.0",
         "csv-stringify": "^6.5.2",
         "exceljs": "^4.4.0",
         "image-size": "^1.1.1",
         "markdown-it": "^14.1.0",
         "sharp": "^0.33.5",
-        "svgo-ll": "^5.6.0",
+        "svgo-ll": "^6.0.1",
         "unzipper": "^0.12.3"
     },
     "devDependencies": {
@@ -57,10 +57,10 @@
         "@types/markdown-it": "^14.1.2",
         "@types/node": "^22.10.7",
         "@types/unzipper": "^0.10.9",
-        "eslint": "^9.20.1",
+        "eslint": "^9.35.0",
         "jest": "^29.7.0",
-        "prettier": "^3.5.1",
+        "prettier": "^3.6.2",
         "puppeteer": "^24.1.1",
-        "typescript": "^5.7.3"
+        "typescript": "^5.9.2"
     }
 }

package/scripts/build-ebook.js

@@ -8,9 +8,16 @@ import { Program } from "../lib/program.js";
 import { Taxa } from "../lib/taxonomy/taxa.js";
 
 const program = Program.getProgram();
-program
-    .option("-l, --locationsdir <dir>", "directory containing location data")
-    .action(build);
+program.option(
+    "-l, --locationsdir <dir>",
+    "directory containing location data",
+);
+program.option(
+    "--location <name>",
+    "name of location to generate (otherwise all ebooks will be generated)",
+);
+program.option("--max-taxa <number>", "maximum number of taxa to include");
+program.action(build);
 
 await program.parseAsync();
 
@@ -26,6 +33,11 @@ async function build(options) {
         const outputBase = options.outputdir;
         const subdirs = Files.getDirEntries(locationsDir);
         for (const subdir of subdirs) {
+            // If a single location was specified, ignore the others.
+            if (options.location && subdir !== options.location) {
+                continue;
+            }
+
             console.log("Generating " + subdir);
             const suffix = "/" + subdir;
             const path = locationsDir + suffix;
@@ -34,6 +46,7 @@ async function build(options) {
                     outputBase + suffix,
                     path,
                     options.showFlowerErrors,
+                    options.maxTaxa,
                 );
             }
         }
@@ -43,6 +56,7 @@ async function build(options) {
             options.outputdir,
             options.datadir,
             options.showFlowerErrors,
+            options.maxTaxa,
         );
     }
 }
@@ -51,18 +65,19 @@ async function build(options) {
  * @param {string} outputDir
  * @param {string} dataDir
  * @param {boolean} showFlowerErrors
+ * @param {number|undefined} maxTaxa
  */
-async function buildBook(outputDir, dataDir, showFlowerErrors) {
+async function buildBook(outputDir, dataDir, showFlowerErrors, maxTaxa) {
     const errorLog = new ErrorLog(outputDir + "/errors.tsv");
 
     const taxa = new Taxa(
-        Program.getIncludeList(dataDir),
+        Taxa.getIncludeList(dataDir),
         errorLog,
         showFlowerErrors,
     );
 
     const config = new Config(dataDir);
-    const ebook = new PlantBook(outputDir, config, taxa);
+    const ebook = new PlantBook(outputDir, config, taxa, maxTaxa);
     await ebook.create();
     errorLog.write();
 }