@ca-plant-list/ca-plant-list 0.4.30 → 0.4.31

package/data/inattaxonphotos.csv

@@ -53,7 +53,6 @@ Acaena californica,7285167,jpeg,cc-by-nc,Alison Young
 Acanthomintha lanceolata,38917484,jpeg,cc-by-nc,Joey Santore
 Acanthomintha lanceolata,35057066,jpeg,cc-by-nc,Damon Tighe
 Acanthomintha lanceolata,37516943,jpg,cc-by,Ken-ichi Ueda
-Acer campestre,304282317,jpg,cc-by-nc,Soumil
 Acer campestre,21762680,jpeg,cc-by-nc,wolf3178
 Acer campestre,10775,jpg,cc-by-nc,AnneTanne
 Acer campestre,451583323,jpeg,cc-by-nc,Marek Koszorek
@@ -168,7 +167,6 @@ Agrostis pallens,390912548,jpg,cc-by-nc,jrebman
 Agrostis stolonifera,43639048,jpg,cc-by-nc,Barbara L. Wilson
 Agrostis stolonifera,65982270,jpeg,cc-by-nc,Rowan Hindmarsh-Walls
 Agrostis stolonifera,42924476,jpg,cc-by-nc,arseniy maximenko
-Ailanthus altissima,32905540,jpeg,cc-by-nc,Katerina Kashirina
 Ailanthus altissima,74889269,jpg,cc-by,Emily Summerbell
 Ailanthus altissima,124882976,jpg,cc-by,Jessica Precht
 Ailanthus altissima,80889194,jpeg,cc-by-nc,Matthieu Gauvain
@@ -311,6 +309,8 @@ Amsinckia menziesii,62837069,jpg,cc-by-nc,jalopy
 Amsinckia menziesii,184386626,jpeg,cc-by-nc,Peri Lee Pipkin
 Amsinckia menziesii,62966680,jpeg,cc-by-nc,jalopy
 Amsinckia menziesii,62463973,jpeg,cc-by-nc,devinl
+Amsinckia retrorsa,23982770,jpeg,cc-by-nc,James Bailey
+Amsinckia retrorsa,23982685,jpeg,cc-by-nc,James Bailey
 Amsinckia tessellata var. gloriosa,189079209,jpg,cc-by-nc,davidmagney
 Amsinckia tessellata var. gloriosa,265596824,jpeg,cc-by,Matt Berger
 Amsinckia tessellata var. gloriosa,263526141,jpg,cc-by-nc,pleistocene
@@ -979,7 +979,6 @@ Cardamine californica,344581239,jpg,cc-by-nc,nathantay
 Cardamine californica,73565,jpg,cc-by,dloarie
 Cardamine californica,180021353,jpg,cc-by-nc,J. Maughn
 Cardamine hirsuta,10620,jpg,cc-by-nc,AnneTanne
-Cardamine hirsuta,96758889,jpg,cc-by,Kevin Thiele
 Cardamine oligosperma,3002876,jpg,cc-by,Don Loarie
 Cardamine oligosperma,86226,jpg,cc-by,Ken-ichi Ueda
 Cardamine oligosperma,86227,jpg,cc-by,Ken-ichi Ueda
@@ -1673,7 +1672,6 @@ Datura wrightii,426614925,jpeg,cc-by-nc,txnaturewatch
 Daucus carota,435058164,jpeg,cc-by,Saryu Mae
 Daucus carota,115648219,jpeg,cc-by,Eleftherios Katsillis
 Daucus carota,390996627,jpg,cc-by-nc,Avelino Vieira
-Daucus carota,115648186,jpeg,cc-by,Eleftherios Katsillis
 Daucus carota,45271729,jpeg,cc-by-nc,lvconrad1977
 Daucus pusillus,7606922,jpg,cc-by-nc,Philip Woods
 Daucus pusillus,3456940,jpg,cc-by,NatureShutterbug
