@rhizomatics/signalk-einklabel-plugin 0.7.1 → 0.8.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.8.1
+
+- A preferred `provider` can now be set for `resources`.
+  - The example `tide.svg` sets this to `provider=tides` to ignore other providers, (such as `mareas-ihm`)
+- Devices will repaint at startup even if no schedule slot has been missed prior to startup, if the template itself has subsequently changed
+
+# 0.8.0
+
+- New `settle` time, configurable and defaulting to 120 seconds, to wait after plugin startup before attempting to access paths
+  - First few minutes of a SignalK server startup can be a mess of plugins missing their dependencies and logging errors.
+- Schedule correctly picks up on previous schedule at startup, only repainting if the last scheduled time was overdue
+- Path based subscriptions ignore temporarily missing paths, so displays don't waste their tiny batteries on flapping values
+- Documentation now has a FAQ plus lots of other ESL/eInk hacking links.
+
 # 0.7.1
 
 - Fix path value retrieved for Image Fields when running in live plugin

package/README.md

@@ -7,17 +7,17 @@
 [![code style: oxfmt](https://img.shields.io/badge/code_style-oxfmt-blue.svg)](https://github.com)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/rhizomatics/signalk-einklabel-plugin/blob/main/LICENSE)
 
-** Fully working but limited vendor/product support and requires Linux for device access **
+    Fully working but limited vendor/product support and requires Linux for device access.
 
 A SignalK plugin to display data from SignalK paths, APIs and plugins on Electronic Shelf Labels (ESL) over a Bluetooth Low Energy (BLE) connection using simple SVG templates.
 
 ## What is an ESL?
 
-Electronic Shelf Labels are [eInk](https://en.wikipedia.org/wiki/E_Ink) devices that consume very little battery energy, presuming they are not constantly updated - the battery is used only when the display changes, and a periodic BLE check for incoming changes. Perfect for info that changes only once or twice a day, like tidal information.
+Electronic Shelf Labels are [eInk](https://en.wikipedia.org/wiki/E_Ink) devices that consume very little battery energy, presuming they are not constantly updated - the battery is used only when the display changes (which can take 5-10 seconds) and a periodic BLE check for incoming changes. Perfect for info that changes only once or twice a day, like tidal information.
 
 Since they are designed to be used in large quantity in small shops, they are cheap and simple devices. Earlier models required dedicated controllers, or updates over Wifi or NFC, whereas many modern ones are standalone BLE devices that can be updated from a phone or server.
 
-Being battery operated, they can be stuck on anywhere without wiring - the only constraints are bluetooth range, visibility (they need ambient light since the display is more like paper than a traditional lit-up electronic display) and out of the weather since the devices are intended for indoor use.
+Being battery operated, they can be stuck on anywhere without wiring - the only location constraints are bluetooth range, visibility (they need ambient light since the display is more like paper than a traditional lit-up electronic display) and out of the weather since the devices are intended for indoor use.
 
 ## Pre-requisites
 
@@ -48,7 +48,7 @@ Most of these requirements are about making SignalK work with Bluetooth Low Ener
 
 5. Correct time zone set on server if local time is to be shown on display
 
-- Use `raspi-config` on a Raspberry Pi, or `timedatectl` on a Linux server
+- See [FAQ](#faq-timezone)
 - If not set, everything will work, but you may see the wrong zone or not have daylight savings applied
 
 Once you have all of that, it may be worth also installing [signalk-victron-ble](https://github.com/stefanor/signalk-victron-ble) or [bt-sensors-plugin](https://github.com/naugehyde/bt-sensors-plugin-sk) to pull in data from other sensors and equipment.
@@ -72,7 +72,7 @@ npm install @rhizomatics/signalk-einklabel-plugin
 
 ![Tide Clock](docs/assets/screenshots/example_tidal_clock.png)
 
-The tide clock needs the [signalk-tides](https://github.com/openwatersio/signalk-tides) plugin to be installed and publishing tides to the Resources API. The [tide.svg](https://github.com/rhizomatics/signalk-einklabel-plugin/blob/main/templates/tide.svg) can be customized to run with other APIs or take data only from SignalK data paths.
+The tide clock needs the [signalk-tides](https://github.com/openwatersio/signalk-tides) plugin to be installed and publishing tides to the Resources API. The [tide.svg](https://github.com/rhizomatics/signalk-einklabel-plugin/blob/main/templates/tide.svg) can be customized to run with other APIs or take data only from SignalK data paths. For example, `source=resources,resource=tides,provider=tides,path=extremes[0].time,format=local_time` gets the first tide time, ensures its the preferred `signalk-tides` provider and makes it a simple local time rather than a UTC date time.
 
 To show the lunar phase, the `environment.moon.phaseName` path is required, which can
 be easily achieved by installing and configuring the `derived-data` plugin.
@@ -83,7 +83,7 @@ Use the standard configuration option in the SignalK menu for the plugin.
 
 ![Plugin Configuration](docs/assets/screenshots/plugin_config.png)
 
-## Scanning for Devices
+### Scanning for Devices
 
 Since these are ultra-low power devices, they don't respond instantly to either identify themselves or accept a new image. By default, both scanning and painting have time-outs to wait for a response, which can be altered in the plugin configuration or CLI argument.
 
@@ -91,14 +91,17 @@ One other quirk is that some devices respond with a different name at different
 
 The plugin will optionally re-scan whenever it starts up, although this isn't essential once a label has been configured.
 
-### Scans from CLI
+### Scheduling
 
-The command line tools, run from inside the `.signalk` directory, can be used to help troubleshoot
+There are two ways of scheduling scans:
 
-- Scan for longer, in this example 90 seconds
-  - `npx esl-cli scan -d 90`
-- Scan for all BLE devices, whatever they are
-  - `npx esl-cli scan -a`
+#### Time Based
+
+This will schedule at fixed hours of the day, for example 00:00/08:00/16:00 for an 8h schedule, and at a selected minutes past the hour. At plugin startup/restart, the devices will be repainted if they missed their last slot.
+
+#### Path Subscription
+
+The devices will be painted when the plugin starts, and then every time the selected SignalK path changes.
 
 ## Templating
 
@@ -114,7 +117,9 @@ For example, `path=environment.forecast.description` uses the default data sourc
 
 #### SignalK REST APIs
 
-The source can be overridden to use the SignalK server's Resources API instead. For example, `source=resources,resource=tides,path=station.name` picks the `tides` resource and pulls the `station.name` path out of the JSON response - this works for any resource type (`tides`, `waypoints`, `routes`, ...), and needs nothing configured: the plugin reaches the Resources API directly. Where a resource is specified, it will be fetched once for that render, and subsequent fields sourced from the same resource use that cached response.
+The source can be overridden to use the SignalK server's Resources API instead. Change `source` to `resources` and specify which resource with `resource`. If there are multiple providers for the same resource, and they're not equally useful, then either set a default provider in SignalK, or use the `provider` tag to set the name.
+
+For example, `source=resources,resource=tides,provider=tides,path=station.name` picks the `tides` resource and pulls the `station.name` path out of the JSON response - this works for any resource type (`tides`, `waypoints`, `routes`, ...), and needs nothing configured: the plugin reaches the Resources API directly. Where a resource is specified, it will be fetched once for that render, and subsequent fields sourced from the same resource use that cached response. `provider` is optional, the default provider will be used if not specified.
 
 #### Plugin Data
 
@@ -147,7 +152,7 @@ Common categories:
 
 Additionally, `round=n` can be used to round to limited decimal places.
 
-These can all be combined as in `source=resources,resource=tides,path=extremes[2].level,category=depth,round=2`
+These can all be combined as in `source=resources,resource=tides,provider=tides,path=extremes[2].level,category=depth,round=2`
 
 ### Non-Textual Fields (Images)
 
@@ -171,22 +176,6 @@ Three font types are loaded by default, use the generic font family, or exact fo
 - `sans-serif` - `Roboto`
 - `monospace` - `Roboto Mono`
 
-## Command Line Interface
-
-To get fast feedback on templates and shelf devices without updating and configuring SignalK, a CLI call `esl-cli` is provided when the module is manually installed that has these commands. Use `--help` to get all the options.
-
-- `vendors` - list supported vendors
-- `scan` - report supported devices found from a BLE scan
-
-See also the commands useful for debugging under [Developing Templates]
-
-- `render` - transform an SVG template and data into a PNG
-- `paint` - render an SVG template and data to a selected ESL
-
-The width, height, vertical offset and colour palette for the device is taken from the internal register of devices, however can be overridden on the command line. This could be used to help you choose what size of label to buy, or to get an unsupported label working.
-
-( The CLI can also be run from a checked out module, or by opening a terminal shell at `~/.signalk/node_modules/@rhizomatics/signalk-einklabel-plugin`, as `npx esl-cli command --args` )
-
 ## Vendors
 
 ### Zhsunyco
@@ -214,6 +203,31 @@ The primary things managed and provided by the plugin are:
   - Optional: left blank, the plugin probes the probable values in likelihood order at startup - `http://localhost:3000`, `http://localhost`, `https://localhost`. Set it explicitly to skip probing
   - Either way, errors clearly if nothing responds (wrong port) or the probe is rejected (anonymous read access not enabled) - these endpoints must allow anonymous read access, since the plugin has no login flow
 
+## Command Line Interface
+
+To get fast feedback on templates and shelf devices without updating and configuring SignalK, a CLI call `esl-cli` is provided when the module is manually installed that has these commands. Use `--help` to get all the options.
+
+- `vendors` - list supported vendors
+- `scan` - report supported devices found from a BLE scan
+
+See also the commands useful for debugging under [Developing Templates]
+
+- `render` - transform an SVG template and data into a PNG
+- `paint` - render an SVG template and data to a selected ESL
+
+The width, height, vertical offset and colour palette for the device is taken from the internal register of devices, however can be overridden on the command line. This could be used to help you choose what size of label to buy, or to get an unsupported label working.
+
+( The CLI can also be run from a checked out module, or by opening a terminal shell at `~/.signalk/node_modules/@rhizomatics/signalk-einklabel-plugin`, as `npx esl-cli command --args` )
+
+### Scans from CLI
+
+The command line tools, run from inside the `.signalk` directory, can be used to help troubleshoot
+
+- Scan for longer, in this example 90 seconds
+  - `npx esl-cli scan -d 90`
+- Scan for all BLE devices, whatever they are
+  - `npx esl-cli scan -a`
+
 ## Extending
 
 ### Hardware
@@ -226,6 +240,8 @@ Additional vendors and devices can be added by a separate npm package that imple
 
 ### Developing Templates
 
+See the [Templating] section for more details.
+
 Templates can be added to the configurable directory. [Inkscape](https://inkscape.org) free, open source, and recommended for editing templates, or your own favourite editor, or by hand in a text editor for hard core (or just tidying up the template side).
 
 ![Example Field Definition](docs/assets/screenshots/inkscape_desc.png)
@@ -256,25 +272,25 @@ npx esl-cli fields -t templates/tide.svg -u http://localhost
 ```
 
 ```
-id                       spec                                                                     value
-station.name             source=resources,resource=tides,path=station.name                        Tobermory
-source.name.             source=resources,resource=tides,path=station.source.name                 TICON-4
-last_repaint             source=einklabel,path=repainted,format=local_datetime_short              30 Jun 26 00:08
-extremes.0               source=resources,resource=tides,path=extremes[0].label                   Low
-extremes.1               source=resources,resource=tides,path=extremes[1].label                   High
-extremes.2               source=resources,resource=tides,path=extremes[2].label                   Low
-timezoneRegion           source=einklabel,path=local_zone                                         BST
-lat                      source=resources,resource=tides,path=station.datums.LAT,category=depth   0.2m
-hat                      source=resources,resource=tides,path=station.datums.HAT,category=depth   5.2m
-extremes.2.level         source=resources,resource=tides,path=extremes[2].level,category=depth    1.1m
-extremes.2.time          source=resources,resource=tides,path=extremes[2].time,format=local_time  13:15
-extremes.1.level         source=resources,resource=tides,path=extremes[1].level,category=depth    3.8m
-extremes.1.time          source=resources,resource=tides,path=extremes[1].time,format=local_time  07:05
-extremes.0.time          source=resources,resource=tides,path=extremes[0].time,format=local_time  01:21
-extremes.0.time-8        source=resources,resource=tides,path=extremes[0].time,format=day_mon     30 Jun
-extremes.0.time-8-5      source=resources,resource=tides,path=extremes[1].time,format=day_mon     30 Jun
-extremes.0.time-8-9      source=resources,resource=tides,path=extremes[2].time,format=day_mon     30 Jun
-extremes.0.level         source=resources,resource=tides,path=extremes[0].level,category=depth    1.3m
+id                   spec                                                                                    value
+station.name         source=resources,resource=tides,provider=tides,path=station.name                        Tobermory
+source.name.         source=resources,resource=tides,provider=tides,path=station.source.name                 TICON-4
+last_repaint         source=einklabel,path=repainted,format=local_datetime_short                             30 Jun 26 00:08
+extremes.0           source=resources,resource=tides,provider=tides,path=extremes[0].label                   Low
+extremes.1           source=resources,resource=tides,provider=tides,path=extremes[1].label                   High
+extremes.2           source=resources,resource=tides,provider=tides,path=extremes[2].label                   Low
+timezoneRegion       source=einklabel,path=local_zone                                                        BST
+lat                  source=resources,resource=tides,provider=tides,path=station.datums.LAT,category=depth   0.2m
+hat                  source=resources,resource=tides,provider=tides,path=station.datums.HAT,category=depth   5.2m
+extremes.2.level     source=resources,resource=tides,provider=tides,path=extremes[2].level,category=depth    1.1m
+extremes.2.time      source=resources,resource=tides,provider=tides,path=extremes[2].time,format=local_time  13:15
+extremes.1.level     source=resources,resource=tides,provider=tides,path=extremes[1].level,category=depth    3.8m
+extremes.1.time      source=resources,resource=tides,provider=tides,path=extremes[1].time,format=local_time  07:05
+extremes.0.time      source=resources,resource=tides,provider=tides,path=extremes[0].time,format=local_time  01:21
+extremes.0.time-8    source=resources,resource=tides,provider=tides,path=extremes[0].time,format=day_mon     30 Jun
+extremes.0.time-8-5  source=resources,resource=tides,provider=tides,path=extremes[1].time,format=day_mon     30 Jun
+extremes.0.time-8-9  source=resources,resource=tides,provider=tides,path=extremes[2].time,format=day_mon     30 Jun
+extremes.0.level     source=resources,resource=tides,provider=tides,path=extremes[0].level,category=depth    1.3m
 ```
 
 ### Offline Working
@@ -286,3 +302,38 @@ extremes.0.level         source=resources,resource=tides,path=extremes[0].level,
 - `categories.json` - SignalK unit categories needed for `category=depth` type formatting
 
 For example, `npx esl-cli fields -t templates/tide.svg -e examples` will show all the field data that will be populated from the example API, vessel and category data in the `examples` local directory.
+
+## Frequently Asked Questions
+
+### Sometimes values are missing on the display
+
+If the plugin repaints a display at server startup, then the plugin that provides the data may not have started ( or in the case of `derived-data` the plugin that the plugin depends on! ) and unlike Home Assistant, there's no good way of sequencing the start of plugins.
+
+Use the _settle_ time, to impose a minimum wait between the eInk Label plugin being initialized, and it attempting to paint any displays, and increase this value if its still missing data.
+
+### Times are showing incorrectly {#faq-timezone}
+
+If times are in the wrong timezone, or don't have daylight savings applied correctly,
+then check that the server itself (at the Linux level, not SignalK, which doesn't know)is configured for your timezone, assuming of course that you're a coastal sailor. Use `raspi-config` on a Raspberry Pi, or `timedatectl` on a Linux server.
+
+If you're a global cruiser, then use something like [signalk-set-gps-timezone](https://github.com/hoeken/signalk-set-gps-timezone) to set the value in the operating system.
+
+### The ESL signal is too weak from my SignalK server
+
+Try a BLE proxy device, ESP32 is popular for this.
+
+## Other ESL and General eInk Resources
+
+- [Open ePaper Link](https://openepaperlink.de) - Alternative open source firmware to flash onto eInk shelf labels, with Home Assistant integration.
+- [e-ink dashboard for Signal K](https://github.com/meri-imperiumi/dashboard) - Waveshare display based multi instrument display.
+- [eInk Dashboard Modern SK](https://github.com/VladimirKalachikhin/e-inkDashboardModernSK) - SignalK dashboard for non-ESL eInk display.
+- [esp32-esl-system](https://github.com/giobauermeister/esp32-esl-system) - Docker and ESP32 based system for updating ESLs.
+- [hass-gicisky](https://github.com/eigger/hass-gicisky) - Home Assistant integration for Gicisky ESLs ( a similar vendor to Zhsunyco). Uses [imagespec](https://github.com/eigger/imagespec) for templating.
+- [ha-panda](https://github.com/moryoav/ha-panda) - Home Assistant integration for Panda ESLs ( a similar vendor to Zhsunyco).
+- [Dmitry.gr](https://dmitry.gr/?r=05.Projects&proj=29.%20eInk%20Price%20Tags) - Personal site of an ESL hacker
+- [Aaron Christobel](https://www.youtube.com/@atc1441) - YouTube channel of an ESL hacker.
+- [rbaron.net](https://rbaron.net/blog/2022/07/29/Daisy-chaining-multiple-electronic-shelf-labels) - Blog of an early ESL hacker.
+- [Pimoroni](https://shop.pimoroni.com/collections/displays?tags=e-ink%20Displays) - All shapes and sizes of eInk displays, aimed at hackers, and with an [inky](https://github.com/pimoroni/inky) GitHub project to support them.
+- [WaveShare](https://www.waveshare.com/product/displays/e-paper.htm) - Wide range of eInk displays for hardware projects, not limited to ESLs.
+
+See also the [Boat Tech Directory](https://boat-tech-directory.rhizomatics.org.uk).

package/dist/cli/liveContext.js

@@ -7,6 +7,7 @@ exports.assembleLiveContext = assembleLiveContext;
 exports.assembleExampleContext = assembleExampleContext;
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
+const binding_1 = require("../render/binding");
 const formatters_1 = require("../render/formatters");
 const unwrapSignalkTree_1 = require("../render/unwrapSignalkTree");
 const httpJson_1 = require("../httpJson");
@@ -47,11 +48,19 @@ async function assembleLiveContext(signalkUrl, bindings) {
         }
     }
     const resources = {};
-    const resourceNames = new Set(bindings.filter((binding) => binding.source === "resources").map((binding) => binding.resource));
-    for (const name of resourceNames) {
-        const url = `${signalkUrl}${RESOURCES_API_PATH}/${name}`;
+    const resourceBindings = new Map();
+    for (const binding of bindings) {
+        if (binding.source !== "resources")
+            continue;
+        resourceBindings.set((0, binding_1.resourceContextKey)(binding), binding);
+    }
+    for (const [key, binding] of resourceBindings) {
+        // A `provider=` binding pins which registered provider plugin answers the request (matches
+        // `checkForProvider`'s `?provider=` query param in signalk-server's resources REST API) rather
+        // than leaving it to whichever provider the server considers the default for that resource type.
+        const url = `${signalkUrl}${RESOURCES_API_PATH}/${binding.resource}${binding.provider ? `?provider=${encodeURIComponent(binding.provider)}` : ""}`;
         (0, log_1.logDebug)(`GET ${url}`);
-        resources[name] = await (0, httpJson_1.fetchJson)(url);
+        resources[key] = await (0, httpJson_1.fetchJson)(url);
     }
     const categoryNames = new Set(bindings.filter((binding) => binding.category).map((binding) => binding.category));
     const categories = await (0, unitCategories_1.fetchCategoryDisplayUnits)(signalkUrl, categoryNames);
@@ -112,11 +121,18 @@ async function assembleExampleContext(examplesDir, bindings) {
         }
     }
     const resources = {};
-    const resourceNames = new Set(bindings.filter((binding) => binding.source === "resources").map((binding) => binding.resource));
-    for (const name of resourceNames) {
-        const resourcePath = path_1.default.join(examplesDir, "resources", `${name}.json`);
+    const resourceBindings = new Map();
+    for (const binding of bindings) {
+        if (binding.source !== "resources")
+            continue;
+        resourceBindings.set((0, binding_1.resourceContextKey)(binding), binding);
+    }
+    for (const [key, binding] of resourceBindings) {
+        // Example data has no notion of multiple providers for the same resource type - the file is
+        // still named after the bare `resource=` type regardless of any `provider=` a binding pins.
+        const resourcePath = path_1.default.join(examplesDir, "resources", `${binding.resource}.json`);
         (0, log_1.logDebug)(`reading ${resourcePath}`);
-        resources[name] = await readJsonFile(resourcePath);
+        resources[key] = await readJsonFile(resourcePath);
     }
     const categoryNames = new Set(bindings.filter((binding) => binding.category).map((binding) => binding.category));
     let categories = {};

package/dist/config.d.ts

@@ -36,6 +36,15 @@ export interface PluginConfig {
     paintConnectTimeoutSeconds: number;
     /** How many times to attempt a repaint (including the first try) before giving up and reporting failure. */
     paintRetries: number;
+    /**
+     * How long after plugin start to hold off on every repaint trigger (startup check, interval, and
+     * subscription alike) - the first minute or two of a SignalK server's life is a chaos of plugin
+     * dependency sequencing (e.g. `derived-data` may not have published `environment.moon.phaseName`
+     * yet), so a repaint attempted immediately at startup can render with missing/wrong data, and hash
+     * dedup (see `considerRepaint`) then means it silently stays that way until the underlying data
+     * happens to change again. Defaults to 120s - see `startRepaintScheduler`.
+     */
+    settleSeconds: number;
     /**
      * Base URL of this SignalK server, used for: (1) a `signalk`-sourced numeric value's automatic unit
      * conversion (`GET .../vessels/<context>/meta`, see `../pathMeta.ts`) unless `format=raw`, and (2) an

package/dist/config.js

@@ -29,6 +29,7 @@ function defaultConfig() {
         scanDurationSeconds: 20,
         paintConnectTimeoutSeconds: 30,
         paintRetries: 3,
+        settleSeconds: 120,
         devices: [],
     };
 }
@@ -153,6 +154,15 @@ function configSchema(app, discovered = []) {
                 minimum: 1,
                 default: defaults.paintRetries,
             },
+            settleSeconds: {
+                type: "number",
+                title: "Settle time after plugin start (seconds)",
+                description: "Holds off every repaint (startup check, interval, and subscription alike) until this long after the plugin starts - " +
+                    "the first minute or two of SignalK startup often has many errors as plugins start before the paths they depend on are ready, so data a template needs " +
+                    "(e.g. from the derived-data plugin) may not be published yet.",
+                minimum: 0,
+                default: defaults.settleSeconds,
+            },
             signalkApiUrl: {
                 type: "string",
                 title: "SignalK API base URL (leave blank to auto-detect)",

package/dist/render/binding.d.ts

@@ -10,6 +10,15 @@ export interface Binding {
     context: string;
     /** Required when `source === 'resources'` - the Resources API resource type, e.g. `tides`, `waypoints`. */
     resource?: string;
+    /**
+     * Only meaningful when `source === 'resources'` - the plugin id of the Resource Provider to query
+     * (SignalK's `listResources(resType, params, providerId)`), e.g. `signalk-tides`. Optional - when
+     * omitted, the server picks whichever provider is registered for `resource` (its "default"), which is
+     * ambiguous/unpredictable when more than one plugin provides the same resource type (e.g. installing
+     * a second tides plugin can silently make it the one used instead of the one the template was authored
+     * for). Set this to pin a template to one provider regardless of what else is installed.
+     */
+    provider?: string;
     /** For `source === 'einklabel'`, a dotted path into the plugin's own injected `meta` (e.g. `repainted`), rather than into vessel/resource data. */
     path: string;
     /** A named formatter (see `./formatters.ts`), or `'raw'` to suppress automatic unit conversion (see `renderBinding`). */
@@ -37,6 +46,14 @@ export interface Binding {
  * unambiguously signals this shorthand.
  */
 export declare function parseBinding(desc: string): Binding;
+/**
+ * Key under which a `source=resources` binding's data is stored in `context.resources` (see
+ * `assembleRawContext` in repaintScheduler.ts and `cli/liveContext.ts`'s equivalent) - incorporates
+ * `provider` so two bindings naming the same `resource` type but different providers (e.g. pinning one
+ * template's `tides` binding to `provider=signalk-tides` while another is left to the server's default)
+ * don't collide on a single cache entry.
+ */
+export declare function resourceContextKey(binding: Pick<Binding, "resource" | "provider">): string;
 /**
  * Parses every `<text>` and `<image>` element's `<desc>` binding out of raw SVG source - lets a caller
  * discover what data a template needs before fetching anything, with no separate config declaring it

package/dist/render/binding.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBinding = parseBinding;
+exports.resourceContextKey = resourceContextKey;
 exports.findBindings = findBindings;
 exports.resolveBinding = resolveBinding;
 exports.renderBinding = renderBinding;
 const xmldom_1 = require("@xmldom/xmldom");
 const formatters_1 = require("./formatters");
 const SOURCES = ["signalk", "resources", "einklabel"];
-const KNOWN_KEYS = new Set(["source", "context", "resource", "path", "format", "category", "round", "assets"]);
+const KNOWN_KEYS = new Set(["source", "context", "resource", "provider", "path", "format", "category", "round", "assets"]);
 /**
  * Parses a `<desc>` element's text content into a `Binding`, e.g.
  * `source=resources,resource=tides,path=extremes[0].level,category=depth,round=2` or, using the
@@ -45,6 +46,9 @@ function parseBinding(desc) {
     if (source === "resources" && !fields.resource) {
         throw new Error(`invalid binding "${desc}" - source=resources requires a "resource" key`);
     }
+    if (fields.provider && source !== "resources") {
+        throw new Error(`invalid binding "${desc}" - "provider" is only valid with source=resources`);
+    }
     if (!fields.path) {
         throw new Error(`invalid binding "${desc}" - missing required "path" key`);
     }
@@ -52,6 +56,7 @@ function parseBinding(desc) {
         source,
         context,
         resource: fields.resource,
+        provider: fields.provider,
         path: fields.path,
         format: fields.format,
         category: fields.category,
@@ -59,6 +64,16 @@ function parseBinding(desc) {
         assets: fields.assets,
     };
 }
+/**
+ * Key under which a `source=resources` binding's data is stored in `context.resources` (see
+ * `assembleRawContext` in repaintScheduler.ts and `cli/liveContext.ts`'s equivalent) - incorporates
+ * `provider` so two bindings naming the same `resource` type but different providers (e.g. pinning one
+ * template's `tides` binding to `provider=signalk-tides` while another is left to the server's default)
+ * don't collide on a single cache entry.
+ */
+function resourceContextKey(binding) {
+    return binding.provider ? `${binding.resource}@${binding.provider}` : binding.resource;
+}
 /**
  * Parses every `<text>` and `<image>` element's `<desc>` binding out of raw SVG source - lets a caller
  * discover what data a template needs before fetching anything, with no separate config declaring it
@@ -112,9 +127,10 @@ function resolveBinding(binding, context) {
         return getAtPath(meta, binding.path);
     }
     const resources = context.resources;
-    const resource = resources?.[binding.resource];
+    const resourceKey = resourceContextKey(binding);
+    const resource = resources?.[resourceKey];
     if (resource === undefined) {
-        throw new Error(`binding references resource "${binding.resource}" which is not present in the render context`);
+        throw new Error(`binding references resource "${resourceKey}" which is not present in the render context`);
     }
     return getAtPath(resource, binding.path);
 }

package/dist/render/svgRenderer.js

@@ -135,8 +135,8 @@ class SvgRenderer {
                     const dirProblem = (0, assets_1.describeAssetsDirProblem)(templatesDir, bundledTemplatesDir, binding.assets);
                     console.error(key
                         ? `${pluginVersion_1.PLUGIN_NAME}: image "${descElement.textContent}" has no asset file for value "${key}" in "${binding.assets}"`
-                        : `${pluginVersion_1.PLUGIN_NAME}: image "${descElement.textContent}" resolved to no usable value to pick an asset file with`);
-                    console.error(`${pluginVersion_1.PLUGIN_NAME}: ${dirProblem ?? `assets directory for "${binding.assets}" checked out fine - the miss is just this value's`}`);
+                        : `${pluginVersion_1.PLUGIN_NAME}: image "${descElement.textContent}" resolved to empty value to select asset`);
+                    console.error(`${pluginVersion_1.PLUGIN_NAME}: ${dirProblem ?? `assets directory for "${binding.assets}" is present`}`);
                     element.parentNode?.removeChild(element);
                     continue;
                 }

package/dist/repaintScheduler.d.ts

@@ -3,4 +3,14 @@ import { PluginConfig } from "./config";
 export interface RepaintScheduler {
     stop(): void;
 }
+/**
+ * The most recent wall-clock instant at or before `now` that an `interval`-triggered device's own
+ * periodic check (below, in `startRepaintScheduler`) would fire at - every `intervalHours` hours,
+ * at `intervalMinute` minutes past the hour (e.g. hours=8,minute=0 -> 00:00, 08:00, 16:00 each day).
+ * Used only by the deferred startup catch-up check to tell an interval device that's already been
+ * painted for its current slot (skip - the regular periodic check will catch the *next* slot in due
+ * course) from one that's overdue (e.g. the plugin was down across a scheduled slot - paint now
+ * rather than waiting up to `intervalHours` for the next one).
+ */
+export declare function mostRecentScheduledSlot(now: Date, intervalHours: number, intervalMinute: number): Date;
 export declare function startRepaintScheduler(app: ServerAPI, config: PluginConfig): RepaintScheduler;

package/dist/repaintScheduler.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mostRecentScheduledSlot = mostRecentScheduledSlot;
 exports.startRepaintScheduler = startRepaintScheduler;
 const crypto_1 = require("crypto");
 const path_1 = require("path");
@@ -17,6 +18,23 @@ const resolveApiUrl_1 = require("./resolveApiUrl");
 const pluginVersion_1 = require("./pluginVersion");
 const INTERVAL_POLL_MS = 60000;
 const SUBSCRIPTION_DEBOUNCE_MS = 2000;
+/**
+ * The most recent wall-clock instant at or before `now` that an `interval`-triggered device's own
+ * periodic check (below, in `startRepaintScheduler`) would fire at - every `intervalHours` hours,
+ * at `intervalMinute` minutes past the hour (e.g. hours=8,minute=0 -> 00:00, 08:00, 16:00 each day).
+ * Used only by the deferred startup catch-up check to tell an interval device that's already been
+ * painted for its current slot (skip - the regular periodic check will catch the *next* slot in due
+ * course) from one that's overdue (e.g. the plugin was down across a scheduled slot - paint now
+ * rather than waiting up to `intervalHours` for the next one).
+ */
+function mostRecentScheduledSlot(now, intervalHours, intervalMinute) {
+    const slot = new Date(now);
+    slot.setHours(Math.floor(now.getHours() / intervalHours) * intervalHours, intervalMinute, 0, 0);
+    if (slot.getTime() > now.getTime()) {
+        slot.setHours(slot.getHours() - intervalHours);
+    }
+    return slot;
+}
 function statePath(app) {
     return (0, path_1.join)(app.getDataDirPath(), "repaint-state.json");
 }
@@ -42,8 +60,9 @@ function stableStringify(value) {
     }
     return JSON.stringify(value);
 }
-function hashContext(context) {
-    return (0, crypto_1.createHash)("sha1").update(stableStringify(context)).digest("hex");
+/** Hashes both the live data context and the template's mtime, so editing a template (even with no data change) triggers a repaint. */
+function hashContext(context, templateMtimeMs) {
+    return (0, crypto_1.createHash)("sha1").update(stableStringify(context)).update(String(templateMtimeMs)).digest("hex");
 }
 /** Merges `value` into `target` at the nested location described by a dotted SignalK path. */
 function setAtPath(target, path, value) {
@@ -104,13 +123,20 @@ async function assembleRawContext(app, apiUrl, bindings) {
         }
     }
     const resources = {};
-    const resourceNames = new Set(bindings.filter((binding) => binding.source === "resources").map((binding) => binding.resource));
-    for (const name of resourceNames) {
+    const resourceBindings = new Map();
+    for (const binding of bindings) {
+        if (binding.source !== "resources")
+            continue;
+        resourceBindings.set((0, binding_1.resourceContextKey)(binding), binding);
+    }
+    for (const [key, binding] of resourceBindings) {
         // `listResources`'s type only allows the standard SignalKResourceType union, but the underlying
         // Resources API (and a custom provider like signalk-tides, registered under the non-standard
         // "tides" type) accepts any registered resource type string - this cast matches `getResource`'s
-        // wider, accurate signature.
-        resources[name] = await app.resourcesApi.listResources(name, {});
+        // wider, accurate signature. An explicit `provider=` pins which registered provider plugin
+        // answers the request (SignalK's `listResources(resType, params, providerId)`) rather than
+        // leaving it to whichever provider the server considers the default for that resource type.
+        resources[key] = await app.resourcesApi.listResources(binding.resource, {}, binding.provider);
     }
     const categoryNames = new Set(bindings.filter((binding) => binding.category).map((binding) => binding.category));
     if (categoryNames.size > 0 && !apiUrl) {
@@ -137,13 +163,14 @@ async function considerRepaint(app, config, device, state, getApiUrl) {
     }
     const templatesDir = (0, config_1.resolveTemplatesDir)(config.templatesDir);
     const templatePath = (0, config_1.resolveTemplatePath)(templatesDir, device.templateName);
+    const templateMtimeMs = (0, fs_1.statSync)(templatePath).mtimeMs;
     const bindings = (0, binding_1.findBindings)((0, fs_1.readFileSync)(templatePath, "utf-8"));
     const apiUrl = await getApiUrl().catch((err) => {
         app.debug(`"${device.friendlyName}": ${err.message}`);
         return undefined;
     });
     const rawContext = await assembleRawContext(app, apiUrl, bindings);
-    const hash = hashContext(rawContext);
+    const hash = hashContext(rawContext, templateMtimeMs);
     if (state[device.friendlyName]?.hash === hash && !device.forceRepaint) {
         app.debug(`"${device.friendlyName}": data unchanged, skipping repaint`);
         return;
@@ -168,7 +195,7 @@ async function considerRepaint(app, config, device, state, getApiUrl) {
         await driver.paint(bitmap, { address: model.address, aesKey: device.aesKey, connectTimeoutMs });
         paintDurationMs = Date.now() - startedAt;
     });
-    state[device.friendlyName] = { hash };
+    state[device.friendlyName] = { hash, repaintedAt: Date.now() };
     saveState(app, state);
     if (device.forceRepaint) {
         clearForceRepaint(app, device.friendlyName);
@@ -179,7 +206,21 @@ function startRepaintScheduler(app, config) {
     const state = loadState(app);
     const unsubscribes = [];
     const getApiUrl = (0, resolveApiUrl_1.createApiUrlResolver)(config.signalkApiUrl);
-    const repaint = (device) => considerRepaint(app, config, device, state, getApiUrl).catch((err) => app.debug(`"${device.friendlyName}": repaint failed: ${err.message}`));
+    // The first minute or two of a SignalK server's life is a chaos of plugin dependency sequencing -
+    // a repaint attempted before other plugins (e.g. derived-data) have published the data a template
+    // needs renders with missing/wrong values, and hash dedup (see `considerRepaint`) then means it
+    // silently stays that way until the underlying data happens to change again. So every trigger
+    // (startup check, interval, subscription alike) funnels through this one gate.
+    const startedAt = Date.now();
+    const settleMs = (config.settleSeconds ?? 120) * 1000;
+    const repaint = (device) => {
+        const elapsedMs = Date.now() - startedAt;
+        if (elapsedMs < settleMs) {
+            app.debug(`"${device.friendlyName}": still settling (${Math.round(elapsedMs / 1000)}s/${Math.round(settleMs / 1000)}s) - skipping repaint`);
+            return Promise.resolve();
+        }
+        return considerRepaint(app, config, device, state, getApiUrl).catch((err) => app.debug(`"${device.friendlyName}": repaint failed: ${err.message}`));
+    };
     const intervalDevices = config.devices.filter((device) => device.repaintTrigger === "interval");
     if (intervalDevices.length > 0) {
         const timer = setInterval(() => {
@@ -197,15 +238,43 @@ function startRepaintScheduler(app, config) {
     for (const device of config.devices) {
         if (device.repaintTrigger === "subscription" && device.triggerPath) {
             const stream = app.streambundle.getSelfStream(device.triggerPath).debounce(SUBSCRIPTION_DEBOUNCE_MS);
-            const unsub = stream.onValue(() => repaint(device));
+            // A path can report a transient `null`/missing value (e.g. a sensor briefly drops out) then go
+            // right back to what it was before - e.g. 1111, then missing, then 1111 again. Ignoring the
+            // missing emission entirely (rather than repainting for it) means it's never actually painted,
+            // so when the value comes back the same as before, `considerRepaint`'s hash dedup sees nothing
+            // changed since the last real paint and skips too - net effect: no repaint at all for this
+            // blip, instead of one flickering the display blank/wrong and a second restoring it.
+            const unsub = stream.onValue((value) => {
+                if (value !== null && value !== undefined)
+                    void repaint(device);
+            });
             unsubscribes.push(unsub);
         }
     }
-    // Check every device once at startup - harmless given hash dedup, and covers newly-added
-    // devices or a forceRepaint left set from before a restart.
-    for (const device of config.devices) {
-        void repaint(device);
-    }
+    // Check every device once, after the settle window. Deferred (rather than run immediately) so a
+    // subscription-triggered device whose path is slow-changing (e.g. tide/moon data that might not
+    // change again for hours) still gets its first real paint promptly once settled, instead of
+    // waiting on that path's next unrelated update - it's then left alone until the path changes
+    // again, same as always. An interval-triggered device, though, only gets this catch-up paint if
+    // it's actually overdue - already painted for the current scheduled slot (e.g. plugin restarted
+    // mid-way through its interval) just waits for the regular periodic check above to hit the *next*
+    // slot, rather than jumping the gun with an extra unscheduled paint every time the plugin restarts.
+    const startupCheckTimer = setTimeout(() => {
+        for (const device of config.devices) {
+            if (device.repaintTrigger === "interval" && !device.forceRepaint) {
+                const hours = device.intervalHours ?? 1;
+                const minute = device.intervalMinute ?? 0;
+                const dueSlot = mostRecentScheduledSlot(new Date(), hours, minute);
+                const repaintedAt = state[device.friendlyName]?.repaintedAt;
+                if (repaintedAt !== undefined && repaintedAt >= dueSlot.getTime()) {
+                    app.debug(`"${device.friendlyName}": already painted for the current ${hours}h schedule slot - skipping startup catch-up`);
+                    continue;
+                }
+            }
+            void repaint(device);
+        }
+    }, settleMs);
+    unsubscribes.push(() => clearTimeout(startupCheckTimer));
     return {
         stop() {
             for (const unsubscribe of unsubscribes)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhizomatics/signalk-einklabel-plugin",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Display SignalK data on eInk Electronic Shelf Labels",
   "keywords": [
     "ble",

package/templates/tide.svg

@@ -69,7 +69,7 @@
      fill="yellow"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:serif;-inkscape-font-specification:'Roboto Serif 20pt';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffff00;stroke:#000000;stroke-width:1.2278;stroke-opacity:1"
      transform="scale(0.89274878,1.1201359)">Tidal Station Name<desc
-   id="desc1">source=resources,resource=tides,path=station.name</desc></text><text
+   id="desc1">source=resources,resource=tides,provider=tides,path=station.name</desc></text><text
      id="source"
      x="367.44577"
      y="226.1548"
@@ -78,7 +78,7 @@
      fill="black"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:sans-serif;-inkscape-font-specification:'\'Roboto\', sans-serif';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff0000;stroke-width:3.80045"
      transform="scale(0.95907862,1.0426674)"><desc
-       id="desc21">source=resources,resource=tides,path=station.source.name</desc><tspan
+       id="desc21">source=resources,resource=tides,provider=tides,path=station.source.name</desc><tspan
        sodipodi:role="line"
        id="tspan20"
        x="367.44577"
@@ -102,7 +102,7 @@
      font-family="monospace"
      fill="black"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff0000"><desc
-   id="desc13">source=resources,resource=tides,path=extremes[0].label</desc>High or Low</text><text
+   id="desc13">source=resources,resource=tides,provider=tides,path=extremes[0].label</desc>High or Low</text><text
      id="extremes.1"
      x="7.6000967"
      y="117.85719"
@@ -110,7 +110,7 @@
      font-family="monospace"
      fill="black"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff0000"><desc
-   id="desc14">source=resources,resource=tides,path=extremes[1].label</desc>High or Low</text><text
+   id="desc14">source=resources,resource=tides,provider=tides,path=extremes[1].label</desc>High or Low</text><text
      id="extremes.2"
      x="7.2470098"
      y="176.12112"
@@ -118,7 +118,7 @@
      font-family="monospace"
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff0000"><desc
-   id="desc15">source=resources,resource=tides,path=extremes[2].label</desc>High or Low</text><text
+   id="desc15">source=resources,resource=tides,provider=tides,path=extremes[2].label</desc>High or Low</text><text
      id="timezone"
      x="330.60489"
      y="204.67754"
@@ -148,7 +148,7 @@
      font-family="sans-serif"
      fill="#ffff00"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:sans-serif;-inkscape-font-specification:'\'Roboto, Normal\', sans-serif';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#1a1a1a;stroke:#fefe54;stroke-opacity:1"><desc
-       id="desc18">source=resources,resource=tides,path=station.datums.LAT,category=depth,round=1</desc><tspan
+       id="desc18">source=resources,resource=tides,provider=tides,path=station.datums.LAT,category=depth,round=1</desc><tspan
        sodipodi:role="line"
        id="tspan17"
        x="282.65424"
@@ -160,7 +160,7 @@
      font-family="sans-serif"
      fill="#ffff00"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:sans-serif;-inkscape-font-specification:'\'Roboto, Normal\', sans-serif';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#1a1a1a;stroke:#fefe54;stroke-opacity:1"><desc
-       id="desc19">source=resources,resource=tides,path=station.datums.HAT,category=depth,round=1</desc><tspan
+       id="desc19">source=resources,resource=tides,provider=tides,path=station.datums.HAT,category=depth,round=1</desc><tspan
        sodipodi:role="line"
        id="tspan18"
        x="360.77148"
@@ -180,7 +180,7 @@
        x="322.52386"
        y="158.08005"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'\'Roboto Mono, Bold\', monospace';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.78893">3.3m</tspan><desc
-       id="desc6">source=resources,resource=tides,path=extremes[2].level,category=depth</desc></text><text
+       id="desc6">source=resources,resource=tides,provider=tides,path=extremes[2].level,category=depth</desc></text><text
      id="extremes.2.time"
      x="203.77321"
      y="146.1584"
@@ -189,7 +189,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'\'Roboto Mono, Bold\', monospace';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.51352"
      transform="scale(0.70226239,1.4239692)">15:53<desc
-   id="desc10">source=resources,resource=tides,path=extremes[2].time,format=local_time</desc></text><text
+   id="desc10">source=resources,resource=tides,provider=tides,path=extremes[2].time,format=local_time</desc></text><text
      id="extremes.1.level"
      x="334.30084"
      y="109.17664"
@@ -205,7 +205,7 @@
        x="334.30084"
        y="109.17664"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'\'Roboto Mono, Bold\', monospace';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.701">1.6m</tspan><desc
-       id="desc5">source=resources,resource=tides,path=extremes[1].level,category=depth</desc></text><text
+       id="desc5">source=resources,resource=tides,provider=tides,path=extremes[1].level,category=depth</desc></text><text
      id="extremes.1.time"
      x="188.63072"
      y="108.65867"
@@ -214,7 +214,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'\'Roboto Mono, Bold\', monospace';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.48364"
      transform="scale(0.7345432,1.3613903)">09:36<desc
-   id="desc8">source=resources,resource=tides,path=extremes[1].time,format=local_time</desc></text><text
+   id="desc8">source=resources,resource=tides,provider=tides,path=extremes[1].time,format=local_time</desc></text><text
      id="extremes.0.time"
      x="184.40854"
      y="64.242691"
@@ -223,7 +223,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'Roboto Mono, Bold',monospace;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.55397"
      transform="scale(0.74654856,1.3394976)">03:27<desc
-   id="desc3">source=resources,resource=tides,path=extremes[0].time,format=local_time</desc></text><text
+   id="desc3">source=resources,resource=tides,provider=tides,path=extremes[0].time,format=local_time</desc></text><text
      id="extremes.0.date"
      x="10.326324"
      y="74.630478"
@@ -232,7 +232,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;stroke-width:1.32646"
      transform="scale(0.82428216,1.2131768)"><desc
-   id="desc2">source=resources,resource=tides,path=extremes[0].time,format=day_mon</desc>27 Jun</text><text
+   id="desc2">source=resources,resource=tides,provider=tides,path=extremes[0].time,format=day_mon</desc>27 Jun</text><text
      id="extremes.1.date"
      x="9.9649849"
      y="123.34451"
@@ -241,7 +241,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;stroke-width:1.32646"
      transform="scale(0.82428216,1.2131768)"><desc
-   id="desc7">source=resources,resource=tides,path=extremes[1].time,format=day_mon</desc>27 Jun</text><text
+   id="desc7">source=resources,resource=tides,provider=tides,path=extremes[1].time,format=day_mon</desc>27 Jun</text><text
      id="extremes.2.date"
      x="12.934491"
      y="156.77794"
@@ -250,7 +250,7 @@
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.6667px;font-family:sans-serif;-inkscape-font-specification:'Roboto, Normal',sans-serif;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;stroke-width:1.4652"
      transform="scale(0.74623156,1.3400666)"><desc
-   id="desc9">source=resources,resource=tides,path=extremes[2].time,format=day_mon</desc>27 Jun</text><text
+   id="desc9">source=resources,resource=tides,provider=tides,path=extremes[2].time,format=day_mon</desc>27 Jun</text><text
      id="extremes.0.level"
      x="324.0769"
      y="64.82357"
@@ -264,7 +264,7 @@
        x="324.0769"
        y="64.82357"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.3333px;font-family:monospace;-inkscape-font-specification:'\'Roboto Mono, Bold\', monospace';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.71992">3.4m</tspan><desc
-       id="desc4">source=resources,resource=tides,path=extremes[0].level,category=depth</desc></text><text
+       id="desc4">source=resources,resource=tides,provider=tides,path=extremes[0].level,category=depth</desc></text><text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;font-family:sans-serif;-inkscape-font-specification:'\'Roboto, Normal\', sans-serif';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#1a1a1a;stroke:#fefe54;stroke-width:0.612283;stroke-opacity:1"
      x="337.254"