@ca-plant-list/ca-plant-list 0.4.17 → 0.4.19

package/lib/pagerenderer.js

@@ -7,259 +7,262 @@ import { HTML } from "./html.js";
 import { HTMLTaxon, TAXA_LIST_COLS } from "./htmltaxon.js";
 
 const ENDANGERED_COLS = [
-  TAXA_LIST_COLS.SPECIES,
-  TAXA_LIST_COLS.COMMON_NAME,
-  TAXA_LIST_COLS.CESA,
-  TAXA_LIST_COLS.FESA,
+    TAXA_LIST_COLS.SPECIES,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CESA,
+    TAXA_LIST_COLS.FESA,
 ];
 const RPI_COLUMNS = [
-  TAXA_LIST_COLS.SPECIES_BARE,
-  TAXA_LIST_COLS.COMMON_NAME,
-  TAXA_LIST_COLS.CNPS_RANK,
+    TAXA_LIST_COLS.SPECIES_BARE,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CNPS_RANK,
 ];
 
 class PageRenderer extends BasePageRenderer {
-  /**
-   * @param {string} outputDir
-   * @param {import('./config.js').Config} config
-   * @param {Taxa} taxa
-   */
-  static render(outputDir, config, taxa) {
-    super.renderBasePages(outputDir, taxa);
+    /**
+     * @param {string} outputDir
+     * @param {import('./config.js').Config} config
+     * @param {import("./taxa.js").Taxa} taxa
+     */
+    static render(outputDir, config, taxa) {
+        super.renderBasePages(outputDir, taxa);
 
-    this.renderLists(outputDir, config, taxa);
+        this.renderLists(outputDir, config, taxa);
 
-    const taxonList = taxa.getTaxonList();
-    for (const taxon of taxonList) {
-      new PageTaxon(outputDir, config, taxon).render();
+        const taxonList = taxa.getTaxonList();
+        for (const taxon of taxonList) {
+            new PageTaxon(outputDir, config, taxon).render();
+        }
     }
-  }
 
-  /**
-   * @param {string} outputDir
-   * @param {Config} config
-   * @param {Taxa} taxa
-   */
-  static renderLists(outputDir, config, taxa) {
     /**
-     * @param {ListInfo[]} listInfo
-     * @param {Object<string,string>} attributes
-     * @param {TaxaCol[]} [columns]
-     * @returns {string}
+     * @param {string} outputDir
+     * @param {import('./config.js').Config} config
+     * @param {import("./taxa.js").Taxa} taxa
      */
-    function getListArray(listInfo, attributes = {}, columns) {
-      const listArray = [];
-      for (const list of listInfo) {
-        const listTaxa = [];
-        const calfloraTaxa = [];
-        const iNatTaxa = [];
-        for (const taxon of taxa.getTaxonList()) {
-          if (list.include(taxon)) {
-            listTaxa.push(taxon);
-            calfloraTaxa.push(taxon.getCalfloraName());
-            iNatTaxa.push(taxon.getINatName());
-          }
-        }
+    static renderLists(outputDir, config, taxa) {
+        /**
+         * @param {ListInfo[]} listInfo
+         * @param {Object<string,string>} attributes
+         * @param {import("./htmltaxon.js").TaxaColDef[]} [columns]
+         * @returns {string}
+         */
+        function getListArray(listInfo, attributes = {}, columns) {
+            const listArray = [];
+            for (const list of listInfo) {
+                const listTaxa = [];
+                const calfloraTaxa = [];
+                const iNatTaxa = [];
+                for (const taxon of taxa.getTaxonList()) {
+                    if (list.include(taxon)) {
+                        listTaxa.push(taxon);
+                        calfloraTaxa.push(taxon.getCalfloraName());
+                        iNatTaxa.push(taxon.getINatName());
+                    }
+                }
 
-        if (listTaxa.length === 0) {
-          continue;
-        }
+                if (listTaxa.length === 0) {
+                    continue;
+                }
 
-        Files.write(
-          outputDir + "/calflora_" + list.filename + ".txt",
-          calfloraTaxa.join("\n")
-        );
-        Files.write(
-          outputDir + "/inat_" + list.filename + ".txt",
-          iNatTaxa.join("\n")
-        );
+                Files.write(
+                    outputDir + "/calflora_" + list.filename + ".txt",
+                    calfloraTaxa.join("\n"),
+                );
+                Files.write(
+                    outputDir + "/inat_" + list.filename + ".txt",
+                    iNatTaxa.join("\n"),
+                );
 
-        const cols = columns ? columns : list.columns;
-        new PageTaxonList(outputDir, list.name, list.filename).render(
-          listTaxa,
-          cols
-        );
+                const cols = columns ? columns : list.columns;
+                new PageTaxonList(outputDir, list.name, list.filename).render(
+                    listTaxa,
+                    cols,
+                );
 
-        // Check for sublists.
-        const subListHTML = list.listInfo
-          ? getListArray(list.listInfo, { class: "indent" }, cols)
-          : "";
+                // Check for sublists.
+                const subListHTML = list.listInfo
+                    ? getListArray(list.listInfo, { class: "indent" }, cols)
+                    : "";
 
-        listArray.push(
-          HTML.getLink("./" + list.filename + ".html", list.name) +
-            " (" +
-            listTaxa.length +
-            ")" +
-            subListHTML
-        );
-      }
+                listArray.push(
+                    HTML.getLink("./" + list.filename + ".html", list.name) +
+                        " (" +
+                        listTaxa.length +
+                        ")" +
+                        subListHTML,
+                );
+            }
 
-      return renderList(listArray, attributes);
-    }
+            return renderList(listArray, attributes);
+        }
 
-    /**
-     * @param {string[]} listsHTML
-     * @param {Object<string,string>} attributes
-     */
-    function renderList(listsHTML, attributes = {}) {
-      return HTML.wrap("ul", HTML.arrayToLI(listsHTML), attributes);
-    }
+        /**
+         * @param {string[]} listsHTML
+         * @param {Object<string,string>} attributes
+         */
+        function renderList(listsHTML, attributes = {}) {
+            return HTML.wrap("ul", HTML.arrayToLI(listsHTML), attributes);
+        }
 
-    /**
-     * @param {string} title
-     * @param {string} listsHTML
-     */
-    function renderSection(title, listsHTML) {
-      let html = '<div class="section nobullet">';
-      html += HTML.textElement("h2", title);
-      html += listsHTML;
-      html += "</div>";
-      return html;
-    }
+        /**
+         * @param {string} title
+         * @param {string} listsHTML
+         */
+        function renderSection(title, listsHTML) {
+            let html = '<div class="section nobullet">';
+            html += HTML.textElement("h2", title);
+            html += listsHTML;
+            html += "</div>";
+            return html;
+        }
 
-    /** @typedef {{name:string,filename:string,include:function(Taxon):boolean,columns?:TaxaCol[],listInfo?:ListInfo[]}} ListInfo */
-    /** @type {{title:string,listInfo:ListInfo[]}[]} */
-    const sections = [
-      {
-        title: "All Species",
-        listInfo: [
-          {
-            name: config.getLabel("native", "Native"),
-            filename: "list_native",
-            include: (t) => t.isNative(),
-          },
-          {
-            name: config.getLabel("introduced", "Introduced"),
-            filename: "list_introduced",
-            include: (t) => !t.isNative(),
-          },
-          {
-            name: "All Plants",
-            filename: "list_all",
-            include: () => true,
-          },
-        ],
-      },
-      {
-        title: "Rare Plants",
-        listInfo: [
-          {
-            name: "CNPS Ranked Plants",
-            filename: "list_rpi",
-            include: (t) => t.getRPIRank() !== undefined,
-            columns: RPI_COLUMNS,
-            listInfo: [
-              {
-                name: RarePlants.getRPIRankDescription("1A"),
-                filename: "list_rpi_1a",
-                include: (t) => t.getRPIRank() === "1A",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("1B"),
-                filename: "list_rpi_1b",
-                include: (t) => t.getRPIRank() === "1B",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("2A"),
-                filename: "list_rpi_2a",
-                include: (t) => t.getRPIRank() === "2A",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("2B"),
-                filename: "list_rpi_2b",
-                include: (t) => t.getRPIRank() === "2B",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("3"),
-                filename: "list_rpi_3",
-                include: (t) => t.getRPIRank() === "3",
-              },
-              {
-                name: RarePlants.getRPIRankDescription("4"),
-                filename: "list_rpi_4",
-                include: (t) => t.getRPIRank() === "4",
-              },
-            ],
-          },
-          {
-            name: "Endangered Species",
-            filename: "list_endangered",
-            include: (t) =>
-              t.getCESA() !== undefined || t.getFESA() !== undefined,
-            columns: ENDANGERED_COLS,
-          },
-        ],
-      },
-    ];
+        /** @typedef {{name:string,filename:string,include:function(import("./taxon.js").Taxon):boolean,columns?:import("./htmltaxon.js").TaxaColDef[],listInfo?:ListInfo[]}} ListInfo */
+        /** @type {{title:string,listInfo:ListInfo[]}[]} */
+        const sections = [
+            {
+                title: "All Species",
+                listInfo: [
+                    {
+                        name: config.getLabel("native", "Native"),
+                        filename: "list_native",
+                        include: (t) => t.isNative(),
+                    },
+                    {
+                        name: config.getLabel("introduced", "Introduced"),
+                        filename: "list_introduced",
+                        include: (t) => !t.isNative(),
+                    },
+                    {
+                        name: "All Plants",
+                        filename: "list_all",
+                        include: () => true,
+                    },
+                ],
+            },
+            {
+                title: "Rare Plants",
+                listInfo: [
+                    {
+                        name: "CNPS Ranked Plants",
+                        filename: "list_rpi",
+                        include: (t) => t.getRPIRank() !== undefined,
+                        columns: RPI_COLUMNS,
+                        listInfo: [
+                            {
+                                name: RarePlants.getRPIRankDescription("1A"),
+                                filename: "list_rpi_1a",
+                                include: (t) => t.getRPIRank() === "1A",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("1B"),
+                                filename: "list_rpi_1b",
+                                include: (t) => t.getRPIRank() === "1B",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("2A"),
+                                filename: "list_rpi_2a",
+                                include: (t) => t.getRPIRank() === "2A",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("2B"),
+                                filename: "list_rpi_2b",
+                                include: (t) => t.getRPIRank() === "2B",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("3"),
+                                filename: "list_rpi_3",
+                                include: (t) => t.getRPIRank() === "3",
+                            },
+                            {
+                                name: RarePlants.getRPIRankDescription("4"),
+                                filename: "list_rpi_4",
+                                include: (t) => t.getRPIRank() === "4",
+                            },
+                        ],
+                    },
+                    {
+                        name: "Endangered Species",
+                        filename: "list_endangered",
+                        include: (t) =>
+                            t.getCESA() !== undefined ||
+                            t.getFESA() !== undefined,
+                        columns: ENDANGERED_COLS,
+                    },
+                ],
+            },
+        ];
 
-    let html = '<div class="wrapper">';
-    for (const section of sections) {
-      const listHTML = getListArray(section.listInfo);
+        let html = '<div class="wrapper">';
+        for (const section of sections) {
+            const listHTML = getListArray(section.listInfo);
 
-      if (listHTML.length > 0) {
-        html += renderSection(section.title, listHTML);
-      }
-    }
-    html += renderSection(
-      "Taxonomy",
-      renderList([HTML.getLink("./list_families.html", "Plant Families")])
-    );
+            if (listHTML.length > 0) {
+                html += renderSection(section.title, listHTML);
+            }
+        }
+        html += renderSection(
+            "Taxonomy",
+            renderList([
+                HTML.getLink("./list_families.html", "Plant Families"),
+            ]),
+        );
 
-    html += "</div>";
+        html += "</div>";
 
-    // Write lists to includes directory so it can be inserted into pages.
-    Files.write(outputDir + "/_includes/plantlists.html", html);
-  }
+        // Write lists to includes directory so it can be inserted into pages.
+        Files.write(outputDir + "/_includes/plantlists.html", html);
+    }
 }
 
 class PageTaxonList extends GenericPage {
-  /**
-   * @param {string} outputDir
-   * @param {string} title
-   * @param {string} baseName
-   */
-  constructor(outputDir, title, baseName) {
-    super(outputDir, title, baseName);
-  }
+    /**
+     * @param {string} outputDir
+     * @param {string} title
+     * @param {string} baseName
+     */
+    constructor(outputDir, title, baseName) {
+        super(outputDir, title, baseName);
+    }
 
-  /**
-   *
-   * @param {Taxon[]} taxa
-   * @param {TaxaCol[]|undefined} columns
-   */
-  render(taxa, columns) {
-    let html = this.getDefaultIntro();
+    /**
+     *
+     * @param {import("./taxon.js").Taxon[]} taxa
+     * @param {import("./htmltaxon.js").TaxaColDef[]|undefined} columns
+     */
+    render(taxa, columns) {
+        let html = this.getDefaultIntro();
 
-    html += '<div class="wrapper">';
+        html += '<div class="wrapper">';
 
-    html += '<div class="section">';
-    html += HTMLTaxon.getTaxaTable(taxa, columns);
-    html += "</div>";
+        html += '<div class="section">';
+        html += HTMLTaxon.getTaxaTable(taxa, columns);
+        html += "</div>";
 
-    html += '<div class="section nobullet">';
-    html += HTML.textElement("h2", "Download");
-    html += "<ul>";
-    html +=
-      "<li>" +
-      HTML.getLink(
-        "./calflora_" + this.getBaseFileName() + ".txt",
-        "Calflora List"
-      ) +
-      "</li>";
-    html +=
-      "<li>" +
-      HTML.getLink(
-        "./inat_" + this.getBaseFileName() + ".txt",
-        "iNaturalist List"
-      ) +
-      "</li>";
-    html += "</ul>";
-    html += "</div>";
+        html += '<div class="section nobullet">';
+        html += HTML.textElement("h2", "Download");
+        html += "<ul>";
+        html +=
+            "<li>" +
+            HTML.getLink(
+                "./calflora_" + this.getBaseFileName() + ".txt",
+                "Calflora List",
+            ) +
+            "</li>";
+        html +=
+            "<li>" +
+            HTML.getLink(
+                "./inat_" + this.getBaseFileName() + ".txt",
+                "iNaturalist List",
+            ) +
+            "</li>";
+        html += "</ul>";
+        html += "</div>";
 
-    html += "</div>";
+        html += "</div>";
 
-    this.writeFile(html);
-  }
+        this.writeFile(html);
+    }
 }
 
 export { PageRenderer };

package/lib/photo.js

@@ -1,44 +1,74 @@
-const CC0 = "CC0";
-const CC_BY = "CC BY";
-const CC_BY_NC = "CC BY-NC";
-const COPYRIGHT = "C";
+/**
+ * @typedef {"CC0" | "CC BY" | "CC BY-NC" | "C" | null} PhotoRights
+ * @typedef { "cc-by-nc-sa"
+    | "cc-by-nc"
+    | "cc-by-nc-nd"
+    | "cc-by"
+    | "cc-by-sa"
+    | "cc-by-nd"
+    | "pd"
+    | "gdfl"
+    | "cc0"} InatLicenseCode
+ */
 
-class Photo {
-    /** @type {string?} */
-    #url;
-    /** @type {string?} */
-    rightsHolder;
-    /** @type {null | typeof COPYRIGHT | typeof CC_BY | typeof CC_BY_NC | typeof CC0} */
-    rights;
+export class Photo {
+    #id;
+    #ext;
+    #rightsHolder;
+    /** @type {PhotoRights} */
+    #rights;
 
     /**
-     * @param {string?} url
-     * @param {string?} rightsHolder
-     * @param {null | typeof COPYRIGHT | typeof CC_BY | typeof CC_BY_NC | typeof CC0} rights
+     * @param {number} id
+     * @param {string} ext
+     * @param {InatLicenseCode} licenseCode
+     * @param {string} rightsHolder
      */
-    constructor( url, rightsHolder, rights ) {
-        this.#url = url;
-        this.rightsHolder = rightsHolder;
-        this.rights = rights;
+    constructor(id, ext, licenseCode, rightsHolder) {
+        this.#id = id;
+        this.#ext = ext;
+        this.#rightsHolder = rightsHolder;
+        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";
     }
 
-    getUrl() {
-        return this.#url;
+    /**
+     * @returns {string}
+     */
+    getAttribution() {
+        if (this.#rights === "CC0") {
+            if (this.#rightsHolder) {
+                return `By ${this.#rightsHolder} (${this.#rights})`;
+            }
+            return this.#rights;
+        }
+        if (this.#rightsHolder) {
+            return `(c) ${this.#rightsHolder} (${this.#rights})`;
+        }
+        return `(c) (${this.#rights})`;
+    }
+
+    getExt() {
+        return this.#ext;
+    }
+
+    getId() {
+        return this.#id;
     }
 
     /**
-     * Return URL of page from whence this photo came
-     * @return {string?}
+     * @returns {string} The URL of the iNaturalist page with details about the image.
      */
     getSourceUrl() {
-        return null;
+        return `https://www.inaturalist.org/photos/${this.#id}`;
     }
-}
 
-export {
-    CC0,
-    CC_BY,
-    CC_BY_NC,
-    COPYRIGHT,
-    Photo
-};
+    /**
+     * @returns {string} The URL to retrieve the image file.
+     */
+    getUrl() {
+        return `https://inaturalist-open-data.s3.amazonaws.com/photos/${this.#id}/medium.${this.#ext}`;
+    }
+}

package/lib/taxa.js

@@ -7,10 +7,10 @@ import { Genera } from "./genera.js";
 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";
 import { ErrorLog } from "./errorlog.js";
 import { Program } from "./program.js";
+import { Photo } from "./photo.js";
 
 const FLOWER_COLORS = [
     { name: "white", color: "white" },
@@ -138,7 +138,7 @@ class Taxa {
                 continue;
             }
             taxon.addPhoto(
-                new InatPhoto(
+                new Photo(
                     csvPhoto.id,
                     csvPhoto.ext,
                     csvPhoto.licenseCode,

package/lib/taxon.js

@@ -35,12 +35,12 @@ class Taxon {
     #rankGlobal;
     /** @type {string[]} */
     #synonyms = [];
-    /** @type {Photo[]} */
+    /** @type {import("./photo.js").Photo[]}*/
     #photos = [];
 
     /**
      * @param {TaxonData} data
-     * @param {Genera} genera
+     * @param {import("./genera.js").Genera} genera
      */
     constructor(data, genera) {
         this.#genera = genera;
@@ -98,12 +98,15 @@ class Taxon {
     }
 
     /**
-     * @param {InatPhoto} photo
+     * @param {import("./photo.js").Photo} photo
      */
     addPhoto(photo) {
         this.#photos = this.#photos.concat([photo]);
     }
 
+    /**
+     * @returns {import("./photo.js").Photo[]}
+     */
     getPhotos() {
         return this.#photos;
     }
@@ -264,6 +267,9 @@ class Taxon {
         return this.#iNatSyn ? link + " (" + this.#iNatSyn + ")" : link;
     }
 
+    /**
+     * @returns {string}
+     */
     getJepsonID() {
         return this.#jepsonID;
     }
@@ -287,6 +293,9 @@ class Taxon {
         return this.#rankRPI.split(".")[0];
     }
 
+    /**
+     * @returns {string}
+     */
     getRPIRankAndThreat() {
         return this.#rankRPI;
     }