@ca-plant-list/ca-plant-list 0.3.6 → 0.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/data/synonyms.csv +24 -1
  2. package/data/taxa.csv +40 -26
  3. package/data/text/Antirrhinum-thompsonii.md +1 -0
  4. package/data/text/Calyptridium-monospermum.md +1 -0
  5. package/data/text/Calyptridium-ubellatum.md +1 -0
  6. package/data/text/Clarkia-affinis.md +1 -0
  7. package/data/text/Clarkia-breweri.md +1 -0
  8. package/data/text/Clarkia-concinna-subsp-automixa.md +1 -0
  9. package/data/text/Clarkia-modesta.md +1 -0
  10. package/data/text/Clarkia-purpurea-subsp-quadrivulnera.md +1 -0
  11. package/data/text/Clarkia-rubicunda.md +1 -0
  12. package/data/text/Delphinium-californicum-subsp-californicum.md +1 -1
  13. package/data/text/Delphinium-californicum-subsp-interius.md +1 -0
  14. package/data/text/Delphinium-hesperium-subsp-hesperium.md +1 -1
  15. package/data/text/Delphinium-hesperium-subsp-pallescens.md +1 -0
  16. package/data/text/Delphinium-parryi-subsp-parryi.md +1 -0
  17. package/data/text/Erythranthe-moschata.md +1 -0
  18. package/data/text/Erythranthe-primuloides.md +1 -0
  19. package/data/text/Erythranthe-tilingii.md +1 -0
  20. package/data/text/Lilium-pardalinum-subsp-shastense.md +1 -0
  21. package/data/text/Logfia-filaginoides.md +1 -0
  22. package/data/text/Logfia-gallica.md +1 -0
  23. package/data/text/Malacothamnus-arcuatus-var-elmeri.md +1 -0
  24. package/data/text/Malacothamnus-fremontii-var-fremontii.md +1 -0
  25. package/data/text/Trifolium-obtusiflorum.md +1 -0
  26. package/data/text/Trifolium-willdenovii.md +1 -0
  27. package/lib/ebook/images.js +49 -40
  28. package/lib/ebook/pages/page_list_species.js +15 -9
  29. package/lib/ebook/pages/taxonpage.js +2 -5
  30. package/lib/ebook/xhtml.js +3 -5
  31. package/lib/families.js +0 -2
  32. package/lib/genera.js +1 -3
  33. package/lib/genericpage.js +26 -18
  34. package/lib/generictaxaloader.js +1 -1
  35. package/lib/htmltaxon.js +29 -12
  36. package/lib/markdown.js +7 -9
  37. package/lib/pagerenderer.js +127 -82
  38. package/lib/plants/glossary.js +9 -14
  39. package/lib/taxa.js +9 -12
  40. package/lib/taxaloader.js +3 -1
  41. package/lib/taxon.js +2 -4
  42. package/lib/web/glossarypages.js +31 -18
  43. package/package.json +1 -2
  44. package/scripts/build-ebook.js +1 -1
  45. package/scripts/build-site.js +34 -24
  46. package/types/classes.d.ts +26 -0
package/data/synonyms.csv CHANGED
@@ -508,6 +508,7 @@ Cyperus alternifolius subsp. flabelliformis,Cyperus involucratus,INAT
508
508
  Cyperus diandrus var. castaneus,Cyperus niger
509
509
  Cyperus ferax,Cyperus odoratus
510
510
  Cyperus hansenii,Cyperus strigosus
511
+ Cyperus melanostachyus,Cyperus niger,INAT
511
512
  Cyperus niger var. capitatus,Cyperus niger
512
513
  Cyperus niger var. castaneus,Cyperus niger
513
514
  Cytisus monspessulanus,Genista monspessulana
@@ -596,6 +597,7 @@ Ellisia torreyi var. orcuttii,Eucrypta chrysanthemifolia var. chrysanthemifolia
596
597
  Ellisia torreyi var. paniculata,Eucrypta chrysanthemifolia var. chrysanthemifolia
597
598
  Elodea brandegeeae,Elodea canadensis
598
599
  Elodea densa,Egeria densa
600
+ Elodea densa,Egeria densa,INAT
599
601
  Elymus elongatus var. ponticus,Elymus ponticus
600
602
  Elymus elymoides subsp. elymoides,Elymus elymoides var. elymoides
601
603
  Elymus glaucus subsp. jepsonii,Elymus glaucus subsp. glaucus
@@ -641,12 +643,15 @@ Eriogonella membranacea,Chorizanthe membranacea
641
643
  Eriogonum acetoselloides,Eriogonum gracile var. gracile
642
644
  Eriogonum auriculatum,Eriogonum nudum var. auriculatum
643
645
  Eriogonum caninum,Eriogonum luteolum var. caninum
646
+ Eriogonum curvatum,Eriogonum wrightii var. subscaposum
644
647
  Eriogonum fasciculatum subsp. foliolosum,Eriogonum fasciculatum var. foliolosum
645
648
  Eriogonum fasciculatum subsp. polifolium,Eriogonum fasciculatum var. polifolium
646
649
  Eriogonum fasciculatum var. obtusiflorum,Eriogonum fasciculatum var. foliolosum
647
650
  Eriogonum fasciculatum var. revolutum,Eriogonum fasciculatum var. polifolium
648
651
  Eriogonum gracile var. acetoselloides,Eriogonum gracile var. gracile
649
652
  Eriogonum gracile var. leucocladon,Eriogonum gracile var. gracile
653
+ Eriogonum junceum,Eriogonum wrightii var. subscaposum
654
+ Eriogonum kennedyi subsp. pinorum,Eriogonum wrightii var. subscaposum
650
655
  Eriogonum latifolium subsp. auriculatum,Eriogonum nudum var. auriculatum
651
656
  Eriogonum latifolium subsp. pauciflorum,Eriogonum nudum var. pauciflorum
652
657
  Eriogonum latifolium var. alternans,Eriogonum nudum var. auriculatum
@@ -658,6 +663,9 @@ Eriogonum revolutum,Eriogonum fasciculatum var. polifolium
658
663
  Eriogonum roseum var. leucocladon,Eriogonum gracile var. gracile
659
664
  Eriogonum rosmarinifolium var. foliolosum,Eriogonum fasciculatum var. foliolosum
