@ca-plant-list/ca-plant-list 0.1.3 → 0.1.4

package/lib/dataloader.js

@@ -14,16 +14,22 @@ class DataLoader {
         return OPTION_DEFS;
     }
 
-    static load( options ) {
+    static init( taxaDir ) {
 
         const defaultDataDir = Config.getPackageDir() + "/data";
-        const taxaDir = options.datadir;
-
-        console.log( "loading data" );
 
         Exceptions.init( taxaDir );
         Families.init( defaultDataDir );
         Genera.init( defaultDataDir );
+    }
+
+    static load( options ) {
+
+        const taxaDir = options.datadir;
+
+        console.log( "loading data" );
+
+        this.init( taxaDir );
         Taxa.init( taxaDir );
 
     }

package/lib/genera.js

@@ -9,6 +9,11 @@ class Genera {
 
         const genusName = taxon.getGenusName();
         const genusData = this.#genera[ genusName ];
+        if ( !genusData ) {
+            console.log( taxon.getName() + " genus not found" );
+            return;
+        }
+
         if ( genusData.taxa === undefined ) {
             genusData.taxa = [];
         }
@@ -16,7 +21,7 @@ class Genera {
 
         const family = this.getFamily( genusName );
         if ( !family ) {
-            console.log( taxon.getName() + " genus/family not found" );
+            console.log( taxon.getName() + " family not found" );
             return;
         }
         family.addTaxon( taxon );

package/lib/index.js

@@ -1,5 +1,10 @@
 import { BasePageRenderer } from "./basepagerenderer.js";
 import { Config } from "./config.js";
+import { CSV } from "./csv.js";
+import { DataLoader } from "./dataloader.js";
+import { ErrorLog } from "./errorlog.js";
+import { Exceptions } from "./exceptions.js";
 import { HTML, HTML_OPTIONS } from "./html.js";
+import { Taxon } from "./taxon.js";
 
-export { BasePageRenderer, Config, HTML, HTML_OPTIONS };
+export { BasePageRenderer, Config, CSV, DataLoader, ErrorLog, Exceptions, HTML, HTML_OPTIONS, Taxon };

package/lib/pagetaxon.js

@@ -31,16 +31,9 @@ class PageTaxon extends HTMLPage {
                 )
             );
         }
-        const iNatID = this.#taxon.getINatID();
-        if ( iNatID ) {
-            links.push(
-                HTML.getLink(
-                    "https://www.inaturalist.org/taxa/" + iNatID,
-                    "iNaturalist",
-                    {},
-                    HTML_OPTIONS.OPEN_NEW
-                )
-            );
+        const iNatLink = this.#taxon.getINatTaxonLink();
+        if ( iNatLink ) {
+            links.push( iNatLink );
         }
         return links;
     }

package/lib/taxa.js

@@ -62,6 +62,7 @@ class Taxa {
                         jepsonID,
                         row[ "calrecnum" ],
                         row[ "inat id" ],
+                        row[ "RPI ID" ],
                         row[ "CRPR" ],
                         row[ "CESA" ]
                     );

package/lib/taxon.js

@@ -12,13 +12,15 @@ class Taxon {
     #status;
     #jepsonID;
     #calRecNum;
+    #cfSyn;
     #iNatID;
     #iNatSyn;
+    #rpiID;
     #rankRPI;
     #cesa;
     #synonyms = [];
 
-    constructor( name, commonNames, status, jepsonID, calRecNum, iNatID, rankRPI, cesa ) {
+    constructor( name, commonNames, status, jepsonID, calRecNum, iNatID, rpiID, rankRPI, cesa ) {
         this.#name = name;
         this.#genus = name.split( " " )[ 0 ];
         this.#commonNames = commonNames ? commonNames.split( "," ).map( t => t.trim() ) : [];
@@ -26,6 +28,7 @@ class Taxon {
         this.#jepsonID = jepsonID;
         this.#calRecNum = calRecNum;
         this.#iNatID = iNatID;
+        this.#rpiID = rpiID;
         this.#rankRPI = rankRPI;
         this.#cesa = cesa;
         Genera.addTaxon( this );
@@ -39,14 +42,23 @@ class Taxon {
 
     addSynonym( syn, type ) {
         this.#synonyms.push( syn );
-        if ( type === "INAT" ) {
-            // Synonyms should be in Jepson format, but store iNatName in iNat format (no var or subsp, space after x).
-            this.#iNatSyn = syn;
+        switch ( type ) {
+            case "CF":
+                // Synonym is in Calflora format.
+                this.#cfSyn = syn;
+                break;
+            case "INAT":
+                // Synonyms should be in Jepson format, but store iNatName in iNat format (no var or subsp, space after x).
+                this.#iNatSyn = syn;
+                break;
         }
     }
 
     getCalfloraName() {
-        return this.#name.replace( " subsp.", " ssp." ).replace( "×", "X" );
+        if ( this.#cfSyn ) {
+            return this.#cfSyn;
+        }
+        return this.getName().replace( " subsp.", " ssp." ).replace( "×", "X" );
     }
 
     getCalfloraID() {
@@ -65,9 +77,13 @@ class Taxon {
         return Genera.getFamily( this.#genus );
     }
 
-    getFileName( ext = "html" ) {
+    getFileName( ext ) {
+        return Taxon.getFileName( this.getName(), ext );
+    }
+
+    static getFileName( name, ext = "html" ) {
         // Convert spaces to "-" and remove ".".
-        return this.getName().replaceAll( " ", "-" ).replaceAll( ".", "" ) + "." + ext;
+        return name.replaceAll( " ", "-" ).replaceAll( ".", "" ) + "." + ext;
     }
 
     getGenus() {
@@ -97,6 +113,15 @@ class Taxon {
         return name.replace( / (subsp|var)\./, "" ).replace( "×", "× " );
     }
 
+    getINatTaxonLink() {
+        const iNatID = this.getINatID();
+        if ( !iNatID ) {
+            return "";
+        }
+        const link = HTML.getLink( "https://www.inaturalist.org/taxa/" + iNatID, "iNaturalist", {}, HTML_OPTIONS.OPEN_NEW );
+        return this.#iNatSyn ? ( link + " (" + this.#iNatSyn + ")" ) : link;
+    }
+
     getJepsonID() {
         return this.#jepsonID;
     }
@@ -105,6 +130,10 @@ class Taxon {
         return this.#name;
     }
 
+    getRPIID() {
+        return this.#rpiID;
+    }
+
     getRPIRank() {
         if ( !this.#rankRPI ) {
             return this.#rankRPI;
@@ -144,6 +173,18 @@ class Taxon {
         return this.getRPIRank() !== undefined;
     }
 
+    setCalfloraID( id ) {
+        this.#calRecNum = id;
+    }
+
+    setINatID( id ) {
+        this.#iNatID = id;
+    }
+
+    setJepsonID( id ) {
+        this.#jepsonID = id;
+    }
+
 }
 
 export { Taxon };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -10,22 +10,7 @@
     "homepage": "https://github.com/ca-plants/ca-plant-list",
     "type": "module",
     "exports": {
-        ".": "./lib/index.js",
-        "./CSV": {
-            "import": "./lib/csv.js"
-        },
-        "./DataLoader": {
-            "import": "./lib/dataloader.js"
-        },
-        "./Exceptions": {
-            "import": "./lib/exceptions.js"
-        },
-        "./Files": {
-            "import": "./lib/files.js"
-        },
-        "./Taxa": {
-            "import": "./lib/taxa.js"
-        }
+        ".": "./lib/index.js"
     },
     "bin": {
         "ca-plant-list": "build-site.js"