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

package/data/text/Agoseris-grandiflora-var-grandiflora.md

@@ -0,0 +1 @@
+Height 25-100 cm. Leaf petiole usually purple.

package/data/text/Agoseris-heterophylla-var-cryptopleura.md

@@ -0,0 +1 @@
+Height 5-60 cm. Leaf petiole usually not purple.

package/data/text/Delphinium-variegatum-subsp-variegatum.md

@@ -0,0 +1 @@
+Leaves hairy on both sides; petioles hairy. 10 or fewer flowers in inflorescence.

package/data/text/Fritillaria-affinis.md

@@ -0,0 +1 @@
+Spots on flower.

package/data/text/Fritillaria-agrestis.md

@@ -0,0 +1 @@
+No spots on flower. Smell unpleasant.

package/data/text/Fritillaria-liliacea.md

@@ -0,0 +1 @@
+Flowers white with green stripes.

package/data/text/Galium-aparine.md

@@ -0,0 +1 @@
+Leaves in whorls of 6 to 8. Similar to _G. triflorum_, but _G. aparine_ has hooked prickles.

package/data/text/Galium-triflorum.md

@@ -0,0 +1 @@
+Leaves in whorls of 6. Similar to _G. aparine_, but _G. triflorum_ does not have hooked prickles.

package/data/text/Hypochaeris-glabra.md

@@ -1 +1 @@
-Annual. [Peduncle](g/peduncle.html) has bracts. Ligules extend only slightly beyond involucre. Leaves hairless or very nearly so. Leaves basal.
+[Peduncle](g/peduncle.html) has bracts. Ligules extend only slightly beyond involucre. Leaves hairless or very nearly so. Leaves basal.

package/data/text/Hypochaeris-radicata.md

@@ -1 +1 @@
-Perennial. [Peduncle](g/peduncle.html) has bracts. Ligules extend much beyond involucre. Leaves bristly and rough to touch. Leaves basal.
+[Peduncle](g/peduncle.html) has bracts. Ligules extend much beyond involucre. Leaves bristly and rough to touch. Leaves basal.

package/data/text/Lithophragma-affine.md

@@ -1 +1 @@
-Pedicel 3-10 mm, floral tube conical at base. In open, grassy areas. Similar to [_L. parviflorum_ var. _parviflorum_](./Lithophragma-parviflorum-var-parviflorum.html).
+Pedicel 3-10 mm, floral tube conical at base. In open, grassy areas. Similar to _L. parviflorum_ var. _parviflorum_.

package/data/text/Lupinus-formosus-var-formosus.md

@@ -1 +1 @@
-Perennial. Keel margins not hairy.
+Keel margins not hairy.

package/data/text/Lupinus-latifolius-var-latifolius.md

@@ -1 +1 @@
-Perennial. Fruit densely hairy. Upper keel margin hairy from base to middle, not hairy from middle to tip
+Fruit densely hairy. Upper keel margin hairy from base to middle, not hairy from middle to tip

package/data/text/Lupinus-microcarpus-var-densiflorus.md

@@ -1 +1 @@
-Annual. At least lower part of stem clearly hollow. Lower keel margins usually not hairy or less hairy than upper. Flowers generally yellow or white.
+At least lower part of stem clearly hollow. Lower keel margins usually not hairy or less hairy than upper. Flowers generally yellow or white.

package/data/text/Lupinus-microcarpus-var-microcarpus.md

@@ -1 +1 @@
-Annual. At least lower part of stem clearly hollow. Lower keel margins usually not hairy or less hairy than upper. Flowers generally pink or purple.
+At least lower part of stem clearly hollow. Lower keel margins usually not hairy or less hairy than upper. Flowers generally pink or purple.

package/data/text/Lupinus-succulentus.md

@@ -1 +1 @@
-Annual. Fruit not densely hairy.
+Fruit not densely hairy.

package/data/text/Pinus-ponderosa-var-pacifica.md

@@ -0,0 +1 @@
+3 needles, deep green and shiny. Mature bark light to medium yellow-brown, with shallow furrows. Cone stalk less than 2cm long.

package/data/text/Pinus-sabiniana.md

@@ -0,0 +1 @@
+3 gray-green needles; needles flexible and usually drooping. Bark dark gray with irregular furrows. Bark on older trees in yellow plates. Cone stalk less than 7 cm.

package/data/text/Quercus-douglasii.md

