@ca-plant-list/ca-plant-list 0.1.17 → 0.1.19

package/data/genera.json

@@ -11,10 +11,6 @@
         "family": "Lycopodiaceae",
         "id": "9179"
     },
-    "Rhinotropis": {
-        "family": "Polygalaceae",
-        "id": 99965
-    },
     "Selaginella": {
         "family": "Selaginellaceae",
         "id": "8877"
@@ -2091,6 +2087,10 @@
         "family": "Caryophyllaceae",
         "id": "10424"
     },
+    "Atocion": {
+        "family": "Caryophyllaceae",
+        "id": "85146"
+    },
     "Agrostemma": {
         "family": "Caryophyllaceae",
         "id": "10425"
@@ -2107,6 +2107,10 @@
         "family": "Caryophyllaceae",
         "id": "10429"
     },
+    "Cherleria": {
+        "family": "Caryophyllaceae",
+        "id": "103805"
+    },
     "Dianthus": {
         "family": "Caryophyllaceae",
         "id": "10431"
@@ -2119,6 +2123,10 @@
         "family": "Caryophyllaceae",
         "id": "10434"
     },
+    "Hartmaniella": {
+        "family": "Caryophyllaceae",
+        "id": "82772"
+    },
     "Herniaria": {
         "family": "Caryophyllaceae",
         "id": "10435"
@@ -2135,10 +2143,6 @@
         "family": "Caryophyllaceae",
         "id": "10844"
     },
-    "Minuartia": {
-        "family": "Caryophyllaceae",
-        "id": "10845"
-    },
     "Moehringia": {
         "family": "Caryophyllaceae",
         "id": "10846"
@@ -2159,10 +2163,6 @@
         "family": "Caryophyllaceae",
         "id": "10841"
     },
-    "Pseudostellaria": {
-        "family": "Caryophyllaceae",
-        "id": "10842"
-    },
     "Sabulina": {
         "family": "Caryophyllaceae",
         "id": "69193"
@@ -2175,6 +2175,10 @@
         "family": "Caryophyllaceae",
         "id": "10855"
     },
+    "Schizotechium": {
+        "family": "Caryophyllaceae",
+        "id": "85148"
+    },
     "Scleranthus": {
         "family": "Caryophyllaceae",
         "id": "10857"
@@ -2199,14 +2203,6 @@
         "family": "Caryophyllaceae",
         "id": "10852"
     },
-    "Vaccaria": {
-        "family": "Caryophyllaceae",
-        "id": "10862"
-    },
-    "Velezia": {
-        "family": "Caryophyllaceae",
-        "id": "10863"
-    },
     "Euonymus": {
         "family": "Celastraceae",
         "id": "9802"
@@ -2275,10 +2271,6 @@
         "family": "Chenopodiaceae",
         "id": "11499"
     },
-    "Kochia": {
-        "family": "Chenopodiaceae",
-        "id": "11500"
-    },
     "Krascheninnikovia": {
         "family": "Chenopodiaceae",
         "id": "11501"
@@ -2291,6 +2283,10 @@
         "family": "Chenopodiaceae",
         "id": "11502"
     },
+    "Neokochia": {
+        "family": "Chenopodiaceae",
+        "id": "91852"
+    },
     "Salicornia": {
         "family": "Chenopodiaceae",
         "id": "11506"
@@ -3847,9 +3843,9 @@
         "family": "Polemoniaceae",
         "id": "80251"
     },
