Skip to content

Commit

Permalink
chore: remove Calscape errors
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkenny54 committed Dec 5, 2024
1 parent 9edb869 commit 4b665d7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
7 changes: 7 additions & 0 deletions data/exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,19 @@
"translation-to-rpi": "Malacothamnus hallii"
}
},
"Mentha arvensis": {
"calflora": { "native": false },
"calscape": { "notnative": true }
},
"Myosurus minimus subsp. apus": {
"comment": "in CNPS Rare Plant Inventory",
"jepson": {
"notineflora": true
}
},
"Ranunculus sceleratus var. sceleratus": {
"calflora": { "native": false }
},
"Ravenella exigua": {
"comment": "in CNPS Rare Plant Inventory as Ravenella",
"rpi": {
Expand Down
5 changes: 3 additions & 2 deletions data/taxa.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ Melissa officinalis,lemon balm,X,33161,5408,59901
Mentha ×gracilis,Scotch spearmint,X,33199,11833,181919
Mentha ×piperita,peppermint,X,33203,5412,181525
Mentha aquatica,water mint,X,33191,10110,77990
Mentha arvensis,field mint,X,33193,5413,58188,Field Mint
Mentha arvensis,field mint,X,33193,5413,58188
Mentha canadensis,American cornmint,N,33195,10635,77991,American Cornmint
Mentha pulegium,pennyroyal,X,33206,5414,57116
Mentha spicata,spearmint,X,33209,10111,62652
Expand Down Expand Up @@ -1525,7 +1525,8 @@ Ranunculus occidentalis var. occidentalis,,N,64947,11979,81335,Western Buttercup
Ranunculus orthorhynchus var. bloomeri,,N,64956,7051,81337,Bloomer's Buttercup
Ranunculus orthorhynchus var. orthorhynchus,,N,64957,7052,81338,Straightbeak Buttercup
Ranunculus repens,,X,40965,7056,48229
Ranunculus sceleratus,cursed crowsfoot,X,40971,7059,59301,Cursed Buttercup
Ranunculus sceleratus,cursed crowsfoot,N,40971,7059,59301,Cursed Buttercup
Ranunculus sceleratus var. sceleratus,,X,64987,11983,,,annual,yellow,4,6
Raphanus raphanistrum,jointed charlock,X,40991,7063,55411
Raphanus sativus,wild radish,X,40992,7064,995125
Rhamnus alaternus,Italian buckthorn,X,81104,9447,82856
Expand Down
10 changes: 8 additions & 2 deletions lib/taxa.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Taxon } from "./taxon.js";
import { Families } from "./families.js";
import { FlowerColor } from "./flowercolor.js";
import { InatPhoto } from "./inat_photo.js";
import { TaxaCSV } from "./tools/taxacsv.js";

const FLOWER_COLORS = [
{ name: "white", color: "white" },
Expand Down Expand Up @@ -62,8 +63,13 @@ class Taxa {

this.#families = new Families();

const taxaCSV = CSV.parseFile(dataDir, "taxa.csv");
this.#loadTaxa(taxaCSV, inclusionList, taxonFactory, showFlowerErrors);
const taxaCSV = new TaxaCSV(dataDir);
this.#loadTaxa(
taxaCSV.getTaxa(),
inclusionList,
taxonFactory,
showFlowerErrors,
);
this.#loadTaxa(
extraTaxa,
inclusionList,
Expand Down

0 comments on commit 4b665d7

Please sign in to comment.