660
665
  Eriogonum stellatum var. bahiiforme,Eriogonum umbellatum var. bahiiforme
666
+ Eriogonum suffrutescens,Eriogonum wrightii var. subscaposum
667
+ Eriogonum trachygonum subsp. subscaposum,Eriogonum wrightii var. subscaposum
668
+ Eriogonum trachygonum var. subscaposum,Eriogonum wrightii var. subscaposum
661
669
  Eriogonum trachygonum,Eriogonum wrightii var. trachygonum
662
670
  Eriogonum trichotomum,Eriogonum umbellatum var. bahiiforme
663
671
  Eriogonum umbellatum subsp. bahiiforme,Eriogonum umbellatum var. bahiiforme
@@ -672,7 +680,9 @@ Eriogonum vimineum var. luteolum,Eriogonum luteolum var. luteolum
672
680
  Eriogonum virgatum var. roseum,Eriogonum roseum
673
681
  Eriogonum virgatum var. rubidum,Eriogonum roseum
674
682
  Eriogonum virgatum,Eriogonum roseum
683
+ Eriogonum wrightii subsp. subscaposum,Eriogonum wrightii var. subscaposum
675
684
  Eriogonum wrightii subsp. trachygonum,Eriogonum wrightii var. trachygonum
685
+ Eriogonum wrightii var. curvatum,Eriogonum wrightii var. subscaposum
676
686
  Eriophyllum confertiflorum var. latum,Eriophyllum confertiflorum var. confertiflorum
677
687
  Eriophyllum idoneum,Eriophyllum lanatum var. achilleoides
678
688
  Eriophyllum staechadifolium var. artemisiifolium,Eriophyllum staechadifolium
@@ -856,7 +866,6 @@ Hibiscus lasiocarpos var. californicus,Hibiscus lasiocarpos var. occidentalis
856
866
  Hibiscus moscheutos var. occidentalis,Hibiscus lasiocarpos var. occidentalis
857
867
  Hierochloe occidentalis,Anthoxanthum occidentale
858
868
  Holocarpha obconica subsp. autumnalis,Holocarpha obconica
859
- Holodiscus saxicola,Holodiscus discolor
860
869
  Hookera capitata,Dipterostemon capitatus
861
870
  Hookera congesta,Dichelostemma congestum
862
871
  Hookera hyacinthina var. lactea,Triteleia hyacinthina
@@ -908,6 +917,8 @@ Iva axillaris var. robustior,Iva axillaris
908
917
  Jacobaea vulgaris,Senecio jacobaea,INAT
909
918
  Johnstonella micromeres,Cryptantha micromeres,INAT
910
919
  Juglans californica var. californica,Juglans californica
920
+ Juglans californica var. hindsii,Juglans hindsii
921
+ Juncoides comosa var. macrantha,Luzula macrantha
911
922
  Juncoides comosa var. subsessilis,Luzula subsessilis
912
923
  Juncoides subsessilis,Luzula subsessilis
913
924
  Juncus amuricus,Juncus bufonius var. occidentalis,INAT
@@ -1090,6 +1101,8 @@ Lupinus subvexus var. transmontanus,Lupinus microcarpus var. microcarpus
1090
1101
  Lupinus subvexus,Lupinus microcarpus var. microcarpus
1091
1102
  Lupinus vallicola,Lupinus nanus
1092
1103
  Lupinus variicolor,Lupinus littoralis var. variicolor
1104
+ Luzula campestris var. macrantha,Luzula macrantha
1105
+ Luzula comosa var. macrantha,Luzula macrantha
1093
1106
  Luzula comosa var. subsessilis,Luzula subsessilis
1094
1107
  Lythrum alatum var. linearifolium,Lythrum californicum
1095
1108
  Lythrum sanfordii,Lythrum californicum
@@ -1107,12 +1120,19 @@ Mahonia nervosa var. mendocinensis,Berberis nervosa
1107
1120
  Mahonia pinnata subsp. pinnata,Berberis pinnata subsp. pinnata
1108
1121
  Maianthemum racemosum subsp. amplexicaule,Maianthemum racemosum
1109
1122
  Malacothamnus arcuatus var. elmeri,Malacothamnus hallii,INAT
1123
+ Malacothamnus fremontii subsp. cercophorus,Malacothamnus fremontii var. fremontii
1110
1124
  Malacothamnus hallii,Malacothamnus arcuatus var. elmeri
1125
+ Malacothamnus howellii,Malacothamnus fremontii var. fremontii
1111
1126
  Malacothrix coulteri var. cognata,Malacothrix coulteri
1112
1127
  Malacothrix senecioides,Malacothrix clevelandii
1113
1128
  Malva pseudolavatera,Malva multiflora
1114
1129
  Malvastrum exilis,Eremalche exilis
1130
+ Malvastrum fremontii var. cercophorum,Malacothamnus fremontii var. fremontii
1131
+ Malvastrum fremontii,Malacothamnus fremontii var. fremontii
1115
1132
  Malvastrum hallii,Malacothamnus arcuatus var. elmeri
1133
+ Malvastrum howellii var. cordatum,Malacothamnus fremontii var. fremontii
1134
+ Malvastrum howellii,Malacothamnus fremontii var. fremontii
1135
+ Malveopsis fremontii,Malacothamnus fremontii var. fremontii
1116
1136
  Marah fabacea var. agrestis,Marah fabacea
1117
1137
  Maruta cotula,Anthemis cotula
1118
1138
  Meconella linearis,Hesperomecon linearis
@@ -1350,6 +1370,7 @@ Oxybasis rubra var. rubra,Chenopodium rubrum var. rubrum,INAT
1350
1370
  Oxybasis rubra,Chenopodium rubrum,INAT
1351
1371
  Oxytheca inermis,Eriogonum inerme var. inerme
1352
1372
  Papaver lemmonii,Papaver californicum
1373
+ Parapholis cylindrica,Hainardia cylindrica,INAT
1353
1374
  Paronychia pusilla,Herniaria hirsuta var. cinerea
1354
1375
  Parvisedum pentandrum,Sedella pentandra
1355
1376
  Paspalum distichum var. indutum,Paspalum distichum
@@ -1835,6 +1856,8 @@ Spergularia marina var. tenuis,Spergularia marina
1835
1856
  Spergularia maritima,Spergularia media var. media