-    "Polygala": {
+    "Rhinotropis": {
         "family": "Polygalaceae",
-        "id": "9160"
+        "id": "99965"
     },
     "Acanthoscyphus": {
         "family": "Polygonaceae",

package/jekyll/assets/css/main.css

@@ -35,6 +35,25 @@ th {
     vertical-align: bottom;
 }
 
+ul.listmenu {
+    display: flex;
+    padding: 0;
+}
+
+ul.listmenu li {
+    display: inline-block;
+    padding: 0;
+    padding-right: .25em;
+}
+
+ul.listmenu li::after {
+    content: "  |";
+}
+
+ul.listmenu li:last-child:after {
+    content: "";
+}
+
 /* Lists */
 
 span.native {

package/lib/families.js

@@ -1,4 +1,4 @@
-import { HTMLPage } from "./htmlpage.js";
+import { GenericPage } from "./genericpage.js";
 import { HTML } from "./html.js";
 import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
@@ -20,41 +20,54 @@ class Families {
 
         this.#families = JSON.parse( Files.read( dataDir + "/families.json" ) );
         for ( const [ k, v ] of Object.entries( this.#families ) ) {
-            this.#families[ k ] = new Family( k, { id: v } );
+            this.#families[ k ] = new Family( k, v );
         }
 
         Genera.init( dataDir );
 
     }
 
-    static renderPages( outputDir, columns ) {
-        new PageFamilyList( Object.values( this.#families ) ).render( outputDir );
+    static renderPages( outputDir, taxaColumns ) {
+        new PageFamilyList( outputDir, this.#families ).render( taxaColumns );
 
-        for ( const family of Object.values( this.#families ) ) {
+        const names = Object.keys( this.#families );
+        for ( const name of names.sort() ) {
+            const family = this.#families[ name ];
             if ( family.getTaxa() ) {
-                new PageFamily( family ).render( outputDir, columns );
+                new PageFamily( outputDir, family ).render( taxaColumns );
             }
         }
     }
 
 }
 
-class PageFamilyList extends HTMLPage {
+class PageFamilyList extends GenericPage {
 
     #families;
 
-    constructor( families ) {
-        super();
+    constructor( outputDir, families ) {
+        super( outputDir, "Families", "list_families" );
         this.#families = families;
     }
 
-    render( outputDir ) {
+    render( taxaColumns ) {
 
-        const title = "Families";
+        let html = this.getDefaultIntro();
 
-        let html = this.getFrontMatter( title );
+        const sections = Sections.getSections();
+        const sectionLinks = [];
+        for ( const name of Object.keys( sections ).sort() ) {
 
-        html += HTML.textElement( "h1", title );
+            const taxa = sections[ name ];
+
+            // Render the section page.
+            new PageSection( this.getOutputDir(), name, taxa ).render( taxaColumns );
+
+            // Render the link.
+            const href = "./" + name + ".html";
+            sectionLinks.push( HTML.getLink( href, name ) + " (" + taxa.length + ")" );
+        }
+        html += HTML.wrap( "ul", HTML.arrayToLI( sectionLinks ), { class: "listmenu" } );
 
         html += "<table>";
         html += "<thead>";
@@ -63,7 +76,9 @@ class PageFamilyList extends HTMLPage {
         html += "</thead>";
 
         html += "<tbody>";
-        for ( const family of this.#families ) {
+        const names = Object.keys( this.#families ).sort();
+        for ( const name of names ) {
+            const family = this.#families[ name ];
             const taxa = family.getTaxa();
             if ( !taxa ) {
                 continue;
@@ -76,24 +91,22 @@ class PageFamilyList extends HTMLPage {
 
         html += "</table>";
 
-        this.writeFile( outputDir, "list_families.html", html );
+        this.writeFile( html );
     }
 }
 
-class PageFamily extends HTMLPage {
+class PageFamily extends GenericPage {
 
     #family;
 
-    constructor( family ) {
-        super();
+    constructor( outputDir, family ) {
+        super( outputDir, family.getName(), family.getBaseFileName() );
         this.#family = family;
     }
 
-    render( outputDir, columns ) {
-
-        let html = this.getFrontMatter( this.#family.getName() );
+    render( columns ) {
 
-        html += HTML.textElement( "h1", this.#family.getName() );
+        let html = this.getDefaultIntro();
 
         html += HTML.wrap(
             "div",
@@ -103,7 +116,27 @@ class PageFamily extends HTMLPage {
 
         html += Taxa.getHTMLTable( this.#family.getTaxa(), columns );
 
-        this.writeFile( outputDir, this.#family.getFileName(), html );
+        this.writeFile( html );
+
+    }
+}
+
+class PageSection extends GenericPage {
+
+    #taxa;
+
+    constructor( outputDir, name, taxa ) {
+        super( outputDir, name, name );
+        this.#taxa = taxa;
+    }
+
+    render( columns ) {
+
+        let html = this.getDefaultIntro();
+
+        html += Taxa.getHTMLTable( this.#taxa, columns );
+
+        this.writeFile( html );
 
     }
 }
@@ -123,10 +156,15 @@ class Family {
             this.#data.taxa = [];
         }
         this.#data.taxa.push( taxon );
+        Sections.addTaxon( this.getSectionName(), taxon );
+    }
+
+    getBaseFileName() {
+        return this.getName();
     }
 
     getFileName( ext = "html" ) {
-        return this.getName() + "." + ext;
+        return this.getBaseFileName() + "." + ext;
     }
 
     getJepsonID() {
@@ -137,10 +175,33 @@ class Family {
         return this.#name;
     }
 
+    getSectionName() {
+        return this.#data.section;
+    }
+
     getTaxa() {
         return this.#data.taxa;
     }
 
 }
 
+class Sections {
+
+    static #sections = {};
+
+    static addTaxon( name, taxon ) {
+        let section = this.#sections[ name ];
+        if ( !section ) {
+            section = [];
+            this.#sections[ name ] = section;
+        }
+        section.push( taxon );
+    }
+
+    static getSections() {
+        return this.#sections;
+    }
+
+}
+
 export { Families };

package/lib/files.js

@@ -27,7 +27,7 @@ class Files {
      * @param {string|URL} url 
      * @param {string|undefined} targetFileName If targetFileName is undefined, the data will be retrieved but not written to a file.
      * @param {Object} [headers={}] Request Headers.
-     * @returns {Headers} The Response headers.
+     * @returns {Promise<Headers>} The Response headers.
      */
     static async fetch( url, targetFileName, headers = {} ) {
         const response = await fetch( url, headers );

package/lib/genericpage.js

@@ -21,7 +21,7 @@ class GenericPage {
     getDefaultIntro() {
         let html = this.#getFrontMatter();
         html += HTML.textElement( "h1", this.#title );
-        const introPath = "lists/" + this.#baseFileName + "-intro.md";
+        const introPath = "intros/" + this.#baseFileName + ".md";
         if ( Jekyll.hasInclude( this.#outputDir, introPath ) ) {
             html += HTML.wrap( "div", Jekyll.include( introPath ), { class: "section" } );
         }

package/lib/index.d.ts

@@ -7,9 +7,9 @@ export class Files {
      * @param {string|URL} url
      * @param {string|undefined} targetFileName If targetFileName is undefined, the data will be retrieved but not written to a file.
      * @param {Object} [headers={}] Request Headers.
-     * @returns {Headers} The Response headers.
+     * @returns {Promise<Headers>} The Response headers.
      */
-    static fetch(url: string | URL, targetFileName: string | undefined, headers?: any): Headers;
+    static fetch(url: string | URL, targetFileName: string | undefined, headers?: any): Promise<Headers>;
     static mkdir(path: any): void;
     static read(path: any): string;
     static rmDir(dir: any): void;
@@ -29,7 +29,7 @@ export class HTML {
      * @deprecated
      */
     static getElement(elName: any, text: any, attributes?: {}, options?: number): string;
-    static "__#2@#getElement"(elName: any, text: any, attributes: any, escape: any): string;
+    static "__#3@#getElement"(elName: any, text: any, attributes: any, escape: any): string;
     /**
      * Generate HTML for an &lt;a> element.
      * @param {string|undefined} href

package/lib/pagerenderer.js

@@ -7,7 +7,7 @@ import { BasePageRenderer } from "./basepagerenderer.js";
 import { Files } from "./files.js";
 import { GenericPage } from "./genericpage.js";
 
-const RPI_CESA = [ TAXA_LIST_COLS.SPECIES, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CESA ];
+const ENDANGERED_COLS = [ TAXA_LIST_COLS.SPECIES, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CESA, TAXA_LIST_COLS.FESA ];
 const RPI_COLUMNS = [ TAXA_LIST_COLS.SPECIES_BARE, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CNPS_RANK ];
 
 class PageRenderer extends BasePageRenderer {
@@ -124,10 +124,10 @@ class PageRenderer extends BasePageRenderer {
                         ]
                     },
                     {
-                        name: "California Endangered Species Act",
-                        filename: "list_cesa",
-                        include: ( t ) => t.getCESA() !== undefined,
-                        columns: RPI_CESA,
+                        name: "Endangered Species",
+                        filename: "list_endangered",
+                        include: ( t ) => ( t.getCESA() || t.getFESA() ),
+                        columns: ENDANGERED_COLS,
                     },
                 ]
             },

package/lib/pagetaxon.js

@@ -3,7 +3,6 @@ import { Jepson } from "./jepson.js";
 import { Config } from "./config.js";
 import { RarePlants } from "./rareplants.js";
 import { GenericPage } from "./genericpage.js";
-import { Files } from "./files.js";
 
 class PageTaxon extends GenericPage {
 
@@ -138,15 +137,6 @@ class PageTaxon extends GenericPage {
 
         html += "</div>";
 
-        const introName = "intros/" + this.#taxon.getFileName( "md" );
-        if ( Files.exists( "./jekyll/_includes/" + introName ) ) {
-            html += HTML.wrap(
-                "div",
-                "{% capture my_include %}{% include " + introName + "%}{% endcapture %}{{ my_include | markdownify }}",
-                { class: "section" }
-            );
-        }
-
         html += "<div class=\"grid\">";
         html += this.#getListSectionHTML( this.#getInfoLinks(), "Information", "info" );
         html += this.#getListSectionHTML( this.#getObsLinks(), "Observations", "obs" );

package/lib/rareplants.js

@@ -20,12 +20,31 @@ const CESA_DESCRIPS = {
     "CT": "Threatened",
 };
 
+const FESA_DESCRIPS = {
+    "FE": "Endangered",
+    "FT": "Threatened",
+    "PE": "Proposed Endangered",
+    "PT": "Proposed Threatened",
+    "FC": "Candidate",
+    "FD": "Delisted",
+};
+
 class RarePlants {
 
     static getCESADescription( cesa ) {
+        if ( !cesa ) {
+            return "";
+        }
         return CESA_DESCRIPS[ cesa ];
     }
 
+    static getFESADescription( fesa ) {
+        if ( !fesa ) {
+            return "";
+        }
+        return FESA_DESCRIPS[ fesa ];
+    }
+
     static getRPIRankDescription( rank ) {
         const pieces = rank.split( "." );
         return RANK_DESCRIPS[ pieces[ 0 ] ];

package/lib/taxa.js

@@ -7,7 +7,7 @@ import { Exceptions } from "./exceptions.js";
 
 const TAXA_LIST_COLS = {
     CESA: {
-        title: "CESA",
+        title: "California",
         data: ( t ) => RarePlants.getCESADescription( t.getCESA() )
     },
     COMMON_NAME: {
@@ -18,6 +18,10 @@ const TAXA_LIST_COLS = {
         title: "CNPS Rank",
         data: ( t ) => HTML.getToolTip( HTML.textElement( "span", t.getRPIRankAndThreat() ), t.getRPIRankAndThreatTooltip() )
     },
+    FESA: {
+        title: "Federal",
+        data: ( t ) => RarePlants.getFESADescription( t.getFESA() )
+    },
     SPECIES: {
         title: "Species",
         data: ( t ) => t.getHTMLLink( true, true )
@@ -94,7 +98,8 @@ class Taxa {
                         row[ "inat id" ],
                         row[ "RPI ID" ],
                         row[ "CRPR" ],
-                        row[ "CESA" ]
+                        row[ "CESA" ],
+                        row[ "FESA" ]
                     );
                     if ( !jepsonID && !Exceptions.hasException( name, "jepson", "badjepsonid" ) ) {
                         ErrorLog.log( name, "has no Jepson ID" );

package/lib/taxon.js

@@ -18,9 +18,11 @@ class Taxon {
     #rankRPI;
     #cesa;
     #fesa;
+    #rankCNDDB;
+    #rankGlobal;
     #synonyms = [];
 
-    constructor( name, commonNames, status, jepsonID, calRecNum, iNatID, rpiID, rankRPI, cesa, fesa ) {
+    constructor( name, commonNames, status, jepsonID, calRecNum, iNatID, rpiID, rankRPI, cesa, fesa, rankCNDDB, rankGlobal ) {
         this.#name = name;
         this.#genus = name.split( " " )[ 0 ];
         this.#commonNames = commonNames ? commonNames.split( "," ).map( t => t.trim() ) : [];
@@ -32,6 +34,8 @@ class Taxon {
         this.#rankRPI = rankRPI;
         this.#cesa = cesa ? cesa : undefined;
         this.#fesa = fesa ? fesa : undefined;
+        this.#rankCNDDB = rankCNDDB ? rankCNDDB : undefined;
+        this.#rankGlobal = rankGlobal ? rankGlobal : undefined;
         Genera.addTaxon( this );
     }
 
@@ -78,6 +82,10 @@ class Taxon {
         return this.#cesa;
     }
 
+    getCNDDBRank() {
+        return this.#rankCNDDB;
+    }
+
     getCommonNames() {
         return this.#commonNames;
     }
@@ -102,6 +110,10 @@ class Taxon {
         return this.#genus;
     }
 
+    getGlobalRank() {
+        return this.#rankGlobal;
+    }
+
     getHTMLLink( href = true, includeRPI = true ) {
         href = href ? ( "./" + this.getFileName() ) : undefined;
         let className = this.isNative() ? "native" : "non-native";

package/package.json

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

package/lib/htmlpage.js

@@ -1,21 +0,0 @@
-import { Files } from "./files.js";
-
-/**
- * @deprecated
- */
-class HTMLPage {
-
-    getFrontMatter( title, js ) {
-        return "---\n"
-            + "title: \"" + title + "\"\n"
-            + ( js ? ( "js: " + js + "\n" ) : "" )
-            + "---\n";
-    }
-
-    writeFile( outputDir, fileName, html ) {
-        Files.write( outputDir + "/" + fileName, html );
-    }
-
-}
-
-export { HTMLPage };