@ca-plant-list/ca-plant-list 0.2.14 → 0.2.16

package/data/synonyms.csv

@@ -811,7 +811,6 @@ Helianthemum scoparium var. vulgare,Crocanthemum scoparium var. vulgare
 Helianthus annuus subsp. jaegeri,Helianthus annuus
 Helianthus annuus subsp. lenticularis,Helianthus annuus
 Helianthus annuus var. macrocarpus,Helianthus annuus
-Helichrysum luteoalbum,Pseudognaphalium luteoalbum,INAT
 Heliotropium oculatum,Heliotropium curassavicum var. oculatum
 Heliotropium spathulatum subsp. oculatum,Heliotropium curassavicum var. oculatum
 Helxine soleirolii,Soleirolia soleirolii
@@ -979,7 +978,6 @@ Lessingia filaginifolia var. filaginifolia,Corethrogyne filaginifolia
 Lessingia germanorum var. parvula,Lessingia tenuis
 Lessingia germanorum var. tenuis,Lessingia tenuis
 Lessingia nemaclada var. albiflora,Lessingia nemaclada
-Leuzea repens,Rhaponticum repens,INAT
 Lewisia alba,Lewisia rediviva var. rediviva
 Leymus ×multiflorus,Elymus ×gouldii,INAT
 Leymus mollis subsp. mollis,Elymus mollis subsp. mollis,INAT
@@ -1538,6 +1536,7 @@ Prunella vulgaris var. atropurpurea,Prunella vulgaris var. lanceolata
 Prunella vulgaris var. parviflora,Prunella vulgaris var. vulgaris
 Prunus amygdalus,Prunus dulcis,INAT
 Pseudognaphalium canescens subsp. beneolens,Pseudognaphalium beneolens
+Pseudognaphalium luteoalbum,Pseudognaphalium luteoalbum,INAT
 Pseudognaphalium microcephalum var. thermale,Pseudognaphalium thermale
 Psilocarphus tenellus var. globiferus,Psilocarphus chilensis
 Psilocarphus tenellus var. tenellus,Psilocarphus tenellus
@@ -1590,6 +1589,7 @@ Rhamnus tomentella subsp. tomentella,Frangula californica subsp. tomentella
 Rhamnus tomentella,Frangula californica subsp. tomentella
 Rhamphospermum arvense,Sinapis arvensis,INAT
 Rhamphospermum nigrum,Brassica nigra,INAT
+Rhaponticum repens,Rhaponticum repens,INAT
 Rhus aromatica subsp. trilobata,Rhus aromatica
 Rhus aromatica var. simplicifolia,Rhus aromatica
 Rhus aromatica var. trilobata,Rhus aromatica

package/data/taxa.csv

@@ -248,7 +248,7 @@ Bromus sitchensis var. maritimus,maritime brome,N,108591,13625,71142
 Bromus sterilis,poverty brome,X,16288,1216,57163
 Bromus tectorum,cheat grass,X,16290,1218,58369
 Buddleja davidii,butterfly bush,X,16349,1222,75916
-Cabomba caroliniana,fanwort,X,16450,8513,75921
+Cabomba caroliniana,fanwort,X,16450,8513,75921,white,5,9
 Cakile edentula,sea rocket,X,16523,1232,52162
 Cakile maritima,sea rocket,X,16531,1233,60982
 Calamagrostis koelerioides,,N,16557,1240,75927
@@ -267,7 +267,7 @@ Calochortus albus,white globe lily,N,16710,1264,51315,white
 Calochortus argillosus,clay mariposa lily,N,76542,1268,64330,"white,pink"
 Calochortus clavatus var. pallidus,,N,55455,1275,58360
 Calochortus invenustus,,N,16733,1284,64432
-Calochortus leichtlinii
+Calochortus leichtlinii,,N,16735,1288,52542
 Calochortus luteus,yellow mariposa lily,N,16737,1290,51077,yellow
 Calochortus pulchellus,Mt. Diablo fairy lantern,N,16755,1303,47326,,,,50,1B.2,,,S2,G2
 Calochortus splendens,,N,16759,1306,58361