1836
1857
  Spergularia salina,Spergularia marina
1837
1858
  Sphaeralcea fasciculata var. elmeri,Malacothamnus arcuatus var. elmeri
1859
+ Sphaeralcea fremontii var. cercophora,Malacothamnus fremontii var. fremontii
1860
+ Sphaeralcea fremontii,Malacothamnus fremontii var. fremontii
1838
1861
  Spirodela oligorrhiza,Landoltia punctata
1839
1862
  Spirodela punctata,Landoltia punctata
1840
1863
  Sporobolus alterniflorus,Spartina alterniflora,INAT
package/data/taxa.csv CHANGED
@@ -101,6 +101,7 @@ Amsinckia vernicosa,,N,13155,335,58051
101
101
  Anaphalis margaritacea,pearly everlasting,N,846,341,52833
102
102
  Ancistrocarphus filagineus,woolly fishhook,N,849,345,50795
103
103
  Androsace elongata subsp. acuta,,N,49111,348,58299,,,,,1799,4.2,,,S3S4,G5?T3T4
104
+ Anemone occidentalis,white pasqueflower,N,13385,,,perennial,white,5,9
104
105
  Anemopsis californica,yerba mansa,N,13392,360,60241
105
106
  Angelica californica,,N,13406,364,75448
106
107
  Anisocarpus madioides,,N,77551,10770,53137
@@ -110,7 +111,7 @@ Anthriscus caucalis,bur-chervil,X,13523,396,52846,,white
110
111
  Antirrhinum kelloggii,,N,13568,401,165675
111
112
  Antirrhinum majus,snapdragon,X,13557,404,48969
112
113
  Antirrhinum thompsonii,Sierra snapdragon,N,108978,14286,168306,,pink,4,8
113
- Antirrhinum vexillocalyculatum subsp. vexillocalyculatum,,N,88873,10499,840919,,purple,6,8
114
+ Antirrhinum vexillocalyculatum subsp. vexillocalyculatum,,N,88873,10499,840919,annual,purple,6,8
114
115
  Aphyllon californicum subsp. jepsonii,,N,103325,13438,802459
115
116
  Aphyllon epigalium subsp. epigalium,,N,103327,13527,809377
116
117
  Aphyllon fasciculatum,clustered broom-rape,N,100018,13441,802543
@@ -157,6 +158,7 @@ Arundo donax,giant reed,X,14319,732,64017
157
158
  Asarum caudatum,wild-ginger,N,14334,733,52858
158
159
  Asclepias californica,California milkweed,N,14357,739,51272,perennial,purple,4,7
159
160
  Asclepias cordifolia,purple milkweed,N,14360,741,62248
161
+ Asclepias eriocarpa,kotolo,N,14369,,,perennial,white,5,10
160
162
  Asclepias fascicularis,narrow-leaf milkweed,N,14375,747,56851,perennial,white,5,10
161
163
  Asclepias speciosa,milkweed,N,14422,751,62292
162
164
  Asparagus asparagoides,,X,14480,755,64107
@@ -278,6 +280,8 @@ Calochortus venustus,butterfly mariposa lily,N,16772,1313,53902,bulb,"white,red"
278
280
  Caltha palustris,marsh-marigold,X,16802,8708,56224
279
281
  Calycadenia multiglandulosa,,N,1875,1324,56863
280
282
  Calycadenia truncata,rosin weed,N,1884,1328,62567
283
+ Calyptridium monospermum,one-seeded pussypaws,N,16846,,,perennial,"pink,white",4,9
284
+ Calyptridium umbellatum,Mount Hood pussypaws,N,,,127100,perennial,white,5,10
281
285
  Calystegia malacophylla subsp. pedicellata,woolly morning-glory,N,76596,1364,79655
282
286
  Calystegia occidentalis subsp. occidentalis,,N,49559,1368,56086
283
287
  Calystegia purpurata subsp. purpurata,,N,49560,1371,58882
@@ -413,15 +417,15 @@ Cirsium quercetorum,brownie thistle,N,2232,2146,60954
413
417
  Cirsium remotifolium var. odontolepis,,N,7076,11533,80596
414
418
  Cirsium vulgare,bull thistle,X,2285,2151,52989
415
419
  Citrullus lanatus var. citroides,watermelon,X,56575,9813,841204
416
- Clarkia affinis,chaparral clarkia,N,19563,2159,58943,annual
420
+ Clarkia affinis,chaparral clarkia,N,19563,2159,58943,annual,pink,5,6
417
421
  Clarkia biloba subsp. biloba,twolobe clarkia,N,49891,2168,51857,annual
418
- Clarkia breweri,Brewer's clarkia,N,19571,2174,56067,annual,,,,159,4.2,,,S4,G4
419
- Clarkia concinna subsp. automixa,Santa Clara red ribbons,N,49895,2176,51856,annual,,,,1629,4.3,,,S3,G5?T3
422
+ Clarkia breweri,Brewer's clarkia,N,19571,2174,56067,annual,pink,4,6,159,4.2,,,S4,G4
423
+ Clarkia concinna subsp. automixa,Santa Clara red ribbons,N,49895,2176,51856,annual,pink,4,6,1629,4.3,,,S3,G5?T3
420
424
  Clarkia concinna subsp. concinna,red ribbons,N,49896,2177,51855,annual
421
425
  Clarkia epilobioides,,N,19577,2185,58945,annual
422
426
  Clarkia franciscana,Presidio clarkia,N,19579,2187,61899,annual,,,,162,1B.1,CE,FE,S1,G1
423
427
  Clarkia gracilis subsp. gracilis,slender clarkia,N,49901,2190,61896,annual,pink,4,7
424
- Clarkia modesta,,N,19588,2200,58946,annual
428
+ Clarkia modesta,,N,19588,2200,58946,annual,pink,4,5
425
429
  Clarkia purpurea subsp. purpurea,purple clarkia,N,49906,2207,79741,annual
426
430
  Clarkia purpurea subsp. quadrivulnera,four-spot,N,49907,2208,57146,annual,pink,4,8
427
431
  Clarkia purpurea subsp. viminea,four-spot,N,49908,2209,57147,annual
