@rhizomatics/signalk-einklabel-plugin 0.4.2 → 0.4.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.4.4
+- Update `node-ble` to new packaging
+# 0.4.3
+- Fixed datetime values when running from plugin were blank while CLI was fine
+- Added an example Resources API output from signalk-tides plugin
+- Relaid out the example tide clock, adding the tidal range (LAT to HAT) and the source of tide data
+- Alternative source of time zone info, `source=einklabel,path=local_zone`
 # 0.4.2
 - Fix High/Low display for tide clock template
 - Fix last repaint time for display being hour out

package/README.md

@@ -2,7 +2,7 @@
 
 ** BETA - basic functionality, limited vendor/product support **
 
-A SignalK plugin to display data from SignalK paths, APIs and plugins on Electronic Shelf Labels over a Bluetooth Low Energy (BLE) connection.  
+A SignalK plugin to display data from SignalK paths, APIs and plugins on Electronic Shelf Labels over a Bluetooth Low Energy (BLE) connection using simple SVG templates.
 
 Electronic Shelf Labels (ESLs) 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.
 
@@ -36,7 +36,10 @@ The source can be overridden to use the SignalK server's Resources API instead.
 
 #### Plugin Data
 
-`source=einklabel` reads data injected by the plugin itself, rather than from SignalK. Currently the only such value is `path=repainted`, the timestamp of the current repaint - for example `source=einklabel,path=repainted,format=local_datetime_short` to show when the label was last updated.
+`source=einklabel` reads data injected by the plugin itself, rather than from SignalK. Available paths:
+
+* `path=repainted` - the timestamp of the current repaint - for example `source=einklabel,path=repainted,format=local_datetime_short` to show when the label was last updated.
+* `path=local_zone` - a short zone name (e.g. `BST`) for the same timezone used for `local_time`/`day_mon`/`local_datetime_short` (see above) - a fallback for `environment.time.timezoneRegion,format=utc_offset` on installs that never publish that path, since it needs no SignalK metadata of its own. Falls back to a plain UTC offset like `GMT+1` where the host's locale has no real abbreviation for the zone.
 
 #### Customizing Output
 

package/dist/cli/liveContext.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assembleLiveContext = assembleLiveContext;
+const formatters_1 = require("../render/formatters");
 const httpJson_1 = require("../httpJson");
 const unitCategories_1 = require("../unitCategories");
 const pathMeta_1 = require("../pathMeta");
@@ -71,6 +72,6 @@ async function assembleLiveContext(signalkUrl, bindings) {
     const categories = await (0, unitCategories_1.fetchCategoryDisplayUnits)(signalkUrl, categoryNames);
     // Matches `considerRepaint` in repaintScheduler.ts - the CLI has no real device repaint to time, so
     // a `source=einklabel,path=repainted` binding just resolves to "now", same as a live render would.
-    const meta = { repainted: new Date().toISOString() };
+    const meta = { repainted: new Date().toISOString(), local_zone: (0, formatters_1.resolveLocalZoneAbbreviation)({ signalk }) };
     return { signalk, resources, pathMeta, categories, meta };
 }

package/dist/render/binding.d.ts

@@ -20,7 +20,7 @@ export interface Binding {
 }
 /**
  * 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
+ * `source=resources,resource=tides,path=extremes[0].level,category=depth,round=2` or, using the
  * defaults (`source=signalk,context=self`), plain `path=navigation.speedOverGround` (auto-converts via
  * that path's own metadata - see `renderBinding`). A bare path with no `key=value` pairs at all, e.g.
  * `environment.forecast.description`, is shorthand for `path=environment.forecast.description`

package/dist/render/binding.js

@@ -10,7 +10,7 @@ const SOURCES = ['signalk', 'resources', 'einklabel'];
 const KNOWN_KEYS = new Set(['source', 'context', 'resource', 'path', 'format', 'category', 'round']);
 /**
  * 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
+ * `source=resources,resource=tides,path=extremes[0].level,category=depth,round=2` or, using the
  * defaults (`source=signalk,context=self`), plain `path=navigation.speedOverGround` (auto-converts via
  * that path's own metadata - see `renderBinding`). A bare path with no `key=value` pairs at all, e.g.
  * `environment.forecast.description`, is shorthand for `path=environment.forecast.description`

package/dist/render/formatters.d.ts

@@ -14,5 +14,15 @@ export interface DisplayUnits {
 }
 /** Converts a base-SI value (always what SignalK paths deliver) to its metadata's preferred display unit and formats it with the unit's symbol, e.g. 3.42 -> "11.2ft". */
 export declare function formatDisplayUnits(value: number, displayUnits: DisplayUnits, round: number | undefined): string;
