@ca-plant-list/ca-plant-list 0.4.8 → 0.4.10

package/.github/workflows/main.yml

@@ -0,0 +1,20 @@
+on:
+    workflow_dispatch:
+    pull_request:
+    push:
+
+permissions:
+    contents: read
+
+jobs:
+    check:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: latest
+                  cache: "npm"
+            - run: npm update
+            - run: npx eslint
+            - run: npx tsc

package/.vscode/settings.json

@@ -1,4 +1,9 @@
 {
-    "editor.formatOnSave": true,
-    "eslint.validate": ["javascript", "typescript"]
+    "eslint.validate": ["javascript", "typescript"],
+    "json.schemas": [
+        {
+            "fileMatch": ["exceptions.json"],
+            "url": "./schemas/exceptions.schema.json"
+        }
+    ]
 }

package/data/glossary/perianth.md

@@ -0,0 +1 @@
+The collection of petals and [sepals](./sepal.html) on a flower.

package/data/inattaxonphotos.csv

@@ -56,6 +56,8 @@ 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
+Acer campestre,451583345,jpeg,cc-by-nc,Marek Koszorek
 Acer macrophyllum,105744044,jpeg,cc-by-nc,Olivia Tittaferrante
 Acer macrophyllum,34737887,jpeg,cc-by-nc,Rene Burk
 Acer macrophyllum,30451227,jpeg,cc-by-nc,Barbara L. Wilson
@@ -76,6 +78,9 @@ Achyrachaena mollis,120782896,jpg,cc-by-nc,Sandy Bernhard
 Achyrachaena mollis,37638783,jpg,cc-by,Sula Vanderplank
 Achyrachaena mollis,3276295,JPG,cc-by-nc,James Bailey
 Achyrachaena mollis,36450224,jpg,cc-by,Mary K. Hanson
+Acmispon americanus var. americanus,137953721,jpg,cc-by-nc,Charlie Russell
+Acmispon americanus var. americanus,309771490,jpg,cc-by-nc,Dan Antonaccio
+Acmispon americanus var. americanus,135171065,jpeg,cc-by-nc,Morgan Stickrod
 Acmispon brachycarpus,70511717,jpg,cc-by-nc,Gustavo Vasquez
 Acmispon brachycarpus,126604380,jpg,cc-by,Ken-ichi Ueda
 Acmispon brachycarpus,7807378,jpg,cc-by-nc,Cat Chang
@@ -213,6 +218,7 @@ Allium peninsulare var. peninsulare,1741008,JPG,cc-by-nc,James Bailey
 Allium serra,7382660,jpg,cc-by-nc,Cat Chang
 Allium serra,797131,jpg,cc-by-nc,J. Maughn
 Allium serra,1717488,jpg,cc-by-nc,Liam O'Brien
+Allium sharsmithiae,64788581,jpeg,cc-by-nc,Morgan Stickrod
 Allium unifolium,38202930,jpg,cc-by-nc,bugg
 Allium unifolium,36594374,jpg,cc-by-nc,wyattherp
 Allophyllum divaricatum,848078,jpg,cc-by,Ken-ichi Ueda
@@ -371,6 +377,11 @@ Antirrhinum majus,34886142,jpeg,cc-by-nc,Marcel Hospers
 Antirrhinum thompsonii,41440,jpg,cc-by,Ken-ichi Ueda
 Antirrhinum thompsonii,41384,jpg,cc-by,marlin harms
 Antirrhinum thompsonii,75285845,jpg,cc-by-nc,jtomala
+Aphanes occidentalis,272953944,jpg,cc-by-nc,madge
+Aphanes occidentalis,265353003,jpg,cc-by-nc,madge
+Aphanes occidentalis,178663495,jpeg,cc-by-nc,Shane Hanofee
+Aphanes occidentalis,275727400,jpeg,cc-by-nc,Peter Zika
+Aphanes occidentalis,178663476,jpeg,cc-by-nc,Shane Hanofee
 Aphyllon californicum subsp. jepsonii,2274004,jpg,cc-by,Calibas
 Aphyllon epigalium subsp. epigalium,15224,jpg,cc-by,Ken-ichi Ueda
 Aphyllon epigalium subsp. epigalium,15225,jpg,cc-by,Ken-ichi Ueda
@@ -717,7 +728,11 @@ Bidens laevis,73368057,jpg,cc-by-nc,A Clarke
 Bidens laevis,2587585,jpg,cc-by,Michael D Fox
 Bidens laevis,512698,jpg,cc-by-nc,Matthew Herron
 Blepharizonia laxa,10507539,jpeg,cc-by,Ken-ichi Ueda
