@ca-plant-list/ca-plant-list 0.4.38 → 0.4.39

package/data/exceptions.json

@@ -81,6 +81,15 @@
             "notineflora": true
         }
     },
+    "Oenothera deltoides subsp. julpunensis": {
+        "comment": "subsp. not yet in Jepson; see data/taxatext for details",
+        "calflora": {
+            "notintaxondata": true
+        },
+        "jepson": {
+            "notineflora": true
+        }
+    },
     "Polypogon interruptus": { "calflora": { "native": true } },
     "Ranunculus sceleratus var. sceleratus": {
         "calflora": { "native": false }

package/data/taxa.csv

@@ -1332,6 +1332,7 @@ Oenanthe sarmentosa,,N,,,,,34904,5881,60127,205153,,Pacific Oenanthe
 Oenothera biennis,common evening-primrose,X,,,,,34975,5882,62207,26661,true
 Oenothera deltoides subsp. cognata,,N,,,,,51746,5891,80072,43163,true,Birdcage Evening Primrose
 Oenothera deltoides subsp. howellii,Antioch Dunes evening-primrose,N,,,,,51748,5893,80074,43166,true,Antioch Dunes Evening Primrose,,1179,1B.1,CE,FE,S1,G5T1
+Oenothera deltoides subsp. julpunensis,,N,,,,,,,1631990,438449,,,,5767,1B.1,,,S1,G5T1
 Oenothera elata subsp. hookeri,evening primrose,N,,,,,51752,5897,51814,43171,true,Hooker's Evening Primrose
 Oenothera glazioviana,,X,,,,,35004,5899,62208,26721,true
 Oenothera laciniata,,X,,,,,35016,5900,78243,26747,true
@@ -1838,7 +1839,7 @@ Symphyotrichum lanceolatum var. hesperium,,N,,,,,80306,11093,81407,202308,true,W
 Symphyotrichum lentum,Suisun Marsh aster,N,,,,,80304,9490,60130,211454,true,Suisun Marsh Aster,,289,1B.2,,,S2,G2
 Symphyotrichum spathulatum,,N,,,,,80300,10409,79302,206133,true,Western Mountain Aster
 Symphyotrichum subulatum var. parviflorum,saltmarsh aster,N,annual,"white,pink",7,10,81976,11094,169461,202299,true,Saltmarsh Aster
-Symphyotrichum subulatum var. squamatum,saltmarsh aster,X,annual,white,7,10,93843,,169489,,true
+Symphyotrichum subulatum var. squamatum,saltmarsh aster,X,annual,white,7,10,93843,12081,169489,207358,true
 Tamarix parviflora,smallflower tamarisk,X,,,,,46074,7916,56011,119759,true,,tamarix-parviflora-plant-profile
 Tamarix ramosissima,saltcedar,X,,,,,46076,7917,56015,119761,true,,tamarix-ramosissima-profile
 Tanacetum parthenium,feverfew,X,,,,,5215,7919,54520,206156,true

package/lib/taxonomy/taxon.js

@@ -226,7 +226,7 @@ class Taxon extends Taxonomy {
 
     getINatName() {
         const name = this.#iNatSyn ? this.#iNatSyn : this.getName();
-        return name.replace(/ (subsp|var)\./, "").replace("×", "× ");
+        return name.replace(/ (cf|subsp|var)\./, "").replace("×", "× ");
     }
 
     /**

package/lib/tools/rpi.js

@@ -4,7 +4,7 @@ import { Files } from "../files.js";
 import { TaxaCSV } from "./taxacsv.js";
 
 /**
- * @typedef {"CESA"|"CNDDB"|"FESA"|"Global"} Rank
+ * @typedef {"CRPR"|"CESA"|"CNDDB"|"FESA"|"Global"} Rank
  * @typedef {Map<string,Map<Rank,string|undefined>>} RanksToUpdate
  */
 
@@ -166,17 +166,13 @@ export class RPI {
                 }
             }
 
-            if (rank !== taxon.getRPIRankAndThreat()) {
-                if (taxon.isNative()) {
-                    errorLog.log(
-                        name,
-                        "rank in taxa.csv is different than rank in " +
-                            fileName,
-                        taxon.getRPIRankAndThreat(),
-                        rank,
-                    );
-                }
-            }
+            checkStatusMatch(
+                name,
+                "CRPR",
+                rank,
+                taxon.getRPIRankAndThreat(),
+                ranksToUpdate,
+            );
             checkStatusMatch(
                 name,
                 "CESA",
@@ -249,7 +245,7 @@ export class RPI {
 
         this.#checkExceptions(taxa, config, exceptions, errorLog);
 
-        this.#scrape(toolsDataDir, taxa, exceptions, errorLog);
+        this.#scrape(toolsDataDir, dataDir, taxa, exceptions, errorLog, update);
 
         if (update) {
             this.#updateRanks(dataDir, ranksToUpdate);
@@ -421,11 +417,20 @@ export class RPI {
 
     /**
      * @param {string} toolsDataDir
+     * @param {string} dataDir
      * @param {import("../types.js").Taxa} taxa
      * @param {import("../exceptions.js").Exceptions} exceptions
      * @param {import("../errorlog.js").ErrorLog} errorLog
+     * @param {boolean} update
      */
-    static async #scrape(toolsDataDir, taxa, exceptions, errorLog) {
+    static async #scrape(
+        toolsDataDir,
+        dataDir,
+        taxa,
+        exceptions,
+        errorLog,
+        update,
+    ) {
         const toolsDataPath = toolsDataDir + "/rpi";
         const fileName = HTML_FILE_NAME;
         const filePath = toolsDataPath + "/" + fileName;
@@ -444,6 +449,9 @@ export class RPI {
             rpiIDs[name] = id;
         }
 
+        /** @type {Map<string,string>} */
+        const idsToUpdate = new Map();
+
         for (const taxon of taxa.getTaxonList()) {
             if (!taxon.getRPIRankAndThreat()) {
                 continue;
@@ -463,8 +471,13 @@ export class RPI {
                     id,
                     taxon.getRPIID(),
                 );
+                idsToUpdate.set(name, id);
             }
         }
+
+        if (update) {
+            this.#updateIDs(dataDir, idsToUpdate);
+        }
     }
 
     /**
@@ -485,6 +498,24 @@ export class RPI {
         return false;
     }
 
+    /**
+     * @param {string} dataDir
+     * @param {Map<string,string>} idsToUpdate
+     */
+    static #updateIDs(dataDir, idsToUpdate) {
+        const taxa = new TaxaCSV(dataDir);
+
+        for (const taxonData of taxa.getTaxa()) {
+            const id = idsToUpdate.get(taxonData.taxon_name);
+            if (!id) {
+                continue;
+            }
+            taxonData["RPI ID"] = id;
+        }
+
+        taxa.write();
+    }
+
     /**
      * @param {string} dataDir
      * @param {RanksToUpdate} ranksToUpdate

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.4.38",
+    "version": "0.4.39",
     "description": "Tools to create files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -47,7 +47,7 @@
         "image-size": "^2.0.2",
         "markdown-it": "^14.1.0",
         "sharp": "^0.34.4",
-        "svgo-ll": "^6.1.0",
+        "svgo-ll": "^6.2.0",
         "unzipper": "^0.12.3"
     },
     "devDependencies": {