@@ -0,0 +1 @@
+Leaves usually shallowly lobed; upper sides generally dull and blue-green.

package/data/text/Quercus-kelloggii.md

@@ -0,0 +1 @@
+Leaf moderately to deeply lobed. Each lobe with 1-4 teeth, which are usually bristle-tipped.

package/data/text/Quercus-lobata.md

@@ -0,0 +1 @@
+Leaves usually deeply lobed; upper sides generally shiny and dark green.

package/data/text/Sidalcea-diploscypha.md

@@ -1 +1 @@
-Annual. Stipules on upper stem having two or more linear lobes.
+Stipules on upper stem having two or more linear lobes.

package/ebook/css/main.css

@@ -12,11 +12,20 @@ div.section {
     margin-bottom: .5rem;
 }
 
-img.flr {
+img.flr-color {
     padding-right: .25rem;
     width: 1rem;
 }
 
+span.flr-time,
+span.lc {
+    font-weight: bold;
+}
+
+span.lcs {
+    margin-right: 1rem;
+}
+
 /* Glossary */
 div.glossary img {
     max-height: 300px;

package/jekyll/assets/css/main.css

@@ -131,12 +131,21 @@ div.section ul.indent {
     padding-left: 1rem;
 }
 
-img.flower-color {
+img.flr-color {
     margin-bottom: .2rem;
     margin-right: .5rem;
     width: 1rem;
 }
 
+span.flr-time,
+span.lc {
+    font-weight: bold;
+}
+
+span.lcs {
+    margin-right: 1rem;
+}
+
 /* Forms */
 input {
     margin-right: .5em;

package/lib/ebook/image.js

@@ -1,9 +1,12 @@
 class Image {
-
     #src;
     #credit;
 
-    constructor( src, credit ) {
+    /**
+     * @param {string} src
+     * @param {string} credit
+     */
+    constructor(src, credit) {
         this.#src = src;
         this.#credit = credit;
     }
@@ -15,7 +18,6 @@ class Image {
     getSrc() {
         return this.#src;
     }
-
 }
 
-export { Image };
+export { Image };

package/lib/ebook/pages/taxonpage.js

@@ -1,11 +1,13 @@
-import sizeOf from "image-size";
+import imageSize from "image-size";
 import { Config, Files } from "@ca-plant-list/ca-plant-list";
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
 import { Markdown } from "../../markdown.js";
-import { DateUtils } from "../../dateutils.js";
 // eslint-disable-next-line no-unused-vars
 import { Taxon } from "../../taxon.js";
+// eslint-disable-next-line no-unused-vars
+import { Image } from "../image.js";
+import { HTMLTaxon } from "../../htmltaxon.js";
 
 class TaxonPage extends EBookPage {
     #outputDir;
@@ -13,10 +15,9 @@ class TaxonPage extends EBookPage {
     #photos;
 
     /**
-     *
      * @param {string} outputDir
      * @param {Taxon} taxon
-     * @param {*} photos
+     * @param {Image[]} photos
      */
     constructor(outputDir, taxon, photos) {
         super(outputDir + "/" + taxon.getFileName(), taxon.getName());
@@ -26,36 +27,6 @@ class TaxonPage extends EBookPage {
     }
 
     renderPageBody() {
-        /**
-         * @param {Taxon} taxon
-         */
-        function renderBloomInfo(taxon) {
-            const colors = taxon.getFlowerColors();
-            const monthStart = taxon.getBloomStart();
-            const monthEnd = taxon.getBloomEnd();
-            if (!colors && !monthStart) {
-                return "";
-            }
-            let html = "";
-            if (colors) {
-                for (const color of colors) {
-                    html += XHTML.textElement("img", "", {
-                        src: "./i/f-" + color + ".svg",
-                        class: "flr",
-                    });
-                }
-            }
-            if (monthStart && monthEnd) {
-                html += XHTML.textElement(
-                    "div",
-                    DateUtils.getMonthName(monthStart) +
-                        "-" +
-                        DateUtils.getMonthName(monthEnd)
-                );
-            }
-            return XHTML.wrap("div", html, { class: "section flr" });
-        }
-
         /**
          * @param {string} name
          */
@@ -87,7 +58,7 @@ class TaxonPage extends EBookPage {
             });
         }
 
-        html += renderBloomInfo(this.#taxon);
+        html += HTMLTaxon.getFlowerInfo(this.#taxon, "section flr");
 
         html += renderCustomText(this.#taxon.getBaseFileName());
 
@@ -95,7 +66,9 @@ class TaxonPage extends EBookPage {
             let photoHTML = "";
             for (const photo of this.#photos) {
                 const src = photo.getSrc();
-                const dimensions = sizeOf(this.#outputDir + "/" + src);
+                const dimensions = imageSize.imageSize(
+                    this.#outputDir + "/" + src
+                );
                 let img = XHTML.textElement("img", "", {
                     src: src,
                     style: "max-width:" + dimensions.width + "px",

package/lib/externalsites.js

@@ -1,23 +1,18 @@
 class ExternalSites {
+    static getInatObsLink(options) {
+        const url = new URL(
+            "https://www.inaturalist.org/observations?subview=map"
+        );
 
-    static getCalscapeLink( taxonName ) {
-        const url = new URL( "https://calscape.org/loc-California/" + taxonName.replace( "subsp.", "ssp." ) + " ()" );
-        return url.toString();
-    }
-
-    static getInatObsLink( options ) {
-
-        const url = new URL( "https://www.inaturalist.org/observations?subview=map" );
-
-        for ( const [ k, v ] of Object.entries( options ) ) {
-            switch ( k ) {
+        for (const [k, v] of Object.entries(options)) {
+            switch (k) {
                 case "coords": {
-                    const delta = .1;
+                    const delta = 0.1;
                     const params = url.searchParams;
-                    params.set( "nelat", v[ 1 ] + delta );
-                    params.set( "swlat", v[ 1 ] - delta );
-                    params.set( "nelng", v[ 0 ] + delta );
-                    params.set( "swlng", v[ 0 ] - delta );
+                    params.set("nelat", v[1] + delta);
+                    params.set("swlat", v[1] - delta);
+                    params.set("nelng", v[0] + delta);
+                    params.set("swlng", v[0] - delta);
                     break;
                 }
                 case "created_d1":
@@ -27,17 +22,15 @@ class ExternalSites {
                 case "subview":
                 case "taxon_id":
                 case "taxon_name":
-                    if ( v ) {
-                        url.searchParams.set( k, v );
+                    if (v) {
+                        url.searchParams.set(k, v);
                     }
                     break;
             }
         }
 
         return url.toString();
-
     }
-
 }
 
-export { ExternalSites };
+export { ExternalSites };

package/lib/html.js

@@ -8,41 +8,60 @@ export const HTML_OPTIONS = {
 
 /** HTML utility functions. */
 export class HTML {
-
-    static arrayToLI( items ) {
-        return items.reduce( ( itemHTML, currVal ) => itemHTML + "<li>" + currVal + "</li>", "" );
+    /**
+     * @param {string[]} items
+     */
+    static arrayToLI(items) {
+        return items.reduce(
+            (itemHTML, currVal) => itemHTML + "<li>" + currVal + "</li>",
+            ""
+        );
     }
 
-    static escapeAttribute( value ) {
-        return value.replaceAll( "\"", "&quot;" );
+    /**
+     * @param {string} value
+     */
+    static escapeAttribute(value) {
+        return value.replaceAll('"', "&quot;");
     }
 
-    static escapeText( text ) {
-        return text.replaceAll( "&", "&amp;" ).replaceAll( "<", "&lt;" ).replaceAll( ">", "&gt;" );
+    /**
+     * @param {string} text
+     */
+    static escapeText(text) {
+        return text
+            .replaceAll("&", "&amp;")
+            .replaceAll("<", "&lt;")
+            .replaceAll(">", "&gt;");
     }
 
     /**
      * @deprecated
      */
-    static getElement( elName, text, attributes = {}, options = 0 ) {
+    static getElement(elName, text, attributes = {}, options = 0) {
         let html = "<" + elName;
-        html += this.renderAttributes( attributes );
-        if ( !( options & HTML_OPTIONS.NO_ESCAPE ) ) {
-            text = this.escapeText( text );
+        html += this.renderAttributes(attributes);
+        if (!(options & HTML_OPTIONS.NO_ESCAPE)) {
+            text = this.escapeText(text);
         }
         html += ">" + text + "</" + elName + ">";
         return html;
-
     }
 
-    static #getElement( elName, text, attributes, escape ) {
+    /**
+     * @param {string} elName
+     * @param {string} text
+     * @param {string|Object<string,string>|undefined} attributes
+     * @param {boolean} escape
+     */
+    static #getElement(elName, text, attributes, escape) {
         let html = "<" + elName;
-        html += this.renderAttributes( attributes );
-        if ( escape && ( typeof text === "string" ) ) {
-            text = this.escapeText( text );
+        html += this.renderAttributes(attributes);
+        if (escape && typeof text === "string") {
+            text = this.escapeText(text);
         }
         // If tag is empty, make it self-closing so it is XHTML (epub) compatible.
-        if ( text === "" ) {
+        if (text === "") {
             return html + "/>";
         }
         return html + ">" + text + "</" + elName + ">";
@@ -50,22 +69,22 @@ export class HTML {
 
     /**
      * Generate HTML for an &lt;a> element.
-     * @param {string|undefined} href 
-     * @param {string} linkText 
-     * @param {Object} [attributes] 
+     * @param {string|undefined} href
+     * @param {string} linkText
+     * @param {Object} [attributes]
      * @param {boolean} [openInNewWindow] true if the link should open in a new window.
      * @returns {string} an HTML &lt;a> element.
      */
-    static getLink( href, linkText, attributes = {}, openInNewWindow ) {
+    static getLink(href, linkText, attributes = {}, openInNewWindow) {
         let html = "<a";
-        if ( href !== undefined ) {
-            html += this.renderAttribute( "href", href );
+        if (href !== undefined) {
+            html += this.renderAttribute("href", href);
         }
-        html += this.renderAttributes( attributes );
-        if ( openInNewWindow ) {
-            html += this.renderAttribute( "target", "_blank" );
+        html += this.renderAttributes(attributes);
+        if (openInNewWindow) {
+            html += this.renderAttribute("target", "_blank");
         }
-        return html + ">" + this.escapeText( linkText ) + "</a>";
+        return html + ">" + this.escapeText(linkText) + "</a>";
     }
 
     /**
@@ -76,32 +95,42 @@ export class HTML {
      * @param {boolean} options.icon [true] display an icon after the text
      * @returns {string} A &lt;span> element to be used as a Bootstrap tooltip.
      */
-    static getToolTip( text, tooltip, options = {} ) {
-        const func = text.charAt( 0 ) === "<" ? HTML.wrap : HTML.textElement;
-        if ( options.icon !== false ) {
+    static getToolTip(text, tooltip, options = {}) {
+        const func = text.charAt(0) === "<" ? HTML.wrap : HTML.textElement;
+        if (options.icon !== false) {
             text += " ⓘ";
         }
-        return func( "span", text, { "data-bs-html": "true", "title": tooltip } );
+        return func("span", text, { "data-bs-html": "true", title: tooltip });
     }
 
-    static renderAttribute( n, v ) {
-        return " " + n + "=\"" + this.escapeAttribute( v ) + "\"";
+    static renderAttribute(n, v) {
+        return " " + n + '="' + this.escapeAttribute(v) + '"';
     }
 
-    static renderAttributes( attributes ) {
+    /**
+     * @param {string|Object<string,string>|undefined} attributes
+     */
+    static renderAttributes(attributes = {}) {
+        if (typeof attributes === "string") {
+            return this.renderAttribute("class", attributes);
+        }
         let html = "";
-        for ( const [ k, v ] of Object.entries( attributes ) ) {
-            html += this.renderAttribute( k, v );
+        for (const [k, v] of Object.entries(attributes)) {
+            html += this.renderAttribute(k, v);
         }
         return html;
     }
 
-    static textElement( elName, text, attributes = {} ) {
-        return HTML.#getElement( elName, text, attributes, true );
+    static textElement(elName, text, attributes = {}) {
+        return HTML.#getElement(elName, text, attributes, true);
     }
 
-    static wrap( elName, text, attributes = {} ) {
-        return HTML.#getElement( elName, text, attributes, false );
+    /**
+     * @param {string} elName
+     * @param {string} text
+     * @param {string|Object<string,string>|undefined} [attributes]
+     */
+    static wrap(elName, text, attributes) {
+        return HTML.#getElement(elName, text, attributes, false);
     }
-
 }

package/lib/htmltaxon.js

@@ -0,0 +1,52 @@
+import { DateUtils } from "./dateutils.js";
+import { HTML } from "./html.js";
+// eslint-disable-next-line no-unused-vars
+import { Taxon } from "./taxon.js";
+import { TextUtils } from "./textutils.js";
+
+class HTMLTaxon {
+    /**
+     * @param {Taxon} taxon
+     * @param {string} classNames
+     */
+    static getFlowerInfo(taxon, classNames = "section") {
+        const lifeCycle = taxon.getLifeCycle();
+        const colors = taxon.getFlowerColors();
+        const monthStart = taxon.getBloomStart();
+        const monthEnd = taxon.getBloomEnd();
+
+        const parts = [];
+        if (lifeCycle) {
+            const text =
+                HTML.wrap("span", TextUtils.ucFirst(lifeCycle), "lc") + ".";
+            parts.push(HTML.wrap("span", text, "lcs"));
+        }
+
+        if (colors || monthStart) {
+            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: "flr-color",
+                    });
+                }
+            }
+            if (monthStart && monthEnd) {
+                html += HTML.wrap(
+                    "span",
+                    DateUtils.getMonthName(monthStart) +
+                        "-" +
+                        DateUtils.getMonthName(monthEnd),
+                    { class: "flr-time" }
+                );
+            }
+            parts.push(HTML.wrap("span", html));
+        }
+        return HTML.wrap("div", parts.join(""), { class: classNames });
+    }
+}
+
+export { HTMLTaxon };

package/lib/index.js

@@ -11,6 +11,7 @@
  * GRank:string;
  * "inat id":string;
  * "jepson id":string;
+ * life_cycle:"annual"|"perennial"|undefined
  * SRank:string;
  * status:string;
  * "RPI ID":string;

package/lib/taxa.js

@@ -2,8 +2,9 @@ import { Config } from "./config.js";
 import { HTML } from "./html.js";
 import { CSV } from "./csv.js";
 import { RarePlants } from "./rareplants.js";
-import { ErrorLog, Families, Taxon } from "./index.js";
+import { Families, Taxon } from "./index.js";
 import { Genera } from "./genera.js";
+import { TextUtils } from "./textutils.js";
 
 const FLOWER_COLORS = [
     { name: "white", color: "white" },
@@ -14,6 +15,7 @@ const FLOWER_COLORS = [
     { name: "blue", color: "blue" },
     { name: "purple", color: "purple" },
     { name: "green", color: "green" },
+    { name: "brown", color: "brown" },
 ];
 
 /**
@@ -72,9 +74,7 @@ class FlowerColor {
     }
 
     getColorName(uc = false) {
-        return uc
-            ? this.#color[0].toUpperCase() + this.#color.substring(1)
-            : this.#color;
+        return uc ? TextUtils.ucFirst(this.#color) : this.#color;
     }
 
     getFileName() {
@@ -259,9 +259,7 @@ class Taxa {
     }
 
     /**
-     * @param {*} taxaCSV
-     * @param {*} inclusionList
-     * @param {*} taxaMeta
+     * @param {import("./index.js").TaxonData[]} taxaCSV
      * @param {Taxon} taxonClass
      * @param {boolean} showFlowerErrors
      */
@@ -294,7 +292,10 @@ class Taxa {
                     const color = this.#flower_colors[colorName];
                     if (!color) {
                         throw new Error(
-                            'flower color "' + colorName + '" not found'
+                            'flower color "' +
+                                colorName +
+                                '" not found for ' +
+                                name
                         );
                     }
                     color.addTaxon(taxon);

package/lib/taxon.js

@@ -24,6 +24,7 @@ class Taxon {
     #iNatID;
     /**@type {string|undefined} */
     #iNatSyn;
+    #lifeCycle;
     #flowerColors;
     #bloomStart;
     #bloomEnd;
@@ -57,6 +58,7 @@ class Taxon {
         this.#jepsonID = data["jepson id"];
         this.#calRecNum = data["calrecnum"];
         this.#iNatID = data["inat id"];
+        this.#lifeCycle = data.life_cycle;
         const colors = data["flower_color"];
         this.#flowerColors = colors ? colors.split(",") : undefined;
         if (data["bloom_start"]) {
@@ -234,6 +236,10 @@ class Taxon {
         return this.#jepsonID;
     }
 
+    getLifeCycle() {
+        return this.#lifeCycle;
+    }
+
     getName() {
         return this.#name;
     }

package/lib/textutils.js

@@ -0,0 +1,10 @@
+class TextUtils {
+    /**
+     * @param {string} t
+     */
+    static ucFirst(t) {
+        return t[0].toUpperCase() + t.substring(1);
+    }
+}
+
+export { TextUtils };