+Blepharizonia laxa,94791085,jpeg,cc0,Alex Heyman
+Blepharizonia laxa,98116007,jpg,cc-by-nc,Chloe Novak
+Blepharizonia laxa,10515436,jpg,cc-by,Ken-ichi Ueda
 Blepharizonia plumosa,89389742,jpg,cc-by-nc,Chloe Novak
+Blepharizonia plumosa,89389624,jpg,cc-by-nc,Chloe Novak
 Boechera breweri subsp. breweri,854971,jpg,cc-by-nc,Robert
 Bolboschoenus fluviatilis,5421230,jpg,cc-by-nc,sarahaj
 Bolboschoenus maritimus subsp. paludosus,132800260,jpeg,cc-by-nc,Peter Zika
@@ -904,6 +919,7 @@ Calochortus umbellatus,3061,jpg,cc-by,Ken-ichi Ueda
 Calochortus umbellatus,26898,jpg,cc-by,Tom Hilton
 Calochortus umbellatus,26897,jpg,cc-by,Tom Hilton
 Calochortus umbellatus,270671042,jpeg,cc-by-nc,Valentina L.
+Calochortus umbellatus,392254006,jpeg,cc-by-nc,Sue Lindner
 Calochortus venustus,129369125,jpeg,cc-by-nc,Denise Wight
 Calochortus venustus,91765,jpg,cc-by,Zack Abbey
 Calochortus venustus,206217015,jpg,cc-by-nc,Dan Fitzgerald (Fitz)
@@ -1473,6 +1489,8 @@ Corethrogyne filaginifolia,23537046,jpeg,cc-by-nc,Asa Spade
 Corethrogyne filaginifolia,56579,jpg,cc-by,Jerry Kirkhart
 Cornus glabrata,38925157,jpeg,cc-by-nc,Rob Irwin
 Cornus glabrata,38925165,jpeg,cc-by-nc,Rob Irwin
+Cornus glabrata,74189069,jpg,cc-by-nc,Tim Messick
+Cornus glabrata,70648152,jpg,cc-by-nc,Rob Irwin
 Cornus sericea subsp. occidentalis,89793568,jpeg,cc-by-nc,Greg Froelich
 Cornus sericea subsp. occidentalis,89793590,jpeg,cc-by-nc,Greg Froelich
 Cornus sericea subsp. sericea,89010941,jpeg,cc-by-nc,Morgan Stickrod
@@ -1986,7 +2004,6 @@ Elodea canadensis,14784467,jpeg,cc-by-nc,Sean Blaney
 Elodea canadensis,5316445,jpg,cc-by,Radio Tonreg
 Elodea canadensis,45053113,jpg,cc-by,Justin
 Elodea canadensis,57234967,jpeg,cc-by-nc,eugenezakharov
-Elymus ×gouldii,128311999,jpg,cc-by-nc,jrebman
 Elymus caput-medusae,24101478,jpeg,cc-by-nc,Rob Irwin
 Elymus caput-medusae,13162675,jpg,cc-by-nc,Jennifer Rycenga
 Elymus glaucus subsp. virescens,3807104,JPG,cc-by-nc,emwest
@@ -2002,6 +2019,7 @@ Elymus ponticus,4122272,jpg,cc-by-nc,Kathleen Sayce
 Elymus ponticus,106811004,jpg,cc-by,Jared Shorma
 Elymus ponticus,83692446,jpg,cc-by-nc,Ulysses M
 Elymus ponticus,83253203,jpeg,cc-by-nc,Phyllis Holst
+Elymus stebbinsii,449433127,jpeg,cc-by-nc,Matt Reala
 Elymus trachycaulus subsp. trachycaulus,146511572,jpg,cc-by-nc,TeMarChi
 Elymus trachycaulus subsp. trachycaulus,114083182,jpeg,cc-by-nc,John Koenig
 Elymus trachycaulus subsp. trachycaulus,163912630,jpg,cc-by,Eric Lamb
@@ -2009,6 +2027,7 @@ Elymus triticoides,389174390,jpg,cc-by-nc,Paul Barnett
 Elymus triticoides,13913918,jpg,cc-by,Jim Morefield
 Elymus triticoides,26984620,jpg,cc-by-nc,2008 Zoya Akulova
 Elymus triticoides,26984619,jpg,cc-by-nc,2010 Zoya Akulova
+Elymus ×gouldii,128311999,jpg,cc-by-nc,jrebman
 Emmenanthe penduliflora,34464275,jpg,cc-by-nc,Timothy Eric Robinson
 Emmenanthe penduliflora,263226896,jpg,cc-by-nc,nathantay
 Emmenanthe penduliflora,263226911,jpg,cc-by-nc,nathantay
