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

package/data/synonyms.csv

@@ -924,7 +924,6 @@ Jussiaea repens var. peploides,Ludwigia peploides subsp. peploides
 Kali australis,Salsola australis
 Keckiella breviflora subsp. breviflora,Keckiella breviflora var. breviflora
 Koeleria cristata var. longifolia,Koeleria macrantha
-Koeleria gerardii,Koeleria gerardi,INAT
 Koeleria nitida,Koeleria macrantha
 Kohlrauschia velutina,Petrorhagia dubia
 Lachnagrostis filiformis,Agrostis avenacea,INAT
@@ -1102,6 +1101,7 @@ Mahonia dictyota,Berberis aquifolium var. dictyota
 Mahonia nervosa var. mendocinensis,Berberis nervosa
 Mahonia pinnata subsp. pinnata,Berberis pinnata subsp. pinnata
 Maianthemum racemosum subsp. amplexicaule,Maianthemum racemosum
+Malacothamnus arcuatus var. elmeri,Malacothamnus hallii,INAT
 Malacothamnus fremontii subsp. cercophorus,Malacothamnus fremontii
 Malacothamnus helleri,Malacothamnus fremontii
 Malacothamnus howellii,Malacothamnus fremontii
@@ -1618,6 +1618,7 @@ Rorippa palustris var. occidentalis,Rorippa palustris subsp. palustris
 Rosa eglanteria,Rosa rubiginosa
 Rosa spithamea var. sonomensis,Rosa spithamea
 Rostraria cristata,Koeleria gerardi
+Rostraria cristata,Koeleria gerardi,INAT
 Rottboellia cylindrica,Hainardia cylindrica
 Rubacer parviflorum,Rubus parviflorus
 Rubus almus,Rubus pensilvanicus
@@ -1799,6 +1800,7 @@ Smilacina racemosa var. glabra,Maianthemum racemosum
 Smilacina racemosa,Maianthemum racemosum
 Smilacina stellata var. sessilifolia,Maianthemum stellatum
 Smilacina stellata,Maianthemum stellatum
+Solanum nitidibaccatum,Solanum physalifolium var. nitidibaccatum,INAT
 Solanum nodiflorum,Solanum americanum
 Solanum tenuilobatum,Solanum xanti
 Solanum umbelliferum var. glabrescens,Solanum umbelliferum

package/data/taxa.csv

@@ -940,7 +940,7 @@ Keckiella corymbosa,,N,29883,4523,62043
 Kickxia elatine,fluellin,X,29898,4532,64332
 Kickxia spuria,fluellin,X,29899,4533,64191
 Kniphofia uvaria,,X,29921,8635,56035
-Koeleria gerardi,annual junegrass,X,29957,13237,77610
+Koeleria gerardi,annual junegrass,X,29957,13237,167999
 Koeleria macrantha,junegrass,N,29951,4539,57183
 Kopsiopsis strobilacea,California ground-cone,N,93802,11786,77612
 Lactuca saligna,,X,3688,4549,53105
@@ -1101,7 +1101,7 @@ Madia sativa,coast tarweed,N,4055,5298,53143,yellow
 Maianthemum racemosum,false Solomon's seal,N,32495,10096,51062
 Maianthemum stellatum,,N,32497,9629,53268
 Malacothamnus fremontii,white-coat mallow,N,32524,5312,70397
-Malacothamnus hallii,Hall's bush mallow,N,32519,5314,77930,,,,1065,1B.2,,,S2,G2
+Malacothamnus hallii,Hall's bush mallow,N,32519,5314,1497404,,,,1065,1B.2,,,S2,G2
 Malacothrix californica,,N,4059,5325,58026
 Malacothrix clevelandii,Cleveland's malacothrix,N,4060,5326,58841
 Malacothrix coulteri,snake's-head,N,4061,5327,58027
@@ -1622,7 +1622,7 @@ Solanum elaeagnifolium,white horse-nettle,X,44852,7654,79137
 Solanum furcatum,,X,44856,7655,79138
 Solanum lanceolatum,lanceleaf nightshade,X,44872,7656,79139
 Solanum nigrum,black nightshade,X,44883,7658,79141
-Solanum physalifolium var. nitidibaccatum,nightshade,X,66519,11086,81374
+Solanum physalifolium var. nitidibaccatum,nightshade,X,66519,11086,406080
 Solanum umbelliferum,blue witch,N,44919,7664,50639
 Solanum xanti,,N,77308,7666,79146
 Soleirolia soleirolii,baby's tears,X,44928,7667,79147

package/ebook/css/main.css

@@ -2,6 +2,11 @@
     font-family: Georgia, 'Times New Roman', Times, serif;
 }
 