+/**
+ * Short zone name (e.g. "BST", or "GMT+1" where the host's own `Intl` locale has no real abbreviation
+ * for the zone) for the same zone `selfTimezone` resolves - an alternative for
+ * `environment.time.timezoneRegion,format=utc_offset` on installs that never publish that path (see
+ * `selfTimezone`'s own comment). Uses the host's default locale rather than pinning one, so it shows
+ * whatever `Intl` would show the host's own user - "GMT+1" is an acceptable fallback where that locale
+ * doesn't have a 3-letter abbreviation to offer. Resolved as a `source=einklabel,path=local_zone`
+ * binding (see `considerRepaint`).
+ */
+export declare function resolveLocalZoneAbbreviation(context: TemplateContext): string;
 /** Applies a named `format=` formatter to a resolved binding value. */
 export declare function applyFormat(name: string, value: unknown, context: TemplateContext, round: number | undefined): string;

package/dist/render/formatters.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatDisplayUnits = formatDisplayUnits;
+exports.resolveLocalZoneAbbreviation = resolveLocalZoneAbbreviation;
 exports.applyFormat = applyFormat;
 const luxon_1 = require("luxon");
 const mathjs_1 = require("mathjs");
@@ -26,30 +27,53 @@ function selfTimezone(context) {
     const environment = self?.environment;
     return environment?.time?.timezoneRegion || Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
+/**
+ * Short zone name (e.g. "BST", or "GMT+1" where the host's own `Intl` locale has no real abbreviation
+ * for the zone) for the same zone `selfTimezone` resolves - an alternative for
+ * `environment.time.timezoneRegion,format=utc_offset` on installs that never publish that path (see
+ * `selfTimezone`'s own comment). Uses the host's default locale rather than pinning one, so it shows
+ * whatever `Intl` would show the host's own user - "GMT+1" is an acceptable fallback where that locale
+ * doesn't have a 3-letter abbreviation to offer. Resolved as a `source=einklabel,path=local_zone`
+ * binding (see `considerRepaint`).
+ */
+function resolveLocalZoneAbbreviation(context) {
+    const part = new Intl.DateTimeFormat(undefined, { timeZone: selfTimezone(context), timeZoneName: 'short' })
+        .formatToParts(new Date())
+        .find((p) => p.type === 'timeZoneName');
+    return part?.value ?? '';
+}
+/**
+ * A `resources`-sourced timestamp can arrive as either an ISO string (always true over HTTP, since
+ * `JSON.stringify` converts a `Date` to its ISO string automatically) or a live `Date` instance (an
+ * in-process `app.resourcesApi` call skips that serialisation step entirely, so a provider that hasn't
+ * itself called `.toISOString()` yet hands back the raw object) - accept both so the live plugin and
+ * the CLI render identically regardless of which path a binding's data took.
+ */
+function parseTimestamp(value) {
+    if (value instanceof Date)
+        return luxon_1.DateTime.fromJSDate(value, { zone: 'utc' });
+    if (typeof value === 'string')
+        return luxon_1.DateTime.fromISO(value, { zone: 'utc' });
+    return undefined;
+}
 /**
  * Shows the explicit IANA zone name rather than an abbreviation (e.g. "BST") - UK tide tables are
  * officially published in GMT, so the basis for the displayed time must be unambiguous rather than
  * just locally styled.
  */
 function formatLocalTime(value, context) {
-    if (typeof value !== 'string')
-        return '';
-    const dt = luxon_1.DateTime.fromISO(value, { zone: 'utc' }).setZone(selfTimezone(context));
-    return dt.isValid ? dt.toFormat('HH:mm') : '';
+    const dt = parseTimestamp(value)?.setZone(selfTimezone(context));
+    return dt?.isValid ? dt.toFormat('HH:mm') : '';
 }
 /** e.g. "27 Jun" - day of month (no leading zero) and abbreviated month name, in the local vessel's timezone. */
 function formatDayMonth(value, context) {
-    if (typeof value !== 'string')
-        return '';
-    const dt = luxon_1.DateTime.fromISO(value, { zone: 'utc' }).setZone(selfTimezone(context));
-    return dt.isValid ? dt.toFormat('d MMM') : '';
+    const dt = parseTimestamp(value)?.setZone(selfTimezone(context));
+    return dt?.isValid ? dt.toFormat('d MMM') : '';
 }
 /** e.g. "21 Jun 26 18:05" - day of month (no leading zero), abbreviated month, 2-digit year, and 24h time, in the local vessel's timezone. */
 function formatLocalDatetimeShort(value, context) {
-    if (typeof value !== 'string')
-        return '';
-    const dt = luxon_1.DateTime.fromISO(value, { zone: 'utc' }).setZone(selfTimezone(context));
-    return dt.isValid ? dt.toFormat('d MMM yy HH:mm') : '';
+    const dt = parseTimestamp(value)?.setZone(selfTimezone(context));
+    return dt?.isValid ? dt.toFormat('d MMM yy HH:mm') : '';
 }
 /**
  * IANA region names are ambiguous about DST (e.g. "Europe/London" is UTC+00:00 in winter, UTC+01:00

package/dist/render/svgRenderer.d.ts

@@ -5,7 +5,7 @@ import { Bitmap, Renderer, TemplateContext } from './types';
  * Binding model: a `<text>` element with a `<desc>` child has that child's
  * content parsed as a flat `key=value,key=value` binding against the render
  * context and substituted in as the element's text, e.g.
- * `<desc>source=resources,resource=tides,path=extremes.[0].time,format=local_time</desc>`
+ * `<desc>source=resources,resource=tides,path=extremes[0].time,format=local_time</desc>`
  * (see `./binding.ts` for the grammar and `./formatters.ts` for the `format=` registry).
  * The `<text>` element's own visible content is left untouched in the source
  * file - it's just a placeholder so the template looks sane while laying it

package/dist/render/svgRenderer.js

@@ -19,7 +19,7 @@ function ensureWasmInitialized() {
  * Binding model: a `<text>` element with a `<desc>` child has that child's
  * content parsed as a flat `key=value,key=value` binding against the render
  * context and substituted in as the element's text, e.g.
- * `<desc>source=resources,resource=tides,path=extremes.[0].time,format=local_time</desc>`
+ * `<desc>source=resources,resource=tides,path=extremes[0].time,format=local_time</desc>`
  * (see `./binding.ts` for the grammar and `./formatters.ts` for the `format=` registry).
  * The `<text>` element's own visible content is left untouched in the source
  * file - it's just a placeholder so the template looks sane while laying it

package/dist/repaintScheduler.js

@@ -9,6 +9,7 @@ const bleDiscovery_1 = require("./devices/bleDiscovery");
 const registry_1 = require("./devices/registry");
 const svgRenderer_1 = require("./render/svgRenderer");
 const binding_1 = require("./render/binding");
+const formatters_1 = require("./render/formatters");
 const unitCategories_1 = require("./unitCategories");
 const pathMeta_1 = require("./pathMeta");
 const resolveApiUrl_1 = require("./resolveApiUrl");
@@ -136,7 +137,10 @@ async function considerRepaint(app, config, device, state, getApiUrl) {
         app.debug(`"${device.friendlyName}": data unchanged, skipping repaint`);
         return;
     }
-    const renderContext = { ...rawContext, meta: { repainted: new Date().toISOString() } };
+    const renderContext = {
+        ...rawContext,
+        meta: { repainted: new Date().toISOString(), local_zone: (0, formatters_1.resolveLocalZoneAbbreviation)(rawContext) },
+    };
     const renderer = new svgRenderer_1.SvgRenderer();
     const bitmap = await renderer.render(templatePath, renderContext, metadata.width, metadata.height - metadata.voffset);
     const connectTimeoutMs = config.paintConnectTimeoutSeconds * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhizomatics/signalk-einklabel-plugin",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "SignalK plugin that renders selected SignalK data to eInk Electronic Shelf Labels",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "test": "node --require ts-node/register --test \"src/**/*.test.ts\"",
     "prepublishOnly": "npm run build"
   },