@@ -449,7 +453,7 @@ Collinsia sparsiflora var. collina,,N,56722,2290,57290
449
453
  Collinsia sparsiflora var. sparsiflora,,N,56723,2291,64295
450
454
  Collinsia tinctoria,,N,20008,2293,51850
451
455
  Collomia diversifolia,serpentine collomia,N,20020,2299,62230,,,,,126,4.3,,,S4,G4
452
- Collomia grandiflora,large-flowered collomia,N,20021,,61871,annual,orange,4,6
456
+ Collomia grandiflora,large-flowered collomia,N,20021,2300,61871,annual,orange,4,6
453
457
  Collomia heterophylla,,N,20022,2301,52996
454
458
  Conium maculatum,poison hemlock,X,20136,2317,52998,,white
455
459
  Consolida ajacis,,X,20161,9821,401314
@@ -521,7 +525,7 @@ Cyperus eragrostis,,N,21820,2581,59055
521
525
  Cyperus erythrorhizos,,N,21822,2582,59060
522
526
  Cyperus esculentus,yellow nut sedge,N,21824,2583,76584
523
527
  Cyperus involucratus,umbrella-sedge,X,21853,2585,414284
524
- Cyperus niger,,N,21881,2588,76591
528
+ Cyperus niger,,N,21881,2588,1551513
525
529
  Cyperus odoratus,,N,21885,2589,63329
526
530
  Cyperus strigosus,,N,21948,2593,59063
527
531
  Cypselea humifusa,,X,21994,2597,1355489
@@ -541,17 +545,17 @@ Deinandra kelloggii,,N,79196,10829,76615
541
545
  Deinandra lobbii,,N,77606,10830,58813
542
546
  Delairea odorata,German-ivy,X,80449,9623,53208
543
547
  Delphinium californicum subsp. californicum,,N,50072,2631,51860,perennial,white,4,6
544
- Delphinium californicum subsp. interius,California larkspur,N,50073,2632,51859,perennial,,,,551,1B.2,,,S3,G3T3
548
+ Delphinium californicum subsp. interius,California larkspur,N,50073,2632,51859,perennial,white,4,6,551,1B.2,,,S3,G3T3
545
549
  Delphinium decorum subsp. decorum,coast larkspur,N,50079,2635,79784,perennial,"blue,purple",3,5
546
550
  Delphinium gracilentum,,N,22474,2639,76626,perennial
547
551
  Delphinium gypsophilum,gypsum-loving larkspur,N,22476,2640,56068,perennial
548
552
  Delphinium hansenii subsp. hansenii,Hansen's larkspur,N,50088,2645,79787,perennial
549
553
  Delphinium hesperium subsp. hesperium,western larkspur,N,50091,2649,57238,perennial,"blue,purple",3,6
550
- Delphinium hesperium subsp. pallescens,,N,50092,2650,58997,perennial
554
+ Delphinium hesperium subsp. pallescens,,N,50092,2650,58997,perennial,white,3,5
551
555
  Delphinium nudicaule,red larkspur,N,22492,2655,50642,perennial,red,3,6
552
- Delphinium parryi subsp. parryi,Parry's larkspur,N,50107,2665,58999,perennial
556
+ Delphinium parryi subsp. parryi,Parry's larkspur,N,50107,2665,58999,perennial,blue,4,6
553
557
  Delphinium patens subsp. patens,spreading larkspur,N,50113,2670,57246,perennial,blue,3,6
554
- Delphinium recurvatum,valley larkspur,N,22516,2673,58305,perennial,,,,222,1B.2,,,S2?,G2?
558
+ Delphinium recurvatum,valley larkspur,N,22516,2673,58305,perennial,,,,222,1B.2,,,S2,G2?
555
559
  Delphinium variegatum subsp. variegatum,royal larkspur,N,50119,2682,50633,perennial,"blue,purple",3,5
556
560
  Dendromecon rigida,bush poppy,N,22541,2686,58224
557
561
  Deschampsia cespitosa subsp. cespitosa,tufted hairgrass,N,50130,2689,61199
@@ -560,7 +564,7 @@ Deschampsia danthonioides,annual hairgrass,N,22598,2691,57164
560
564
  Deschampsia elongata,slender hairgrass,N,22600,2692,52722
561
565
  Descurainia pinnata subsp. brachycarpa,tansy mustard,N,50146,11596,59235
562
566
  Desmazeria rigida,,X,22633,2706,288259
563
- Dianthus nudiflorus,,X,85151,14658,1143003
567
+ Dianthus nudiflorus,,X,85151,14658,1143003,annual,pink
564
568
  Dicentra formosa,bleeding heart,N,22766,2711,51048
565
569
  Dichelostemma congestum,ookow,N,22850,2721,56593
566
570
  Dichelostemma multiflorum,,N,22853,2723,62262
@@ -604,7 +608,7 @@ Echinochloa muricata var. microstachya,,N,58092,9886,80690
604
608
  Echinodorus berteroi,burhead,N,23812,2886,76761
605
609
  Echium candicans,Pride of Madeira,X,77286,2888,57723
606
610
  Eclipta prostrata,,N,2527,2892,76765
607
- Egeria densa,Brazilian waterweed,X,23849,2893,60465
611
+ Egeria densa,Brazilian waterweed,X,23849,2893,1555600
608
612
  Ehrendorferia chrysantha,golden ear-drops,N,88966,9511,58952
609
613
  Ehrharta erecta,Stebbins' grass,X,23854,2895,64140
610
614
  Eichhornia crassipes,water-hyacinth,X,23856,2896,962637
@@ -693,7 +697,7 @@ Eriogonum roseum,virgate buckwheat,N,24922,3360,58280
693
697
  Eriogonum truncatum,Mt. Diablo buckwheat,N,24957,3383,77039,,,,,766,1B.1,,,S1,G1
694
698
  Eriogonum umbellatum var. bahiiforme,sulfur flower,N,58755,3388,80851,,,,,1338,4.2,,,S3,G5T3
695
699
  Eriogonum wrightii var. trachygonum,,N,58801,3413,59244
696
- Eriogonum wrightii var. subscaposum,short-stemmed bastard-sage,N,58800,,,perennial,"white,pink",6,9
700
+ Eriogonum wrightii var. subscaposum,short-stemmed bastard-sage,N,58800,3412,58985,perennial,"white,pink",6,9
697
701
  Eriophyllum confertiflorum var. confertiflorum,golden-yarrow,N,69866,3423,53397,perennial,yellow,4,8