+div.flr {
+    display: flex;
+    align-items: center;
+}
+
 img {
     width: 100%;
 }

package/lib/dateutils.js

@@ -16,7 +16,26 @@ const MONTH_NAMES = [
 class DateUtils {
 
     static getMonthName( monthNum ) {
-        return MONTH_NAMES[ 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 ];
+            }
+            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 ( r2[ 0 ] > r2[ 1 ] ) {
+            return this.monthRangesOverlap( r1, [ r2[ 0 ], 12 ] ) || this.monthRangesOverlap( r1, [ 1, r2[ 1 ] ] );
+        }
+        return contains( r1, r2 ) || contains( r2, r1 );
     }
 
 }

package/lib/ebook/pages/page_list_flowers.js

@@ -0,0 +1,108 @@
+import { EBookPage } from "../ebookpage.js";
+import { XHTML } from "../xhtml.js";
+import { DateUtils } from "../../dateutils.js";
+import { EBook } from "../ebook.js";
+import { Taxa } from "../../taxa.js";
+
+const FN_FLOWER_TIME_INDEX = "fm.html";
+
+class PageListFlowers {
+
+    static createPages( contentDir ) {
+        new PageListFlowerTimeIndex( contentDir ).create();
+        for ( let m1 = 1; m1 < 13; m1++ ) {
+            new PageListFlowerTime( contentDir, m1 ).create();
+        }
+    }
+
+    static getManifestEntries() {
+
+        const manifestEntries = [];
+
+        manifestEntries.push( EBook.getManifestEntry( "fm0", FN_FLOWER_TIME_INDEX ) );
+        for ( let m1 = 1; m1 < 13; m1++ ) {
+            manifestEntries.push( EBook.getManifestEntry( "fm" + m1, PageListFlowerTime.getFileNameBloomTime( m1 ) ) );
+        }
+
+        return manifestEntries.join( "" );
+    }
+
+    static getSpineEntries() {
+
+        const spineEntries = [];
+
+        spineEntries.push( EBook.getSpineEntry( "fm0" ) );
+        for ( let m1 = 1; m1 < 13; m1++ ) {
+            spineEntries.push( EBook.getSpineEntry( "fm" + m1 ) );
+        }
+
+        return spineEntries.join( "" );
+
+    }
+
+    static renderMonthLinks() {
+        const links = [];
+        for ( let m1 = 1; m1 < 13; m1++ ) {
+            links.push(
+                XHTML.getLink(
+                    PageListFlowerTime.getFileNameBloomTime( m1 ),
+                    DateUtils.getMonthName( m1 ) + " - " + DateUtils.getMonthName( ( m1 ) % 12 + 1 )
+                )
+            );
+        }
+        return XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
+    }
+
+}
+
+class PageListFlowerTimeIndex extends EBookPage {
+
+    constructor( outputDir ) {
+        super( outputDir + "/" + FN_FLOWER_TIME_INDEX, "Flowering Times" );
+    }
+
+    renderPageBody() {
+        const html = XHTML.textElement( "h1", this.getTitle() );
+        return html + PageListFlowers.renderMonthLinks();
+    }
+
+}
+
+class PageListFlowerTime extends EBookPage {
+
+    #m1;
+    #m2;
+
+    constructor( outputDir, month ) {
+        super(
+            outputDir + "/" + PageListFlowerTime.getFileNameBloomTime( month ),
+            "Flowering in " + DateUtils.getMonthName( month ) + " - " + DateUtils.getMonthName( month % 12 + 1 )
+        );
+        this.#m1 = month;
+        this.#m2 = month % 12 + 1;
+    }
+
+    static getFileNameBloomTime( m1 ) {
+        return "list_fm_" + m1 + ".html";
+    }
+
+    renderPageBody() {
+
+        const html = XHTML.textElement( "h1", this.getTitle() );
+
+        const range = [ this.#m1, this.#m2 ];
+        const links = [];
+        for ( const taxon of Taxa.getTaxa() ) {
+            const m1 = taxon.getBloomStart();
+            const m2 = taxon.getBloomEnd();
+            if ( m1 && DateUtils.monthRangesOverlap( range, [ m1, m2 ] ) ) {
+                links.push( XHTML.getLink( taxon.getFileName(), taxon.getName() ) );
+            }
+        }
+
+        return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
+    }
+
+}
+
+export { PageListFlowers, PageListFlowerTime };

package/lib/ebook/pages/taxonpage.js

@@ -3,6 +3,7 @@ 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";
 
 class TaxonPage extends EBookPage {
 
@@ -19,16 +20,22 @@ class TaxonPage extends EBookPage {
 
     renderPageBody() {
 
-        function renderColors( colors ) {
-            if ( !colors ) {
+        function renderBloomInfo( taxon ) {
+            const colors = taxon.getFlowerColors();
+            const monthStart = taxon.getBloomStart();
+            const monthEnd = taxon.getBloomEnd();
+            if ( !colors && !monthStart ) {
                 return "";
             }
             let html = "";
             for ( const color of colors ) {
-                // html += XHTML.textElement( "span", "", { class: "color " + color } );
                 html += XHTML.textElement( "img", "", { src: "./i/f-" + color + ".svg", class: "flr" } );
             }
-            return html;
+            if ( monthStart ) {
+                html += XHTML.textElement( "div", DateUtils.getMonthName( monthStart ) + "-" + DateUtils.getMonthName( monthEnd ) );
+
+            }
+            return XHTML.wrap( "div", html, { class: "flr" } );
         }
 
 
@@ -53,7 +60,7 @@ class TaxonPage extends EBookPage {
             html += XHTML.textElement( "p", cn.join( ", " ) );
         }
 
-        html += renderColors( this.#taxon.getFlowerColors() );
+        html += renderBloomInfo( this.#taxon );
 
         html += renderCustomText( this.#taxon.getBaseFileName() );
 

package/lib/ebook/pages/tocpage.js

@@ -1,6 +1,7 @@
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
 import { FLOWER_COLOR_NAMES } from "../../taxa.js";
+import { PageListFlowers } from "./page_list_flowers.js";
 
 class TOCPage extends EBookPage {
 
@@ -15,6 +16,7 @@ class TOCPage extends EBookPage {
 
         const mainLinks = [];
         mainLinks.push( this.#getFlowerColorLinks() );
+        mainLinks.push( this.#getFlowerTimeLinks() );
         mainLinks.push( XHTML.getLink( "./list_families.html", "All Families" ) );
         mainLinks.push( XHTML.getLink( "./list_species.html", "All Species" ) );
         mainLinks.push( XHTML.getLink( "./glossary.html", "Glossary" ) );
@@ -33,6 +35,12 @@ class TOCPage extends EBookPage {
         }
         return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
     }
+
+    #getFlowerTimeLinks() {
+        const html = XHTML.getLink( "fm.html", "Flowering Times" );
+        return html + PageListFlowers.renderMonthLinks();
+    }
+
 }
 
 export { TOCPage };

package/lib/ebook/plantbook.js

@@ -4,6 +4,7 @@ import { GlossaryPages } from "./glossarypages.js";
 import { Images } from "./images.js";
 import { PageListFamilies } from "./pages/page_list_families.js";
 import { PageListFlowerColor } from "./pages/page_list_flower_color.js";
+import { PageListFlowers } from "./pages/page_list_flowers.js";
 import { PageListSpecies } from "./pages/page_list_species.js";
 import { TaxonPage } from "./pages/taxonpage.js";
 import { TOCPage } from "./pages/tocpage.js";
@@ -44,6 +45,9 @@ class PlantBook extends EBook {
         for ( const colorName of FLOWER_COLOR_NAMES ) {
             new PageListFlowerColor( contentDir, Taxa.getFlowerColor( colorName ) ).create();
         }
+
+        PageListFlowers.createPages( contentDir );
+
         new PageListFamilies( contentDir ).create();
         for ( const family of Families.getFamilies() ) {
             const taxa = family.getTaxa();
@@ -89,6 +93,7 @@ class PlantBook extends EBook {
             xml += "<item id=\"t" + index + "\" href=\"" + taxon.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
         }
 
+        xml += PageListFlowers.getManifestEntries();
         xml += this.#glossary.getManifestEntries();
         xml += this.#images.getManifestEntries();
 
@@ -103,6 +108,8 @@ class PlantBook extends EBook {
             const color = Taxa.getFlowerColor( colorName );
             xml += "<itemref idref=\"l" + color.getColorName() + "\"/>";
         }
+        xml += PageListFlowers.getSpineEntries();
+
         xml += "<itemref idref=\"lfamilies\"/>";
         xml += "<itemref idref=\"lspecies\"/>";
 

package/lib/index.d.ts

@@ -27,6 +27,10 @@ export class DataLoader {
     static init(taxaDir: any): void;
     static load(options: any): void;
 }
+export class DateUtils {
+    static getMonthName(monthNum: any): string;
+    static monthRangesOverlap(r1: any, r2: any): any;
+}
 export class ErrorLog {
     static "__#8@#errors": any[];
     static log(...args: any[]): void;

package/package.json

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