@@ -362,7 +362,7 @@ Centromadia pungens subsp. pungens,common spikeweed,N,80173,9544,64196
 Cephalanthus occidentalis,button bush,N,18612,9794,52763
 Cerastium fontanum subsp. vulgare,,X,49818,1872,1005385
 Cerastium glomeratum,mouse-ear chickweed,X,18675,1873,52973
-Ceratophyllum demersum,hornwort,N,18711,1874,60997
+Ceratophyllum demersum,hornwort,N,18711,1874,60997,,6,8
 Cercis occidentalis,western redbud,N,18736,1877,59556
 Cercocarpus betuloides var. betuloides,mountain-mahogany,N,71734,1879,59001
 Cestrum parqui,Chilean jessamine,X,18790,8746,76226
@@ -907,7 +907,7 @@ Impatiens balfourii,touch-me-not,X,28954,4320,77490
 Iris douglasiana,Douglas' iris,N,29188,4346,50854
 Iris foetidissima,stinking iris,X,29193,8604,64331
 Iris longipetala,central coast iris,N,29293,4354,67703,,,,3169,4.2,,,S3,G3
-Iris macrosiphon,,N,29289
+Iris macrosiphon,,N,29289,4355,54057
 Iris pseudacorus,yellow flag,X,29301,4358,47779
 Isocoma arguta,Carquinez goldenbush,N,3633,4369,77510,,,,1264,1B.1,,,S1,G1
 Isoetes howellii,Howell's quillwort,N,29392,4379,63823
@@ -1216,7 +1216,7 @@ Navarretia squarrosa,skunkweed,N,34475,5807,53157
 Navarretia tagetina,,N,34477,5809,60226
 Navarretia viscidula,sticky navarretia,N,34478,5810,78195
 Nemophila heterophylla,,N,34539,5834,53158
-Nemophila menziesii var. atomaria,,N,62279,,,white,2,6
+Nemophila menziesii var. atomaria,,N,62279,5837,50647,white,2,6
 Nemophila menziesii var. menziesii,baby blue-eyes,N,62285,5839,50650
 Nemophila parviflora var. parviflora,,N,62288,5842,58921
 Nemophila pedunculata,,N,34544,5844,55461
@@ -1425,7 +1425,7 @@ Prunus virginiana var. demissa,western choke-cherry,N,64546,6898,63900
 Pseudognaphalium beneolens,,N,81674,11047,64303
 Pseudognaphalium biolettii,,N,81666,11955,58829
 Pseudognaphalium californicum,,N,80569,11956,53077
-Pseudognaphalium luteoalbum,cudweed,X,101867,11957,209711
+Pseudognaphalium luteoalbum,cudweed,X,101867,11957,53083
 Pseudognaphalium microcephalum,,N,81265,11048,78763
 Pseudognaphalium ramosissimum,,N,80579,11959,53088
 Pseudognaphalium stramineum,,N,40045,11960,53089
@@ -1480,7 +1480,7 @@ Raphanus sativus,wild radish,X,40992,7064,55410
 Rhamnus alaternus,Italian buckthorn,X,81104,9447,82856
 Rhamnus crocea,spiny redberry,N,41069,7075,57243
 Rhamnus ilicifolia,holly-leaf redberry,N,41070,7076,58308
-Rhaponticum repens,Russian knapweed,X,103802,13621,1061170
+Rhaponticum repens,Russian knapweed,X,103802,13621,339502
 Rhinotropis californica,California milkwort,N,107535,14636,876453
 Rhus aromatica,skunkbrush,N,41175,11056,58738
 Ribes amarum,bitter gooseberry,N,41372,7099,53433

package/jekyll/_config.yml

