signalk-charts-provider-simple 2.7.1 → 2.8.1

package/README.md

@@ -8,6 +8,7 @@ A lightweight Signal K server plugin for managing local nautical charts, written
 - **Folder Groups**: Enable/disable whole chart folders at once (OpenCPN-style groups, including nested folders); clients like Freeboard-SK see the change live via `resources.charts` deltas
 - **Download Manager**: Built-in download queue with progress tracking and ZIP extraction
 - **Chart Catalog**: Browse and download charts from [chartcatalogs.github.io](https://chartcatalogs.github.io/) with automatic update notifications
+- **Online Charts**: Add weather radar and satellite, online nautical charts, depth layers and base maps from the Chart Catalog with one click — no download, no conversion
 - **NOAA Charts**: Draw a coverage region on a map from NOAA band-4 chart footprints; the plugin bundles the overlapping band-3/4/5 ENCs and converts them into a single vector MBTiles named after your chart set
 - **S-57 ENC Conversion**: Convert IENC/ENC charts to vector MBTiles with full S-52 symbology in Freeboard-SK
 - **BSB Raster Conversion**: Convert BSB/KAP raster charts and Pilot Charts to raster MBTiles
@@ -88,11 +89,13 @@ The interface provides five tabs:
    - Live conversion progress with log viewer
 
 4. **Chart Catalog**:
-   - Dynamic catalog from [chartcatalogs.github.io](https://chartcatalogs.github.io/)
+   - Downloadable charts from [chartcatalogs.github.io](https://chartcatalogs.github.io/) and a curated list of online charts, in one list, sectioned by what the charts show, with **Near me** narrowing each section to where you are
+   - **Online charts** (weather radar and satellite, online nautical charts, depths, base maps): press **Add** and the chart appears in Manage Charts and in your chart plotter. They stream from their provider, so they need an internet connection to display. They go into an "Online Charts" folder by default, so you can switch them all off at once when you're offline
+   - Live weather layers (radar, satellite, forecasts) keep their recent images or forecast steps up to date, so chart plotters with a time slider (Freeboard-SK) can play them back
    - One-click download for MBTiles charts (NOAA)
    - Download & convert for S-57 ENC, BSB raster, Pilot Charts, and basemaps
    - Automatic update notifications (Signal K delta + tab badge)
-   - Category filtering (MBTiles / RNC / IENC / General)
+   - Filters: **Download** (works offline) or **Stream** (needs internet); what the chart shows (Navigation, Weather, Depth & Seabed, Base maps, Overlays); chart type under "More filters"; and **Near me**, using the boat's position
 
 5. **NOAA Charts**:
    - Build a named **chart set** of NOAA ENC coverage by clicking band-4 footprints on a map (Leaflet + OpenSeaMap)
@@ -186,6 +189,12 @@ Inspired by [Signal K Charts Plugin](https://github.com/SignalK/charts-plugin) b
 
 Contributions are welcome! Please feel free to submit a Pull Request.
 
+**Online charts in the Chart Catalog** are curated in this repository. To add or fix one, see
+[Maintaining the catalog](docs/chart-catalog.md#maintaining-the-catalog). If you know a good
+free service but don't want to write the entry yourself, open a
+[Suggest an online chart](https://github.com/dirkwa/signalk-charts-provider-simple/issues/new?template=suggest-online-chart.yml)
+issue.
+
 ## Support
 
 For issues and feature requests:

package/dist/catalog/build-merged-catalog.d.ts

@@ -0,0 +1,85 @@
+/**
+ * Pure assembly of the merged chart catalog. File and network access live
+ * in `publish-catalog-cli.ts`; everything here is deterministic so it can be
+ * unit-tested and so an unchanged input always yields the same content hash.
+ */
+import type { ParsedChartcatalogsXml } from './chartcatalogs-xml.js';
+import { type ChartcatalogsIndex, type MergedCatalog, type MergedChartcatalogsCatalog, type OnlineChartsSourceFile } from './merged-catalog-schema.js';
+export declare const CHARTCATALOGS_HOMEPAGE = "https://chartcatalogs.github.io/";
+export declare const CHARTCATALOGS_ISSUES = "https://github.com/chartcatalogs/catalogs/issues";
+export interface ChartcatalogsFile {
+    file: string;
+    /** `null` when the file exists upstream but could not be parsed. */
+    parsed: ParsedChartcatalogsXml | null;
+}
+export interface BuildInputs {
+    chartcatalogs: ChartcatalogsFile[];
+    chartcatalogsCommit?: string;
+    index: ChartcatalogsIndex;
+    online: OnlineChartsSourceFile;
+    /** `owner/name` of the repo publishing the catalog; issue links point here. */
+    repo: string;
+    /** chartcatalogs entries from the catalog currently published, by file. */
+    previous?: Map<string, MergedChartcatalogsCatalog>;
+    now: Date;
+}
+export interface BuildResult {
+    catalog: MergedCatalog;
+    /** chartcatalogs files with no entry in the index yet. */
+    unindexed: string[];
+    /** Index entries whose file chartcatalogs no longer has. */
+    staleIndexEntries: string[];
+    /** Files that failed to parse or came back empty, kept from the published catalog. */
+    carriedForward: string[];
+    /** Files that failed to parse and had nothing published to fall back on. */
+    skipped: string[];
+    /** Charts dropped because their download location is not an http(s) URL. */
+    droppedCharts: string[];
+    /**
+     * Published catalogs whose file chartcatalogs no longer has. They leave
+     * the catalog (the file may really have been withdrawn), but the drop
+     * guard tolerates a few, so each one is reported.
+     */
+    removedUpstream: string[];
+}
+/**
+ * Hash of what a user would actually see. chartcatalogs re-commits every
+ * hour just to refresh its header dates, so those dates, the upstream
+ * commit id and our own `generatedAt` are excluded by name; anything else,
+ * including fields added later, is hashed.
+ */
+export declare function computeContentHash(catalog: Omit<MergedCatalog, 'contentHash'>): string;
+export declare function buildMergedCatalog(inputs: BuildInputs): BuildResult;
+/** What the drop guard and change detection need to know about the live catalog. */
+export interface PublishedState {
+    contentHash: string | null;
+    catalogCount: number;
+    chartCount: number;
+    /** chartcatalogs entries that still validate, for carrying forward. */
+    chartcatalogs: Map<string, MergedChartcatalogsCatalog>;
+    /** The published `catalog.schema.json` text, or null if absent. */
+    schemaText: string | null;
+}
+/**
+ * Read the published catalog loosely. It may predate the current schema
+ * (that is exactly when a build change is riskiest), so the counts the drop
+ * guard relies on are taken from the raw arrays rather than a full parse.
+ */
+export declare function readPublishedState(raw: unknown, schemaText: string | null): PublishedState;
+/**
+ * Reasons not to replace the published catalog with `next`. Per-file
+ * breakage is absorbed by carrying entries forward; these thresholds catch
+ * whole-source failures such as a truncated clone.
+ */
+export declare function publishBlockers(next: MergedCatalog, published: PublishedState | null): string[];
+export interface PublishDecision {
+    publish: boolean;
+    blockers: string[];
+}
+/**
+ * Whether to deploy. The site also carries the JSON Schema, so a schema
+ * change with identical content must still deploy, or third parties would
+ * keep validating against a stale schema.
+ */
+export declare function decidePublish(next: MergedCatalog, published: PublishedState | null, schemaText: string, force: boolean): PublishDecision;
+//# sourceMappingURL=build-merged-catalog.d.ts.map

package/dist/catalog/build-merged-catalog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-merged-catalog.d.ts","sourceRoot":"","sources":["../../src/catalog/build-merged-catalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAQL,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAElB,KAAK,0BAA0B,EAE/B,KAAK,sBAAsB,EAC5B,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,sBAAsB,qCAAqC,CAAC;AACzE,eAAO,MAAM,oBAAoB,qDAAqD,CAAC;AAEvF,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACnD,GAAG,EAAE,IAAI,CAAC;CACX;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,aAAa,CAAC;IACvB,0DAA0D;IAC1D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,sFAAsF;IACtF,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,4EAA4E;IAC5E,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;OAIG;IACH,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAkED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,MAAM,CAYtF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,CAoEnE;AAED,oFAAoF;AACpF,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,cAAc,CAmB1F;AAMD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,cAAc,GAAG,IAAI,GAAG,MAAM,EAAE,CAuB/F;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,cAAc,GAAG,IAAI,EAChC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,OAAO,GACb,eAAe,CAKjB"}

package/dist/catalog/build-merged-catalog.js

@@ -0,0 +1,210 @@
+/**
+ * Pure assembly of the merged chart catalog. File and network access live
+ * in `publish-catalog-cli.ts`; everything here is deterministic so it can be
+ * unit-tested and so an unchanged input always yields the same content hash.
+ */
+import { createHash } from 'node:crypto';
+import { Value } from '@sinclair/typebox/value';
+import { MERGED_CATALOG_SCHEMA_VERSION, MergedCatalogSchema, MergedChartcatalogsCatalogSchema, checkChartcatalogsIndex, checkOnlineChartEntry, formatForChartType, schemaErrors } from './merged-catalog-schema.js';
+export const CHARTCATALOGS_HOMEPAGE = 'https://chartcatalogs.github.io/';
+export const CHARTCATALOGS_ISSUES = 'https://github.com/chartcatalogs/catalogs/issues';
+function compareStrings(a, b) {
+    return a < b ? -1 : a > b ? 1 : 0;
+}
+function mergeChartcatalogsFile(file, parsed, index, droppedCharts) {
+    const id = file.replace(/\.xml$/i, '');
+    // One odd upstream URL must not fail the whole build (the schema would
+    // reject the catalog), so bad charts are dropped here and reported.
+    const charts = parsed.charts.filter((chart) => {
+        const ok = /^https?:\/\//.test(chart.zipfile_location);
+        if (!ok) {
+            droppedCharts.push(`${file} ${chart.number}`);
+        }
+        return ok;
+    });
+    const base = { id, file, use: 'download', header: parsed.header, charts };
+    const facets = index[file];
+    if (facets) {
+        return { ...base, ...facets, indexed: true };
+    }
+    // Nearly every chartcatalogs catalog is a navigation chart set, so that is
+    // the safest default until someone adds the file to the index.
+    return { ...base, label: parsed.header.title || id, category: 'navigation', indexed: false };
+}
+function mergeOnlineCharts(online) {
+    const problems = [];
+    const seen = new Set();
+    for (const entry of online.charts) {
+        if (seen.has(entry.id)) {
+            problems.push(`${entry.id}: duplicate id`);
+        }
+        seen.add(entry.id);
+        problems.push(...checkOnlineChartEntry(entry));
+    }
+    if (problems.length > 0) {
+        throw new Error(`Invalid online chart entries:\n  ${problems.join('\n  ')}`);
+    }
+    return online.charts.map((entry) => ({
+        ...entry,
+        use: 'stream',
+        format: formatForChartType(entry.chart.type)
+    }));
+}
+/** JSON with object keys sorted, so key order never changes the hash. */
+function canonicalJson(value) {
+    if (Array.isArray(value)) {
+        return `[${value.map(canonicalJson).join(',')}]`;
+    }
+    if (value !== null && typeof value === 'object') {
+        const entries = Object.entries(value)
+            .filter(([, v]) => v !== undefined)
+            .sort(([a], [b]) => compareStrings(a, b));
+        return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson(v)}`).join(',')}}`;
+    }
+    return JSON.stringify(value);
+}
+/**
+ * Hash of what a user would actually see. chartcatalogs re-commits every
+ * hour just to refresh its header dates, so those dates, the upstream
+ * commit id and our own `generatedAt` are excluded by name; anything else,
+ * including fields added later, is hashed.
+ */
+export function computeContentHash(catalog) {
+    const { generatedAt: _generatedAt, ...content } = catalog;
+    const { commit: _commit, ...chartcatalogsSource } = content.sources.chartcatalogs;
+    const hashed = {
+        ...content,
+        sources: { ...content.sources, chartcatalogs: chartcatalogsSource },
+        chartcatalogs: content.chartcatalogs.map((c) => {
+            const { dateCreated: _created, dateValid: _valid, ...header } = c.header;
+            return { ...c, header };
+        })
+    };
+    return createHash('sha256').update(canonicalJson(hashed)).digest('hex');
+}
+export function buildMergedCatalog(inputs) {
+    const indexProblems = checkChartcatalogsIndex(inputs.index);
+    if (indexProblems.length > 0) {
+        throw new Error(`Invalid chartcatalogs index:\n  ${indexProblems.join('\n  ')}`);
+    }
+    const files = [...inputs.chartcatalogs].sort((a, b) => compareStrings(a.file, b.file));
+    const carriedForward = [];
+    const skipped = [];
+    const droppedCharts = [];
+    const chartcatalogs = [];
+    for (const { file, parsed } of files) {
+        const previous = inputs.previous?.get(file);
+        // A file that still exists upstream but is broken or suddenly empty is
+        // far more likely an upstream mistake than a withdrawn catalog, so keep
+        // what users can see today rather than wiping it from every plugin.
+        if (previous && (!parsed || parsed.charts.length === 0)) {
+            const facets = inputs.index[file];
+            chartcatalogs.push(facets ? { ...previous, ...facets, indexed: true } : previous);
+            carriedForward.push(file);
+            continue;
+        }
+        if (!parsed) {
+            skipped.push(file);
+            continue;
+        }
+        chartcatalogs.push(mergeChartcatalogsFile(file, parsed, inputs.index, droppedCharts));
+    }
+    const fileNames = new Set(files.map((f) => f.file));
+    const withoutHash = {
+        schemaVersion: MERGED_CATALOG_SCHEMA_VERSION,
+        generatedAt: inputs.now.toISOString(),
+        sources: {
+            chartcatalogs: {
+                homepage: CHARTCATALOGS_HOMEPAGE,
+                issues: CHARTCATALOGS_ISSUES,
+                license: 'CC0-1.0',
+                ...(inputs.chartcatalogsCommit ? { commit: inputs.chartcatalogsCommit } : {})
+            },
+            online: {
+                homepage: `https://github.com/${inputs.repo}`,
+                issues: `https://github.com/${inputs.repo}/issues/new?template=catalog-problem.yml`
+            }
+        },
+        chartcatalogs,
+        online: mergeOnlineCharts(inputs.online)
+    };
+    const catalog = { ...withoutHash, contentHash: computeContentHash(withoutHash) };
+    if (!Value.Check(MergedCatalogSchema, catalog)) {
+        throw new Error(`Merged catalog failed validation:\n  ${schemaErrors(MergedCatalogSchema, catalog).join('\n  ')}`);
+    }
+    return {
+        catalog,
+        unindexed: chartcatalogs.filter((c) => !c.indexed).map((c) => c.file),
+        staleIndexEntries: Object.keys(inputs.index).filter((f) => !fileNames.has(f)),
+        carriedForward,
+        skipped,
+        droppedCharts,
+        removedUpstream: [...(inputs.previous?.keys() ?? [])]
+            .filter((f) => !fileNames.has(f))
+            .sort(compareStrings)
+    };
+}
+/**
+ * Read the published catalog loosely. It may predate the current schema
+ * (that is exactly when a build change is riskiest), so the counts the drop
+ * guard relies on are taken from the raw arrays rather than a full parse.
+ */
+export function readPublishedState(raw, schemaText) {
+    const obj = raw !== null && typeof raw === 'object' ? raw : {};
+    const rawCatalogs = Array.isArray(obj.chartcatalogs) ? obj.chartcatalogs : [];
+    const chartcatalogs = new Map();
+    let chartCount = 0;
+    for (const entry of rawCatalogs) {
+        const charts = entry?.charts;
+        chartCount += Array.isArray(charts) ? charts.length : 0;
+        if (Value.Check(MergedChartcatalogsCatalogSchema, entry)) {
+            chartcatalogs.set(entry.file, entry);
+        }
+    }
+    return {
+        contentHash: typeof obj.contentHash === 'string' ? obj.contentHash : null,
+        catalogCount: rawCatalogs.length,
+        chartCount,
+        chartcatalogs,
+        schemaText
+    };
+}
+function chartCount(catalog) {
+    return catalog.chartcatalogs.reduce((n, c) => n + c.charts.length, 0);
+}
+/**
+ * Reasons not to replace the published catalog with `next`. Per-file
+ * breakage is absorbed by carrying entries forward; these thresholds catch
+ * whole-source failures such as a truncated clone.
+ */
+export function publishBlockers(next, published) {
+    const blockers = [];
+    if (next.chartcatalogs.length === 0) {
+        blockers.push('no chartcatalogs catalogs were read');
+    }
+    if (next.online.length === 0) {
+        blockers.push('the online chart list is empty');
+    }
+    if (published) {
+        const after = next.chartcatalogs.length;
+        if (after < Math.floor(published.catalogCount * 0.8)) {
+            blockers.push(`chartcatalogs catalogs dropped from ${String(published.catalogCount)} to ${String(after)}`);
+        }
+        const chartsAfter = chartCount(next);
+        if (chartsAfter < Math.floor(published.chartCount * 0.5)) {
+            blockers.push(`chartcatalogs charts dropped from ${String(published.chartCount)} to ${String(chartsAfter)}`);
+        }
+    }
+    return blockers;
+}
+/**
+ * Whether to deploy. The site also carries the JSON Schema, so a schema
+ * change with identical content must still deploy, or third parties would
+ * keep validating against a stale schema.
+ */
+export function decidePublish(next, published, schemaText, force) {
+    const blockers = publishBlockers(next, published);
+    const changed = !published || published.contentHash !== next.contentHash || published.schemaText !== schemaText;
+    return { publish: force || (changed && blockers.length === 0), blockers };
+}
+//# sourceMappingURL=build-merged-catalog.js.map

package/dist/catalog/build-merged-catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-merged-catalog.js","sourceRoot":"","sources":["../../src/catalog/build-merged-catalog.ts"],"names":[],"mappings":"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"}

package/dist/catalog/chartcatalogs-xml.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Parser for chartcatalogs.github.io catalog XML (the NOAA RNC product
+ * catalog subset used by OpenCPN). Shared by the plugin's catalog manager
+ * and the merged-catalog build so both read the files identically.
+ */
+import type { CatalogChart, CatalogHeader } from '../utils/catalog-schemas.js';
+export interface ParsedChartcatalogsXml {
+    header: CatalogHeader;
+    charts: CatalogChart[];
+}
+/**
+ * Parse one catalog file. Entries without a chart number or download
+ * location are dropped: they cannot be installed or tracked for updates.
+ * Throws when the document is not a chartcatalogs catalog at all.
+ */
+export declare function parseChartcatalogsXml(xmlData: string): Promise<ParsedChartcatalogsXml>;
+//# sourceMappingURL=chartcatalogs-xml.d.ts.map

package/dist/catalog/chartcatalogs-xml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chartcatalogs-xml.d.ts","sourceRoot":"","sources":["../../src/catalog/chartcatalogs-xml.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAeD;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAmC5F"}

package/dist/catalog/chartcatalogs-xml.js

@@ -0,0 +1,53 @@
+/**
+ * Parser for chartcatalogs.github.io catalog XML (the NOAA RNC product
+ * catalog subset used by OpenCPN). Shared by the plugin's catalog manager
+ * and the merged-catalog build so both read the files identically.
+ */
+import { parseStringPromise } from 'xml2js';
+// xml2js keeps element text verbatim, and some catalogs wrap values on
+// their own lines (ACE_BUOY's zip URL is surrounded by newlines), which
+// would otherwise reach the downloader as an invalid URL.
+function text(node, ...names) {
+    for (const name of names) {
+        const value = node[name]?.[0];
+        if (typeof value === 'string') {
+            return value.trim();
+        }
+    }
+    return '';
+}
+/**
+ * Parse one catalog file. Entries without a chart number or download
+ * location are dropped: they cannot be installed or tracked for updates.
+ * Throws when the document is not a chartcatalogs catalog at all.
+ */
+export async function parseChartcatalogsXml(xmlData) {
+    const result = await parseStringPromise(xmlData);
+    if (typeof result !== 'object' || result === null) {
+        throw new Error('Invalid XML parse result');
+    }
+    const parsed = result;
+    const root = (parsed.RncProductCatalogChartCatalogs ?? parsed.EncProductCatalogcellCatalogs);
+    if (!root) {
+        throw new Error('Unexpected XML root element');
+    }
+    const headerArr = root.Header;
+    const headerNode = headerArr?.[0] ?? {};
+    const header = {
+        title: text(headerNode, 'title'),
+        dateCreated: text(headerNode, 'date_created'),
+        dateValid: text(headerNode, 'date_valid')
+    };
+    const chartNodes = (root.chart ?? root.cell ?? []);
+    const charts = chartNodes
+        .map((node) => ({
+        number: text(node, 'number', 'name'),
+        title: text(node, 'title', 'lname'),
+        format: text(node, 'format'),
+        zipfile_location: text(node, 'zipfile_location'),
+        zipfile_datetime_iso8601: text(node, 'zipfile_datetime_iso8601')
+    }))
+        .filter((c) => c.number !== '' && c.zipfile_location !== '');
+    return { header, charts };
+}
+//# sourceMappingURL=chartcatalogs-xml.js.map

package/dist/catalog/chartcatalogs-xml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chartcatalogs-xml.js","sourceRoot":"","sources":["../../src/catalog/chartcatalogs-xml.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAQ5C,uEAAuE;AACvE,wEAAwE;AACxE,0DAA0D;AAC1D,SAAS,IAAI,CAAC,IAA0C,EAAE,GAAG,KAAe;IAC1E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAe;IACzD,MAAM,MAAM,GAAY,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE1D,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,MAAM,GAAG,MAAiC,CAAC;IACjD,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,8BAA8B,IAAI,MAAM,CAAC,6BAA6B,CACtD,CAAC;IAEtC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAA4D,CAAC;IACpF,MAAM,UAAU,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,MAAM,GAAkB;QAC5B,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;QAChC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;QAC7C,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;KAC1C,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAA2C,CAAC;IAC7F,MAAM,MAAM,GAAmB,UAAU;SACtC,GAAG,CAAC,CAAC,IAAI,EAAgB,EAAE,CAAC,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;QACpC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;QACnC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;QAC5B,gBAAgB,EAAE,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC;QAChD,wBAAwB,EAAE,IAAI,CAAC,IAAI,EAAE,0BAA0B,CAAC;KACjE,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,IAAI,CAAC,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;IAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC"}