@ca-plant-list/ca-plant-list 0.2.7 → 0.2.8

package/data/synonyms.csv

@@ -1146,6 +1146,7 @@ Milla laxa,Triteleia laxa
 Milla maritima,Muilla maritima
 Milla peduncularis,Triteleia peduncularis
 Mimulus androsaceus,Erythranthe androsacea
+Mimulus arvensis,Erythranthe arvensis
 Mimulus aurantiacus,Diplacus aurantiacus
 Mimulus bakeri,Erythranthe nasuta
 Mimulus bolanderi,Diplacus bolanderi
@@ -1164,9 +1165,15 @@ Mimulus glabratus var. adscendens,Erythranthe guttata
 Mimulus glareosus,Erythranthe microphylla
 Mimulus glutinosus,Diplacus aurantiacus
 Mimulus grandiflorus,Erythranthe guttata
+Mimulus grandis,Erythranthe grandis
+Mimulus guttatus subsp. arvensis,Erythranthe arvensis
 Mimulus guttatus subsp. haidensis,Erythranthe guttata
+Mimulus guttatus subsp. litoralis,Erythranthe grandis
+Mimulus guttatus subsp. micranthus,Erythranthe arvensis
+Mimulus guttatus var. arvensis,Erythranthe arvensis
 Mimulus guttatus var. depauperatus,Erythranthe microphylla
 Mimulus guttatus var. gracilis,Erythranthe nasuta
+Mimulus guttatus var. grandis,Erythranthe grandis
 Mimulus guttatus var. insignis,Erythranthe microphylla
 Mimulus guttatus var. microphyllus,Erythranthe microphylla
 Mimulus guttatus var. nasutus,Erythranthe nasuta
@@ -1178,7 +1185,9 @@ Mimulus inconspicuus,Erythranthe inconspicua
 Mimulus kelloggii,Diplacus kelloggii
 Mimulus laciniatus,Erythranthe laciniata
 Mimulus langsdorffii var. argutus,Erythranthe guttata
+Mimulus langsdorffii var. arvensis,Erythranthe arvensis
 Mimulus langsdorffii var. californicus,Erythranthe guttata
+Mimulus langsdorffii var. grandis,Erythranthe grandis
 Mimulus langsdorffii var. guttatus,Erythranthe guttata
 Mimulus langsdorffii var. insignis,Erythranthe microphylla
 Mimulus langsdorffii var. microphyllus,Erythranthe microphylla
@@ -1188,10 +1197,12 @@ Mimulus langsdorffii var. platyphyllus,Erythranthe guttata
 Mimulus langsdorffii,Erythranthe guttata
 Mimulus latidens,Erythranthe latidens
 Mimulus laxus,Erythranthe microphylla
+Mimulus longulus,Erythranthe arvensis
 Mimulus luteus var. depauperatus,Erythranthe microphylla
 Mimulus luteus var. gracilis,Erythranthe nasuta
 Mimulus lyratus,Erythranthe guttata
 Mimulus membranaceus,Erythranthe floribunda
+Mimulus micranthus,Erythranthe arvensis
 Mimulus microphyllus,Erythranthe microphylla
 Mimulus nasutus var. insignis,Erythranthe microphylla
 Mimulus nasutus,Erythranthe nasuta
@@ -1203,6 +1214,7 @@ Mimulus pilosus,Mimetanthe pilosa
 Mimulus platycalyx,Erythranthe microphylla
 Mimulus platylaemus,Diplacus bolanderi
 Mimulus prionophyllus,Erythranthe guttata
+Mimulus procerus,Erythranthe grandis
 Mimulus puberulus,Erythranthe guttata
 Mimulus puncticalyx,Erythranthe nasuta
 Mimulus rattanii subsp. decurtatus,Diplacus rattanii

package/data/taxa.csv

@@ -412,7 +412,7 @@ Citrullus lanatus var. citroides,watermelon,X,56575,9813,841204
 Clarkia affinis,chaparral clarkia,N,19563,2159,58943
 Clarkia biloba subsp. biloba,twolobe clarkia,N,49891,2168,51857
 Clarkia breweri,Brewer's clarkia,N,19571,2174,56067,,,,159,4.2,,,S4,G4
-Clarkia concinna subsp. automixa,Santa Clara red ribbons,N,49895,2176,51856,,,,1629,4.3,,,S3,G5
+Clarkia concinna subsp. automixa,Santa Clara red ribbons,N,49895,2176,51856,,,,1629,4.3,,,S3,G5?T3
 Clarkia concinna subsp. concinna,red ribbons,N,49896,2177,51855
 Clarkia epilobioides,,N,19577,2185,58945
 Clarkia franciscana,Presidio clarkia,N,19579,2187,61899,,,,162,1B.1,CE,FE,S1,G1
