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

package/data/text/Nemophila-heterophylla.md

@@ -0,0 +1 @@
+Style 2–4 mm long. Lower leaves with deep lobes; lobes similar. Corolla 4-12 mm wide.

package/data/text/Nemophila-parviflora-var-parviflora.md

@@ -0,0 +1 @@
+Style less than 2 mm long. Lower leaves cut or shallow-lobed; lobes dissimilar. Corolla 1-5 mm wide.

package/data/text/Plectritis-ciliosa.md

@@ -0,0 +1 @@
+Corolla with 2 lips. Lower lip usually has 2 red spots.

package/data/text/Plectritis-macrocera.md

@@ -0,0 +1 @@
+Corolla symmetrical, circular.

package/data/text/Primula-clevelandii-var-patula.md

@@ -0,0 +1 @@
+Leaf blade usually more than twice as long as wide. Filament tube usually 3 to 4 mm wide. Anther usually dark purple. [Peduncle](./g/peduncle.html) usually green.

package/data/text/Primula-hendersonii.md

@@ -0,0 +1 @@
+Leaf blade usually less than twice as long as wide. Filament tube usually less than 3 mm wide. [Peduncle](./g/peduncle.html) usually red.

package/data/text/Sidalcea-diploscypha.md

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

package/data/text/Thysanocarpus-curvipes.md

@@ -0,0 +1 @@
+Difficult to distinguish from _T. laciniatus_, with which it likely hybridizes.

package/data/text/Thysanocarpus-laciniatus.md

@@ -0,0 +1 @@
+Difficult to distinguish from _T. curvipes_, with which it likely hybridizes.

package/data/text/Viola-douglasii.md

@@ -0,0 +1 @@
+Leaves compound.

package/data/text/Viola-pedunculata.md

@@ -0,0 +1 @@
+Leaves not compound. No basal leaves.

package/data/text/Viola-purpurea-subsp-quercetorum.md

@@ -0,0 +1 @@
+Leaves not compound.

package/ebook/css/main.css

@@ -8,7 +8,12 @@ div.flr {
     align-items: center;
 }
 
+div.section {
+    margin-bottom: .5rem;
+}
+
 img.flr {
+    padding-right: .25rem;
     width: 1rem;
 }
 

package/lib/basepagerenderer.js