@@ -2253,8 +2251,8 @@ Erythranthe arvensis,139615007,jpg,cc-by,mark-groeneveld
 Erythranthe arvensis,138889197,jpeg,cc-by-nc,Joey Santore
 Erythranthe breweri,10301236,jpeg,cc-by-nc,Damon Tighe
 Erythranthe breweri,17193,jpg,cc-by,Ken-ichi Ueda
-Erythranthe breweri,301588080,jpeg,cc-by-nc,Julia Markey
-Erythranthe breweri,301588359,jpeg,cc-by-nc,Julia Markey
+Erythranthe breweri,301588080,jpeg,cc-by-nc,juliamarkey
+Erythranthe breweri,301588359,jpeg,cc-by-nc,juliamarkey
 Erythranthe breweri,4327500,jpeg,cc-by-nc,faerthen
 Erythranthe cardinalis,4447174,jpg,cc-by-nc,Raphaela E. Floreani Buzbee
 Erythranthe cardinalis,4035791,jpg,cc-by-nc,Jenny Smith
@@ -2449,8 +2447,6 @@ Festuca temulenta,39124250,jpeg,cc-by-nc,James Bailey
 Festuca temulenta,39124273,jpeg,cc-by-nc,James Bailey
 Ficus carica,3069933,jpg,cc-by,Drepanostoma
 Ficus carica,217972106,jpeg,cc-by-nc,Errol Véla
-Ficus carica,38291711,jpeg,cc-by,Michele Jones
-Ficus carica,87770239,jpg,cc-by-nc,richardpatters
 Ficus carica,126762573,jpg,cc-by-nc,Иван Матершев
 Foeniculum vulgare,89318955,jpg,cc-by-nc,sstudebaker
 Foeniculum vulgare,89168026,jpg,cc-by-nc,Eric Koberle
@@ -2668,10 +2664,7 @@ Hedera canariensis,249819535,jpg,cc-by-nc,Andriy Kovalchuk
 Hedera canariensis,255805787,jpeg,cc-by-nc,David G. del Olmo
 Hedera canariensis,170855930,jpeg,cc-by-nc,Sébastien SANT
 Hedera helix,23968680,jpeg,cc-by,Gianni Del Bufalo bygdb
-Hedera helix,129890133,jpg,cc-by-nc,sveatoussaint
 Hedera helix,38428455,jpeg,cc-by,Marianna Boi
-Hedera helix,63642529,jpeg,cc-by-nc,joe__hill
-Hedera helix,23968712,jpeg,cc-by,Gianni Del Bufalo bygdb
 Hedypnois rhagadioloides,3156331,jpg,cc-by-nc,Bryan
 Hedypnois rhagadioloides,37923304,jpeg,cc-by-nc,mustangmari
 Hedypnois rhagadioloides,122232888,jpg,cc-by-nc,Богданович Светлана

package/data/synonyms.csv

@@ -89,10 +89,12 @@ Amerosedum radiatum,Sedum radiatum
 Amerosedum radiatum subsp. radiatum,Sedum radiatum subsp. radiatum
 Ammannia coccinea subsp. purpurea,Ammannia coccinea
 Amsinckia gloriosa,Amsinckia tessellata var. gloriosa
+Amsinckia helleri,Amsinckia retrorsa
 Amsinckia intermedia var. eastwoodiae,Amsinckia eastwoodiae
 Amsinckia intermedia var. echinata,Amsinckia intermedia
 Amsinckia menziesii var. intermedia,Amsinckia intermedia,INAT
 Amsinckia menziesii var. menziesii,Amsinckia menziesii
+Amsinckia menziesii var. menziesii,Amsinckia retrorsa,INAT
 Amsinckia micrantha,Amsinckia menziesii
 Amsinckia straminea,Amsinckia lycopsoides
 Amsinckia tessellata var. elegans,Amsinckia tessellata var. tessellata

package/data/taxa.csv

