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

package/lib/web/pagetaxon.js

@@ -2,64 +2,50 @@ import { Jepson } from "../jepson.js";
 import { RarePlants } from "../rareplants.js";
 import { GenericPage } from "../genericpage.js";
 import { ExternalSites } from "../externalsites.js";
-import { DateUtils } from "../dateutils.js";
 import { HTML } from "../html.js";
+// eslint-disable-next-line no-unused-vars
+import { Config } from "../config.js";
+// eslint-disable-next-line no-unused-vars
+import { Taxon } from "../taxon.js";
+import { HTMLTaxon } from "../htmltaxon.js";
 
 class PageTaxon extends GenericPage {
-
     #config;
     #taxon;
 
-    constructor( outputDir, config, taxon ) {
-        super( outputDir, taxon.getName(), taxon.getBaseFileName() );
+    /**
+     * @param {string} outputDir
+     * @param {Config} config
+     * @param {Taxon} taxon
+     */
+    constructor(outputDir, config, taxon) {
+        super(outputDir, taxon.getName(), taxon.getBaseFileName());
         this.#config = config;
         this.#taxon = taxon;
     }
 
-    getFlowerInfo() {
-
-        const colors = this.#taxon.getFlowerColors();
-        const monthStart = this.#taxon.getBloomStart();
-        const monthEnd = this.#taxon.getBloomEnd();
-
-        if ( !colors && !monthStart ) {
-            return "";
-        }
-
-        let html = "Flowers: ";
-        if ( colors ) {
-            for ( const color of colors ) {
-                html += HTML.textElement( "img", "", { src: "/i/f-" + color + ".svg", alt: color + " flowers", title: color, class: "flower-color" } );
-            }
-        }
-        if ( monthStart ) {
-            html += DateUtils.getMonthName( monthStart ) + "-" + DateUtils.getMonthName( monthEnd );
-        }
-        return HTML.wrap( "div", html, { class: "section" } );
-    }
-
     #getInfoLinks() {
         const links = [];
         const jepsonID = this.#taxon.getJepsonID();
-        if ( jepsonID ) {
-            links.push( Jepson.getEFloraLink( jepsonID ) );
+        if (jepsonID) {
+            links.push(Jepson.getEFloraLink(jepsonID));
         }
         const cfLink = this.#taxon.getCalfloraTaxonLink();
-        if ( cfLink ) {
-            links.push( cfLink );
+        if (cfLink) {
+            links.push(cfLink);
         }
         const iNatLink = this.#taxon.getINatTaxonLink();
-        if ( iNatLink ) {
-            links.push( iNatLink );
+        if (iNatLink) {
+            links.push(iNatLink);
         }
         const rpiLink = this.#taxon.getRPITaxonLink();
-        if ( rpiLink ) {
-            links.push( rpiLink );
+        if (rpiLink) {
+            links.push(rpiLink);
         }
-        if ( this.#taxon.isNative() ) {
+        if (this.#taxon.isNative()) {
             links.push(
                 HTML.getLink(
-                    ExternalSites.getCalscapeLink( this.#taxon.getName() ),
+                    ExternalSites.getCalscapeLink(this.#taxon.getName()),
                     "Calscape",
                     undefined,
                     true
@@ -73,25 +59,27 @@ class PageTaxon extends GenericPage {
         const links = [];
         links.push(
             HTML.getLink(
-                "https://www.calflora.org/entry/observ.html?track=m#srch=t&grezc=5&cols=b&lpcli=t&cc="
-                + this.#config.getCountyCodes().join( "!" ) + "&incobs=f&taxon="
-                + this.#taxon.getCalfloraName().replaceAll( " ", "+" ),
+                "https://www.calflora.org/entry/observ.html?track=m#srch=t&grezc=5&cols=b&lpcli=t&cc=" +
+                    this.#config.getCountyCodes().join("!") +
+                    "&incobs=f&taxon=" +
+                    this.#taxon.getCalfloraName().replaceAll(" ", "+"),
                 "Calflora",
                 {},
                 true
             )
         );
         const iNatID = this.#taxon.getINatID();
-        if ( iNatID ) {
+        if (iNatID) {
             links.push(
                 HTML.getLink(
-                    ExternalSites.getInatObsLink(
-                        {
-                            project_id: this.#config.getConfigValue( "inat", "project_id" ),
-                            subview: "map",
-                            taxon_id: iNatID
-                        }
-                    ),
+                    ExternalSites.getInatObsLink({
+                        project_id: this.#config.getConfigValue(
+                            "inat",
+                            "project_id"
+                        ),
+                        subview: "map",
+                        taxon_id: iNatID,
+                    }),
                     "iNaturalist",
                     {},
                     true
@@ -102,13 +90,18 @@ class PageTaxon extends GenericPage {
         return links;
     }
 
-    #getListSectionHTML( list, header, className ) {
+    /**
+     * @param {string[]} list
+     * @param {string} header
+     * @param {string} className
+     */
+    #getListSectionHTML(list, header, className) {
         let html = "";
-        if ( list.length > 0 ) {
-            html += "<div class=\"section " + className + "\">";
-            html += HTML.textElement( "h2", header );
+        if (list.length > 0) {
+            html += '<div class="section ' + className + '">';
+            html += HTML.textElement("h2", header);
             html += "<ul>";
-            html += HTML.arrayToLI( list );
+            html += HTML.arrayToLI(list);
             html += "</ul>";
             html += "</div>";
         }
@@ -117,32 +110,44 @@ class PageTaxon extends GenericPage {
 
     #getRarityInfo() {
         const cnpsRank = this.#taxon.getRPIRankAndThreat();
-        if ( !cnpsRank ) {
+        if (!cnpsRank) {
             return "";
         }
         const ranks = [];
 
-        ranks.push( HTML.textElement( "span", "CNPS Rare Plant Rank:", { class: "label" } )
-            + HTML.getToolTip( cnpsRank, this.#taxon.getRPIRankAndThreatTooltip() ) );
-        if ( this.#taxon.getCESA() ) {
-            ranks.push( HTML.textElement( "span", "CESA:", { class: "label" } ) + RarePlants.getCESADescription( this.#taxon.getCESA() ) );
+        ranks.push(
+            HTML.textElement("span", "CNPS Rare Plant Rank:", {
+                class: "label",
+            }) +
+                HTML.getToolTip(
+                    cnpsRank,
+                    this.#taxon.getRPIRankAndThreatTooltip()
+                )
+        );
+        if (this.#taxon.getCESA()) {
+            ranks.push(
+                HTML.textElement("span", "CESA:", { class: "label" }) +
+                    RarePlants.getCESADescription(this.#taxon.getCESA())
+            );
         }
 
-        return HTML.wrap(
-            "div",
-            "<ul>" + HTML.arrayToLI( ranks ) + "</ul>",
-            { class: "section" }
-        );
+        return HTML.wrap("div", "<ul>" + HTML.arrayToLI(ranks) + "</ul>", {
+            class: "section",
+        });
     }
 
     #getRelatedTaxaLinks() {
         const links = [];
         const genus = this.#taxon.getGenus();
-        if ( genus ) {
+        if (genus) {
             const taxa = genus.getTaxa();
-            if ( taxa.length > 1 ) {
-                for ( const taxon of taxa ) {
-                    links.push( taxon.getHTMLLink( taxon.getName() !== this.#taxon.getName() ) );
+            if (taxa.length > 1) {
+                for (const taxon of taxa) {
+                    links.push(
+                        taxon.getHTMLLink(
+                            taxon.getName() !== this.#taxon.getName()
+                        )
+                    );
                 }
             }
         }
@@ -154,22 +159,28 @@ class PageTaxon extends GenericPage {
     }
 
     render() {
-
         let html = this.getFrontMatter();
 
-        html += "<div class=\"wrapper\">";
+        html += '<div class="wrapper">';
 
         const cn = this.#taxon.getCommonNames();
-        if ( cn.length > 0 ) {
-            html += HTML.textElement( "div", cn.join( ", " ), { class: "section common-names" } );
+        if (cn.length > 0) {
+            html += HTML.textElement("div", cn.join(", "), {
+                class: "section common-names",
+            });
         }
 
-        html += HTML.textElement( "div", this.#taxon.getStatusDescription( this.#config ), { class: "section native-status" } );
+        html += HTML.textElement(
+            "div",
+            this.#taxon.getStatusDescription(this.#config),
+            { class: "section native-status" }
+        );
 
         const family = this.#taxon.getFamily();
         html += HTML.wrap(
             "div",
-            HTML.textElement( "span", "Family:", { class: "label" } ) + HTML.getLink( "./" + family.getFileName(), family.getName() ),
+            HTML.textElement("span", "Family:", { class: "label" }) +
+                HTML.getLink("./" + family.getFileName(), family.getName()),
             { class: "section" }
         );
 
@@ -177,21 +188,35 @@ class PageTaxon extends GenericPage {
 
         html += "</div>";
 
-        html += this.getFlowerInfo();
+        html += HTMLTaxon.getFlowerInfo(this.#taxon);
 
         html += this.getMarkdown();
 
-        html += "<div class=\"grid borders\">";
-        html += this.#getListSectionHTML( this.#getInfoLinks(), "References", "info" );
-        html += this.#getListSectionHTML( this.#getObsLinks(), "Observations", "obs" );
-        html += this.#getListSectionHTML( this.#getRelatedTaxaLinks(), "Related Species", "rel-taxa" );
-        html += this.#getListSectionHTML( this.#getSynonyms(), "Synonyms", "synonyms" );
+        html += '<div class="grid borders">';
+        html += this.#getListSectionHTML(
+            this.#getInfoLinks(),
+            "References",
+            "info"
+        );
+        html += this.#getListSectionHTML(
+            this.#getObsLinks(),
+            "Observations",
+            "obs"
+        );
+        html += this.#getListSectionHTML(
+            this.#getRelatedTaxaLinks(),
+            "Related Species",
+            "rel-taxa"
+        );
+        html += this.#getListSectionHTML(
+            this.#getSynonyms(),
+            "Synonyms",
+            "synonyms"
+        );
         html += "</div>";
 
-        this.writeFile( html );
-
+        this.writeFile(html);
     }
-
 }
 
-export { PageTaxon };
+export { PageTaxon };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.3.3",
+    "version": "0.3.5",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -23,7 +23,7 @@
         "command-line-args": "^5.2.1",
         "command-line-usage": "^6.1.3",
         "csv-parse": "^5.3.1",
-        "image-size": "^1.0.2",
+        "image-size": "^1.1.1",
         "markdown-it": "^13.0.1",
         "sharp": "^0.32.1",
         "svgo": "^3.0.3",
@@ -36,4 +36,4 @@
         "eslint": "^8.26.0",
         "typescript": "^5.3.3"
     }
-}
+}

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(