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

package/data/text/Trifolium-willdenovii.md

@@ -0,0 +1 @@
+Similar to _T. obtusiflorum_, but with shorter teeth on leaves, [calyx](./g/calyx.html) not hairy or bumpy.

package/ebook/css/main.css

@@ -22,6 +22,10 @@ span.lc {
     font-weight: bold;
 }
 
+span.lcs {
+    margin-right: 1rem;
+}
+
 /* Glossary */
 div.glossary img {
     max-height: 300px;

package/jekyll/assets/css/main.css

@@ -142,6 +142,10 @@ span.lc {
     font-weight: bold;
 }
 
+span.lcs {
+    margin-right: 1rem;
+}
+
 /* Forms */
 input {
     margin-right: .5em;

package/lib/ebook/images.js

@@ -3,88 +3,97 @@ import path from "node:path";
 
 import sharp from "sharp";
 
-import { Config, CSV, Files } from "@ca-plant-list/ca-plant-list";
-
 import { Image } from "./image.js";
 import { EBook } from "./ebook.js";
 import { Taxa } from "../taxa.js";
+import { Config } from "../config.js";
+import { CSV } from "../csv.js";
+import { Files } from "../files.js";
 
 class Images {
-
     #siteGenerator;
     #contentDir;
     #taxa;
     #images = {};
 
-    constructor( siteGenerator, contentDir, taxa ) {
+    constructor(siteGenerator, contentDir, taxa) {
         this.#siteGenerator = siteGenerator;
         this.#contentDir = contentDir;
         this.#taxa = taxa;
     }
 
     async createImages() {
-
         const photoDirSrc = "external_data/photos";
         const imagePrefix = "i";
         const photoDirTarget = this.#contentDir + "/" + imagePrefix;
-        fs.mkdirSync( photoDirSrc, { recursive: true } );
-        fs.mkdirSync( photoDirTarget, { recursive: true } );
-
-        const rows = CSV.parseFile( Config.getPackageDir() + "/data", "photos.csv" );
-        for ( const row of rows ) {
-
-            const name = row[ "taxon_name" ];
-            const taxon = this.#taxa.getTaxon( name );
-            if ( !taxon ) {
+        fs.mkdirSync(photoDirSrc, { recursive: true });
+        fs.mkdirSync(photoDirTarget, { recursive: true });
+
+        const rows = CSV.parseFile(
+            Config.getPackageDir() + "/data",
+            "photos.csv"
+        );
+        for (const row of rows) {
+            const name = row["taxon_name"];
+            const taxon = this.#taxa.getTaxon(name);
+            if (!taxon) {
                 continue;
             }
 
-            let imageList = this.#images[ name ];
-            if ( !imageList ) {
+            let imageList = this.#images[name];
+            if (!imageList) {
                 imageList = [];
-                this.#images[ name ] = imageList;
+                this.#images[name] = imageList;
             }
 
-            const src = new URL( row[ "source" ] );
-            const parts = path.parse( src.pathname ).dir.split( "/" );
-            const prefix = src.host.includes( "calflora" ) ? "cf-" : "inat-";
-            const filename = prefix + parts.slice( -1 )[ 0 ] + ".jpg";
+            const src = new URL(row["source"]);
+            const parts = path.parse(src.pathname).dir.split("/");
+            const prefix = src.host.includes("calflora") ? "cf-" : "inat-";
+            const filename = prefix + parts.slice(-1)[0] + ".jpg";
             const srcFileName = photoDirSrc + "/" + filename;
             const targetFileName = photoDirTarget + "/" + filename;
 
-            if ( !fs.existsSync( srcFileName ) ) {
+            if (!fs.existsSync(srcFileName)) {
                 // File is not there; retrieve it.
-                console.log( "retrieving " + srcFileName );
-                await Files.fetch( src, srcFileName );
+                console.log("retrieving " + srcFileName);
+                await Files.fetch(src, srcFileName);
             }
 
-            await new sharp( srcFileName ).resize( { width: 300 } ).jpeg( { quality: 40 } ).toFile( targetFileName );
-
-            imageList.push( new Image( imagePrefix + "/" + filename, row[ "credit" ] ) );
+            await new sharp(srcFileName)
+                .resize({ width: 300 })
+                .jpeg({ quality: 40 })
+                .toFile(targetFileName);
 
+            imageList.push(
+                new Image(imagePrefix + "/" + filename, row["credit"])
+            );
         }
 
-        this.#siteGenerator.copyIllustrations( Taxa.getFlowerColors() );
-
+        this.#siteGenerator.copyIllustrations(Taxa.getFlowerColors());
     }
 
     getManifestEntries() {
-
         const entries = [];
-        const images = Files.getDirEntries( this.#contentDir + "/i" ).sort();
-
-        for ( let index = 0; index < images.length; index++ ) {
-            const fileName = images[ index ];
-            const ext = fileName.split( "." )[ 1 ];
-            entries.push( EBook.getManifestEntry( "i" + index, "i/" + fileName, EBook.getMediaTypeForExt( ext ) ) );
+        const images = Files.getDirEntries(this.#contentDir + "/i").sort();
+
+        for (let index = 0; index < images.length; index++) {
+            const fileName = images[index];
+            const ext = fileName.split(".")[1];
+            entries.push(
+                EBook.getManifestEntry(
+                    "i" + index,
+                    "i/" + fileName,
+                    EBook.getMediaTypeForExt(ext)
+                )
+            );
         }
 
-        return entries.join( "" );
+        return entries.join("");
     }
 
-    getTaxonImages( name ) {
-        return this.#images[ name ];
+    getTaxonImages(name) {
+        return this.#images[name];
     }
 }
 
-export { Images };
+export { Images };

package/lib/ebook/pages/page_list_species.js

@@ -1,26 +1,32 @@
+import { HTMLTaxon } from "../../htmltaxon.js";
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
 
 class PageListSpecies extends EBookPage {
-
     #taxa;
 
-    constructor( outputDir, taxa, filename, title ) {
-        super( outputDir + "/" + filename, title );
+    /**
+     *
+     * @param {string} outputDir
+     * @param {Taxon[]} taxa
+     * @param {string} filename
+     * @param {string} title
+     */
+    constructor(outputDir, taxa, filename, title) {
+        super(outputDir + "/" + filename, title);
         this.#taxa = taxa;
     }
 
     renderPageBody() {
-
-        const html = XHTML.textElement( "h1", this.getTitle() );
+        const html = XHTML.textElement("h1", this.getTitle());
 
         const links = [];
-        for ( const taxon of this.#taxa ) {
-            links.push( XHTML.getLink( taxon.getFileName(), taxon.getName() ) );
+        for (const taxon of this.#taxa) {
+            links.push(HTMLTaxon.getLink(taxon));
         }
 
-        return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
+        return html + XHTML.wrap("ol", XHTML.arrayToLI(links));
     }
 }
 
-export { PageListSpecies };
+export { PageListSpecies };

package/lib/ebook/pages/taxonpage.js

@@ -1,13 +1,10 @@
 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";
-// 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";
+import { Config } from "../../config.js";
+import { Files } from "../../files.js";
 
 class TaxonPage extends EBookPage {
     #outputDir;
@@ -58,7 +55,7 @@ class TaxonPage extends EBookPage {
             });
         }
 
-        html += HTMLTaxon.getFlowerInfo(this.#taxon);
+        html += HTMLTaxon.getFlowerInfo(this.#taxon, "section flr");
 
         html += renderCustomText(this.#taxon.getBaseFileName());
 

package/lib/ebook/xhtml.js

@@ -1,7 +1,5 @@
-import { HTML } from "@ca-plant-list/ca-plant-list";
+import { HTML } from "../html.js";
 
-class XHTML extends HTML {
+class XHTML extends HTML {}
 
-}
-
-export { XHTML };
+export { XHTML };

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

@@ -4,8 +4,6 @@ import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
 import { Files } from "./files.js";
 import { Config } from "./config.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "./index.js";
 
 class Family {
     #name;

package/lib/genera.js

@@ -1,14 +1,12 @@
 import { Config } from "./config.js";
-import { Families } from "./families.js";
 import { Files } from "./files.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "./taxon.js";
 
 class Genera {
     #families;
     #genera;
 
     /**
+     *
      * @param {Families} families
      */
     constructor(families) {

package/lib/genericpage.js

@@ -1,14 +1,16 @@
-import { Config, Files, HTML, Jekyll } from "@ca-plant-list/ca-plant-list";
+import { Config } from "./config.js";
+import { Files } from "./files.js";
+import { HTML } from "./html.js";
+import { Jekyll } from "./jekyll.js";
 import { Markdown } from "./markdown.js";
 
 class GenericPage {
-
     #outputDir;
     #title;
     #baseFileName;
     #js;
 
-    constructor( outputDir, title, baseFileName, js ) {
+    constructor(outputDir, title, baseFileName, js) {
         this.#outputDir = outputDir;
         this.#title = title;
         this.#baseFileName = baseFileName;
@@ -25,31 +27,38 @@ class GenericPage {
     }
 
     getFrontMatter() {
-        return "---\n"
-            + "title: \"" + this.#title + "\"\n"
-            + ( this.#js ? ( "js: " + this.#js + "\n" ) : "" )
-            + "---\n";
+        return (
+            "---\n" +
+            'title: "' +
+            this.#title +
+            '"\n' +
+            (this.#js ? "js: " + this.#js + "\n" : "") +
+            "---\n"
+        );
     }
 
     getMarkdown() {
         // Include site-specific markdown.
-        let html = this.#getMarkdown( "intros" );
+        let html = this.#getMarkdown("intros");
 
         // Include package markdown.
-        const mdPath = Config.getPackageDir() + "/data/text/" + this.#baseFileName + ".md";
-        if ( Files.exists( mdPath ) ) {
-            html += HTML.wrap( "div", Markdown.fileToHTML( mdPath ), { class: "section" } );
+        const mdPath =
+            Config.getPackageDir() + "/data/text/" + this.#baseFileName + ".md";
+        if (Files.exists(mdPath)) {
+            html += HTML.wrap("div", Markdown.fileToHTML(mdPath), {
+                class: "section",
+            });
         }
 
         return html;
     }
 
-    #getMarkdown( path ) {
+    #getMarkdown(path) {
         const textPath = path + "/" + this.#baseFileName + ".md";
-        if ( !Jekyll.hasInclude( this.#outputDir, textPath ) ) {
+        if (!Jekyll.hasInclude(this.#outputDir, textPath)) {
             return "";
         }
-        return HTML.wrap( "div", Jekyll.include( textPath ), { class: "section" } );
+        return HTML.wrap("div", Jekyll.include(textPath), { class: "section" });
     }
 
     getOutputDir() {
@@ -60,10 +69,9 @@ class GenericPage {
         return this.#title;
     }
 
-    writeFile( html ) {
-        Files.write( this.#outputDir + "/" + this.#baseFileName + ".html", html );
+    writeFile(html) {
+        Files.write(this.#outputDir + "/" + this.#baseFileName + ".html", html);
     }
-
 }
 
-export { GenericPage };
+export { GenericPage };

package/lib/generictaxaloader.js

@@ -1,4 +1,4 @@
-import { ErrorLog } from "./index.js";
+import { ErrorLog } from "./errorlog.js";
 
 class GenericTaxaLoader {
     #options;

package/lib/htmltaxon.js

@@ -1,14 +1,31 @@
 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 {string[]} colors
+     */
+    static getFlowerColors(colors) {
+        let html = "";
+        if (colors) {
+            for (const color of colors) {
+                html += HTML.textElement("img", "", {
+                    src: "./i/f-" + color + ".svg",
+                    alt: color + " flowers",
+                    title: color,
+                    class: "flr-color",
+                });
+            }
+        }
+        return html;
+    }
+
     /**
      * @param {Taxon} taxon
+     * @param {string} classNames
      */
-    static getFlowerInfo(taxon) {
+    static getFlowerInfo(taxon, classNames = "section") {
         const lifeCycle = taxon.getLifeCycle();
         const colors = taxon.getFlowerColors();
         const monthStart = taxon.getBloomStart();
@@ -16,23 +33,14 @@ class HTMLTaxon {
 
         const parts = [];
         if (lifeCycle) {
-            parts.push(
-                HTML.wrap("span", TextUtils.ucFirst(lifeCycle), "lc") + "."
-            );
+            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",
-                    });
-                }
-            }
+            html += this.getFlowerColors(colors);
             if (monthStart && monthEnd) {
                 html += HTML.wrap(
                     "span",
@@ -44,7 +52,17 @@ class HTMLTaxon {
             }
             parts.push(HTML.wrap("span", html));
         }
-        return HTML.wrap("div", parts.join(" "), { class: "section" });
+        return HTML.wrap("div", parts.join(""), { class: classNames });
+    }
+
+    /**
+     * @param {Taxon} taxon
+     */
+    static getLink(taxon) {
+        return (
+            HTML.getLink(taxon.getFileName(), taxon.getName()) +
+            this.getFlowerColors(taxon.getFlowerColors())
+        );
     }
 }
 

package/lib/markdown.js

@@ -1,18 +1,16 @@
 import markdownIt from "markdown-it";
-import { Files } from "@ca-plant-list/ca-plant-list";
+import { Files } from "./files.js";
 
 class Markdown {
+    static #md = new markdownIt({ xhtmlOut: true });
 
-    static #md = new markdownIt( { xhtmlOut: true } );
-
-    static fileToHTML( filePath ) {
-        return this.strToHTML( Files.read( filePath ) );
+    static fileToHTML(filePath) {
+        return this.strToHTML(Files.read(filePath));
     }
 
-    static strToHTML( str ) {
-        return this.#md.render( str );
+    static strToHTML(str) {
+        return this.#md.render(str);
     }
-
 }
 
-export { Markdown };
+export { Markdown };