@@ -6,53 +6,55 @@ import { Taxa } from "./taxa.js";
 import { GlossaryPages } from "./web/glossarypages.js";
 
 class BasePageRenderer {
-
-    static render( outputDir, taxa, familyCols ) {
-
-        const siteGenerator = new Jekyll( outputDir );
+    /**
+     * @param {string} outputDir
+     * @param {Taxa} taxa
+     * @param {*} familyCols
+     */
+    static render(outputDir, taxa, familyCols) {
+        const siteGenerator = new Jekyll(outputDir);
 
         // Copy static files
         // First copy default Jekyll files from package.
-        Files.copyDir( Config.getPackageDir() + "/jekyll", outputDir );
+        Files.copyDir(Config.getPackageDir() + "/jekyll", outputDir);
         // Then copy Jekyll files from current dir (which may override default files).
-        Files.copyDir( "jekyll", outputDir );
+        Files.copyDir("jekyll", outputDir);
 
         // Copy illustrations.
-        siteGenerator.copyIllustrations( Taxa.getFlowerColors() );
+        siteGenerator.copyIllustrations(Taxa.getFlowerColors());
 
-        Families.renderPages( outputDir, familyCols );
+        Families.renderPages(outputDir, familyCols);
 
-        new GlossaryPages( siteGenerator ).renderPages();
-
-        this.renderTools( outputDir, taxa );
+        new GlossaryPages(siteGenerator).renderPages();
 
+        this.renderTools(outputDir, taxa);
     }
 
-    static renderTools( outputDir, taxa ) {
-
+    /**
+     * @param {string} outputDir
+     * @param {Taxa} taxa
+     */
+    static renderTools(outputDir, taxa) {
         const names = [];
-        for ( const taxon of taxa.getTaxonList() ) {
+        for (const taxon of taxa.getTaxonList()) {
             const row = [];
-            row.push( taxon.getName() );
-            const cn = taxon.getCommonNames().join( ", " );
-            if ( cn ) {
-                row.push( cn );
+            row.push(taxon.getName());
+            const cn = taxon.getCommonNames().join(", ");
+            if (cn) {
+                row.push(cn);
             }
             const synonyms = [];
-            for ( const syn of taxon.getSynonyms() ) {
-                synonyms.push( syn );
+            for (const syn of taxon.getSynonyms()) {
+                synonyms.push(syn);
             }
-            if ( synonyms.length > 0 ) {
-                row[ 2 ] = synonyms;
+            if (synonyms.length > 0) {
+                row[2] = synonyms;
             }
-            names.push( row );
+            names.push(row);
         }
 
-        Files.write( outputDir + "/_includes/names.json", JSON.stringify( names ) );
-
+        Files.write(outputDir + "/_includes/names.json", JSON.stringify(names));
     }
-
-
 }
 
-export { BasePageRenderer };
+export { BasePageRenderer };

package/lib/dateutils.js

@@ -14,30 +14,50 @@ const MONTH_NAMES = [
 ];
 
 class DateUtils {
-
-    static getMonthName( monthNum ) {
-        return MONTH_NAMES[ monthNum - 1 ];
+    /**
+     * @param {number} monthNum Starting with 1 for January.
+     * @returns {string}
+     */
+    static getMonthName(monthNum) {
+        return MONTH_NAMES[monthNum - 1];
     }
 
-    static monthRangesOverlap( r1, r2 ) {
-
-        function contains( r1, r2 ) {
-            function inRange( v, r ) {
-                return v >= r[ 0 ] && v <= r[ 1 ];
+    /**
+     * @param {[number,number]} r1
+     * @param {[number,number]} r2
+     * @returns {boolean}
+     */
+    static monthRangesOverlap(r1, r2) {
+        /**
+         * @param {[number,number]} r1
+         * @param {[number,number]} r2
+         */
+        function contains(r1, r2) {
+            /**
+             * @param {number} v
+             * @param {[number,number]} r
+             */
+            function inRange(v, r) {
+                return v >= r[0] && v <= r[1];
             }
-            return inRange( r1[ 0 ], r2 ) || inRange( r1[ 1 ], r2 );
+            return inRange(r1[0], r2) || inRange(r1[1], r2);
         }
 
         // If ranges cross into next year, split them in 2.
-        if ( r1[ 0 ] > r1[ 1 ] ) {
-            return this.monthRangesOverlap( [ r1[ 0 ], 12 ], r2 ) || this.monthRangesOverlap( [ 1, r1[ 1 ] ], r2 );
+        if (r1[0] > r1[1]) {
+            return (
+                this.monthRangesOverlap([r1[0], 12], r2) ||
+                this.monthRangesOverlap([1, r1[1]], r2)
+            );
         }
-        if ( r2[ 0 ] > r2[ 1 ] ) {
-            return this.monthRangesOverlap( r1, [ r2[ 0 ], 12 ] ) || this.monthRangesOverlap( r1, [ 1, r2[ 1 ] ] );
+        if (r2[0] > r2[1]) {
+            return (
+                this.monthRangesOverlap(r1, [r2[0], 12]) ||
+                this.monthRangesOverlap(r1, [1, r2[1]])
+            );
         }
-        return contains( r1, r2 ) || contains( r2, r1 );
+        return contains(r1, r2) || contains(r2, r1);
     }
-
 }
 
-export { DateUtils };
+export { DateUtils };

package/lib/ebook/pages/taxonpage.js

@@ -4,88 +4,115 @@ 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";
 
 class TaxonPage extends EBookPage {
-
     #outputDir;
     #taxon;
     #photos;
 
-    constructor( outputDir, taxon, photos ) {
-        super( outputDir + "/" + taxon.getFileName(), taxon.getName() );
+    /**
+     *
+     * @param {string} outputDir
+     * @param {Taxon} taxon
+     * @param {*} photos
+     */
+    constructor(outputDir, taxon, photos) {
+        super(outputDir + "/" + taxon.getFileName(), taxon.getName());
         this.#outputDir = outputDir;
         this.#taxon = taxon;
         this.#photos = photos;
     }
 
     renderPageBody() {
-
-        function renderBloomInfo( taxon ) {
+        /**
+         * @param {Taxon} taxon
+         */
+        function renderBloomInfo(taxon) {
             const colors = taxon.getFlowerColors();
             const monthStart = taxon.getBloomStart();
             const monthEnd = taxon.getBloomEnd();
-            if ( !colors && !monthStart ) {
+            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 (colors) {
+                for (const color of colors) {
+                    html += XHTML.textElement("img", "", {
+                        src: "./i/f-" + color + ".svg",
+                        class: "flr",
+                    });
                 }
             }
-            if ( monthStart ) {
-                html += XHTML.textElement( "div", DateUtils.getMonthName( monthStart ) + "-" + DateUtils.getMonthName( monthEnd ) );
-
+            if (monthStart && monthEnd) {
+                html += XHTML.textElement(
+                    "div",
+                    DateUtils.getMonthName(monthStart) +
+                        "-" +
+                        DateUtils.getMonthName(monthEnd)
+                );
             }
-            return XHTML.wrap( "div", html, { class: "flr" } );
+            return XHTML.wrap("div", html, { class: "section flr" });
         }
 
-
-        function renderCustomText( name ) {
+        /**
+         * @param {string} name
+         */
+        function renderCustomText(name) {
             // See if there is custom text.
-            const fileName = Config.getPackageDir() + "/data/text/" + name + ".md";
-            if ( !Files.exists( fileName ) ) {
+            const fileName =
+                Config.getPackageDir() + "/data/text/" + name + ".md";
+            if (!Files.exists(fileName)) {
                 return "";
             }
-            const text = Files.read( fileName );
-            return Markdown.strToHTML( text );
+            const text = Files.read(fileName);
+            return Markdown.strToHTML(text);
         }
 
         const name = this.#taxon.getName();
-        let html = XHTML.textElement( "h1", name );
+        let html = XHTML.textElement("h1", name);
 
         const family = this.#taxon.getFamily();
-        html += XHTML.wrap( "div", XHTML.getLink( family.getFileName(), family.getName() ) );
+        html += XHTML.wrap(
+            "div",
+            XHTML.getLink(family.getFileName(), family.getName()),
+            { class: "section" }
+        );
 
         const cn = this.#taxon.getCommonNames();
-        if ( cn && cn.length > 0 ) {
-            html += XHTML.textElement( "p", cn.join( ", " ) );
+        if (cn && cn.length > 0) {
+            html += XHTML.textElement("div", cn.join(", "), {
+                class: "section",
+            });
         }
 
-        html += renderBloomInfo( this.#taxon );
+        html += renderBloomInfo(this.#taxon);
 
-        html += renderCustomText( this.#taxon.getBaseFileName() );
+        html += renderCustomText(this.#taxon.getBaseFileName());
 
-        if ( this.#photos ) {
+        if (this.#photos) {
             let photoHTML = "";
-            for ( const photo of this.#photos ) {
+            for (const photo of this.#photos) {
                 const src = photo.getSrc();
-                const dimensions = sizeOf( this.#outputDir + "/" + src );
-                let img = XHTML.textElement( "img", "", { src: src, style: "max-width:" + dimensions.width + "px" } );
+                const dimensions = sizeOf(this.#outputDir + "/" + src);
+                let img = XHTML.textElement("img", "", {
+                    src: src,
+                    style: "max-width:" + dimensions.width + "px",
+                });
                 const caption = photo.getCaption();
-                if ( caption ) {
-                    img += XHTML.textElement( "figcaption", caption );
+                if (caption) {
+                    img += XHTML.textElement("figcaption", caption);
                 }
-                photoHTML += XHTML.wrap( "figure", img );
+                photoHTML += XHTML.wrap("figure", img);
             }
-            if ( photoHTML ) {
-                html += XHTML.wrap( "div", photoHTML );
+            if (photoHTML) {
+                html += XHTML.wrap("div", photoHTML);
             }
         }
 
         return html;
     }
-
 }
 
-export { TaxonPage };
+export { TaxonPage };

package/lib/errorlog.js

@@ -2,30 +2,35 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 class ErrorLog {
-
     #fileName;
     #echo;
+    /** @type string[] */
     #errors = [];
 
-    constructor( fileName, echo = false ) {
+    /**
+     * @param {string} fileName
+     * @param {boolean} echo
+     */
+    constructor(fileName, echo = false) {
         this.#fileName = fileName;
         this.#echo = echo;
     }
 
-    log( ...args ) {
-        if ( this.#echo ) {
-            console.log( args.join() );
+    /**
+     * @param  {...string} args
+     */
+    log(...args) {
+        if (this.#echo) {
+            console.log(args.join());
         }
-        this.#errors.push( args.join( "\t" ) );
+        this.#errors.push(args.join("\t"));
     }
 
     write() {
         // Make sure directory exists.
-        fs.mkdirSync( path.dirname( this.#fileName ), { recursive: true } );
-
-        fs.writeFileSync( this.#fileName, this.#errors.join( "\n" ) );
+        fs.mkdirSync(path.dirname(this.#fileName), { recursive: true });
+        fs.writeFileSync(this.#fileName, this.#errors.join("\n"));
     }
-
 }
 
-export { ErrorLog };
+export { ErrorLog };