@@ -0,0 +1,9 @@
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      layout: "html"
+
+navbar-name: SITE NAME
+bootstrap-prefix: https://cdn.jsdelivr.net/npm/bootstrap/dist

package/jekyll/_layouts/html.html

@@ -1,60 +1,57 @@
 <!DOCTYPE html>
 <html lang="en">
 
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
-        integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
-    <title>{{page.title}}</title>
-    <link href="{{site.baseurl}}/assets/css/main.css" rel="stylesheet">
-</head>
-
-<body>
-
-    <nav class="navbar navbar-expand-md">
-        <div class="container-xxl px-5">
-            <button id="hamburger" class="navbar-toggler" type="button" data-bs-toggle="collapse"
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="{{site.bootstrap-prefix}}/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+        <title>{{page.title}}</title>
+        <link href="{{site.baseurl}}/assets/css/main.css" rel="stylesheet">
+    </head>
+
+    <body>
+
+        <nav class="navbar navbar-expand-md">
+            <div class="container-xxl px-5">
+                <button id="hamburger" class="navbar-toggler" type="button" data-bs-toggle="collapse"
                 data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
                 aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <a class="navbar-brand" href="{{'/' | relative_url}}">{{site.navbar-name}}</a>
-            <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                <ul class="navbar-nav me-auto mb-lg-0">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{site.baseurl}}/index_lists.html">Plant Lists</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{site.baseurl}}/rare_plants.html">Rare Plants</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{site.baseurl}}/name_search.html">Name Search</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{site.baseurl}}/glossary.html">Glossary</a>
-                    </li>
-                    {%include menu_extra.html %}
-                </ul>
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <a class="navbar-brand" href="{{'/' | relative_url}}">{{site.navbar-name}}</a>
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                    <ul class="navbar-nav me-auto mb-lg-0">
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/index_lists.html">Plant Lists</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/rare_plants.html">Rare Plants</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/name_search.html">Name Search</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/glossary.html">Glossary</a>
+                        </li>
+                        {%include menu_extra.html %}
+                    </ul>
+                </div>
             </div>
-        </div>
-    </nav>
+        </nav>
 
-    <div class="container-xxl px-5">
-        <h1>{{page.title}}</h1>
-        {{content}}
-    </div>
+        <div class="container-xxl px-5">
+            <h1>{{page.title}}</h1>
+            {{content}}
+        </div>
 
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
-        integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
-        crossorigin="anonymous"></script>
+        <script src="{{site.bootstrap-prefix}}/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
 
-    {%if page.js%}
-    <script src="{{site.baseurl}}/assets/js/{{page.js}}" type="module"></script>{%endif%}
+        {%if page.js%}
+            <script src="{{site.baseurl}}/assets/js/{{page.js}}" type="module"></script>{%endif%}
 
-    <script src="{{site.baseurl}}/assets/js/ui.js" type="module"></script>
+            <script src="{{site.baseurl}}/assets/js/ui.js" type="module"></script>
 
-    {%include analytics.html%}
-</body>
+            {%include analytics.html%}
+        </body>
 
-</html>
+    </html>

package/lib/basepagerenderer.js