698
702
  Eriophyllum jepsonii,Jepson's woolly-sunflower,N,2816,3426,77048,,,,,776,4.3,,,S3,G3
699
703
  Eriophyllum lanatum var. achilleoides,,N,7369,10587,80880
@@ -717,7 +721,9 @@ Erysimum capitatum var. angustatum,Contra Costa wallflower,N,58866,9942,119564,,
717
721
  Erysimum capitatum var. capitatum,western wallflower,N,58866,9943,50627,,"orange,yellow",3,9
718
722
  Erythranthe androsacea,,N,99088,13487,771845
719
723
  Erythranthe arvensis,"villous-bracted monkeyflower,field monkeyflower",N,99091,13552,771848,,yellow,4,7
724
+ Erythranthe breweri,Brewer's monkeyflower,N,,,,annual,pink,6,8
720
725
  Erythranthe cardinalis,scarlet monkeyflower,N,25147,13490,319974,,red,5,9
726
+ Erythranthe erubescens,blushing monkeyflower,N,100565,,771871,perennial,pink,6,8
721
727
  Erythranthe floribunda,many-flowered monkeyflower,N,99122,13492,701582,,yellow,4,8
722
728
  Erythranthe grandis,magnificent seep monkeyflower,N,99129,13560,771876,,yellow,5,7
723
729
  Erythranthe guttata,seep monkeyflower,N,99131,13493,470643,,yellow,4,9
@@ -725,7 +731,10 @@ Erythranthe inconspicua,small-flowered monkeyflower,N,99135,13416,771882,,pink,4
725
731
  Erythranthe laciniata,,N,99142,13417,546557,,,,,1093,4.3,,,S4,G4
726
732
  Erythranthe latidens,broad-tooth monkeyflower,N,99144,13495,771886,,"white,pink",4,6
727
733
  Erythranthe microphylla,small leaved monkeyflower,N,99152,13498,453717
734
+ Erythranthe moschata,musk monkeyflower,N,99156,,453644,perennial,yellow,6,8
728
735
  Erythranthe nasuta,shy monkeyflower,N,99158,13637,545973,,yellow,3,7
736
+ Erythranthe primuloides,primrose monkeyflower,N,99174,,635401,perennial,yellow,6,8
737
+ Erythranthe tilingii,Tiling's monkeyflower,N,99191,,,perennial,yellow,6,9
729
738
  Eschscholzia caespitosa,tufted poppy,N,25205,3511,58954
730
739
  Eschscholzia californica,California poppy,N,25206,3512,48225
731
740
  Eschscholzia rhombipetala,,N,25218,3527,77087,,,,,806,1B.1,,,S1,G1
@@ -829,7 +838,7 @@ Grindelia hirsutula,,N,3107,3960,55364,,yellow
829
838
  Grindelia stricta var. angustifolia,marsh gumplant,N,77358,3968,61991,,yellow
830
839
  Gruvelia pusilla,little combseed,N,105901,14570,57694
831
840
  Gutierrezia californica,California matchweed,N,3140,3977,57978
832
- Hainardia cylindrica,,X,27553,3996,60285
841
+ Hainardia cylindrica,,X,27553,3996,1477514
833
842
  Hedera canariensis,Canary Islands ivy,X,81236,8467,64113,,white,8,11
834
843
  Hedera helix,English ivy,X,27768,4023,55882,,white,8,11
835
844
  Hedypnois rhagadioloides,,X,99769,13134,492864
@@ -879,7 +888,7 @@ Holocarpha heermannii,Heermann's tarweed,N,3557,4204,62568,annual,yellow
879
888
  Holocarpha macradenia,Santa Cruz tarplant,N,3558,4205,62573,annual,,,,907,1B.1,CE,FT,S1,G1
880
889
  Holocarpha obconica,,N,3559,4206,62571,annual
881
890
  Holocarpha virgata subsp. virgata,,N,6108,4210,53102,annual,yellow,5,11
882
- Holodiscus discolor var. discolor,"cream bush,oceanspray",N,28344,4211,53414,perennial,white,5,8
891
+ Holodiscus discolor var. discolor,"cream bush,oceanspray",N,75685,11727,80941,perennial,white,5,8
883
892
  Holozonia filipes,Greene's white crown,N,3561,4216,77430,perennial,white,6,10
884
893
  Hordeum brachyantherum subsp. brachyantherum,meadow barley,N,76411,4219,61834
885
894
  Hordeum brachyantherum subsp. californicum,California barley,N,76414,4220,59092
@@ -908,6 +917,7 @@ Hypochaeris radicata,rough cat's ear,X,3625,4314,53104,perennial,yellow,4,7
908
917
  Idahoa scapigera,flat-pod,N,28891,4316,77486
909
918
  Ilex aquifolium,English holly,X,28898,4317,53856
910
919
  Impatiens balfourii,touch-me-not,X,28954,4320,77490
920
+ Ipomopsis aggregata subsp. aggregata,scarlet gilia,N,51025,,,perennial,red,6,9
911
921
  Iris douglasiana,Douglas' iris,N,29188,4346,50854
912
922
  Iris foetidissima,stinking iris,X,29193,8604,64331
913
923
  Iris longipetala,central coast iris,N,29293,4354,67703,,,,,3169,4.2,,,S3,G3
@@ -920,7 +930,7 @@ Isolepis cernua,,N,79218,9605,60257
920
930
  Iva axillaris,poverty weed,N,3654,10020,58837
921
931
  Jaumea carnosa,,N,3667,4424,60969
922
932
  Juglans californica,Southern California black walnut,N,29566,4428,54503,,,,,1704,4.2,,,S4,G4
923
- Juglans hindsii,Northern California black walnut,N,29568,,,perennial,,4,5
933
+ Juglans hindsii,Northern California black walnut,N,29568,8943,54502,perennial,,4,5
924
934
  Juncus acuminatus,tapered rush,N,29592,4432,77549
925
935
  Juncus ambiguus,frog rush,X,29601,4434,436606
926
936
  Juncus articulatus subsp. articulatus,jointed rush,N,91767,11773,79958
