@ca-plant-list/ca-plant-list 0.1.19 → 0.1.21

package/jekyll/_layouts/html.html

@@ -38,6 +38,7 @@
     </nav>
 
     <div class="container-xxl px-5">
+        <h1>{{page.title}}</h1>
         {{content}}
     </div>
 

package/jekyll/assets/css/main.css

@@ -54,6 +54,11 @@ ul.listmenu li:last-child:after {
     content: "";
 }
 
+/* Utilities */
+.right {
+    text-align: right;
+}
+
 /* Lists */
 
 span.native {

package/jekyll/assets/js/name_search.js

@@ -50,7 +50,7 @@ class Search {
 
         Search.#debounceTimer = undefined;
 
-        const value = document.getElementById( "name" ).value.toLowerCase();
+        const value = Search.#normalizeName( document.getElementById( "name" ).value );
 
         const matches = [];
         const shouldSearch = ( value.length >= MIN_LEN );
@@ -124,14 +124,14 @@ class Search {
         // eslint-disable-next-line no-undef
         for ( const taxon of NAMES ) {
             const taxonData = [ taxon ];
-            taxonData.push( taxon[ 0 ].toLowerCase().replace( / (subsp|var)\./, "" ) );
+            taxonData.push( this.#normalizeName( taxon[ 0 ] ) );
             if ( taxon[ 1 ] ) {
                 taxonData.push( taxon[ 1 ].toLowerCase() );
             }
             if ( taxon[ 2 ] ) {
                 const syns = [];
                 for ( const syn of taxon[ 2 ] ) {
-                    syns.push( syn.toLowerCase().replace( / (subsp|var)\./, "" ) );
+                    syns.push( this.#normalizeName( syn ) );
                 }
                 taxonData[ 3 ] = syns;
             }
@@ -156,6 +156,10 @@ class Search {
         document.getElementById( "search_form" ).onsubmit = () => { this.#handleSubmit(); return false; };
     }
 
+    static #normalizeName( name ) {
+        return name.toLowerCase().replace( / (subsp|var)\./, "" );
+    }
+
 }
 
 Search.init();

package/jekyll/name_search.html

@@ -2,7 +2,6 @@
 title: Name Search
 js: name_search.js
 ---
-<h1>Search</h1>
 
 <script>
     const NAMES = {% include names.json%};

package/lib/externalsites.js

@@ -0,0 +1,43 @@
+class ExternalSites {
+
+    static getCalscapeLink( taxonName ) {
+        const url = new URL( "https://calscape.org/loc-California/" + taxonName.replace( "subsp.", "ssp." ) + " ()" );
+        return url.toString();
+    }
+
+    static getInatObsLink( options ) {
+
+        const url = new URL( "https://www.inaturalist.org/observations?subview=map" );
+
+        for ( const [ k, v ] of Object.entries( options ) ) {
+            switch ( k ) {
+                case "coords": {
+                    const delta = .1;
+                    const params = url.searchParams;
+                    params.set( "nelat", v[ 1 ] + delta );
+                    params.set( "swlat", v[ 1 ] - delta );
+                    params.set( "nelng", v[ 0 ] + delta );
+                    params.set( "swlng", v[ 0 ] - delta );
+                    break;
+                }
+                case "created_d1":
+                case "list_id":
+                case "place_id":
+                case "project_id":
+                case "subview":
+                case "taxon_id":
+                case "taxon_name":
+                    if ( v ) {
+                        url.searchParams.set( k, v );
+                    }
+                    break;
+            }
+        }
+
+        return url.toString();
+
+    }
+
+}
+
+export { ExternalSites };

package/lib/genericpage.js

@@ -20,7 +20,6 @@ class GenericPage {
 
     getDefaultIntro() {
         let html = this.#getFrontMatter();
-        html += HTML.textElement( "h1", this.#title );
         const introPath = "intros/" + this.#baseFileName + ".md";
         if ( Jekyll.hasInclude( this.#outputDir, introPath ) ) {
             html += HTML.wrap( "div", Jekyll.include( introPath ), { class: "section" } );

package/lib/pagetaxon.js

@@ -3,6 +3,7 @@ import { Jepson } from "./jepson.js";
 import { Config } from "./config.js";
 import { RarePlants } from "./rareplants.js";
 import { GenericPage } from "./genericpage.js";
+import { ExternalSites } from "./externalsites.js";
 
 class PageTaxon extends GenericPage {
 
@@ -31,6 +32,16 @@ class PageTaxon extends GenericPage {
         if ( rpiLink ) {
             links.push( rpiLink );
         }
+        if ( this.#taxon.isNative() ) {
+            links.push(
+                HTML.getLink(
+                    ExternalSites.getCalscapeLink( this.#taxon.getName() ),
+                    "Calscape",
+                    undefined,
+                    true
+                )
+            );
+        }
         return links;
     }
 
@@ -50,8 +61,13 @@ class PageTaxon extends GenericPage {
         if ( iNatID ) {
             links.push(
                 HTML.getLink(
-                    "https://www.inaturalist.org/observations?project_id=" + Config.getConfigValue( "inat", "project" )
-                    + "&quality_grade=research&subview=map&taxon_id=" + iNatID,
+                    ExternalSites.getInatObsLink(
+                        {
+                            project_id: Config.getConfigValue( "inat", "project" ),
+                            subview: "map",
+                            taxon_id: iNatID
+                        }
+                    ),
                     "iNaturalist",
                     {},
                     true

package/lib/taxon.js

@@ -137,6 +137,10 @@ class Taxon {
         return name.replace( / (subsp|var)\./, "" ).replace( "×", "× " );
     }
 
+    getINatSyn() {
+        return this.#iNatSyn;
+    }
+
     getINatTaxonLink() {
         const iNatID = this.getINatID();
         if ( !iNatID ) {

package/package.json

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