@@ -94,7 +94,8 @@ Amsinckia grandiflora,large-flowered fiddleneck,N,13130,323,75424,202030,,Large-
 Amsinckia intermedia,fiddleneck,N,13131,11324,49141,202031,,Common Fiddleneck
 Amsinckia lunaris,bent-flower fiddleneck,N,13139,324,75425,202032,,Bent Flowered Fiddleneck,,,,,5,1B.2,,,S3,G3
 Amsinckia lycopsoides,,N,13140,325,58048,202033,,Bugloss-flowered Fiddleneck
-Amsinckia menziesii,rancher's fireweed,N,13145,326,55436,202034,,Menzies' Fiddleneck,,orange
+Amsinckia menziesii,rancher's fireweed,N,13145,326,55436,202034,,Menzies' Fiddleneck,annual,orange
+Amsinckia retrorsa,rigid fiddleneck,N,13147,11325,58049,202037,,Rigid Fiddleneck,annual,yellow,2,5
 Amsinckia tessellata var. gloriosa,,N,77019,333,80365,202042,,Carrizo Fiddleneck
 Amsinckia tessellata var. tessellata,devil's lettuce,N,77020,334,58852,202043,,Desert Fiddleneck
 Amsinckia vernicosa,,N,13155,335,58051,202027,,Green Fiddleneck
@@ -637,7 +638,7 @@ Elymus condensatus,giant wild-rye,N,24165,11636,164673,140055,Leymus condensatus
 Elymus elymoides var. elymoides,squirreltail,N,72180,11639,58377,211223,Elymus elymoides subsp. elymoides,Squirreltail
 Elymus glaucus subsp. glaucus,blue wildrye,N,50264,2937,57171,167143,true,Western Rye Grass
 Elymus glaucus subsp. virescens,,N,50266,2939,61203,206754,true,Blue Wildrye
-Elymus hispidus,wheatgrass,X,24153,11640,155848,140096,Thinopyrum intermedium subsp. barbulatum
+Elymus hispidus,wheatgrass,X,24153,11640,155848,140096,Thinopyrum intermedium
 Elymus mollis subsp. mollis,,N,70142,11641,118426,206755,Leymus mollis subsp. mollis,Dune Wild Rye
 Elymus multisetus,big squirreltail,N,24122,2941,57167,140134,true,Big Squirreltail
 Elymus ponticus,tall wheatgrass,X,91896,11643,1301269,206756,Thinopyrum ponticum
@@ -784,7 +785,7 @@ Festuca elmeri,Elmer fescue,N,25798,3580,64333,141011,true,Elmer Fescue
 Festuca idahoensis,Idaho fescue,N,25808,3581,61200,141076,true,Idaho Fescue
 Festuca microstachys,,N,25865,11688,77138,141123,Vulpia microstachys var. ciliata,Pacific Fescue
 Festuca myuros,zorro grass,X,25869,11689,77140,141133,Vulpia myuros
-Festuca octoflora,six-week's fescue,N,25872,11690,77141,141148,Vulpia octoflora var. hirtella,Six Weeks Fescue
+Festuca octoflora,six-week's fescue,N,25872,11690,77141,141148,Vulpia octoflora,Six Weeks Fescue
 Festuca perennis,Italian ryegrass,X,91964,11691,52801,203852,Lolium multiflorum
 Festuca rubra,red fescue,N,25825,3586,61061,141223,true,Red Fescue
 Festuca temulenta,darnel,X,93753,11692,164712,203853,Lolium temulentum
@@ -1558,7 +1559,7 @@ Romulea rosea var. australis,,X,65230,7162,68895,207249
 Rorippa curvisiliqua,yellow cress,N,41580,7168,58866,30089,true,Curvepod Yellowcress
 Rorippa palustris subsp. palustris,,N,52673,11988,64157,43562,true,Bog Yellowcress
 Rosa californica,California rose,N,41631,7179,53437,30158,true,California Wildrose,,pink
-Rosa gymnocarpa,wood rose,N,41652,7182,53441,30212,true,Baldhip Rose,,pink
+Rosa gymnocarpa,wood rose,N,41652,7182,53441,30212,true,Wood Rose,,pink
 Rosa rubiginosa,sweet-brier,X,41648,11057,78886,30313,true
 Rosa spithamea,ground rose,N,41696,7187,53442,30338,true,Ground Rose
 Rubus armeniacus,Himalayan blackberry,X,87465,10319,61317,30459
@@ -1738,7 +1739,7 @@ Stephanomeria virgata subsp. pleurocarpa,,N,6227,7806,58849,206092,true,Wand Wir
 Stipa cernua,nodding needlegrass,N,45640,12042,165654,149288,Nassella cernua,Nodding Needle Grass
 Stipa lemmonii var. lemmonii,Lemmon's needlegrass,N,73899,12053,1220756,173006,Achnatherum lemmonii subsp. lemmonii
 Stipa lepida,foothill needlegrass,N,45641,12054,165656,149399,Nassella lepida,Foothill Needlegrass
-Stipa miliacea var. miliacea,smilo grass,X,91920,12058,524183,206097,Piptatherum miliaceum subsp. miliaceum
+Stipa miliacea var. miliacea,smilo grass,X,91920,12058,524183,206097,Piptatherum miliaceum
 Stipa pulchra,purple needlegrass,N,45644,12067,165659,149498,Nassella pulchra,Purple Needlegrass
 Streptanthus albidus subsp. peramoenus,most beautiful jewelflower,N,53142,7814,58783,258754,Streptanthus glandulosus subsp. glandulosus,,,,,,1490,1B.2,,,S2,G2T2
 Streptanthus breweri,,N,45725,7822,79258,32606,true,Brewer's Jewelflower

package/lib/externalsites.js

@@ -88,20 +88,26 @@ export class ExternalSites {
     }
 
     /**
-     * @param {import("./types.js").Taxon} taxon
+     * @param {{taxon_id?:string,taxon_name?:string,subview?:"map"|"table",view?:"species"}} params
      * @param {import("./config.js").Config} config
      * @returns {URL|undefined}
      */
-    static getInatObsLink(taxon, config) {
-        const iNatID = taxon.getINatID();
-        if (!iNatID) {
-            return;
-        }
-
+    static getInatObsLink(params, config) {
         const url = new URL(
-            "https://www.inaturalist.org/observations?subview=map",
+            "https://www.inaturalist.org/observations?subview=map&iconic_taxa=Plantae",
         );
-        url.searchParams.set("taxon_id", iNatID);
+        if (params.subview) {
+            url.searchParams.set("subview", params.subview);
+        }
+        if (params.taxon_id) {
+            url.searchParams.set("taxon_id", params.taxon_id);
+        }
+        if (params.taxon_name) {
+            url.searchParams.set("taxon_name", params.taxon_name);
+        }
+        if (params.view) {
+            url.searchParams.set("view", params.view);
+        }
         for (const p of ["place_id", "project_id"]) {
             const v = config.getConfigValue("inat", p);
             if (v) {

package/lib/htmltaxon.js

@@ -60,7 +60,11 @@ const OBSLINKS = {
     },
     inat: {
         label: "iNaturalist",
-        href: (taxon, config) => ExternalSites.getInatObsLink(taxon, config),
+        href: (taxon, config) =>
+            ExternalSites.getInatObsLink(
+                { taxon_id: taxon.getINatID() },
+                config,
+            ),
     },
 };
 
@@ -120,6 +124,45 @@ class HTMLTaxon {
      */
     static addObsLink(links, taxon, config, sourceCode, label) {
         const source = OBSLINKS[sourceCode];
+        if (sourceCode === "inat") {
+            const iNatName = taxon.getINatName().split(" ");
+            /** @type {string[]} */
+            const iNatLinks = [];
+            iNatLinks.push(
+                HTML.getLink(
+                    ExternalSites.getInatObsLink(
+                        { taxon_name: iNatName[0], view: "species" },
+                        config,
+                    ),
+                    `Genus ${iNatName[0]}`,
+                    undefined,
+                    true,
+                ),
+            );
+            if (iNatName.length > 2) {
+                const species = `${iNatName[0]} ${iNatName[1]}`;
+                iNatLinks.push(
+                    HTML.getLink(
+                        ExternalSites.getInatObsLink(
+                            { taxon_name: species },
+                            config,
+                        ),
+                        species,
+                        undefined,
+                        true,
+                    ),
+                );
+            }
+            this.addLink(
+                iNatLinks,
+                source.href(taxon, config),
+                taxon.getINatSyn() ?? taxon.getName(),
+            );
+
+            const html = HTML.textElement("span", label ?? source.label);
+            links.push(html + HTML.wrap("ul", HTML.arrayToLI(iNatLinks)));
+            return;
+        }
         this.addLink(links, source.href(taxon, config), label ?? source.label);
     }
 

package/lib/tools/inat.js

@@ -3,6 +3,7 @@ import { Files } from "../files.js";
 import { CSV } from "../csv.js";
 import { sleep } from "../util.js";
 import { TaxaCSV } from "./taxacsv.js";
+import { SynCSV } from "./syncsv.js";
 
 /**
  * @typedef {{id:string,
@@ -65,8 +66,10 @@ export class INat {
 
         const missingTaxa = [];
 
-        /**@type {Map<string,string>} */
+        /** @type {Map<string,string>} */
         const idsToUpdate = new Map();
+        /** @type {import("./syncsv.js").SynData[]} */
+        const synonymsToAdd = [];
 
         for (const taxon of taxa.getTaxonList()) {
             const name = taxon.getName();
@@ -103,12 +106,14 @@ export class INat {
                 errorLog,
                 data.name,
                 data.iNatName,
+                synonymsToAdd,
             );
         }
 
         this.#checkExceptions(taxa, exceptions, errorLog);
 
         if (update) {
+            updateSynCSV(dataDir, synonymsToAdd);
             updateTaxaCSV(dataDir, idsToUpdate);
         }
     }
@@ -167,14 +172,21 @@ export class INat {
     }
 
     /**
-     *
      * @param {import("../types.js").Taxa} taxa
      * @param {import("../exceptions.js").Exceptions} exceptions
      * @param {import("../errorlog.js").ErrorLog} errorLog
      * @param {string} name
      * @param {string} iNatName
+     * @param {import("./syncsv.js").SynData[]} synonymsToAdd
      */
-    static async #findCurrentName(taxa, exceptions, errorLog, name, iNatName) {
+    static async #findCurrentName(
+        taxa,
+        exceptions,
+        errorLog,
+        name,
+        iNatName,
+        synonymsToAdd,
+    ) {
         /**
          * @param {{matched_term:string,name:string,rank:string}[]} results
          * @param {string} iNatName
@@ -242,11 +254,17 @@ export class INat {
                 }
             }
         } else {
+            const formerName = this.makeSynonymName(result, errorLog);
             errorLog.log(
                 name,
                 "found iNat synonym",
-                this.makeSynonymName(result, errorLog) + "," + name + ",INAT",
+                formerName + "," + name + ",INAT",
             );
+            synonymsToAdd.push({
+                Former: formerName,
+                Current: name,
+                Type: "INAT",
+            });
         }
 
         // Delay to throttle queries to iNat API.
@@ -297,6 +315,17 @@ class InatTaxon {
     }
 }
 
+/**
+ * @param {string} dataDir
+ * @param {import("./syncsv.js").SynData[]} synonymsToAdd
+ */
+function updateSynCSV(dataDir, synonymsToAdd) {
+    const csv = new SynCSV(dataDir);
+    const data = csv.getData();
+    data.push(...synonymsToAdd);
+    csv.write();
+}
+
 /**
  * @param {string} dataDir
  * @param {Map<string,string>} idsToUpdate

package/package.json

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