@@ -2031,6 +2050,8 @@ Epilobium brachycarpum,23989929,jpg,cc-by-nc,Cat Chang
 Epilobium brachycarpum,4239069,jpg,cc-by,Andrey Zharkikh
 Epilobium brachycarpum,4239070,jpg,cc-by,Andrey Zharkikh
 Epilobium campestre,7627757,jpeg,cc-by-nc,James Bailey
+Epilobium campestre,79205774,jpg,cc-by-nc,Christian Schwarz
+Epilobium campestre,80750322,jpeg,cc-by-nc,frankiecoburn
 Epilobium canum subsp. canum,43958421,jpeg,cc-by-nc,Ron Vanderhoff
 Epilobium canum subsp. canum,158630917,jpeg,cc-by-nc,mhrains
 Epilobium canum subsp. canum,80364468,jpeg,cc-by,Millie Basden
@@ -2091,8 +2112,14 @@ Eragrostis hypnoides,164046029,jpg,cc-by-nc,Pat Deacon
 Eragrostis hypnoides,164045951,jpg,cc-by-nc,Pat Deacon
 Eragrostis mexicana subsp. virescens,4248627,jpg,cc-by-nc,Steve Jones
 Eragrostis mexicana subsp. virescens,4248602,jpg,cc-by-nc,Steve Jones
+Eragrostis mexicana subsp. virescens,421992570,jpeg,cc-by-nc,Věra Kafková
+Eragrostis mexicana subsp. virescens,421992786,jpeg,cc-by-nc,Věra Kafková
 Eragrostis pectinacea var. pectinacea,10331618,jpg,cc-by-nc,Pat Deacon
 Eremalche exilis,6527589,jpg,cc-by,W. Terry Hunefeld
+Eremalche exilis,350833945,jpg,cc-by-nc,nathantay
+Eremalche exilis,362953560,jpeg,cc-by-nc,Rachel Woodard
+Eremalche exilis,360231454,jpg,cc-by-nc,D Roy
+Eremalche exilis,358557932,jpg,cc-by-nc,James Bardo
 Eriastrum abramsii,1979365,JPG,cc-by-nc,kevinhintsa
 Eriastrum abramsii,859835,jpg,cc0,
 Eriastrum abramsii,859836,jpg,cc0,
@@ -2436,6 +2463,7 @@ Extriplex joaquinana,189169450,jpg,cc-by-nc,Dylan Winkler
 Extriplex joaquinana,122136102,jpg,cc-by,Chloe and Trevor Van Loon
 Extriplex joaquinana,189169955,jpg,cc-by-nc,Dylan Winkler
 Fallopia japonica,158604528,jpg,cc-by-nc,Lara Maynard
+Fallopia japonica,160080625,jpg,cc-by-nc,空猫 T. N
 Festuca arundinacea,29121494,jpeg,cc-by-nc,James Bailey
 Festuca arundinacea,308793068,jpeg,cc-by-nc,Věra Kafková
 Festuca arundinacea,106530308,jpg,cc-by-nc,Alexey P. Seregin
@@ -2718,6 +2746,8 @@ Hedypnois rhagadioloides,122232888,jpg,cc-by-nc,Богданович Светл
 Hedypnois rhagadioloides,34900325,jpg,cc-by-nc,Sarah
 Hedypnois rhagadioloides,3210726,JPG,cc-by-nc,James Bailey
 Helenium bigelovii,47216819,jpg,cc-by-nc,Aaron Echols
+Helenium bigelovii,316292622,jpeg,cc-by-nc,Howard W Erbe
+Helenium bigelovii,141300006,jpeg,cc-by-nc,Ethan
 Helenium puberulum,404884351,jpg,cc-by-nc,nathantay
 Helenium puberulum,404884500,jpg,cc-by-nc,nathantay
 Helenium puberulum,4037319,JPG,cc-by-nc,Chris Evers
@@ -3144,6 +3174,7 @@ Lathyrus jepsonii var. californicus,70821184,jpg,cc-by-nc,Rob Irwin
 Lathyrus latifolius,41528872,jpg,cc-by-nc,Andreas Rockstein
 Lathyrus latifolius,43406461,jpeg,cc-by-nc,mobbini
 Lathyrus latifolius,98792094,jpg,cc-by-nc,esdena
+Lathyrus latifolius,290743350,jpeg,cc-by,Gavin Slater
 Lathyrus vestitus var. vestitus,20085,jpg,cc-by,Tom Hilton
 Lathyrus vestitus var. vestitus,62792953,jpeg,cc-by-nc,shrike2
 Lathyrus vestitus var. vestitus,18307531,jpg,cc-by-nc,shrike2
@@ -3664,9 +3695,6 @@ Melilotus indicus,66820236,jpg,cc-by-nc,Alan King
 Melissa officinalis,82807082,jpg,cc-by-nc,Steve Kelley
 Melissa officinalis,115806500,jpeg,cc-by,Eleftherios Katsillis
 Melissa officinalis,122530581,jpeg,cc-by-nc,nico2007
-Mentha ×gracilis,31529239,jpg,cc-by-nc,Aleksandr Ebel
-Mentha ×piperita,4677970,jpeg,cc-by-nc,Chevaun
-Mentha ×piperita,947761,jpg,cc-by-nc,Hidetsugu Tonomura
 Mentha aquatica,437878448,jpg,cc-by-nc,mobbini
 Mentha aquatica,315881232,jpg,cc-by-nc,Иван Матершев
 Mentha aquatica,58267279,jpg,cc-by-nc,A Emmerson
@@ -3692,6 +3720,9 @@ Mentha spicata,85965702,jpg,cc0,
 Mentha spicata,1186003,jpg,cc-by,Jon Sullivan
 Mentha spicata,47507014,jpg,cc-by-nc,Chloe and Trevor Van Loon
 Mentha suaveolens,28457953,jpeg,cc-by,Duarte Frade
+Mentha ×gracilis,31529239,jpg,cc-by-nc,Aleksandr Ebel
+Mentha ×piperita,4677970,jpeg,cc-by-nc,Chevaun
+Mentha ×piperita,947761,jpg,cc-by-nc,Hidetsugu Tonomura
 Mentzelia laevicaulis var. laevicaulis,12966945,jpg,cc-by-nc,mhays
 Mentzelia lindleyi,1024864,jpg,cc-by-nc,Amelia Ryan
 Mentzelia lindleyi,119069149,jpg,cc-by,Dee Shea Himes
@@ -3885,6 +3916,11 @@ Navarretia squarrosa,79748116,jpg,cc-by-nc,Alan Siegel
 Navarretia viscidula,944084,jpg,cc0,
 Navarretia viscidula,41343887,jpg,cc-by-nc,Neil O. Frakes
 Navarretia viscidula,944083,jpg,cc0,
+Nemacladus capillaris,79260550,jpg,cc-by-nc,Damon Tighe
+Nemacladus capillaris,79260558,jpg,cc-by-nc,Damon Tighe
+Nemacladus capillaris,79260568,jpg,cc-by-nc,Damon Tighe
+Nemacladus capillaris,1026228,jpg,cc-by-nc,2013 Scot Loring
+Nemacladus capillaris,1026229,jpg,cc-by-nc,2013 Scot Loring
 Nemophila heterophylla,6852120,jpg,cc-by-nc,Michael A. Voeltz
 Nemophila heterophylla,14110056,jpeg,cc-by-nc,Rob Irwin
 Nemophila heterophylla,105517,jpg,cc-by,dloarie
@@ -3907,6 +3943,8 @@ Nicotiana acuminata var. multiflora,328298852,jpg,cc-by-nc,Dan Antonaccio
 Nicotiana attenuata,21912630,jpg,cc-by-nc,Cat Chang
 Nicotiana attenuata,21937008,jpg,cc-by-nc,Liam O'Brien
 Nicotiana attenuata,21912646,jpg,cc-by-nc,Cat Chang
+Nicotiana attenuata,163826554,jpg,cc-by,Steve Matson
+Nicotiana attenuata,163826744,jpg,cc-by,Steve Matson
 Nicotiana glauca,26703,jpg,cc-by,Scott Zona
 Nicotiana glauca,343854850,jpg,cc-by,Connor Margetts
 Nicotiana glauca,343854730,jpg,cc-by,Connor Margetts
@@ -4467,9 +4505,16 @@ Polypogon viridis,11486827,jpeg,cc-by-nc,Tim Quinn
 Polypogon viridis,129503350,jpeg,cc-by-nc,Ron Vanderhoff
 Polypogon viridis,55763555,jpeg,cc-by-nc,lern
 Polypogon viridis,71977150,jpeg,cc-by,Daniel Cahen
+Polystichum californicum,425119886,jpg,cc-by,Timothy McNitt
+Polystichum californicum,183073570,jpeg,cc-by-nc,Steve Ansell
+Polystichum californicum,449265176,jpeg,cc-by-nc,ehappy
 Polystichum imbricans subsp. imbricans,882385,jpg,cc-by,benet2006
 Polystichum imbricans subsp. imbricans,9885744,jpg,cc-by-nc,Todd Ramsden
 Polystichum munitum,879724,jpg,cc-by-nc,kqedquest
+Polystichum munitum,412744739,jpeg,cc-by-nc,mme_renn
+Polystichum munitum,382846807,jpg,cc-by-nc,myosoto
+Polystichum munitum,338428197,jpg,cc-by-nc,tuesdaytumbleweed
+Polystichum munitum,219027536,jpeg,cc0,Quentin Groom
 Populus trichocarpa,440702,png,cc-by-nc,Thayne Tuason
 Populus trichocarpa,177932421,jpg,cc-by-nc,myrrhtle
 Populus trichocarpa,8057333,jpg,cc-by-nc,Ashley Connors
@@ -4694,6 +4739,7 @@ Quercus douglasii,244111877,jpeg,cc-by-nc,kevinhintsa
 Quercus douglasii,188209585,jpeg,cc-by-nc,Mart Hughes
 Quercus douglasii,3195952,jpeg,cc-by-nc,Alex Jones
 Quercus douglasii,1701488,jpg,cc-by,Ken-ichi Ueda
+Quercus douglasii,398060264,jpeg,cc-by-nc,Marisol Villarreal
 Quercus durata var. durata,6441485,jpg,cc-by-nc,Ken-ichi Ueda
 Quercus durata var. durata,22846295,jpg,cc-by-nc,Ken-ichi Ueda
 Quercus durata var. durata,2378132,jpg,cc0,rockybajada
@@ -4806,6 +4852,7 @@ Rhinotropis californica,121640,jpg,cc-by,Don Loarie
 Rhus aromatica,3578615,jpg,cc-by-nc,Chuck Sexton
 Rhus aromatica,168104108,jpeg,cc-by-nc,Jesús Niño C.
 Rhus aromatica,14541423,jpg,cc-by,Matt Berger
+Rhus aromatica,310253516,jpg,cc-by,Catherine C. Galley
 Ribes amarum,79956311,jpg,cc-by-nc,Stephanie Calloway
 Ribes amarum,250145643,jpg,cc-by-nc,bradleytsalyuk
 Ribes californicum var. californicum,10908,jpg,cc-by,Ken-ichi Ueda
@@ -4944,12 +4991,19 @@ Ruppia maritima,41269117,jpeg,cc-by-nc,James Coquat
 Ruppia maritima,9025147,png,cc-by-nc,jiayizhou-zoe
 Rytidosperma caespitosum,415436,jpg,cc-by,Harry Rose
 Rytidosperma caespitosum,415437,jpg,cc-by,Harry Rose
+Rytidosperma caespitosum,95674316,jpg,cc-by,Kym Nicolson
+Rytidosperma caespitosum,95674356,jpg,cc-by,Kym Nicolson
+Rytidosperma caespitosum,163217365,jpg,cc-by,Ben Fisher
 Rytidosperma penicillatum,322700849,jpeg,cc-by,Kevin Faccenda
 Rytidosperma penicillatum,322700890,jpeg,cc-by,Kevin Faccenda
 Rytidosperma penicillatum,322700790,jpeg,cc-by,Kevin Faccenda
 Rytidosperma penicillatum,322700724,jpeg,cc-by,Kevin Faccenda
 Rytidosperma penicillatum,4439174,jpg,cc-by-nc,Raphaela E. Floreani Buzbee
 Rytidosperma racemosum,68345797,jpg,cc-by-nc,Margaret Alcorn
+Rytidosperma racemosum,17831219,jpg,cc-by-nc,reinderw
+Rytidosperma racemosum,108375616,jpg,cc-by-nc,reinderw
+Rytidosperma racemosum,339325287,jpeg,cc-by-nc,Kurtis
+Rytidosperma racemosum,360394861,jpg,cc-by,Petra Holland
 Sabulina douglasii,14107428,jpg,cc-by-nc,mhays
 Sabulina douglasii,1737562,jpg,cc-by,Ken-ichi Ueda
 Sabulina douglasii,1561728,JPG,cc-by-nc,kevinhintsa
@@ -4973,6 +5027,10 @@ Sagittaria latifolia,89848802,jpg,cc-by-nc,Susan Elliott
 Sagittaria latifolia,92971300,jpg,cc-by-nc,roy pilcher
 Sagittaria latifolia,10083800,jpg,cc-by-nc,Ian Bryson
 Sagittaria latifolia,4391482,jpg,cc-by-nc,Liana May
+Sagittaria montevidensis subsp. calycina,23908573,jpeg,cc-by-nc,Nathan Taylor
+Sagittaria montevidensis subsp. calycina,23776957,jpeg,cc-by-nc,Joseph D Kurtz
+Sagittaria montevidensis subsp. calycina,53648830,jpeg,cc-by-nc,jim_keesling
+Sagittaria montevidensis subsp. calycina,225270837,jpeg,cc-by-nc,pine-wood
 Salicornia depressa,23010186,jpg,cc-by-nc,Norman Welsh
 Salicornia depressa,135973750,jpg,cc-by-nc,Chase Mathey
 Salicornia pacifica,161785604,jpg,cc-by-nc,Dani Montijo
@@ -5467,6 +5525,10 @@ Stellaria pallida,66236079,jpeg,cc-by-nc,Václav Dvořák
 Stellaria pallida,173854425,jpg,cc-by-nc,Valerio Lazzeri
 Stenotaphrum secundatum,66591991,jpeg,cc-by-nc,mattward
 Stenotaphrum secundatum,126466342,jpg,cc-by-nc,Jamee Moulton
+Stephanomeria elata,4287353,jpeg,cc-by,Don Loarie
+Stephanomeria elata,421569534,jpeg,cc-by-nc,Fred Watson
+Stephanomeria elata,421706175,jpeg,cc-by-nc,Fred Watson
+Stephanomeria elata,141166677,jpg,cc0,Irene
 Stephanomeria exigua subsp. coronaria,18547528,jpg,cc-by,Jim Morefield
 Stephanomeria exigua subsp. coronaria,14048144,jpg,cc-by,Jim Morefield
 Stephanomeria virgata subsp. pleurocarpa,17618,jpg,cc-by,Ken-ichi Ueda
@@ -5640,6 +5702,8 @@ Toxicoscordion paniculatum,18853230,jpg,cc-by-nc,Frank Fogarty
 Toxicoscordion paniculatum,39029901,jpg,cc-by-nc,Rick Williams
 Toxicoscordion paniculatum,4181166,jpg,cc-by-nc,2008 Gary A. Monroe
 Toxicoscordion paniculatum,39489863,jpg,cc-by,Andrey Zharkikh
+Toxicoscordion venenosum var. venenosum,286053222,jpg,cc-by-nc,Eric Koberle
+Toxicoscordion venenosum var. venenosum,76985646,jpg,cc-by-nc,emily_jeanne
 Tradescantia fluminensis,247170901,jpeg,cc-by-nc,Johnson Chen
 Tradescantia fluminensis,96861636,jpeg,cc-by-nc,Lucía Rodríguez-Tricot
 Tradescantia fluminensis,46110772,jpeg,cc-by-nc,金翼白眉

package/data/taxa.csv

@@ -1255,6 +1255,8 @@ Navarretia pubescens,downy pincushion,N,34471,5804,58976
 Navarretia squarrosa,skunkweed,N,34475,5807,53157
 Navarretia tagetina,,N,34477,5809,60226
 Navarretia viscidula,sticky navarretia,N,34478,5810,78195
+Nemacladus capillaris,common threadplant,N,34503,5815,78199,annual,white,5,7
+Nemacladus montanus,mountain threadplant,N,34508,5824,78203,annual,white,5,7
 Nemophila heterophylla,,N,34539,5834,53158,,white,2,6
 Nemophila menziesii var. atomaria,,N,62279,5837,50647,,white,2,6
 Nemophila menziesii var. menziesii,baby blue-eyes,N,62285,5839,50650
@@ -1771,9 +1773,9 @@ Torilis arvensis,tall sock-destroyer,X,46743,8004,56846
 Torilis nodosa,short sock-destroyer,X,46747,8007,53304
 Torreyochloa pallida var. pauciflora,,N,67197,8010,81431
 Toxicodendron diversilobum,poison-oak,N,46791,8015,51080,,white
-Toxicoscordion fremontii,zigadene,N,89163,11103,49649,,white
-Toxicoscordion paniculatum,,N,46802,11105,79380
-Toxicoscordion venenosum var. venenosum,death-camas,N,93851,11106,81432
+Toxicoscordion fremontii,zigadene,N,89163,11103,49649,bulb,white,2,6
+Toxicoscordion paniculatum,,N,46802,11105,79380,bulb,white,5,6
+Toxicoscordion venenosum var. venenosum,death-camas,N,93851,11106,81432,bulb,white,5,7
 Tradescantia fluminensis,,X,77137,8017,79382
 Tragopogon porrifolius,salsify,X,5449,8020,54141
 Trianthema portulacastrum,,N,46920,8023,79390

package/data/text/Toxicoscordion-fremontii.md

@@ -0,0 +1 @@
+Leaves 8-30 mm wide. [Perianth](./perianth.html) parts 5-15 mm long.

package/data/text/Toxicoscordion-paniculatum.md

@@ -0,0 +1 @@
+Leaves 6-16 mm wide. [Perianth](./perianth.html) parts 2-6 mm long. Perianth parts unequal, outer parts generally without claws, inner parts with claws. Stamens at least as long as perianth parts.

package/data/text/Toxicoscordion-venenosum-var-venenosum.md

@@ -0,0 +1 @@
+Leaves 4-10 mm wide. [Perianth](./perianth.html) parts 4-6 mm long. Stamens at least as long as perianth parts.

package/ebook/css/main.css

@@ -12,6 +12,14 @@ div.section {
     margin-bottom: .5rem;
 }
 
+div.photos {
+    display: flex;
+}
+
+figure {
+    margin: auto;
+}
+
 img.flr-color {
     padding-right: .25rem;
     width: 1rem;
@@ -29,4 +37,4 @@ span.lcs {
 /* Glossary */
 div.glossary img {
     max-height: 300px;
-}
+}

package/eslint.config.mjs

@@ -1,13 +1,13 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+
+/** @type {import('eslint').Linter.Config[]} */
 export default [
+    { files: ["**/*.{js,mjs,cjs}"], ignores: ["output/**"] },
     {
-        rules: {
-            indent: ["error", 4, {
-                SwitchCase: 1,
-            }],
-
-            "linebreak-style": ["error", "unix"],
-            quotes: ["error", "double"],
-            semi: ["error", "always"],
+        languageOptions: {
+            globals: { ...globals.browser, ...globals.node, bootstrap: false },
         },
-    }
+    },
+    pluginJs.configs.recommended,
 ];

package/lib/csv.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { finished } from "stream/promises";
 import { parse as parseSync } from "csv-parse/sync";
 import { parse } from "csv-parse";
+import { stringify } from "csv-stringify/sync";
 
 class CSV {
     /**
@@ -57,12 +58,10 @@ class CSV {
      * @param {string} fileName
      * @param {boolean|import("csv-parse").ColumnOption[]|function (string[]):string[]} [columns]
      * @param {string} [delimiter]
+     * @deprecated use readFile
      */
     static parseFile(dir, fileName, columns = true, delimiter) {
-        const content = fs.readFileSync(dir + "/" + fileName);
-
-        const options = this.#getOptions(fileName, columns, delimiter);
-        return parseSync(content, options);
+        return this.readFile(dir + "/" + fileName, columns, delimiter);
     }
 
     /**
@@ -77,7 +76,7 @@ class CSV {
         fileName,
         columns = true,
         delimiter,
-        callback
+        callback,
     ) {
         const options = this.#getOptions(fileName, columns, delimiter);
         const processFile = async () => {
@@ -98,6 +97,29 @@ class CSV {
         // Parse the CSV content
         await processFile();
     }
+
+    /**
+     * @param {string} fileName
+     * @param {boolean|import("csv-parse").ColumnOption[]|function (string[]):string[]} [columns]
+     * @param {string} [delimiter]
+     */
+    static readFile(fileName, columns = true, delimiter) {
+        const content = fs.readFileSync(fileName);
+        const options = this.#getOptions(fileName, columns, delimiter);
+        return parseSync(content, options);
+    }
+
+    /**
+     *
+     * @param {string} fileName
+     * @param {string[][]} data
+     * @param {string[]} [headerData]
+     */
+    static writeFile(fileName, data, headerData) {
+        const header = headerData ? stringify([headerData]) : "";
+        const content = header + stringify(data);
+        fs.writeFileSync(fileName, content);
+    }
 }
 
 export { CSV };

package/lib/ebook/images.js

@@ -1,20 +1,15 @@
 import * as fs from "node:fs";
-import path from "node:path";
 
 import sharp from "sharp";
 
 import { EBook } from "./ebook.js";
-import { Config } from "../config.js";
-import { CSV } from "../csv.js";
 import { Files } from "../files.js";
-import { TaxonImage } from "./taxonimage.js";
+import { ProgressMeter } from "../progressmeter.js";
 
 class Images {
     #siteGenerator;
     #contentDir;
     #taxa;
-    /** @type {Object<string,TaxonImage[]>} */
-    #images = {};
 
     /**
      * @param {SiteGenerator} siteGenerator
@@ -27,53 +22,63 @@ class Images {
         this.#taxa = taxa;
     }
 
-    async createImages() {
+    /**
+     * @param {Taxon[]} taxa
+     */
+    async createImages(taxa) {
+        const meter = new ProgressMeter("processing photos", taxa.length);
+
+        const width = 300;
+        const quality = 40;
+
         const photoDirSrc = "external_data/photos";
-        const imagePrefix = "i";
-        const photoDirTarget = this.#contentDir + "/" + imagePrefix;
-        fs.mkdirSync(photoDirSrc, { recursive: true });
-        fs.mkdirSync(photoDirTarget, { recursive: true });
-
-        const rows = CSV.parseFile(
-            Config.getPackageDir() + "/data",
-            "photos.csv"
+        const photoDirCache = `external_data/photos-${width}-${quality}`;
+        [photoDirSrc, photoDirCache, this.#contentDir + "/i"].forEach((dir) =>
+            fs.mkdirSync(dir, { recursive: true }),
         );
-        for (const row of rows) {
-            const name = row["taxon_name"];
-            const taxon = this.#taxa.getTaxon(name);
-            if (!taxon) {
-                continue;
-            }
 
-            let imageList = this.#images[name];
-            if (!imageList) {
-                imageList = [];
-                this.#images[name] = imageList;
+        let downloadCount = 0;
+        let compressCount = 0;
+        let copyCount = 0;
+
+        for (let index = 0; index < taxa.length; index++) {
+            const taxon = taxa[index];
+            const photos = Images.getTaxonPhotos(taxon);
+            for (const photo of photos) {
+                const ext = photo.getExt();
+                const cachedFileName = `${photoDirCache}/${this.getCompressedImageName(photo)}`;
+
+                if (!fs.existsSync(cachedFileName)) {
+                    const srcFileName = `${photoDirSrc}/${photo.getId()}.${ext}`;
+                    // Compress and cache source file.
+                    if (!fs.existsSync(srcFileName)) {
+                        // Retrieve original file.
+                        if (!fs.existsSync(srcFileName)) {
+                            // File is not there; retrieve it.
+                            await Files.fetch(photo.getUrl(), srcFileName);
+                            downloadCount++;
+                        }
+                    }
+                    await sharp(srcFileName)
+                        .resize({ width: width })
+                        .jpeg({ quality: quality })
+                        .toFile(cachedFileName);
+                    compressCount++;
+                }
+
+                fs.copyFileSync(
+                    cachedFileName,
+                    this.getCompressedFilePath(photo),
+                );
+                copyCount++;
             }
-
-            const src = new URL(row["source"]);
-            const parts = path.parse(src.pathname).dir.split("/");
-            const prefix = src.host.includes("calflora") ? "cf-" : "inat-";
-            const filename = prefix + parts.slice(-1)[0] + ".jpg";
-            const srcFileName = photoDirSrc + "/" + filename;
-            const targetFileName = photoDirTarget + "/" + filename;
-
-            if (!fs.existsSync(srcFileName)) {
-                // File is not there; retrieve it.
-                console.log("retrieving " + srcFileName);
-                await Files.fetch(src, srcFileName);
-            }
-
-            await sharp(srcFileName)
-                .resize({ width: 300 })
-                .jpeg({ quality: 40 })
-                .toFile(targetFileName);
-
-            imageList.push(
-                new TaxonImage(imagePrefix + "/" + filename, row["credit"])
-            );
+            meter.update(index + 1, {
+                custom: ` | ${copyCount} copied - ${compressCount} compressed - ${downloadCount} downloaded`,
+            });
         }
 
+        meter.stop();
+
         this.#siteGenerator.copyIllustrations(this.#taxa.getFlowerColors());
     }
 
@@ -88,8 +93,8 @@ class Images {
                 EBook.getManifestEntry(
                     "i" + index,
                     "i/" + fileName,
-                    EBook.getMediaTypeForExt(ext)
-                )
+                    EBook.getMediaTypeForExt(ext),
+                ),
             );
         }
 
@@ -97,10 +102,32 @@ class Images {
     }
 
     /**
-     * @param {string} name
+     * @param {Photo} photo
+     * @returns {string}
+     */
+    getCompressedFilePath(photo) {
+        return `${this.#contentDir}/i/${this.getCompressedImageName(photo)}`;
+    }
+
+    /**
+     * @param {Photo} photo
+     * @returns {string}
      */
-    getTaxonImages(name) {
-        return this.#images[name];
+    getCompressedImageName(photo) {
+        return `${photo.getId()}.${photo.getExt().toLowerCase()}`;
+    }
+
+    /**
+     * @param {Taxon} taxon
+     * @returns {Photo[]}
+     */
+    static getTaxonPhotos(taxon) {
+        const photos = taxon
+            .getPhotos()
+            .filter((photo) =>
+                ["jpg", "jpeg"].includes(photo.getExt().toLowerCase()),
+            );
+        return photos.length > 0 ? [photos[0]] : photos;
     }
 }