@@ -27,7 +27,7 @@ class BasePageRenderer {
     static renderTools( outputDir, taxa ) {
 
         const names = [];
-        for ( const taxon of taxa.getTaxa() ) {
+        for ( const taxon of taxa.getTaxonList() ) {
             const row = [];
             row.push( taxon.getName() );
             const cn = taxon.getCommonNames().join( ", " );

package/lib/commandrunner.js

@@ -3,6 +3,20 @@ import commandLineUsage from "command-line-usage";
 
 const OPTION_DEFS = [
     { name: "help", type: Boolean },
+    { name: "show-flower-errors", type: Boolean },
+];
+
+const OPTION_HELP = [
+    {
+        name: "help",
+        type: Boolean,
+        description: "Print this usage guide."
+    },
+    {
+        name: "show-flower-errors",
+        type: Boolean,
+        description: "Include flower color and flowering time errors in errors.tsv."
+    },
 ];
 
 class CommandRunner {
@@ -45,13 +59,7 @@ class CommandRunner {
             },
             {
                 header: "Options",
-                optionList: [
-                    {
-                        name: "help",
-                        type: Boolean,
-                        description: "Print this usage guide."
-                    },
-                ]
+                optionList: OPTION_HELP
             }
         ];
         help[ 1 ].optionList = help[ 1 ].optionList.concat( this.#optionHelp );

package/lib/dataloader.js

@@ -4,7 +4,7 @@ import { Files } from "./files.js";
 
 class DataLoader {
 
-    static load( dataDir ) {
+    static load( options ) {
 
         function getIncludeList( dataDir ) {
             // Read inclusion list.
@@ -22,9 +22,11 @@ class DataLoader {
             return include;
         }
 
+        const showFlowerErrors = options[ "show-flower-errors" ];
+
         console.log( "loading data" );
 
-        return new Taxa( getIncludeList( dataDir ) );
+        return new Taxa( getIncludeList( options.datadir ), showFlowerErrors );
 
     }
 

package/lib/ebook/pages/page_list_flowers.js

@@ -93,7 +93,7 @@ class PageListFlowerTime extends EBookPage {
 
         const range = [ this.#m1, this.#m2 ];
         const links = [];
-        for ( const taxon of this.#taxa.getTaxa() ) {
+        for ( const taxon of this.#taxa.getTaxonList() ) {
             const m1 = taxon.getBloomStart();
             const m2 = taxon.getBloomEnd();
             if ( m1 && DateUtils.monthRangesOverlap( range, [ m1, m2 ] ) ) {

package/lib/ebook/pages/taxonpage.js

@@ -28,8 +28,10 @@ class TaxonPage extends EBookPage {
                 return "";
             }
             let html = "";
-            for ( const color of colors ) {
-                html += XHTML.textElement( "img", "", { src: "./i/f-" + color + ".svg", class: "flr" } );
+            if ( colors ) {
+                for ( const color of colors ) {
+                    html += XHTML.textElement( "img", "", { src: "./i/f-" + color + ".svg", class: "flr" } );
+                }
             }
             if ( monthStart ) {
                 html += XHTML.textElement( "div", DateUtils.getMonthName( monthStart ) + "-" + DateUtils.getMonthName( monthEnd ) );

package/lib/ebook/plantbook.js

@@ -36,7 +36,7 @@ class PlantBook extends EBook {
         const contentDir = this.getContentDir();
 
         console.log( "creating taxon pages" );
-        const taxonList = this.#taxa.getTaxa();
+        const taxonList = this.#taxa.getTaxonList();
         for ( const taxon of taxonList ) {
             const name = taxon.getName();
             new TaxonPage( contentDir, taxon, this.#images[ name ] ).create();
@@ -124,7 +124,7 @@ class PlantBook extends EBook {
         }
 
         // Add taxa.
-        for ( let index = 0; index < this.#taxa.getTaxa().length; index++ ) {
+        for ( let index = 0; index < this.#taxa.getTaxonList().length; index++ ) {
             xml += "<itemref idref=\"t" + index + "\"/>";
         }
 

package/lib/index.d.ts

@@ -26,7 +26,7 @@ export class CSV {
     static parseStream(dir: any, fileName: any, columns: boolean, delimiter: any, callback: any): Promise<void>;
 }
 export class DataLoader {
-    static load(dataDir: any): Taxa;
+    static load(options: any): Taxa;
 }
 import { Taxa } from "./taxa.js";
 export class DateUtils {
@@ -175,13 +175,8 @@ export class Taxa {
         title: string;
         data: (t: any) => any;
     }[]): string;
-    constructor(inclusionList: any, taxaMeta?: {}, taxonClass?: typeof Taxon, extraTaxa?: any[], extraSynonyms?: any[]);
+    constructor(inclusionList: any, showFlowerErrors: any, taxaMeta?: {}, taxonClass?: typeof Taxon, extraTaxa?: any[], extraSynonyms?: any[]);
     getFlowerColor(name: any): any;
-    /**
-     *
-     * @deprecated
-     */
-    getTaxa(): any[];
     getTaxon(name: any): any;
     getTaxonList(): any[];
     #private;
@@ -273,5 +268,6 @@ export class Taxon {
      */
     isNative(): boolean;
     isRare(): boolean;
+    shouldHaveFlowers(): boolean;
     #private;
 }

package/lib/pagerenderer.js

@@ -32,7 +32,7 @@ class PageRenderer extends BasePageRenderer {
                 const listTaxa = [];
                 const calfloraTaxa = [];
                 const iNatTaxa = [];
-                for ( const taxon of taxa.getTaxa() ) {
+                for ( const taxon of taxa.getTaxonList() ) {
                     if ( list.include( taxon ) ) {
                         listTaxa.push( taxon );
                         calfloraTaxa.push( taxon.getCalfloraName() );

package/lib/taxa.js

@@ -69,7 +69,7 @@ class Taxa {
     #flower_colors = {};
     #sortedTaxa;
 
-    constructor( inclusionList, taxaMeta = {}, taxonClass = Taxon, extraTaxa = [], extraSynonyms = [] ) {
+    constructor( inclusionList, showFlowerErrors, taxaMeta = {}, taxonClass = Taxon, extraTaxa = [], extraSynonyms = [] ) {
         for ( const color of FLOWER_COLOR_NAMES ) {
             this.#flower_colors[ color ] = new FlowerColor( color );
         }
@@ -77,8 +77,8 @@ class Taxa {
         const dataDir = Config.getPackageDir() + "/data";
 
         const taxaCSV = CSV.parseFile( dataDir, "taxa.csv" );
-        this.#loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass );
-        this.#loadTaxa( extraTaxa, inclusionList, taxaMeta, taxonClass );
+        this.#loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass, showFlowerErrors );
+        this.#loadTaxa( extraTaxa, inclusionList, taxaMeta, taxonClass, showFlowerErrors );
 
         // Make sure everything in the inclusionList has been loaded.
         for ( const name of Object.keys( inclusionList ) ) {
@@ -127,14 +127,6 @@ class Taxa {
         return this.#flower_colors[ name ];
     }
 
-    /**
-     * 
-     * @deprecated
-     */
-    getTaxa() {
-        return this.#sortedTaxa;
-    }
-
     getTaxon( name ) {
         return this.#taxa[ name ];
     }
@@ -158,7 +150,7 @@ class Taxa {
         }
     }
 
-    #loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass ) {
+    #loadTaxa( taxaCSV, inclusionList, taxaMeta, taxonClass, showFlowerErrors ) {
         for ( const row of taxaCSV ) {
 
             const name = row[ "taxon_name" ];
@@ -192,6 +184,18 @@ class Taxa {
                 }
             }
 
+            if ( showFlowerErrors ) {
+                // Make sure flower colors/bloom times are present or not depending on taxon.
+                if ( taxon.shouldHaveFlowers() ) {
+                    if ( !colors || !taxon.getBloomStart() || !taxon.getBloomEnd() ) {
+                        ErrorLog.log( name, "does not have all flower info" );
+                    }
+                } else {
+                    if ( colors || taxon.getBloomStart() || taxon.getBloomEnd() ) {
+                        ErrorLog.log( name, "should not have flower info" );
+                    }
+                }
+            }
         }
 
     }

package/lib/taxon.js

@@ -255,6 +255,23 @@ class Taxon {
         return this.getRPIRank() !== undefined;
     }
 
+    shouldHaveFlowers() {
+        const sectionName = this.getFamily().getSectionName();
+        switch ( sectionName ) {
+            case "Ceratophyllales":
+            case "Eudicots":
+            case "Magnoliids":
+            case "Monocots":
+            case "Nymphaeales":
+                return true;
+            case "Ferns":
+            case "Gymnosperms":
+            case "Lycophytes":
+                return false;
+            default:
+                throw new Error( sectionName );
+        }
+    }
 }
 
 export { TAXA_COLNAMES, Taxon };

package/package.json

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

package/scripts/build-ebook.js

@@ -41,7 +41,7 @@ async function generateEBooks( options ) {
 
     // If a data directory was specified, use it.
     if ( dataDir ) {
-        await generateEBook( dataDir );
+        await generateEBook( options );
         return;
     }
 
@@ -54,21 +54,23 @@ async function generateEBooks( options ) {
             const suffix = "/" + subdir;
             const path = LOC_DIR + suffix;
             if ( Files.isDir( path ) ) {
-                await generateEBook( path, suffix );
+                options.datadir = path;
+                await generateEBook( options, suffix );
             }
         }
         return;
     }
 
     // Otherwise use the default directory.
-    await generateEBook( "./data" );
+    options.datadir = "./data";
+    await generateEBook( options );
 
     ErrorLog.write( OUTPUT_DIR + "/errors.tsv" );
 
 }
 
-async function generateEBook( dataDir, outputSuffix = "" ) {
-    const ebook = new PlantBook( OUTPUT_DIR + outputSuffix, new Config( dataDir ), DataLoader.load( dataDir ) );
+async function generateEBook( options, outputSuffix = "" ) {
+    const ebook = new PlantBook( OUTPUT_DIR + outputSuffix, new Config( options.datadir ), DataLoader.load( options ) );
     await ebook.create();
 }
 

package/scripts/build-site.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+import * as child_process from "node:child_process";
+import * as path from "node:path";
+import { Files } from "@ca-plant-list/ca-plant-list";
 import { Config } from "../lib/config.js";
 import { DataLoader } from "../lib/dataloader.js";
 import { PageRenderer } from "../lib/pagerenderer.js";
@@ -22,6 +25,38 @@ const OPTION_HELP = [
     },
 ];
 
+class JekyllRenderer {
+
+    #srcDir = "./output";
+    #destDir = "./public";
+
+    async renderPages() {
+
+        function addConfigFile( configFiles, dir, name ) {
+            const fullPath = path.join( dir, name );
+            if ( Files.exists( fullPath ) ) {
+                configFiles.push( fullPath );
+            }
+        }
+
+        // Remove existing files.
+        Files.rmDir( this.#destDir );
+
+        const options = [ "--source", this.#srcDir, "--destination", this.#destDir ];
+
+        // Find out what config files are available.
+        const configFiles = [];
+        addConfigFile( configFiles, this.#srcDir, "_config.yml" );
+        addConfigFile( configFiles, this.#srcDir, "_config-local.yml" );
+        addConfigFile( configFiles, ".", "_config-dev.yml" );
+        options.push( "--config", "\"" + configFiles.join() + "\"" );
+
+        const result = child_process.execSync( "bundle exec jekyll build " + options.join( " " ) );
+        console.log( result.toString() );
+    }
+
+}
+
 const cr = new CommandRunner(
     "ca-plant-list",
     "A tool to generate a website with local plant data.",
@@ -32,9 +67,13 @@ const cr = new CommandRunner(
 );
 await cr.processCommandLine();
 
-function generateSite( options ) {
+async function generateSite( options ) {
     const dataDir = options.datadir;
-    PageRenderer.render( OUTPUT_DIR, new Config( dataDir ), DataLoader.load( dataDir ) );
+    PageRenderer.render( OUTPUT_DIR, new Config( dataDir ), DataLoader.load( options ) );
     ErrorLog.write( OUTPUT_DIR + "/errors.tsv" );
+
+    console.log( "generating site" );
+    const r = new JekyllRenderer();
+    await r.renderPages();
 }