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

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/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

@@ -138,15 +138,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.18",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {