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

package/data/synonyms.csv

@@ -686,6 +686,7 @@ Erigeron peregrinus var. callianthemus,Erigeron glacialis var. glacialis
 Eriocoma lemmonii subsp. lemmonii,Stipa lemmonii var. lemmonii,INAT
 Eriogonella membranacea,Chorizanthe membranacea
 Eriogonum acetoselloides,Eriogonum gracile var. gracile
+Eriogonum arachnoideum,Eriogonum latifolium
 Eriogonum auriculatum,Eriogonum nudum var. auriculatum
 Eriogonum caninum,Eriogonum luteolum var. caninum
 Eriogonum curvatum,Eriogonum wrightii var. subscaposum
@@ -706,6 +707,7 @@ Eriogonum lobbii var. minus,Eriogonum lobbii
 Eriogonum marifolium var. incanum,Eriogonum incanum
 Eriogonum nivale,Eriogonum ovalifolium var. nivale
 Eriogonum nudum subsp. pauciflorum,Eriogonum nudum var. pauciflorum
+Eriogonum oblongifolium,Eriogonum latifolium
 Eriogonum polifolium,Eriogonum fasciculatum var. polifolium
 Eriogonum polyanthum var. bahiiforme,Eriogonum umbellatum var. bahiiforme
 Eriogonum revolutum,Eriogonum fasciculatum var. polifolium
@@ -1096,6 +1098,7 @@ Linum micranthum,Hesperolinon micranthum
 Linum perenne subsp. lewisii,Linum lewisii var. lewisii
 Lippia lanceolata,Phyla lanceolata
 Lithophragma affine subsp. mixtum,Lithophragma affine
+Lithophragma parviflorum,Lithophragma parviflorum var. parviflorum,INAT
 Lithophragma scabrella,Lithophragma bolanderi
 Lithophragma tripartitum,Lithophragma affine
 Lolium arundinaceum,Festuca arundinacea,INAT
@@ -1152,7 +1155,6 @@ Lupinus congdonii,Lupinus bicolor
 Lupinus densiflorus,Lupinus microcarpus var. densiflorus
 Lupinus densiflorus var. aureus,Lupinus microcarpus var. densiflorus
 Lupinus densiflorus var. austrocollium,Lupinus microcarpus var. microcarpus
-Lupinus densiflorus var. densiflorus,Lupinus microcarpus var. densiflorus,INAT
 Lupinus densiflorus var. palustris,Lupinus microcarpus var. microcarpus
 Lupinus densiflorus var. persecundus,Lupinus microcarpus var. microcarpus
 Lupinus nanus subsp. apricus,Lupinus nanus
@@ -1689,6 +1691,7 @@ Quercus lobata f. rarita,Quercus lobata
 Quercus lobata var. lobata,Quercus lobata
 Quercus lobata var. turbinata,Quercus lobata
 Quercus lobata var. walteri,Quercus lobata
+Ranunculus aquatilis,Ranunculus aquatilis var. aquatilis,INAT
 Ranunculus aquatilis var. capillaceus,Ranunculus aquatilis var. diffusus
 Ranunculus aquatilis var. harrisii,Ranunculus aquatilis var. diffusus
 Ranunculus aquatilis var. hispidulus,Ranunculus aquatilis var. aquatilis

package/data/taxa.csv

@@ -37,11 +37,12 @@ Aegilops triuncialis,barbed goatgrass,X,11997,107,60272,134011,true
 Aesculus californica,California buckeye,N,12026,111,53348,9383,,California Buckeye,,white
 Ageratina adenophora,,X,735,117,64114,201878,true
 Agoseris apargioides var. apargioides,,N,6310,122,58797,201889,true,Coast Dandelion
-Agoseris grandiflora var. grandiflora,perennial,N,79217,10490,80331,201900,true,Giant Mountain Dandelion,,yellow,4,7
-Agoseris heterophylla var. cryptopleura,annual,N,6324,10758,80333,206485,true,,,yellow,5,6
-Agoseris heterophylla var. heterophylla,,N,6323,9654,56859,206486,true
+Agoseris grandiflora var. grandiflora,big mountain dandelion,N,79217,10490,80331,201900,true,Giant Mountain Dandelion,perennial,yellow,4,7
+Agoseris heterophylla var. cryptopleura,mountain dandelion,N,6324,10758,80333,206485,true,,annual,yellow,5,6
+Agoseris heterophylla var. heterophylla,annual false dandelion,N,6323,9654,56859,206486,true,,annual,yellow,5,6
 Agoseris heterophylla,,N,794,132,56856,201901,true,Annual Agoseris
-Agoseris retrorsa,,N,797,133,57908,201902,true,Spearleaf Agoseris
+Agoseris hirsuta,Coast Range agoseris,N,777,10491,61169,206487,true,Coast Range Agoseris,perennial,yellow,4,6
+Agoseris retrorsa,spearleaf agoseris,N,797,133,57908,201902,true,Spearleaf Agoseris,perennial,yellow,4,8
 Agrostis avenacea,blown grass,X,12268,138,288066,134238,Lachnagrostis filiformis
 Agrostis capillaris,colonial bent,X,12276,140,75312,134268,true
 Agrostis exarata,spike redtop,N,12284,143,59088,134320,true,Spike Bentgrass
@@ -237,7 +238,7 @@ Brickellia californica,California brickelbush,N,1794,1152,58803,202493,true,Bric
 Briza maxima,quaking grass,X,16135,1165,57157,136989,true
 Briza minor,little quaking grass,X,16137,1166,57162,136993,true
 Brodiaea elegans subsp. elegans,harvest brodiaea,N,49461,1175,57127,202520,true,Harvest Brodiaea,corm,purple,4,8
-Brodiaea terrestris subsp. terrestris,,N,49464,1188,59081,202533,true,Dwarf Brodiaea,corm
+Brodiaea terrestris subsp. terrestris,,N,49464,1188,59081,202533,true,Dwarf Brodiaea,corm,purple,4,7
 Bromus arenarius,Australian chess,X,16216,1191,58368,137101,true
 Bromus berteroanus,Chilean chess,X,16219,9740,75897,137110,true
 Bromus catharticus var. catharticus,rescue grass,X,85279,11433,80494,169088,true
@@ -275,9 +276,9 @@ Callitriche marginata,water-starwort,N,16692,1259,58093,64128,true,Winged Water
 Callitriche trochlearis,,N,16702,1261,69994,64137,true,Effluent Water-starwort
 Calochortus albus,white globe lily,N,16710,1264,51315,202570,true,White Globe Lily,,white,4,6
 Calochortus argillosus,clay mariposa lily,N,76542,1268,64330,202576,true,Clay Mariposa Lily,bulb,"white,pink",4,6
-Calochortus clavatus var. pallidus,bulb,N,55455,1275,58360,202583,true,Pale Yellow Mariposa
-Calochortus invenustus,bulb,N,16733,1284,64432,202590,true,Plain Mariposa Lily
-Calochortus leichtlinii,bulb,N,16735,1288,52542,202594,true,Leichtlin's Mariposa Lily
+Calochortus clavatus var. pallidus,,N,55455,1275,58360,202583,true,Pale Yellow Mariposa
+Calochortus invenustus,,N,16733,1284,64432,202590,true,Plain Mariposa Lily
+Calochortus leichtlinii,,N,16735,1288,52542,202594,true,Leichtlin's Mariposa Lily
 Calochortus luteus,yellow mariposa lily,N,16737,1290,51077,202595,true,Yellow Mariposa Lily,bulb,yellow,4,6
 Calochortus pulchellus,Mt. Diablo fairy lantern,N,16755,1303,47326,202609,true,Mt. Diablo Fairy Lantern,bulb,,,,50,1B.2,,,S2,G2
 Calochortus splendens,,N,16759,1306,58361,202611,true,Splendid Mariposa Lily,bulb
@@ -307,7 +308,7 @@ Camissoniopsis intermedia,,N,89203,11455,75982,12189,true,Intermediate Suncup
 Camissoniopsis micrantha,,N,89206,11458,75985,12192,true,Small Flowered Evening Primrose
 Capsella bursa-pastoris,shepherd's purse,X,17109,1472,56121,12296,true
 Cardamine californica,"milkmaids,tooth wort",N,76456,1479,49651,12325,true,Milk Maids
-Cardamine hirsuta,,X,17158,1486,55829,12347,true
+Cardamine hirsuta,hairy bittercress,X,17158,1486,55829,12347,true
 Cardamine oligosperma,,N,17171,1493,52981,12369,true,Little Western Bittercress
 Carduus pycnocephalus subsp. pycnocephalus,Italian thistle,X,82221,11464,79672,202704,true
 Carduus tenuiflorus,,X,1902,1505,53007,202705,true
@@ -364,7 +365,7 @@ Ceanothus thyrsiflorus,blue blossom,N,18501,1830,56617,12790,true,Blueblossom Ce
 Centaurea calcitrapa,purple star-thistle,X,1922,1845,56865,202776,true
 Centaurea cyanus,"bachelor's button,cornflower",X,1925,1846,933404,202778,true
 Centaurea iberica,Iberian starthistle,X,1931,1849,76212,206620,true
-Centaurea melitensis,"tocalote,Maltese start-thistle",X,1934,1851,57922,202785,true
+Centaurea melitensis,"tocalote,Maltese star-thistle",X,1934,1851,57922,202785,true
 Centaurea solstitialis,yellow star-thistle,X,1946,1853,52588,202793,true
 Centranthus ruber,red valerian,X,18595,1864,57283,202799
 Centromadia fitchii,Fitch's spikeweed,N,77593,10809,58804,202801,true,Fitch Spikeweed
@@ -443,7 +444,7 @@ Claytonia exigua subsp. glauca,,N,76949,2233,57229,127855,true,Serpentine Spring
 Claytonia gypsophiloides,candy stripers,N,19620,2234,55344,112597,true,Gypsum Springbeauty,annual,pink,3,5
 Claytonia parviflora subsp. parviflora,,N,74695,2242,58296,127861,true,Utah Miner's Lettuce,"annual,perennial",white,3,6
 Claytonia perfoliata subsp. mexicana,,N,76956,2245,53004,127866,true,Southern Miner's Lettuce,annual,white,2,4
-Claytonia perfoliata subsp. perfoliata,Miner's lettuce,N,49921,2246,53002,127867,true,Miner's Lettuce,annual,white,1,5
+Claytonia perfoliata subsp. perfoliata,miner's lettuce,N,49921,2246,53002,127867,true,Miner's Lettuce,annual,white,1,5
 Claytonia rubra subsp. depressa,red stem spring beauty,N,76957,2248,79751,127869,true,Miner's Lettuce,annual,white,2,4
 Clematis lasiantha,pipestems,N,19682,2254,49876,13749,true,Chaparral Clematis,,white,1,6
 Clematis ligusticifolia,virgin's bower,N,19683,2255,58996,13750,true,Virgin's Bower,,white,6,9
@@ -701,6 +702,7 @@ Eriogonum fasciculatum var. polifolium,,N,58546,3247,58272,129983,true,Interior
 Eriogonum gracile var. gracile,slender buckwheat,N,58563,3257,58982,129999,true,Slender Woolly Wild Buckwheat
 Eriogonum incanum,frosted buckwheat,N,24809,3279,62680,114044,true,Frosted Wild Buckwheat,perennial,yellow,6,9
 Eriogonum inerme var. inerme,unarmed buckwheat,N,58586,9110,80799,130026,true,Unarmed Wild Buckwheat
+Eriogonum latifolium,seaside wild buckwheat,N,24832,3293,57211,114060,true,Coast Buckwheat,perennial,"white,pink",1,12
 Eriogonum lobbii,granite buckwheat,N,24839,9935,77005,114067,true,Lobb's Buckwheat,perennial,"white,pink",6,8
 Eriogonum luteolum var. caninum,Tiburon buckwheat,N,58623,3297,61205,130067,true,Tiburon Buckwheat,,,,,733,1B.2,,,S2,G5T2
 Eriogonum luteolum var. luteolum,,N,58624,3298,64226,130068,true,Golden-carpet Wild Buckwheat
@@ -835,7 +837,7 @@ Geranium molle,cranes-bill geranium,X,26729,3800,53076,22359
 Geranium potentilloides,,X,26735,3802,77258,22368
 Geranium purpureum,little robin,X,77514,8594,57643,22370
 Geranium robertianum,,X,26742,3806,55925,22376
-Geranium rotundifolium,,X,26743,3808,77261,22377
+Geranium rotundifolium,round-leaved crane's-bill,X,26743,3808,77261,22377
 Gilia achilleifolia subsp. achilleifolia,,N,50744,3813,51101,95568,,California Gilia
 Gilia achilleifolia subsp. multicaulis,,N,50745,3814,51102,95570,,California Gilia
 Gilia capitata subsp. capitata,,N,50764,3834,57798,95588,,Bluehead Gilia
@@ -894,7 +896,7 @@ Heterotheca grandiflora,telegraph weed,N,3419,4142,58831,204286,true,Telegraph W
 Heterotheca oregona var. rudis,Oregon goldenaster,N,7614,4146,,206910,true
 Heterotheca oregona var. scaberrima,goldenaster,N,7616,4147,80937,204289,true
 Heterotheca sessiliflora subsp. bolanderi,Bolander's goldenaster,N,74443,4151,61170,204291,true,Bolander's Goldenaster
-Heterotheca sessiliflora subsp. echioides,,N,74445,4152,58834,204292,true,Bristly Goldenaster
+Heterotheca sessiliflora subsp. echioides,bristly goldenaster,N,74445,4152,58834,204292,true,Bristly Goldenaster
 Heuchera micrantha,alumroot,N,28126,4171,51274,22981,true,Crevice Alumroot
 Hibiscus lasiocarpos var. occidentalis,rose-mallow,N,91751,11194,80940,266649,,Rose Mallow,,,,,906,1B.2,,,S3,G5T3
 Hieracium albiflorum,white hawkweed,N,3471,4184,63937,204303,true,White Hawkweed
@@ -920,7 +922,7 @@ Hordeum murinum subsp. leporinum,,X,50971,4227,52795,204330,true
 Hordeum murinum subsp. murinum,,X,50972,4228,63333,167373,true
 Horkelia californica var. californica,California horkelia,N,81857,11731,237030,48514,true,California Horkelia
 Horkelia californica var. elata,tall horkelia,N,81856,11732,80945,48515,true,California Honeydew
-Horkelia californica var. frondosa,leafy horkelia,N,81858,11733,,48516,true,California Horkelia
+Horkelia californica var. frondosa,leafy horkelia,N,81858,11733,1629357,48516,true,California Horkelia
 Horkelia cuneata var. sericea,Kellogg's horkelia,N,81861,11738,80951,48524,true,Kellogg's Horkelia,,,,,910,1B.1,,,S1?,G4T1?
 Hornungia procumbens,,X,81333,11748,77452,23250,true
 Hosackia crassifolia var. crassifolia,,N,91757,11750,80960,48541,,Big Deervetch
@@ -1082,17 +1084,17 @@ Lithophragma affine,woodland star,N,31236,4922,50803,24525,true,San Francisco Wo
 Lithophragma bolanderi,,N,31238,4923,77787,24527,true,Bolander's Woodland Star,perennial,white,2,7
 Lithophragma cymbalaria,,N,31241,4925,58323,24531,true,Mission Woodland Star,perennial,white,3,5
 Lithophragma heterophyllum,hill starflower,N,31244,4927,53124,24533,true,Hillside Woodland Star,perennial,white,2,6
-Lithophragma parviflorum var. parviflorum,,N,60952,4930,81027,48936,Lithophragma parviflorum,Smallflower Woodland-star,perennial,"white,pink",3,7
+Lithophragma parviflorum var. parviflorum,,N,60952,4930,77791,48936,Lithophragma parviflorum,Smallflower Woodland-star,perennial,"white,pink",3,7
 Lobularia maritima,sweet alyssum,X,31347,4939,56992,24547,true
 Logfia filaginoides,herba impia,N,81847,10960,64254,204735,true,California Cottonrose,annual,red,2,5
 Logfia gallica,,X,31363,9521,56949,204736,true,,annual,"brown,yellow",3,7
 Lomatium californicum,chu-chu-pate,N,31389,4950,56824,204737,,California Lomatium,,yellow,4,6
 Lomatium caruifolium var. caruifolium,,N,61026,4953,64328,204739,,Alkali Desertparsley
 Lomatium caruifolium var. denticulatum,,N,61027,4954,60123,204740
-Lomatium dasycarpum subsp. dasycarpum,,N,51334,4960,56829,204743,,Woolly Fruited Lomatium,,white,3,6
-Lomatium macrocarpum,,N,31433,4974,56826,204754,,Bigseed Biscuitroot
+Lomatium dasycarpum subsp. dasycarpum,,N,51334,4960,56829,204743,,Woolly Fruited Lomatium,perennial,white,3,6
+Lomatium macrocarpum,,N,31433,4974,56826,204754,,Bigseed Biscuitroot,perennial,white,4,6
 Lomatium nudicaule,,N,31441,4983,77818,204759,,Barestem Biscuitroot
-Lomatium utriculatum,,N,31473,4999,56827,204766,,Common Lomatium,,yellow,2,5
+Lomatium utriculatum,,N,31473,4999,56827,204766,,Common Lomatium,perennial,yellow,2,5
 Lonicera hispidula,California honeysuckle,N,31505,10075,53416,204768,,Pink Honeysuckle,,pink,5,6
 Lonicera interrupta,chaparral honeysuckle,N,31506,5009,60878,204770,,Chaparral Honeysuckle,,"yellow,white",4,5
 Lonicera involucrata var. ledebourii,black twinberry,N,61081,5012,60990,204773,,Twinberry Honeysuckle
@@ -1117,7 +1119,7 @@ Lupinus latifolius var. dudleyi,,N,76660,5161,81063,49195,,Broadleaf Lupine
 Lupinus latifolius var. latifolius,"broadleaf lupine,wood lupine",N,75772,5162,64242,204794,,Broad Leaf Lupine,perennial,blue,4,9
 Lupinus littoralis var. variicolor,,N,80538,14304,,49237
 Lupinus luteolus,butter lupine,N,31956,5176,77875,25020,,Pale Yellow Lupine
-Lupinus microcarpus var. densiflorus,,N,76668,5184,241537,49248,,Dense Flowered Platycarpos,annual,"yellow,white",4,6
+Lupinus microcarpus var. densiflorus,,N,76668,5184,57058,49248,,Dense Flowered Platycarpos,annual,"yellow,white",4,6
 Lupinus microcarpus var. microcarpus,chick lupine,N,75776,5186,58159,204796,,Valley Lupine,annual,"pink,blue",3,6
 Lupinus nanus,sky lupine,N,31978,5189,50612,25068,,Sky Lupine,,blue,3,6
 Lupinus pachylobus,big pod lupine,N,31998,5196,50613,25085,,Big Pod Lupine
@@ -1196,8 +1198,8 @@ Mercurialis annua,annual mercury,X,33300,5450,68838,25939,true
 Mesembryanthemum nodiflorum,,X,33363,5461,71191,116177,true
 Micranthes californica,,N,91942,11841,78023,26022,true,California Saxifrage
 Micropus amphibolus,,N,33474,5462,78034,204946,true,Mount Diablo Cottonseed,,,,,1507,3.2,,,S3S4,G3G4
-Micropus californicus var. californicus,slender cottonweed,N,7993,5464,58030,204950,true,Cottontop
-Micropus californicus var. subvestitus,,N,7994,5465,81107,207081,true,Q-tips
+Micropus californicus var. californicus,slender cottonweed,N,7993,5464,58030,204950,true,Cottontop,annual,white,3,6
+Micropus californicus var. subvestitus,Q-tips,N,7994,5465,81107,207081,true,Q-tips,annual,white,4,6
 Microseris acuminata,,N,4146,5466,60142,204953,true,Sierra Foothill Silverpuffs
 Microseris bigelovii,,N,4147,5467,60977,204954,true,Coastal Silverpuffs
 Microseris campestris,,N,4149,5469,58031,204955,true,San Joaquin Silverpuffs
@@ -1517,7 +1519,7 @@ Quercus parvula var. shrevei,,N,76907,7005,81314,50722,,Shreve Oak
 Quercus wislizeni var. frutescens,,N,64776,7011,58914,50761,,Interior Live Oak
 Quercus wislizeni var. wislizeni,interior live oak,N,64777,7012,58915,50762,Quercus wislizeni,Interior Live Oak
 Rafinesquia californica,California chicory,N,4548,7013,53193,205716,true,California Plumseed
-Ranunculus aquatilis var. aquatilis,,N,73500,10676,81320,50797,true
+Ranunculus aquatilis var. aquatilis,,N,73500,10676,78817,50797,true
 Ranunculus aquatilis var. diffusus,water buttercup,N,80687,11969,486980,50802,true,Hairleaf Water Buttercup
 Ranunculus californicus,California buttercup,N,40867,7032,52173,29565,true,California Buttercup,,yellow
 Ranunculus canus var. canus,,N,73506,11972,81324,50832,true
@@ -1534,7 +1536,7 @@ Raphanus raphanistrum,jointed charlock,X,40991,7063,55411,29701,true
 Raphanus sativus,wild radish,X,40992,7064,995125,29702,true
 Ravenella exigua,chaparral harebell,N,84837,14672,1342787,412341,,,,,,,265,1B.2,,,S2,G2
 Ravenella griffinii,,N,84836,14796,1342789,412342
-Ravenella sharsmithiae,,N,108392,14673,1342786,208086,,,,,,,267,1B.2,,,S1S2,G1G2
+Ravenella sharsmithiae,,N,108392,14673,1342786,432222,,,,,,,267,1B.2,,,S1S2,G1G2
 Rhamnus alaternus,Italian buckthorn,X,81104,9447,82856,29726,true
 Rhamnus crocea,spiny redberry,N,41069,7075,57243,29736,true,Spiny Redberry
 Rhamnus ilicifolia,holly-leaf redberry,N,41070,7076,58308,29743,true,Hollyleaf Redberry
@@ -1562,6 +1564,7 @@ Rosa californica,California rose,N,41631,7179,53437,30158,true,California Wildro
 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
+Rosa woodsii,Woods' rose,N,41704,,78887,30370,true,Woods' Rose,perennial,pink
 Rubus armeniacus,Himalayan blackberry,X,87465,10319,61317,30459
 Rubus laciniatus,cutleaf blackberry,X,42009,7195,78891,30698,true
 Rubus parviflorus,thimbleberry,N,42108,7200,51646,30808,true,Thimbleberry
@@ -1715,12 +1718,12 @@ Spergularia villosa,hairy sand-spurrey,X,45096,7717,60173,119423,true
 Spiranthes porrifolia,,N,45262,7740,50742,206062,true,Creamy Lady's Tresses
 Spiranthes romanzoffiana,,N,45264,7741,50743,206063,true,Irish Lady's-tresses
 Sporobolus airoides,alkali sacaton,N,45286,7744,60313,149026,true,Alkali Sacaton
-Sporobolus alterniflorus,saltwater cordgrass,X,82872,7699,772903,148951,Spartina alterniflora
-Sporobolus densiflorus,dense-flowered cordgrass,X,108405,7700,169300,148961,Spartina densiflora
+Sporobolus alterniflorus,saltwater cordgrass,X,82872,7699,772903,432224,Spartina alterniflora
+Sporobolus densiflorus,dense-flowered cordgrass,X,108405,7700,169300,432225,Spartina densiflora
 Sporobolus foliosus,California cordgrass,N,82873,7701,772992,208714,Spartina foliosa
 Sporobolus indicus,smutgrass,X,45308,7749,79187,149101,true
 Sporobolus niliacus,,X,82876,2440,773022,397065,Crypsis vaginiflora
-Sporobolus pumilus,saltmeadow cordgrass,X,82878,7703,773004,148979,Spartina patens
+Sporobolus pumilus,saltmeadow cordgrass,X,82878,7703,773004,432226,Spartina patens
 Sporobolus schoenoides,swamp grass,X,82879,2439,773038,397066,Crypsis schoenoides
 Stachys ajugoides,hedge nettle,N,45338,7751,53295,77371,,Ajuga Hedge Nettle
 Stachys albens,,N,45339,7754,58192,77372,,White Hedge Nettle
@@ -1833,8 +1836,8 @@ Triphysaria eriantha subsp. eriantha,butter-and-eggs,N,53279,8129,59332,96567,tr
 Triphysaria pusilla,,N,47296,8133,57276,78297,true,Dwarf Owl's-clover
 Triphysaria versicolor subsp. faucibarbata,,N,53281,8135,60737,206269,true,Triphysaria
 Trisetum canescens,,N,47326,8139,1538928,150155,true,Tall False Oat