@@ -1024,11 +1034,14 @@ Lessingia nemaclada,,N,3785,4753,60508
1024
1034
  Lessingia pectinata var. tenuipes,,N,81838,11800,81020
1025
1035
  Lessingia ramulosa,,N,3786,4755,77716
1026
1036
  Lessingia tenuis,spring lessingia,N,3778,4756,58025,,,,,684,4.3,,,S4,G4
1027
- Lewisia rediviva var. rediviva,bitterroot,N,60818,10066,81025,,"white,pink",3,6
1037
+ Lewisia leeana,quill-leaved lewisia,N,30833,,,perennial,"pink,white",6,8
1038
+ Lewisia rediviva var. rediviva,bitterroot,N,60818,10066,81025,perennial,"white,pink",3,6
1028
1039
  Ligusticum apiifolium,,N,30890,4794,59298
1029
1040
  Ligustrum lucidum,Chinese privet,X,30906,8656,77740
1030
1041
  Lilaeopsis masonii,Mason's lilaeopsis,N,30919,4798,77742,,,,,974,1B.1,CR,,S2,G2
1031
1042
  Lilium pardalinum subsp. pardalinum,leopard lily,N,51254,4810,61829
1043
+ Lilium pardalinum subsp. shastense,Shasta lily,N,51255,,,perennial,orange,7,8
1044
+ Lilium rubescens,redwood lily,N,30961,,,perennial,"white,pink",5,8
1032
1045
  Limnanthes douglasii subsp. douglasii,meadowfoam,N,51259,4826,51341
1033
1046
  Limnanthes douglasii subsp. nivea,meadowfoam,N,51260,4827,51342
1034
1047
  Limnanthes douglasii subsp. rosea,,N,51261,4828,51339
@@ -1048,8 +1061,8 @@ Lithophragma cymbalaria,,N,31241,4925,58323
1048
1061
  Lithophragma heterophyllum,hill starflower,N,31244,4927,53124,,white
1049
1062
  Lithophragma parviflorum var. parviflorum,,N,60952,4930,81027,,"white,pink",3,7
1050
1063
  Lobularia maritima,sweet alyssum,X,31347,4939,56992
1051
- Logfia filaginoides,herba impia,N,81847,10960,64254
1052
- Logfia gallica,,X,31363,9521,56949
1064
+ Logfia filaginoides,herba impia,N,81847,10960,64254,annual,red,2,5
1065
+ Logfia gallica,,X,31363,9521,56949,annual,"brown,yellow",3,7
1053
1066
  Lomatium californicum,chu-chu-pate,N,31389,4950,56824,,yellow,4,6
1054
1067
  Lomatium caruifolium var. caruifolium,,N,61026,4953,64328
1055
1068
  Lomatium caruifolium var. denticulatum,,N,61027,4954,60123
@@ -1087,6 +1100,7 @@ Lupinus nanus,sky lupine,N,31978,5189,50612,,blue,3,6
1087
1100
  Lupinus pachylobus,big pod lupine,N,31998,5196,50613
1088
1101
  Lupinus succulentus,arroyo lupine,N,32095,5217,56759,annual,blue,2,5
1089
1102
  Luzula comosa var. comosa,wood rush,N,72790,11810,81079
1103
+ Luzula macrantha,prairie woodrush,N,100427,14739,890625,perennial,brown,4,7
1090
1104
  Luzula subsessilis,,N,32171,11815,77901
1091
1105
  Lychnis coronaria,rose campion,X,32177,5229,485191
1092
1106
  Lycopus americanus,cutleaf bugleweed,N,32313,5247,60206
@@ -1108,8 +1122,8 @@ Madia radiata,showy madia,N,4053,5296,77924,,,,,1054,1B.1,,,S3,G3
1108
1122
  Madia sativa,coast tarweed,N,4055,5298,53143,,yellow
1109
1123
  Maianthemum racemosum,false Solomon's seal,N,32495,10096,51062
1110
1124
  Maianthemum stellatum,,N,32497,9629,53268
1111
- Malacothamnus arcuatus var. elmeri,,N,108345,14681,1497404,,,,,1065,1B.2,,,S2,G2
1112
- Malacothamnus fremontii,white-coat mallow,N,32524,5312,70397
1125
+ Malacothamnus arcuatus var. elmeri,,N,108345,14681,1497404,perennial,pink,4,5,1065,1B.2,,,S2,G2
1126
+ Malacothamnus fremontii var. fremontii,long-haired unfurled bushmallow,N,108341,14689,70398,perennial,pink,5,6
1113
1127
  Malacothamnus hallii,,N,108345,14681,1497404,,,,,1065,1B.2,,,S2,G2
1114
1128
  Malacothrix californica,,N,4059,5325,58026
1115
1129
  Malacothrix clevelandii,Cleveland's malacothrix,N,4060,5326,58841
@@ -1214,7 +1228,7 @@ Navarretia heterandra,Tehama navarretia,N,34453,5781,78181,,,,,1162,4.3,,,S4,G4
1214
1228
  Navarretia intertexta,needleleaf navarretia,N,34455,5783,60225
1215
1229
  Navarretia mellita,,N,34465,5794,58975
1216
1230
  Navarretia nigelliformis subsp. nigelliformis,,N,51676,5797,78186,,,,,3233,4.2,,,S3,G4T3
1217
- Navarretia nigelliformis subsp. radians,adobe navarretia,N,51677,5798,80060,,,,,1738,1B.2,,,S2,G4T2
1231
+ Navarretia nigelliformis subsp. radians,adobe navarretia,N,51677,5798,80060,,,,,1738,1B.2,,,S2S3,G4T2
1218
1232
  Navarretia prostrata,,N,34470,5803,78190,,,,,1983,1B.2,,,S2,G2
1219
1233
  Navarretia pubescens,downy pincushion,N,34471,5804,58976
1220
1234
  Navarretia squarrosa,skunkweed,N,34475,5807,53157
@@ -1587,7 +1601,7 @@ Scoliopus bigelovii,,N,43824,7416,48990
1587
1601
  Scolymus hispanicus,golden thistle,X,4661,7417,79009
1588
1602
  Scribneria bolanderi,,N,43846,7420,57196
1589
1603
  Scrophularia californica,California figwort,N,43849,7422,50812,,white