-  "signalk":{
-    "displayName":"eInk Label Instruments",
+  "signalk": {
+    "displayName": "eInk Label Instruments",
     "appIcon": "docs/assets/icons/icon_tmp.png",
     "screenshots": [
       "docs/assets/screenshots/example_tidal_clock.png"
@@ -52,7 +52,8 @@
     "luxon": "^3.7.2",
     "mathjs": "^15.2.0",
     "node-ble": "^1.13.0",
-    "pngjs": "^7.0.0"
+    "pngjs": "^7.0.0",
+    "form-data":"^4.0.6"
   },
   "devDependencies": {
     "@signalk/server-api": "^2.28.0",

package/templates/tide.svg

@@ -22,15 +22,33 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.98333333"
-     inkscape:cx="250.16949"
-     inkscape:cy="246.61017"
+     inkscape:zoom="1.3906433"
+     inkscape:cx="202.4243"
+     inkscape:cy="151.36879"
      inkscape:window-width="1488"
      inkscape:window-height="674"
      inkscape:window-x="0"
      inkscape:window-y="33"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
+     inkscape:current-layer="svg1"
+     showgrid="true">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
   <rect
      x="1.0169492"
      y="2.0798673e-08"
@@ -58,18 +76,16 @@
    id="desc1">source=resources,resource=tides,path=station.name</desc></text>
   <text
      id="station.name-8"
-     x="325.49939"
-     y="195.87753"
+     x="440.67529"
+     y="196.47466"
      font-size="18"
      font-family="serif"
      fill="black"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;stroke-width:2.39571"
-     transform="scale(0.83037506,1.2042751)"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff0000;stroke-width:2.39571"
+     transform="scale(0.83037506,1.2042751)"><desc
+       id="desc21">source=resources,resource=tides,path=station.source.name</desc><tspan
        sodipodi:role="line"
-       id="tspan1"
-       x="325.49939"
-       y="195.87753"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.99999995px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:2.39571;fill:#ffffff">signalk-einklabel-plugin</tspan></text>
+       id="tspan20">SOURCE</tspan></text>
   <text
      id="last_repaint"
      x="4.3477793"
@@ -90,7 +106,7 @@
      font-family="monospace"
      fill="black"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:monospace;-inkscape-font-specification:'monospace, Normal';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 Water</text>
+   id="desc13">source=resources,resource=tides,path=extremes[0].label</desc>High</text>
   <text
      id="extremes.1"
      x="13.35283"
@@ -99,7 +115,7 @@
      font-family="monospace"
      fill="black"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:monospace;-inkscape-font-specification:'monospace, Normal';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>Low Water</text>
+   id="desc14">source=resources,resource=tides,path=extremes[1].label</desc>Low</text>
   <text
      id="extremes.2"
      x="7.9661016"
@@ -108,123 +124,158 @@
      font-family="monospace"
      fill="red"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:monospace;-inkscape-font-specification:'monospace, Normal';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 Water</text>
+   id="desc15">source=resources,resource=tides,path=extremes[2].label</desc>High</text>
   <text
      id="environment.time.timezoneRegion"
-     x="338.47461"
-     y="17.457626"
+     x="440.41293"
+     y="11.361118"
+     font-size="10.373px"
+     font-family="sans-serif"
+     fill="#ffff00"
+     style="direction:rtl;fill:#000000;stroke-width:0.864419"
+     transform="scale(0.86441854,1.156847)">UTC+01:00<desc
+   id="desc11">source=einklabel,path=local_zone</desc></text>
+  <text
+     id="lat"
+     x="175.5096"
+     y="30.720407"
+     font-size="12px"
+     font-family="sans-serif"
+     fill="#ffff00"
+     style="fill:#ffff00;-inkscape-font-specification:'Sans, Normal';font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:18.6667px;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:#a6a6a6;stroke-opacity:1"><desc
+       id="desc18">source=resources,resource=tides,path=station.datums.LAT,category=depth</desc><tspan
+       sodipodi:role="line"
+       id="tspan17">0.1m</tspan></text>
+  <text
+     id="hat"
+     x="264.41321"
+     y="30.800503"
      font-size="12px"
      font-family="sans-serif"
      fill="#ffff00"
-     style="fill:#000000">UTC+01:00<desc
-   id="desc11">path=environment.time.timezoneRegion,format=utc_offset</desc></text>
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffff00;stroke:#acacaa;stroke-opacity:1"><desc
+       id="desc19">source=resources,resource=tides,path=station.datums.HAT,category=depth</desc><tspan
+       sodipodi:role="line"
+       id="tspan18"
+       x="264.41321"
+       y="30.800503">6.0m</tspan></text>
   <text
      id="extremes.2.level"
-     x="173.64978"
-     y="199.27094"
+     x="335.54352"
+     y="168.08856"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.44101"
-     transform="scale(0.95993086,1.0417417)"
-     inkscape:transform-center-x="11.578901"
-     inkscape:transform-center-y="-62.5909"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.78893"
+     transform="scale(0.7732368,1.2932649)"
+     inkscape:transform-center-x="11.578953"
+     inkscape:transform-center-y="-96.464172"><tspan
        sodipodi:role="line"
        id="tspan2-0"
-       x="173.64978"
-       y="199.27094"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.44101">3.3m</tspan><desc
-       id="desc6">source=resources,resource=tides,path=extremes.[2].level,category=depth</desc></text>
+       x="335.54352"
+       y="168.08856"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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="extremes.2.time"
-     x="31.471279"
-     y="166.20743"
+     x="164.78383"
+     y="154.23825"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.31448"
-     transform="scale(0.77910527,1.2835236)">15:53<desc
-   id="desc10">source=resources,resource=tides,path=extremes.[2].time,format=local_time</desc></text>
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333281px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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.7022624,1.4239692)">15:53<desc
+   id="desc10">source=resources,resource=tides,path=extremes[2].time,format=local_time</desc></text>
   <text
      id="extremes.1.level"
-     x="182.71886"
-     y="135.3521"
+     x="345.0629"
+     y="118.90553"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.40832"
-     transform="scale(0.90784041,1.1015152)"
-     inkscape:transform-center-y="-96.23206"
-     inkscape:transform-center-x="-0.00043342573"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.701"
+     transform="scale(0.75163533,1.3304324)"
+     inkscape:transform-center-y="-140.38618"
+     inkscape:transform-center-x="-0.00038058817"><tspan
        sodipodi:role="line"
        id="tspan2-1"
-       x="182.71886"
-       y="135.3521"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.40832">1.6m</tspan><desc
-       id="desc5">source=resources,resource=tides,path=extremes.[1].level,category=depth</desc></text>
+       x="345.0629"
+       y="118.90553"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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="extremes.1.time"
-     x="33.328102"
-     y="118.54723"
+     x="161.1239"
+     y="115.52532"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.31609"
-     transform="scale(0.77081545,1.2973274)">09:36<desc
-   id="desc8">source=resources,resource=tides,path=extremes.[1].time,format=local_time</desc></text>
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333356px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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="extremes.0.time"
-     x="29.798925"
-     y="79.890121"
+     x="156.47511"
+     y="73.368919"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.32646"
-     transform="scale(0.82428216,1.2131768)">03:27<desc
-   id="desc3">source=resources,resource=tides,path=extremes.[0].time,format=local_time</desc></text>
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333325px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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="extremes.0.time-8"
-     x="378.11157"
-     y="79.890121"
+     x="10.326324"
+     y="77.594147"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;stroke-width:1.32646"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';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>
+   id="desc2">source=resources,resource=tides,path=extremes[0].time,format=day_mon</desc>27 Jun</text>
   <text
      id="extremes.0.time-8-5"
-     x="378.11157"
-     y="125.12273"
+     x="10.83737"
+     y="126.90092"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;stroke-width:1.32646"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';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>
+   id="desc7">source=resources,resource=tides,path=extremes[1].time,format=day_mon</desc>27 Jun</text>
   <text
      id="extremes.0.time-8-9"
-     x="378.11157"
-     y="174.46791"
+     x="12.934491"
+     y="161.07082"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';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="desc9">source=resources,resource=tides,path=extremes.[2].time,format=day_mon</desc>27 Jun</text>
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';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="extremes.0.level"
-     x="173.7571"
-     y="88.829666"
+     x="336.3447"
+     y="76.456078"
      font-size="14"
      font-family="monospace"
      fill="red"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.38653"
-     transform="scale(0.95553786,1.046531)"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:1.71992"
+     transform="scale(0.7703174,1.2981662)"><tspan
        sodipodi:role="line"
        id="tspan2"
-       x="173.7571"
-       y="88.829666"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:1.38653">3.4m</tspan><desc
-       id="desc4">source=resources,resource=tides,path=extremes.[0].level,category=depth</desc></text>
+       x="336.3447"
+       y="76.456078"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:37.33333333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';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
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffff00;stroke:#acacaa;stroke-width:0.612283;stroke-opacity:1"
+     x="232.26662"
+     y="30.201849"
+     id="text19"><tspan
+       sodipodi:role="line"
+       id="tspan19"
+       x="232.26662"
+       y="30.201849">-&gt;</tspan></text>
 </svg>