@@ -710,14 +710,16 @@ Eryngium vaseyi var. vallicola,,N,58851,11675,80888
 Erysimum capitatum var. angustatum,Contra Costa wallflower,N,58866,9942,119564,,,,790,1B.1,CE,FE,S1,G5T1
 Erysimum capitatum var. capitatum,western wallflower,N,58866,9943,50627
 Erythranthe androsacea,,N,99088,13487,771845
-Erythranthe cardinalis,,N,25147,13490,319974
-Erythranthe floribunda,,N,99122,13492,701582
-Erythranthe guttata,,N,99131,13493,470643
-Erythranthe inconspicua,small-flowered monkeyflower,N,99135,13416,771882,,,,1092,4.3,,,S4,G4
+Erythranthe arvensis,"villous-bracted monkeyflower,field monkeyflower",N,99091,13552,771848,yellow,4,7
+Erythranthe cardinalis,scarlet monkeyflower,N,25147,13490,319974,red,5,9
+Erythranthe floribunda,many-flowered monkeyflower,N,99122,13492,701582,yellow,4,8
+Erythranthe grandis,magnificent seep monkeyflower,N,99129,13560,771876,yellow,5,7
+Erythranthe guttata,seep monkeyflower,N,99131,13493,470643,yellow,4,9
+Erythranthe inconspicua,small-flowered monkeyflower,N,99135,13416,771882,pink,4,7,1092,4.3,,,S4,G4
 Erythranthe laciniata,,N,99142,13417,546557,,,,1093,4.3,,,S4,G4
-Erythranthe latidens,,N,99144,13495,771886
+Erythranthe latidens,broad-tooth monkeyflower,N,99144,13495,771886,"white,pink",4,6
 Erythranthe microphylla,small leaved monkeyflower,N,99152,13498,453717
-Erythranthe nasuta,shy monkeyflower,N,99158,13637,545973
+Erythranthe nasuta,shy monkeyflower,N,99158,13637,545973,yellow,3,7
 Eschscholzia caespitosa,tufted poppy,N,25205,3511,58954
 Eschscholzia californica,California poppy,N,25206,3512,48225
 Eschscholzia rhombipetala,,N,25218,3527,77087,,,,806,1B.1,,,S1,G1
@@ -1048,7 +1050,7 @@ Lomatium macrocarpum,,N,31433,4974,56826
 Lomatium nudicaule,,N,31441,4983,77818
 Lomatium utriculatum,,N,31473,4999,56827
 Lonicera hispidula,California honeysuckle,N,31505,10075,53416,pink,5,6
-Lonicera interrupta,chaparral honeysuckle,N,31506,,60878,"yellow,white",4,5
+Lonicera interrupta,chaparral honeysuckle,N,31506,5009,60878,"yellow,white",4,5
 Lonicera involucrata var. ledebourii,black twinberry,N,61081,5012,60990
 Lonicera japonica,Japanese honeysuckle,X,31508,5013,77835
 Lonicera subspicata var. denudata,moronel,N,61089,5015,58872,yellow,6,7

package/data/text/Erythranthe-arvensis.md

@@ -0,0 +1 @@
+Stems not hairy.

package/data/text/Erythranthe-grandis.md

@@ -0,0 +1 @@
+Corolla tube extends 10-15 mm beyond calyx.

package/data/text/Erythranthe-guttata.md

@@ -0,0 +1 @@
+Corolla tube extends 3–5 mm beyond calyx.

package/jekyll/assets/css/main.css

@@ -20,6 +20,10 @@
     background-color: var(--pl-navbar-bg);
 }
 