1590
- Scutellaria bolanderi subsp. bolanderi,Sierra skullcap,N,52896,,,perennial,"white,blue",6,7
1604
+ Scutellaria bolanderi subsp. bolanderi,Sierra skullcap,N,52896,7431,80184,perennial,"white,blue",6,7
1591
1605
  Scutellaria californica,,N,43883,7432,59791,perennial
1592
1606
  Scutellaria galericulata,,N,43891,7433,79016,perennial,,,,1767,2B.2,,,S2,G5
1593
1607
  Scutellaria siphocampyloides,,N,43926,7437,59792,perennial,blue,5,7
@@ -1756,14 +1770,14 @@ Trifolium incarnatum,crimson clover,X,47100,8084,64268
1756
1770
  Trifolium macraei,Macrae's clover,N,47122,8094,61020
1757
1771
  Trifolium microcephalum,small-head clover,N,47129,8096,58911
1758
1772
  Trifolium microdon,thimble clover,N,47130,8097,57079
1759
- Trifolium obtusiflorum,clammy clover,N,47144,8101,58912
1773
+ Trifolium obtusiflorum,clammy clover,N,47144,8101,58912,annual,"purple,white",4,7
1760
1774
  Trifolium oliganthum,few-flowered clover,N,47145,8102,71122
1761
1775
  Trifolium pratense,red clover,X,47160,8104,51875
1762
1776
  Trifolium repens,white clover,X,47164,8105,55745
1763
1777
  Trifolium subterraneum,subterranean clover,X,47174,8106,60201
1764
1778
  Trifolium tomentosum,woolly clover,X,47177,8586,61024
1765
1779
  Trifolium variegatum,,N,47179,8108,57080
1766
- Trifolium willdenovii,tomcat clover,N,47186,8109,57081
1780
+ Trifolium willdenovii,tomcat clover,N,47186,8109,57081,annual,"purple,white",3,6
1767
1781
  Trifolium wormskioldii,cow clover,N,47188,8110,71146
1768
1782
  Triglochin concinna var. concinna,slender arrow-grass,N,74018,8112,81439
1769
1783
  Triglochin maritima,seaside arrow-grass,N,47197,8114,60264
@@ -0,0 +1 @@
1
+ Plant glandular and sticky, hairy.
@@ -0,0 +1 @@
1
+ At least 2 inflorescences per rosette. Usually has some small non-basal leaves.
@@ -0,0 +1 @@
1
+ Only one inflorescence per rosette. Usually has only basal leaves.
@@ -0,0 +1 @@
1
+ [Style](./g/style.html) shorter than stamens. All 4 sepals attached to each other and directed to one side.
@@ -0,0 +1 @@
1
+ Petals with three lobes; middle lobe narrower and longer than the other two. 4 stamens.
@@ -0,0 +1 @@
1
+ Petals with 3 lobes; lobes of equal width. 4 stamens. [Stigma](./g/stigma.html) not protruding beyond anthers.
@@ -0,0 +1 @@
1
+ Petals usually light pink with darker flecks. Petals narrow and not overlapping. All 4 sepals attached to each other and directed to one side. 8 stamens; anthers in two series, with inner series smaller and paler.
@@ -0,0 +1 @@
1
+ [Stigma](./g/stigma.html) not protruding beyond anthers.
@@ -0,0 +1 @@
1
+ Petal red at base. 8 stamens.
@@ -1 +1 @@
1
- Flowers hairy.
1
+ Upper petals, lower surface of leaves, and side sepals hairy. Sepals lavender (subsp. _interius_ has green-white sepals).
@@ -0,0 +1 @@
1
+ Upper petals and leaves not hairy. Sepals green-white (subsp. _californicum_ has lavender sepals).
@@ -1 +1 @@
1
- Flowers dark blue to purple. Sepals dark blue-purple; not bent back.
1
+ Leaves hairy on undersides. Flowers dark blue to purple. Sepals dark blue-purple; not hairy, not bent back.
@@ -0,0 +1 @@
1
+ Leaves hairy on undersides. Flowers white to pink.
@@ -0,0 +1 @@
1
+ Leaves hairy on both sides. Inflorescence with more than 10 flowers.
@@ -0,0 +1 @@
1
+ Has leaves along stem, not just basal rosette. Musky smell.
@@ -0,0 +1 @@
1
+ Leaves resemble a basal rosette.
@@ -0,0 +1 @@
1
+ Base of lower lip swollen.
@@ -0,0 +1 @@
1
+ Pollen yellow to orange. Anthers orange to magenta.
@@ -0,0 +1 @@
1
+ Leaf flexible, wider at end than at base.
@@ -0,0 +1 @@
1
+ Leaf awl-shaped and stiff.
@@ -0,0 +1 @@
1
+ Fewer than 6 [calyx](./g/calyx.html) lobes.
@@ -0,0 +1 @@
1
+ At least 6 [calyx](./g/calyx.html) lobes.
@@ -0,0 +1 @@
1
+ Similar to _T. willdenovii_, but with longer teeth on leaves, [calyx](./g/calyx.html) generally hairy and/or bumpy.
@@ -0,0 +1 @@
1
+ Similar to _T. obtusiflorum_, but with shorter teeth on leaves, [calyx](./g/calyx.html) not hairy or bumpy.
@@ -3,88 +3,97 @@ import path from "node:path";
3
3
 
4
4
  import sharp from "sharp";
5
5
 
6
- import { Config, CSV, Files } from "@ca-plant-list/ca-plant-list";
7
-
8
6
  import { Image } from "./image.js";
9
7
  import { EBook } from "./ebook.js";
10
8
  import { Taxa } from "../taxa.js";
9
+ import { Config } from "../config.js";
10
+ import { CSV } from "../csv.js";
11
+ import { Files } from "../files.js";
11
12
 
12
13
  class Images {
13
-
14
14
  #siteGenerator;
15
15
  #contentDir;
16
16
  #taxa;
17
17
  #images = {};
18
18
 
19
- constructor( siteGenerator, contentDir, taxa ) {
19
+ constructor(siteGenerator, contentDir, taxa) {
20
20
  this.#siteGenerator = siteGenerator;
21
21
  this.#contentDir = contentDir;
22
22
  this.#taxa = taxa;
23
23
  }
24
24
 
25
25
  async createImages() {
26
-
27
26
  const photoDirSrc = "external_data/photos";
28
27
  const imagePrefix = "i";
29
28
  const photoDirTarget = this.#contentDir + "/" + imagePrefix;
30
- fs.mkdirSync( photoDirSrc, { recursive: true } );
31
- fs.mkdirSync( photoDirTarget, { recursive: true } );
32
-
33
- const rows = CSV.parseFile( Config.getPackageDir() + "/data", "photos.csv" );
34
- for ( const row of rows ) {
35
-
36
- const name = row[ "taxon_name" ];
37
- const taxon = this.#taxa.getTaxon( name );
38
- if ( !taxon ) {
29
+ fs.mkdirSync(photoDirSrc, { recursive: true });
30
+ fs.mkdirSync(photoDirTarget, { recursive: true });
31
+
32
+ const rows = CSV.parseFile(
33
+ Config.getPackageDir() + "/data",
34
+ "photos.csv"
35
+ );
36
+ for (const row of rows) {
37
+ const name = row["taxon_name"];
38
+ const taxon = this.#taxa.getTaxon(name);
39
+ if (!taxon) {
39
40
  continue;
40
41
  }
41
42
 
42
- let imageList = this.#images[ name ];
43
- if ( !imageList ) {
43
+ let imageList = this.#images[name];
44
+ if (!imageList) {
44
45
  imageList = [];
45
- this.#images[ name ] = imageList;
46
+ this.#images[name] = imageList;
46
47
  }
47
48
 
48
- const src = new URL( row[ "source" ] );
49
- const parts = path.parse( src.pathname ).dir.split( "/" );
50
- const prefix = src.host.includes( "calflora" ) ? "cf-" : "inat-";
51
- const filename = prefix + parts.slice( -1 )[ 0 ] + ".jpg";
49
+ const src = new URL(row["source"]);
50
+ const parts = path.parse(src.pathname).dir.split("/");
51
+ const prefix = src.host.includes("calflora") ? "cf-" : "inat-";
52
+ const filename = prefix + parts.slice(-1)[0] + ".jpg";
52
53
  const srcFileName = photoDirSrc + "/" + filename;
53
54
  const targetFileName = photoDirTarget + "/" + filename;
54
55
 
55
- if ( !fs.existsSync( srcFileName ) ) {
56
+ if (!fs.existsSync(srcFileName)) {
56
57
  // File is not there; retrieve it.
57
- console.log( "retrieving " + srcFileName );
58
- await Files.fetch( src, srcFileName );
58
+ console.log("retrieving " + srcFileName);
59
+ await Files.fetch(src, srcFileName);
59
60
  }
60
61
 
61
- await new sharp( srcFileName ).resize( { width: 300 } ).jpeg( { quality: 40 } ).toFile( targetFileName );
62
-
63
- imageList.push( new Image( imagePrefix + "/" + filename, row[ "credit" ] ) );
62
+ await new sharp(srcFileName)
63
+ .resize({ width: 300 })
64
+ .jpeg({ quality: 40 })
65
+ .toFile(targetFileName);
64
66
 
67
+ imageList.push(
68
+ new Image(imagePrefix + "/" + filename, row["credit"])
69
+ );
65
70
  }
66
71
 
67
- this.#siteGenerator.copyIllustrations( Taxa.getFlowerColors() );
68
-
72
+ this.#siteGenerator.copyIllustrations(Taxa.getFlowerColors());
69
73
  }
70
74
 
71
75
  getManifestEntries() {
72
-
73
76
  const entries = [];
74
- const images = Files.getDirEntries( this.#contentDir + "/i" ).sort();
75
-
76
- for ( let index = 0; index < images.length; index++ ) {
77
- const fileName = images[ index ];
78
- const ext = fileName.split( "." )[ 1 ];
79
- entries.push( EBook.getManifestEntry( "i" + index, "i/" + fileName, EBook.getMediaTypeForExt( ext ) ) );
77
+ const images = Files.getDirEntries(this.#contentDir + "/i").sort();
78
+
79
+ for (let index = 0; index < images.length; index++) {
80
+ const fileName = images[index];
81
+ const ext = fileName.split(".")[1];
82
+ entries.push(
83
+ EBook.getManifestEntry(
84
+ "i" + index,
85
+ "i/" + fileName,
86
+ EBook.getMediaTypeForExt(ext)
87
+ )
88
+ );
80
89
  }
81
90
 
82
- return entries.join( "" );
91
+ return entries.join("");
83
92
  }
84
93
 
85
- getTaxonImages( name ) {
86
- return this.#images[ name ];
94
+ getTaxonImages(name) {
95
+ return this.#images[name];
87
96
  }
88
97
  }
89
98
 
90
- export { Images };
99
+ export { Images };
@@ -1,26 +1,32 @@
1
+ import { HTMLTaxon } from "../../htmltaxon.js";
1
2
  import { EBookPage } from "../ebookpage.js";
2
3
  import { XHTML } from "../xhtml.js";
3
4
 
4
5
  class PageListSpecies extends EBookPage {
5
-
6
6
  #taxa;
7
7
 
8
- constructor( outputDir, taxa, filename, title ) {
9
- super( outputDir + "/" + filename, title );
8
+ /**
9
+ *
10
+ * @param {string} outputDir
11
+ * @param {Taxon[]} taxa
12
+ * @param {string} filename
13
+ * @param {string} title
14
+ */
15
+ constructor(outputDir, taxa, filename, title) {
16
+ super(outputDir + "/" + filename, title);
10
17
  this.#taxa = taxa;
11
18
  }
12
19
 
13
20
  renderPageBody() {
14
-
15
- const html = XHTML.textElement( "h1", this.getTitle() );
21
+ const html = XHTML.textElement("h1", this.getTitle());
16
22
 
17
23
  const links = [];
18
- for ( const taxon of this.#taxa ) {
19
- links.push( XHTML.getLink( taxon.getFileName(), taxon.getName() ) );
24
+ for (const taxon of this.#taxa) {
25
+ links.push(HTMLTaxon.getLink(taxon));
20
26
  }
21
27
 
22
- return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );
28
+ return html + XHTML.wrap("ol", XHTML.arrayToLI(links));
23
29
  }
24
30
  }
25
31
 
26
- export { PageListSpecies };
32
+ export { PageListSpecies };