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

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/Calochortus-argillosus.md

@@ -0,0 +1 @@
+Nectary crescent-shaped and densely hairy. Generally a dark reddish spot surrounded by pale yellow at base of petals (above nectary).

package/data/text/Calochortus-luteus.md

@@ -0,0 +1 @@
+Petals deep yellow, usually with brown streaking. Nectary generally crescent-shaped.

package/data/text/Calochortus-venustus.md

@@ -0,0 +1 @@
+Nectary almost square. Generally a dark reddish spot at base of petals (above nectary) and a paler spot above.

package/data/text/Claytonia-parviflora-subsp-parviflora.md

@@ -0,0 +1 @@
+Basal leaf blades at least 3 times longer than wide; base tapered gradually to petiole.

package/data/text/Claytonia-perfoliata-subsp-perfoliata.md

@@ -0,0 +1 @@
+Basal leaf blades less than 3 times longer than wide; base not tapered gradually to petiole.

package/data/text/Collinsia-heterophylla-var-heterophylla.md

@@ -0,0 +1 @@
+Flower whorls dense. [Pedicels](./g/pedicel.html) on lower flowers shorter than [calyx](./g/calyx.html).

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/Leptosiphon-ambiguus.md

@@ -0,0 +1 @@
+Flowers pedicelled. Sepals just below lobes (throat is short). Throat of tube usually purple.

package/data/text/Leptosiphon-androsaceus.md

@@ -0,0 +1 @@
+Flowers pedicelled. Corolla tube at least twice as long as [calyx](./g/calyx.html). Corolla lobes 8-14 mm. Calyx membrane much narrower than lobes. Calyx hairs sparse or not present (except on margins).

package/data/text/Leptosiphon-bicolor.md

@@ -1 +1 @@
-Flowers pedicelled. Corolla tube at least twice as long as calyx. Calyx membrane much narrower than lobes.
+Flowers pedicelled. Corolla tube at least twice as long as [calyx](./g/calyx.html); threadlike - no sepals at base of lobes. Corolla lobes less than 4 mm. Calyx membrane much narrower than lobes. Calyx hairs sparse or not present (except on margins).

package/data/text/Leptosiphon-parviflorus.md

@@ -0,0 +1 @@
+Corolla lobes at least 4 mm long, corolla tube at least 14 mm. Calyx hairs dense.

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,16 @@ div.section {
     margin-bottom: .5rem;
 }
 
-img.flr {
+img.flr-color {
     padding-right: .25rem;
     width: 1rem;
 }
 
+span.flr-time,
+span.lc {
+    font-weight: bold;
+}
+
 /* Glossary */
 div.glossary img {
     max-height: 300px;

package/jekyll/assets/css/main.css

@@ -131,12 +131,17 @@ 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;
+}
+
 /* Forms */
 input {
     margin-right: .5em;

package/lib/basepagerenderer.js

@@ -1,5 +1,4 @@
 import { Config } from "./config.js";
-import { Families } from "./families.js";
 import { Files } from "./files.js";
 import { Jekyll } from "./jekyll.js";
 import { Taxa } from "./taxa.js";
@@ -23,7 +22,7 @@ class BasePageRenderer {
         // Copy illustrations.
         siteGenerator.copyIllustrations(Taxa.getFlowerColors());
 
-        Families.renderPages(outputDir, familyCols);
+        taxa.getFamilies().renderPages(outputDir, familyCols);
 
         new GlossaryPages(siteGenerator).renderPages();
 

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/page_list_families.js

@@ -1,27 +1,33 @@
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
+// eslint-disable-next-line no-unused-vars
 import { Families } from "../../families.js";
 
 class PageListFamilies extends EBookPage {
+    #families;
 
-    constructor( outputDir ) {
-        super( outputDir + "/list_families.html", "All Families" );
+    /**
+     * @param {string} outputDir
+     * @param {Families} families
+     */
+    constructor(outputDir, families) {
+        super(outputDir + "/list_families.html", "All Families");
+        this.#families = families;
     }
 
     renderPageBody() {
-
-        const html = XHTML.textElement( "h1", this.getTitle() );
+        const html = XHTML.textElement("h1", this.getTitle());
 
         const links = [];
-        for ( const family of Families.getFamilies() ) {
-            if ( !family.getTaxa() ) {
+        for (const family of this.#families.getFamilies()) {
+            if (!family.getTaxa()) {
                 continue;
             }
-            links.push( XHTML.getLink( family.getFileName(), family.getName() ) );
+            links.push(XHTML.getLink(family.getFileName(), family.getName()));
         }
 
-        return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
+        return html + XHTML.wrap("ol", XHTML.arrayToLI(links));
     }
 }
 
-export { PageListFamilies };
+export { PageListFamilies };

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);
 
         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/ebook/plantbook.js

@@ -1,4 +1,3 @@
-import { Families } from "@ca-plant-list/ca-plant-list";
 import { EBook } from "./ebook.js";
 import { EBookSiteGenerator } from "./ebooksitegenerator.js";
 import { GlossaryPages } from "./glossarypages.js";
@@ -12,89 +11,124 @@ import { TOCPage } from "./pages/tocpage.js";
 import { Taxa } from "../taxa.js";
 
 class PlantBook extends EBook {
-
     #taxa;
     #glossary;
     #images;
 
-    constructor( outputDir, config, taxa ) {
-
+    /**
+     *
+     * @param {string} outputDir
+     * @param {*} config
+     * @param {Taxa} taxa
+     */
+    constructor(outputDir, config, taxa) {
         super(
             outputDir,
-            config.getConfigValue( "ebook", "filename" ),
-            config.getConfigValue( "ebook", "pub_id" ),
-            config.getConfigValue( "ebook", "title" )
+            config.getConfigValue("ebook", "filename"),
+            config.getConfigValue("ebook", "pub_id"),
+            config.getConfigValue("ebook", "title")
         );
 
         this.#taxa = taxa;
-        const generator = new EBookSiteGenerator( this.getContentDir() );
-        this.#glossary = new GlossaryPages( generator );
-        this.#images = new Images( generator, this.getContentDir(), taxa );
-
+        const generator = new EBookSiteGenerator(this.getContentDir());
+        this.#glossary = new GlossaryPages(generator);
+        this.#images = new Images(generator, this.getContentDir(), taxa);
     }
 
     async createPages() {
-
         const contentDir = this.getContentDir();
 
-        await this.#images.createImages( contentDir );
+        await this.#images.createImages();
 
-        console.log( "creating taxon pages" );
+        console.log("creating taxon pages");
         const taxonList = this.#taxa.getTaxonList();
-        for ( const taxon of taxonList ) {
+        for (const taxon of taxonList) {
             const name = taxon.getName();
-            new TaxonPage( contentDir, taxon, this.#images.getTaxonImages( name ) ).create();
+            new TaxonPage(
+                contentDir,
+                taxon,
+                this.#images.getTaxonImages(name)
+            ).create();
         }
 
         // Create lists.
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            new PageListFlowerColor( contentDir, this.#taxa.getFlowerColor( colorName ) ).create();
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            new PageListFlowerColor(
+                contentDir,
+                this.#taxa.getFlowerColor(colorName)
+            ).create();
         }
 
-        PageListFlowers.createPages( contentDir, this.#taxa );
+        PageListFlowers.createPages(contentDir, this.#taxa);
 
-        new PageListFamilies( contentDir ).create();
-        for ( const family of Families.getFamilies() ) {
+        new PageListFamilies(contentDir, this.#taxa.getFamilies()).create();
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
             const name = family.getName();
-            new PageListSpecies( contentDir, taxa, name + ".html", name ).create();
+            new PageListSpecies(
+                contentDir,
+                taxa,
+                name + ".html",
+                name
+            ).create();
         }
-        new PageListSpecies( contentDir, taxonList, "list_species.html", "All Species" ).create();
+        new PageListSpecies(
+            contentDir,
+            taxonList,
+            "list_species.html",
+            "All Species"
+        ).create();
 
         this.#glossary.renderPages();
 
-        new TOCPage( contentDir ).create();
+        new TOCPage(contentDir).create();
     }
 
     renderManifestEntries() {
-
         let xml = "";
 
         // Add lists.
-        xml += "<item id=\"lspecies\" href=\"list_species.html\" media-type=\"application/xhtml+xml\" />";
-        xml += "<item id=\"lfamilies\" href=\"list_families.html\" media-type=\"application/xhtml+xml\" />";
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            const color = this.#taxa.getFlowerColor( colorName );
-            xml += "<item id=\"l" + color.getColorName() + "\" href=\"" + color.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+        xml +=
+            '<item id="lspecies" href="list_species.html" media-type="application/xhtml+xml" />';
+        xml +=
+            '<item id="lfamilies" href="list_families.html" media-type="application/xhtml+xml" />';
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            const color = this.#taxa.getFlowerColor(colorName);
+            xml +=
+                '<item id="l' +
+                color.getColorName() +
+                '" href="' +
+                color.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         // Add family pages.
-        for ( const family of Families.getFamilies() ) {
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
-            xml += "<item id=\"fam" + family.getName() + "\" href=\"" + family.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+            xml +=
+                '<item id="fam' +
+                family.getName() +
+                '" href="' +
+                family.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         // Add taxon pages.
         const taxa = this.#taxa.getTaxonList();
-        for ( let index = 0; index < taxa.length; index++ ) {
-            const taxon = taxa[ index ];
-            xml += "<item id=\"t" + index + "\" href=\"" + taxon.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
+        for (let index = 0; index < taxa.length; index++) {
+            const taxon = taxa[index];
+            xml +=
+                '<item id="t' +
+                index +
+                '" href="' +
+                taxon.getFileName() +
+                '" media-type="application/xhtml+xml" />';
         }
 
         xml += PageListFlowers.getManifestEntries();
@@ -108,27 +142,27 @@ class PlantBook extends EBook {
         let xml = "";
 
         // Add lists.
-        for ( const colorName of Taxa.getFlowerColorNames() ) {
-            const color = this.#taxa.getFlowerColor( colorName );
-            xml += "<itemref idref=\"l" + color.getColorName() + "\"/>";
+        for (const colorName of Taxa.getFlowerColorNames()) {
+            const color = this.#taxa.getFlowerColor(colorName);
+            xml += '<itemref idref="l' + color.getColorName() + '"/>';
         }
         xml += PageListFlowers.getSpineEntries();
 
-        xml += "<itemref idref=\"lfamilies\"/>";
-        xml += "<itemref idref=\"lspecies\"/>";
+        xml += '<itemref idref="lfamilies"/>';
+        xml += '<itemref idref="lspecies"/>';
 
         // Add families.
-        for ( const family of Families.getFamilies() ) {
+        for (const family of this.#taxa.getFamilies().getFamilies()) {
             const taxa = family.getTaxa();
-            if ( !taxa ) {
+            if (!taxa) {
                 continue;
             }
-            xml += "<itemref idref=\"fam" + family.getName() + "\"/>";
+            xml += '<itemref idref="fam' + family.getName() + '"/>';
         }
 
         // Add taxa.
-        for ( let index = 0; index < this.#taxa.getTaxonList().length; index++ ) {
-            xml += "<itemref idref=\"t" + index + "\"/>";
+        for (let index = 0; index < this.#taxa.getTaxonList().length; index++) {
+            xml += '<itemref idref="t' + index + '"/>';
         }
 
         xml += this.#glossary.getSpineEntries();
@@ -137,4 +171,4 @@ class PlantBook extends EBook {
     }
 }
 
-export { PlantBook };
+export { PlantBook };

package/lib/families.js

@@ -57,9 +57,9 @@ class Family {
 }
 
 class Families {
-    static #families;
+    #families;
 
-    static {
+    constructor() {
         const dataDir = Config.getPackageDir() + "/data";
 
         this.#families = JSON.parse(Files.read(dataDir + "/families.json"));
@@ -68,7 +68,7 @@ class Families {
         }
     }
 
-    static getFamilies() {
+    getFamilies() {
         return Object.values(this.#families).sort((a, b) =>
             a.getName().localeCompare(b.getName())
         );
@@ -77,7 +77,7 @@ class Families {
     /**
      * @param {string} familyName
      */
-    static getFamily(familyName) {
+    getFamily(familyName) {
         return this.#families[familyName];
     }
 
@@ -85,7 +85,7 @@ class Families {
      * @param {string} outputDir
      * @param {import("./index.js").TaxaCol[]} taxaColumns
      */
-    static renderPages(outputDir, taxaColumns) {
+    renderPages(outputDir, taxaColumns) {
         new PageFamilyList(outputDir, this.#families).render(taxaColumns);
 
         const names = Object.keys(this.#families);
@@ -209,9 +209,6 @@ class PageSection extends GenericPage {
         this.#taxa = taxa;
     }
 
-    /**
-     * @param {import("./index.js").TaxaCol[]} columns
-     */
     render(columns) {
         let html = this.getDefaultIntro();