-Triteleia hyacinthina,white brodiaea,N,47356,8154,57132,206275,true,White Brodiaea
-Triteleia laxa,Ithuriel's spear,N,47359,8160,51085,206281,true,Ithuriel's Spear
+Triteleia hyacinthina,white brodiaea,N,47356,8154,57132,206275,true,White Brodiaea,corm,white,3,7
+Triteleia laxa,Ithuriel's spear,N,47359,8160,51085,206281,true,Ithuriel's Spear,corm,blue,3,6
 Triteleia peduncularis,,N,47363,8164,57133,206284,true,Long Rayed Brodiaea
 Tropaeolum majus,garden nasturtium,X,47408,8167,54329,34321,true
 Tropidocarpum capparideum,caper-fruited tropidocarpum,N,47411,8168,79456,34327,true,Caper-fruited Tropidocarpum,annual,yellow,3,4,1255,1B.1,,,S1,G1

package/data/text/Brodiaea-elegans-subsp-elegans.md

@@ -0,0 +1 @@
+Base of flower funnel-shaped.

package/data/text/Brodiaea-terrestris-subsp-terrestris.md

@@ -0,0 +1 @@
+Base of flower bell-shaped.

package/lib/ebook/ebooksitegenerator.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { Files } from "../files.js";
 import { SiteGenerator } from "../sitegenerator.js";
+import { XHTML } from "./xhtml.js";
 
 export class EBookSiteGenerator extends SiteGenerator {
     #pageEnd() {
@@ -21,6 +22,7 @@ export class EBookSiteGenerator extends SiteGenerator {
             "../".repeat(depth) +
             'css/main.css" rel="stylesheet" />';
         html += "</head><body>";
+        html += XHTML.wrap("h1", attributes.title);
         return html;
     }
 

package/lib/photo.js

@@ -10,10 +10,10 @@ export class Photo {
     #rights;
 
     /**
-     * @param {number} id
+     * @param {string} id
      * @param {string} ext
-     * @param {import("./utils/inat-tools.js").InatLicenseCode} licenseCode
-     * @param {string} rightsHolder
+     * @param {import("./utils/inat-tools.js").AllowedLicenseCode} licenseCode
+     * @param {string|undefined} rightsHolder
      */
     constructor(id, ext, licenseCode, rightsHolder) {
         this.#id = id;
@@ -22,7 +22,9 @@ export class Photo {
         if (licenseCode === "cc0") this.#rights = "CC0";
         else if (licenseCode === "cc-by") this.#rights = "CC BY";
         else if (licenseCode === "cc-by-nc") this.#rights = "CC BY-NC";
-        else this.#rights = "C";
+        else {
+            throw new Error(`unexpected license code ${licenseCode}`);
+        }
     }
 
     /**

package/lib/taxonomy/taxa.js

@@ -115,27 +115,7 @@ class Taxa {
     #loadPhotosFromFile(dataDir, filename) {
         if (!fs.existsSync(path.join(dataDir, filename))) return;
         /** @type {import("../utils/inat-tools.js").InatCsvPhoto[]} */
-        const csvPhotos = CSV.parseFile(dataDir, filename).map((row) => {
-            /** @type {import("../utils/inat-tools.js").InatLicenseCode} */
-            let licenseCode = "cc-by";
-            if (row.licenseCode === "cc-by-nc-sa") licenseCode = "cc-by-nc-sa";
-            else if (row.licenseCode === "cc-by-nc") licenseCode = "cc-by-nc";
-            else if (row.licenseCode === "cc-by-nc-nd")
-                licenseCode = "cc-by-nc-nd";
-            else if (row.licenseCode === "cc-by") licenseCode = "cc-by";
-            else if (row.licenseCode === "cc-by-sa") licenseCode = "cc-by-sa";
-            else if (row.licenseCode === "cc-by-nd") licenseCode = "cc-by-nd";
-            else if (row.licenseCode === "pd") licenseCode = "pd";
-            else if (row.licenseCode === "gdfl") licenseCode = "gdfl";
-            else if (row.licenseCode === "cc0") licenseCode = "cc0";
-            return {
-                attrName: row.attrName,
-                ext: row.ext,
-                id: Number(row.id),
-                licenseCode,
-                name: row.name,
-            };
-        });
+        const csvPhotos = CSV.readFile(path.join(dataDir, filename));
         for (const csvPhoto of csvPhotos) {
             const taxon = this.getTaxon(csvPhoto.name);
             if (!taxon) {
@@ -156,8 +136,9 @@ class Taxa {
      * @param {string} dataDir
      */
     #loadInatPhotos(dataDir) {
-        this.#loadPhotosFromFile("./data", "inatphotos.csv");
+        // Prefer taxon photos, as they are somewhat curated.
         this.#loadPhotosFromFile(dataDir, "inattaxonphotos.csv");
+        this.#loadPhotosFromFile("./data", "inatobsphotos.csv");
         this.#loadPhotosFromFile(dataDir, "inatobsphotos.csv");
     }
 

package/lib/utils/inat-tools.js

@@ -2,25 +2,25 @@ import { ProgressMeter } from "../progressmeter.js";
 import { chunk, sleep } from "../util.js";
 
 /**
-  @typedef {"cc-by-nc-sa"
-    | "cc-by-nc"
-    | "cc-by-nc-nd"
-    | "cc-by"
-    | "cc-by-sa"
-    | "cc-by-nd"
-    | "pd"
-    | "gdfl"
-    | "cc0"} InatLicenseCode
+ * @typedef {"cc0" | "cc-by" | "cc-by-nc"} AllowedLicenseCode
+ * @typedef {{place_id?:string,project_id?:string}} ObsPhotoLocationOptions
+    @typedef {{
+        id:number,
+        observation_photos: {
+            photo: import("./inat-tools.js").InatApiPhoto;
+        }[];
+    }} InatApiObservationPhotos
   @typedef {{
     id: string;
+    obsId?:string;
     ext: string;
-    licenseCode: string;
+    licenseCode: AllowedLicenseCode;
     attrName: string | undefined;
 }} InatPhotoInfo
  @typedef {{
     id: number;
     attribution: string;
-    license_code: InatLicenseCode;
+    license_code: string;
     medium_url?: string;
     url?: string;
 }} InatApiPhoto
@@ -30,15 +30,38 @@ import { chunk, sleep } from "../util.js";
         photo: InatApiPhoto;
     }[];
 }} InatApiTaxon
- @typedef {{
-    name: string;
-    id: number;
-    ext: string;
-    licenseCode: InatLicenseCode;
-    attrName: string;
-    }} InatCsvPhoto
+ @typedef {{name: string;} & InatPhotoInfo} InatCsvPhoto
  */
+
 const ALLOWED_LICENSE_CODES = ["cc0", "cc-by", "cc-by-nc"];
+const FIELDS_OBS_PHOTO =
+    "(id:!t,observation_photos:(photo:(url:!t,attribution:!t,license_code:!t)))";
+
+/**
+ * @param {InatApiPhoto} apiPhoto
+ * @returns {InatPhotoInfo|undefined}
+ */
+export function convertToCSVPhoto(apiPhoto) {
+    const licenseCode = getAllowedLicenseCode(apiPhoto.license_code);
+    if (licenseCode === undefined) {
+        return;
+    }
+    const url = apiPhoto.medium_url || apiPhoto.url;
+    if (!url) {
+        return;
+    }
+    const ext = url.split(".").at(-1);
+    if (!ext) {
+        return;
+    }
+    /** @type {InatPhotoInfo} */
+    return {
+        id: apiPhoto.id.toString(),
+        ext: ext,
+        licenseCode: licenseCode,
+        attrName: getAttribution(apiPhoto.attribution),
+    };
+}
 
 /**
  * @param {string[]} inatTaxonIDs
@@ -55,6 +78,122 @@ async function fetchInatTaxa(inatTaxonIDs) {
     return json.results;
 }
 
+/**
+ * @param {import("../types.js").Taxon} taxon
+ * @param {{place_id?:string,project_id?:string}} locationOptions
+ * @return {Promise<InatApiObservationPhotos[]|Error>}
+ */
+async function fetchObservationsForTaxon(
+    taxon,
+    locationOptions = { place_id: "14" },
+) {
+    const inatTaxonId = taxon.getINatID();
+    if (!inatTaxonId) return [];
+    let url = new URL(
+        `https://api.inaturalist.org/v2/observations/?taxon_id=${inatTaxonId}` +
+            "&photo_license=" +
+            ALLOWED_LICENSE_CODES.join(",") +
+            "&order=desc" +
+            "&order_by=votes" +
+            "&per_page=5",
+    );
+    url.searchParams.set("fields", FIELDS_OBS_PHOTO);
+    if (locationOptions.place_id) {
+        url.searchParams.set("place_id", locationOptions.place_id);
+    }
+    if (locationOptions.project_id) {
+        url.searchParams.set("project_id", locationOptions.project_id);
+    }
+    const resp = await getResponse(url);
+    if (resp instanceof Error) {
+        return resp;
+    }
+
+    if (!resp.ok) {
+        return new Error(await resp.text());
+    }
+    const json = await resp.json();
+    return json.results;
+}
+
+/**
+ * @param {string[]} obsIds
+ * @returns {Promise<InatApiObservationPhotos[]|Error>}
+ */
+export async function getObsPhotosForIds(obsIds) {
+    let url = new URL("https://api.inaturalist.org/v2/observations/");
+    url.searchParams.set("fields", FIELDS_OBS_PHOTO);
+    url.searchParams.set("id", obsIds.join(","));
+    url.searchParams.set("per_page", obsIds.length.toString());
+
+    const resp = await getResponse(url);
+    if (resp instanceof Error) {
+        return resp;
+    }
+
+    if (!resp.ok) {
+        return new Error(await resp.text());
+    }
+    const json = await resp.json();
+    return json.results;
+}
+
+/**
+ * @param {import("../types.js").Taxon[]} taxaToUpdate
+ * @param {ObsPhotoLocationOptions|undefined} locationOptions
+ * @returns {Promise<Map<string,InatPhotoInfo[]>>}
+ */
+export async function getObsPhotosForTaxa(taxaToUpdate, locationOptions) {
+    /** @type {Map<string,InatPhotoInfo[]>} */
+    const photos = new Map();
+
+    const meter = new ProgressMeter(
+        "retrieving observation photos",
+        taxaToUpdate.length,
+    );
+
+    for (let index = 0; index < taxaToUpdate.length; index++) {
+        const taxon = taxaToUpdate[index];
+        const observations = await fetchObservationsForTaxon(
+            taxon,
+            locationOptions,
+        );
+        if (observations instanceof Error) {
+            console.error(observations.message);
+            continue;
+        }
+
+        // Just get the CC-licensed ones, 5 per taxon should be fine (max is 20 on iNat). Whether or not
+        const rawPhotoInfo = observations
+            .map((obs) =>
+                obs.observation_photos.map((op) => {
+                    return { obsId: obs.id, ...op.photo };
+                }),
+            )
+            .flat();
+
+        /** @type {InatPhotoInfo[]} */
+        const processedPhotoInfo = [];
+        for (const photo of rawPhotoInfo) {
+            if (processedPhotoInfo.length >= 5) {
+                break;
+            }
+            const obj = convertToCSVPhoto(photo);
+            if (!obj) {
+                continue;
+            }
+            processedPhotoInfo.push(obj);
+        }
+        photos.set(taxon.getName(), processedPhotoInfo);
+
+        meter.update(index + 1);
+    }
+
+    meter.stop();
+
+    return photos;
+}
+
 /**
  * @param {import("../types.js").Taxon[]} taxaToUpdate
  * @returns {Promise<Map<string,InatPhotoInfo[]>>}
@@ -78,37 +217,17 @@ export async function getTaxonPhotos(taxaToUpdate) {
     for (const batch of chunk(taxaToUpdate, 30)) {
         const inatTaxa = await fetchInatTaxa(batch.map((t) => t.getINatID()));
         for (const iNatTaxon of inatTaxa) {
-            const iNatTaxonPhotos = iNatTaxon.taxon_photos.filter((tp) =>
-                ALLOWED_LICENSE_CODES.includes(tp.photo.license_code),
-            );
-
             const taxonName = idMap.get(iNatTaxon.id.toString());
             if (!taxonName) {
                 throw new Error(`iNat id ${iNatTaxon.id} not found`);
             }
             /** @type {InatPhotoInfo[]} */
             const taxonPhotos = [];
-            for (const taxonPhoto of iNatTaxonPhotos) {
-                const url = taxonPhoto.photo.medium_url || taxonPhoto.photo.url;
-                if (!url) continue;
-                const ext = url.split(".").at(-1);
-                if (!ext) continue;
-                /** @type {InatPhotoInfo} */
-                const obj = {
-                    id: taxonPhoto.photo.id.toString(),
-                    ext: ext,
-                    licenseCode: taxonPhoto.photo.license_code,
-                    attrName:
-                        // Photographers retain copyright for most CC licenses,
-                        // except CC0, so attribution is a bit different
-                        taxonPhoto.photo.attribution.match(
-                            /\(c\) (.*?),/,
-                        )?.[1] ||
-                        taxonPhoto.photo.attribution.match(
-                            /uploaded by (.*)/,
-                        )?.[1],
-                };
-
+            for (const taxonPhoto of iNatTaxon.taxon_photos) {
+                const obj = convertToCSVPhoto(taxonPhoto.photo);
+                if (!obj) {
+                    continue;
+                }
                 taxonPhotos.push(obj);
             }
             photos.set(taxonName, taxonPhotos);
@@ -122,3 +241,52 @@ export async function getTaxonPhotos(taxaToUpdate) {
 
     return photos;
 }
+
+/**
+ * @param {string} licenseCode
+ * @returns {AllowedLicenseCode|undefined}
+ */
+function getAllowedLicenseCode(licenseCode) {
+    switch (licenseCode) {
+        case "cc0":
+        case "cc-by":
+        case "cc-by-nc":
+            return licenseCode;
+    }
+}
+
+/**
+ * @param {string} rawAttribution
+ * @returns {string|undefined}
+ */
+function getAttribution(rawAttribution) {
+    // Photographers retain copyright for most CC licenses,
+    // except CC0, so attribution is a bit different
+    return (
+        rawAttribution.match(/\(c\) (.*?),/)?.[1] ||
+        rawAttribution.match(/uploaded by (.*)/)?.[1]
+    );
+}
+
+let lastQueryTime = Date.now();
+/**
+ * @param {URL} url
+ * @returns {Promise<Response|Error>}
+ */
+async function getResponse(url) {
+    // If less than one second since last query, delay.
+    const delayTime = 1050 - (Date.now() - lastQueryTime);
+    if (delayTime > 0) {
+        await sleep(delayTime);
+    }
+
+    try {
+        lastQueryTime = Date.now();
+        return await fetch(url);
+    } catch (error) {
+        if (error instanceof Error) {
+            return error;
+        }
+        throw error;
+    }
+}

package/package.json

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