+p {
+    margin-bottom: .5rem;
+}
+
 span.label {
     font-weight: 600;
     padding-right: .5rem;
@@ -126,6 +130,11 @@ div.section ul.indent {
     padding-left: 1rem;
 }
 
+img.flower-color {
+    margin-bottom: .2rem;
+    margin-right: .5rem;
+}
+
 /* Forms */
 input {
     margin-right: .5em;

package/lib/dateutils.js

@@ -0,0 +1,24 @@
+const MONTH_NAMES = [
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December",
+];
+
+class DateUtils {
+
+    static getMonthName( monthNum ) {
+        return MONTH_NAMES[ monthNum ];
+    }
+
+}
+
+export { DateUtils };

package/lib/genericpage.js

@@ -20,11 +20,20 @@ class GenericPage {
     }
 
     getDefaultIntro() {
+        let html = this.getFrontMatter();
+        return html + this.getMarkdown();
+    }
 
-        let html = this.#getFrontMatter();
+    getFrontMatter() {
+        return "---\n"
+            + "title: \"" + this.#title + "\"\n"
+            + ( this.#js ? ( "js: " + this.#js + "\n" ) : "" )
+            + "---\n";
+    }
 
+    getMarkdown() {
         // Include site-specific markdown.
-        html += this.#getMarkdown( "intros" );
+        let html = this.#getMarkdown( "intros" );
 
         // Include package markdown.
         const mdPath = Config.getPackageDir() + "/data/text/" + this.#baseFileName + ".md";
@@ -35,13 +44,6 @@ class GenericPage {
         return html;
     }
 
-    #getFrontMatter() {
-        return "---\n"
-            + "title: \"" + this.#title + "\"\n"
-            + ( this.#js ? ( "js: " + this.#js + "\n" ) : "" )
-            + "---\n";
-    }
-
     #getMarkdown( path ) {
         const textPath = path + "/" + this.#baseFileName + ".md";
         if ( !Jekyll.hasInclude( this.#outputDir, textPath ) ) {

package/lib/index.d.ts

@@ -83,6 +83,8 @@ export class GenericPage {
     constructor(outputDir: any, title: any, baseFileName: any, js: any);
     getBaseFileName(): any;
     getDefaultIntro(): string;
+    getFrontMatter(): string;
+    getMarkdown(): any;
     getOutputDir(): any;
     getTitle(): any;
     writeFile(html: any): void;
@@ -216,6 +218,8 @@ export namespace TAXA_LIST_COLS {
 }
 import { Taxon } from "./taxon.js";
 export namespace TAXA_COLNAMES {
+    const BLOOM_START: string;
+    const BLOOM_END: string;
     const COMMON_NAME: string;
     const FLOWER_COLOR: string;
 }
@@ -223,6 +227,8 @@ export class Taxon {
     constructor(data: any);
     addSynonym(syn: any, type: any): void;
     getBaseFileName(): any;
+    getBloomEnd(): any;
+    getBloomStart(): any;
     getCalfloraName(): any;
     getCalfloraID(): any;
     getCalfloraTaxonLink(): string;

package/lib/taxon.js

@@ -4,6 +4,8 @@ import { HTML } from "./html.js";
 import { RarePlants } from "./rareplants.js";
 
 const TAXA_COLNAMES = {
+    BLOOM_START: "bloom_start",
+    BLOOM_END: "bloom_end",
     COMMON_NAME: "common name",
     FLOWER_COLOR: "flower_color",
 };
@@ -20,6 +22,8 @@ class Taxon {
     #iNatID;
     #iNatSyn;
     #flowerColors;
+    #bloomStart;
+    #bloomEnd;
     #rpiID;
     #rankRPI;
     #cesa;
@@ -44,6 +48,8 @@ class Taxon {
         this.#iNatID = data[ "inat id" ];
         const colors = data[ TAXA_COLNAMES.FLOWER_COLOR ];
         this.#flowerColors = colors ? colors.split( "," ) : undefined;
+        this.#bloomStart = data[ TAXA_COLNAMES.BLOOM_START ];
+        this.#bloomEnd = data[ TAXA_COLNAMES.BLOOM_END ];
         this.#rpiID = data[ "RPI ID" ];
         this.#rankRPI = data[ "CRPR" ];
         this.#cesa = cesa ? cesa : undefined;
@@ -72,6 +78,14 @@ class Taxon {
         return this.#name.replaceAll( " ", "-" ).replaceAll( ".", "" );
     }
 
+    getBloomEnd() {
+        return this.#bloomEnd;
+    }
+
+    getBloomStart() {
+        return this.#bloomStart;
+    }
+
     getCalfloraName() {
         if ( this.#cfSyn ) {
             return this.#cfSyn;

package/lib/web/pagetaxon.js

@@ -4,6 +4,7 @@ import { Config } from "../config.js";
 import { RarePlants } from "../rareplants.js";
 import { GenericPage } from "../genericpage.js";
 import { ExternalSites } from "../externalsites.js";
+import { DateUtils } from "../dateutils.js";
 
 class PageTaxon extends GenericPage {
 
@@ -14,6 +15,28 @@ class PageTaxon extends GenericPage {
         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();
@@ -131,7 +154,7 @@ class PageTaxon extends GenericPage {
 
     render() {
 
-        let html = this.getDefaultIntro();
+        let html = this.getFrontMatter();
 
         html += "<div class=\"wrapper\">";
 
@@ -153,6 +176,10 @@ class PageTaxon extends GenericPage {
 
         html += "</div>";
 
+        html += this.getFlowerInfo();
+
+        html += this.getMarkdown();
+
         html += "<div class=\"grid borders\">";
         html += this.#getListSectionHTML( this.#getInfoLinks(), "References", "info" );
         html += this.#getListSectionHTML( this.#getObsLinks(), "Observations", "obs" );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.2.7",
+    "version": "0.2.8",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {