signalk-chiplog 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -6,6 +6,33 @@ All notable changes to Chiplog are documented here. The format follows
 
 ## [Unreleased]
 
+## [2.2.0] - 2026-09-18
+
+### Added
+
+- **Landmark bearings (amers)** — every position in the log is now also given the way a paper logbook gives one: a
+  distance and a bearing from the nearest landmark, "2,3 M ENE (065°) — Phare de Chauveau", under the coordinates in a
+  lighter grey, on the passage page and in the PDF logbook. The coordinates themselves are unchanged. Landmarks —
+  lighthouses, capes, named towers, harbours — are fetched from OpenStreetMap area by area and kept, so past passages
+  fill in as soon as their area is known and the same waters are never asked for twice; the bearing is computed when the
+  page is drawn, never stored. The landmark quoted is the one closest relative to its own range, so a lighthouse three
+  miles off wins over a marina alongside, and offshore the coordinates stay alone. A new setting, **Read each journal
+  line against the nearest landmark**, turns it off.
+- **Animation** — a new page that replays passages on the map. Pick a start and an end date and every passage between
+  them plays in sequence, the time spent in port skipped, so a week's cruise takes seconds. The map follows the boat at
+  a scale chosen for each passage — a short hop stays readable instead of being magnified, a long crossing gets a wider
+  view without leaving the boat crawling across empty water — and a bubble on the chart shows the speed, the distance
+  covered since the animation began and the date and hour. Play, pause, four speeds (×0,5, ×1, ×2, ×4 — an hour of
+  sailing per second at ×1) and a slider over the animation's own time. A passage page links straight to it with its own
+  dates filled in.
+- **Save an animation as an MP4** — Mobile (9:16), Portrait (3:4), Square (1:1), Landscape (4:3) or Widescreen (16:9),
+  encoded in the browser: nothing is uploaded, and the Signal K server renders nothing. Each frame's map is downloaded
+  just before that frame is drawn, so the film is the same whatever the connection was doing and no range is ever too
+  long to export. Needs a browser with WebCodecs (Chrome, Edge, Safari 17, Firefox 130 and later); without one the
+  animation still plays on screen.
+- **Delete an alarm** — a logged alarm can now be removed from a passage's log, like a crew-entered line already could.
+  Deleting either the alarm or the line that later cleared it removes both, so no orphaned half is left behind.
+
 ## [2.1.0] - 2026-09-17
 
 ### Added
@@ -222,7 +249,8 @@ First release.
 - REST API under `/plugins/signalk-chiplog/api`, documented in [docs/API.md](docs/API.md).
 - Single SQLite database through Node's built-in `node:sqlite`: no native module to build.
 
-[Unreleased]: https://github.com/ricard33/signalk-chiplog/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/ricard33/signalk-chiplog/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/ricard33/signalk-chiplog/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/ricard33/signalk-chiplog/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/ricard33/signalk-chiplog/compare/v1.2.0...v2.0.0
 [1.2.0]: https://github.com/ricard33/signalk-chiplog/compare/v1.1.0...v1.2.0

package/README.md

@@ -11,6 +11,8 @@ sensors cannot know from a tablet at the helm: manoeuvres, notes and handwriting
 - **Automatic events**: alarms, autopilot changes, strong wind, falling barometer.
 - **Departure and arrival names**, looked up online and corrected once for good.
 - **Consultation webapp**: logbook by day, map, timeline, corrections, export.
+- **Replay a range of passages** on the map — an hour of sailing per second — and save it as an MP4 for a phone, a
+  square post or a widescreen, rendered entirely in your browser.
 - **Tablet entry app**: big buttons for gloves and wet fingers, stylus handwriting, night mode, works through Wi-Fi
   dropouts.
 - **Abandon-ship copy**: JSON, CSV and GPX, downloadable or written to a USB drive.
@@ -169,6 +171,26 @@ Departures and arrivals are named automatically:
 3. **Corrections are remembered.** Renaming a departure or arrival in the webapp also renames that place for every later
    passage starting or ending nearby. Past passages keep the name they recorded.
 
+### Landmarks (amers)
+
+Every position in the log is also given the way a paper logbook gives one — as a distance and a bearing **from a
+landmark**, under the coordinates, in a lighter grey:
+
+```text
+46°08.88′N 001°12.90′W
+2,3 M ENE (065°) — Phare de Chauveau
+```
+
+- **The landmarks come from OpenStreetMap**, fetched area by area through Overpass and kept: lighthouses and major
+  lights, capes, named towers and other seamark landmarks, minor lights, isolated-danger and safe-water beacons,
+  harbours and marinas. The numbered marks of a channel are left out — "6 c" says nothing in a logbook.
+- **The nearest useful one wins**, not simply the nearest: each kind carries a range (15 nm for a lighthouse, 3 for a
+  harbour…), narrowed by the light's own range when known, and the landmark closest relative to its range is the one
+  quoted. Offshore, beyond them all, the coordinates stay alone.
+- **Past passages fill in by themselves** once their area has been fetched — the bearing is worked out when the page or
+  the PDF is drawn, never stored.
+- Turn **Read each journal line against the nearest landmark** off to keep the boat off Overpass entirely.
+
 ## The logbook webapp 💻
 
 Open **Chiplog** from the Signal K webapps, or `/signalk-chiplog/`. Reading needs no more than read-only access.
@@ -189,13 +211,20 @@ Open **Chiplog** from the Signal K webapps, or `/signalk-chiplog/`. Reading need
   current noted at departure), and the log: every reading and event in order, including handwritten notes. A passage in
   progress refreshes every minute. Each line's comment can be edited (read/write access); a manoeuvre or note the crew
   logged themselves can also be deleted — automatic lines (alarms, autopilot, weather, corrections) can only be
-  annotated.
+  annotated. Under each position, in grey, its bearing and distance from the nearest landmark.
 - **Corrections** (read/write access):
   - rename the departure, or the arrival once the passage is closed — a passage in progress has none yet to rename;
   - switch an engine period to sail or back;
   - close a passage in progress, e.g. to confirm an arrival;
   - merge with the previous or next passage;
   - delete a passage (admin).
+- **Animation** — pick two dates and every passage between them replays on the map, one after another, the port time
+  skipped. The map follows the boat at a scale chosen for each passage — a short hop kept readable rather than
+  magnified, a long crossing allowed a wider view but never so wide the boat crawls across empty water — while a bubble
+  shows the speed, the distance covered since the start and the date. Play, pause and a slider over the animation's own
+  time, at ×0,5, ×1, ×2 or ×4. **Export MP4** saves it as a video in one of five shapes (Mobile 9:16, Portrait 3:4,
+  Square 1:1, Landscape 4:3, Widescreen 16:9). Everything happens in the browser: nothing is rendered or encoded on the
+  Signal K server, and the map tiles are the only thing downloaded.
 - **Export** — download the whole logbook or a date range as a PDF logbook to print, JSON, CSV or GPX, and write the
   abandon-ship copy to the USB drive now (admin). The PDF is written in the webapp's language and the device's time
   zone.
@@ -291,33 +320,35 @@ a regular Signal K user account.
 
 In the Signal K admin, **Apps & Plugins → Configuration → Chiplog**.
 
-| Setting                                                          | Default                                       | What it does                                                                                                                                            |
-| ---------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Stop duration within which a new departure continues the passage | 30 min                                        | A passage closes when the boat stops; leaving again sooner reopens it, the stop kept as a stopover.                                                     |
-| Under-way speed without navigation.state                         | 1 kn                                          | Used only without signalk-autostate: under way above it, stopped below half of it.                                                                      |
-| Propulsion assumed without engine data                           | sail                                          | When nothing says whether the engine is running. Set to engine on a motorboat.                                                                          |
-| Instrument snapshot interval                                     | 60 min                                        | Readings on this clock boundary during a passage.                                                                                                       |
-| Track point interval                                             | 15 s                                          | A track point at least this often while moving.                                                                                                         |
-| Place matching radius                                            | 200 m                                         | A departure or arrival this close to a known place takes its name.                                                                                      |
-| Name departures and arrivals with online geocoding               | on                                            | Turn off to never send positions online; places are then named after their coordinates until corrected.                                                 |
-| Geocoding service                                                | `https://nominatim.openstreetmap.org`         | Any Nominatim-compatible service, e.g. a self-hosted one.                                                                                               |
-| Fetch the tide forecast at departure                             | on                                            | Turn off to never send the departure position online; the passage page then shows no tide.                                                              |
-| Marine service                                                   | `https://marine-api.open-meteo.com/v1/marine` | Any Open-Meteo Marine-compatible service, e.g. a self-hosted one. Serves the tide, and the sea state and current of the weather forecast.               |
-| Fetch the marine weather forecast at departure                   | on                                            | Turn off to never send the departure position to the weather services; the passage page and the PDF then show no forecast.                              |
-| Weather service                                                  | `https://api.open-meteo.com/v1/forecast`      | Any Open-Meteo-compatible forecast service, e.g. a self-hosted one.                                                                                     |
-| USB export directory                                             | —                                             | Where the abandon-ship copy is written, e.g. `/media/usb`. Empty turns the USB copy off.                                                                |
-| Automatic USB copy interval                                      | 15 min                                        | How often the USB copy is brought up to date. 0 turns the periodic copy off.                                                                            |
-| Copy to the USB drive at each arrival                            | on                                            | Brings the USB copy up to date as soon as a passage ends.                                                                                               |
-| Logbook language (PDF)                                           | en                                            | Language of the PDF logbooks on the USB drive (English or French).                                                                                      |
-| Ship's time zone (PDF)                                           | the server's                                  | Time zone of the PDF logbooks on the USB drive, e.g. `Europe/Paris`.                                                                                    |
-| Wind speed thresholds                                            | 20, 30 kn                                     | Logged when the 2-minute average true wind crosses them.                                                                                                |
-| Barometric drop warning                                          | 4 hPa / 3 h                                   | 0 turns it off.                                                                                                                                         |
-| InfluxDB host (retrospective analysis)                           | —                                             | Local or remote host of the InfluxDB 1.x database signalk-to-influxdb writes to. Empty turns the retrospective analysis page off.                       |
-| InfluxDB port                                                    | 8086                                          |                                                                                                                                                         |
-| InfluxDB database                                                | —                                             |                                                                                                                                                         |
-| InfluxDB username / password                                     | —                                             | Leave empty if the database needs none.                                                                                                                 |
-| InfluxDB protocol                                                | http                                          | `http` or `https`.                                                                                                                                      |
-| InfluxDB vessel context                                          | this server's own                             | Only needed running the replay from a different Signal K server than the one that wrote the history, e.g. development pointed at a production database. |
+| Setting                                                          | Default                                       | What it does                                                                                                                                                                     |
+| ---------------------------------------------------------------- | --------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Stop duration within which a new departure continues the passage | 30 min                                        | A passage closes when the boat stops; leaving again sooner reopens it, the stop kept as a stopover.                                                                              |
+| Under-way speed without navigation.state                         | 1 kn                                          | Used only without signalk-autostate: under way above it, stopped below half of it.                                                                                               |
+| Propulsion assumed without engine data                           | sail                                          | When nothing says whether the engine is running. Set to engine on a motorboat.                                                                                                   |
+| Instrument snapshot interval                                     | 60 min                                        | Readings on this clock boundary during a passage.                                                                                                                                |
+| Track point interval                                             | 15 s                                          | A track point at least this often while moving.                                                                                                                                  |
+| Place matching radius                                            | 200 m                                         | A departure or arrival this close to a known place takes its name.                                                                                                               |
+| Name departures and arrivals with online geocoding               | on                                            | Turn off to never send positions online; places are then named after their coordinates until corrected.                                                                          |
+| Geocoding service                                                | `https://nominatim.openstreetmap.org`         | Any Nominatim-compatible service, e.g. a self-hosted one.                                                                                                                        |
+| Read each journal line against the nearest landmark              | on                                            | Fetches the landmarks of the areas sailed through from OpenStreetMap, so each position is also given as a bearing and distance from one. Turn off to keep the coordinates alone. |
+| Landmark service (Overpass API)                                  | `https://overpass-api.de/api/interpreter`     | Any Overpass-compatible service, e.g. a self-hosted one.                                                                                                                         |
+| Fetch the tide forecast at departure                             | on                                            | Turn off to never send the departure position online; the passage page then shows no tide.                                                                                       |
+| Marine service                                                   | `https://marine-api.open-meteo.com/v1/marine` | Any Open-Meteo Marine-compatible service, e.g. a self-hosted one. Serves the tide, and the sea state and current of the weather forecast.                                        |
+| Fetch the marine weather forecast at departure                   | on                                            | Turn off to never send the departure position to the weather services; the passage page and the PDF then show no forecast.                                                       |
+| Weather service                                                  | `https://api.open-meteo.com/v1/forecast`      | Any Open-Meteo-compatible forecast service, e.g. a self-hosted one.                                                                                                              |
+| USB export directory                                             | —                                             | Where the abandon-ship copy is written, e.g. `/media/usb`. Empty turns the USB copy off.                                                                                         |
+| Automatic USB copy interval                                      | 15 min                                        | How often the USB copy is brought up to date. 0 turns the periodic copy off.                                                                                                     |
+| Copy to the USB drive at each arrival                            | on                                            | Brings the USB copy up to date as soon as a passage ends.                                                                                                                        |
+| Logbook language (PDF)                                           | en                                            | Language of the PDF logbooks on the USB drive (English or French).                                                                                                               |
+| Ship's time zone (PDF)                                           | the server's                                  | Time zone of the PDF logbooks on the USB drive, e.g. `Europe/Paris`.                                                                                                             |
+| Wind speed thresholds                                            | 20, 30 kn                                     | Logged when the 2-minute average true wind crosses them.                                                                                                                         |
+| Barometric drop warning                                          | 4 hPa / 3 h                                   | 0 turns it off.                                                                                                                                                                  |
+| InfluxDB host (retrospective analysis)                           | —                                             | Local or remote host of the InfluxDB 1.x database signalk-to-influxdb writes to. Empty turns the retrospective analysis page off.                                                |
+| InfluxDB port                                                    | 8086                                          |                                                                                                                                                                                  |
+| InfluxDB database                                                | —                                             |                                                                                                                                                                                  |
+| InfluxDB username / password                                     | —                                             | Leave empty if the database needs none.                                                                                                                                          |
+| InfluxDB protocol                                                | http                                          | `http` or `https`.                                                                                                                                                               |
+| InfluxDB vessel context                                          | this server's own                             | Only needed running the replay from a different Signal K server than the one that wrote the history, e.g. development pointed at a production database.                          |
 
 ## Signal K data used 🔌
 
@@ -378,6 +409,8 @@ at the time.
 - **Place names.** With geocoding on, the position of each departure and arrival that matches no known place is sent to
   the geocoding service — OpenStreetMap's public Nominatim by default. Nothing else is sent, and nothing at all when it
   is off.
+- **Landmarks.** With them on, the area a passage sailed through — a half-degree box, not its track — is sent to the
+  Overpass service, OpenStreetMap's public instance by default, once per area ever. Nothing at all when it is off.
 - **Tide forecast.** With it on, the departure position of each passage is sent to the tide service — the public
   Open-Meteo by default — once, at departure. Nothing at all when it is off.
 - **Weather forecast.** With it on, the departure position of each passage is sent to the weather service and to the
@@ -486,7 +519,11 @@ between attempts; nothing is lost, it just takes longer to resolve.
 ## Limitations 🚧
 
 - **Not yet:** a places page, and editing manoeuvre shortcuts from the webapps.
-- **Offline charts** are not provided.
+- **Offline charts** are not provided; the animation draws the tracks on a blank sea when there is no connection.
+- **The MP4 export needs a browser with WebCodecs** — Chrome, Edge, Safari 17 or Firefox 130 and later. Without it the
+  animation still plays on screen, and the export button is simply not offered.
+- **A long animation takes a while to export**: every frame waits for its map before it is drawn, so the video is the
+  same whatever the connection was doing, but a long range means a lot of tiles. Turning the seamarks off halves them.
 - **One vessel per Signal K server**, and no per-crew-member authorship.
 
 ## Development 🧑‍💻

package/index.js

@@ -2,9 +2,10 @@ const { registerRoutes } = require('./lib/api');
 const { openDatabase } = require('./lib/database');
 const { createPassageDetector, DETECTION_DEFAULTS, TICK_INTERVAL_MS } = require('./lib/detection');
 const { ApiError } = require('./lib/errors');
-const { createForecastSchedule } = require('./lib/forecast-schedule');
+const { createBackgroundSchedule } = require('./lib/background-schedule');
 const { createEventWatcher, CHECK_INTERVAL_MS, EVENT_DEFAULTS } = require('./lib/event-watcher');
 const { INFLUX_DEFAULTS } = require('./lib/influx-history');
+const { createLandmarkFinder, LANDMARK_DEFAULTS } = require('./lib/landmark-finder');
 const { OBSERVATION_DEFAULTS } = require('./lib/observation-recorder');
 const { createPlaceNamer, GEOCODING_DEFAULTS } = require('./lib/place-names');
 const { PROPULSION_DEFAULTS } = require('./lib/propulsion-detector');
@@ -26,6 +27,9 @@ const DEFAULT_PLACE_MATCH_RADIUS = 200;
 const FIRST_NAMING_DELAY_MS = 5 * 1000;
 const NAMING_ERROR_RETRY_MS = 5 * 60 * 1000;
 const FIRST_FORECAST_DELAY_MS = 5 * 1000;
+// Landmarks are not needed for the passage under way, only for reading it back,
+// so the first lookup waits for the busier start-up work to be done.
+const FIRST_LANDMARK_DELAY_MS = 30 * 1000;
 
 const MOTION_LABELS = { underway: 'Under way', stopped: 'Stopped', unknown: 'Waiting for data' };
 const MODE_LABELS = { autostate: 'navigation.state', fallback: 'speed fallback' };
@@ -56,7 +60,7 @@ module.exports = function (app) {
   let settings = null;
   let detector = null;
   let namer = null;
-  let forecasts = [];
+  let schedules = [];
   // The open passage detection last reported, to notice a new one.
   let lastActiveEntryId = null;
   let usbExport = null;
@@ -132,6 +136,19 @@ module.exports = function (app) {
         description: 'The public OpenStreetMap instance by default, or a self-hosted Nominatim',
         default: GEOCODING_DEFAULTS.geocodingUrl
       },
+      landmarksEnabled: {
+        type: 'boolean',
+        title: 'Read each journal line against the nearest landmark',
+        description:
+          'Fetches the lighthouses, capes, towers and harbours of the areas sailed through from OpenStreetMap, so every position in the logbook is also given as a bearing and distance from the nearest one (© OpenStreetMap contributors, ODbL). Without it, only the coordinates are shown',
+        default: LANDMARK_DEFAULTS.landmarksEnabled
+      },
+      overpassUrl: {
+        type: 'string',
+        title: 'Landmark service (Overpass API)',
+        description: 'The public Overpass instance by default, or a self-hosted one',
+        default: LANDMARK_DEFAULTS.overpassUrl
+      },
       tidesEnabled: {
         type: 'boolean',
         title: 'Fetch the tide forecast at departure',
@@ -252,10 +269,11 @@ module.exports = function (app) {
     try {
       const outcome = detector.tick();
       usbExport.afterDetection(outcome);
-      // A passage just opened: fetch its forecasts now, not at the next idle
-      // poll or at the end of a retry delay left from an earlier failure.
+      // A passage just opened: fetch its forecasts and the landmarks of where
+      // it is starting from now, not at the next idle poll or at the end of a
+      // retry delay left from an earlier failure.
       if (outcome.activeEntryId !== null && outcome.activeEntryId !== lastActiveEntryId) {
-        forecasts.forEach((schedule) => schedule.nudge());
+        schedules.forEach((schedule) => schedule.nudge());
       }
       lastActiveEntryId = outcome.activeEntryId;
       const usbError = usbExport.status().lastError;
@@ -344,6 +362,8 @@ module.exports = function (app) {
         placeMatchRadius: config.placeMatchRadius ?? DEFAULT_PLACE_MATCH_RADIUS,
         geocodingEnabled: config.geocodingEnabled ?? GEOCODING_DEFAULTS.geocodingEnabled,
         geocodingUrl: config.geocodingUrl || GEOCODING_DEFAULTS.geocodingUrl,
+        landmarksEnabled: config.landmarksEnabled ?? LANDMARK_DEFAULTS.landmarksEnabled,
+        overpassUrl: config.overpassUrl || LANDMARK_DEFAULTS.overpassUrl,
         tidesEnabled: config.tidesEnabled ?? TIDE_DEFAULTS.tidesEnabled,
         tideUrl: config.tideUrl || TIDE_DEFAULTS.tideUrl,
         weatherEnabled: config.weatherEnabled ?? WEATHER_DEFAULTS.weatherEnabled,
@@ -411,23 +431,29 @@ module.exports = function (app) {
     });
     namingTimer = setTimeout(runNaming, FIRST_NAMING_DELAY_MS);
     // Same idea as geocoding: network calls fetching the tide and weather
-    // forecasts near a recent departure, each on its own chain rather than
-    // inside detection.
-    const forecastOptions = { db: database, settings, userAgent: `signalk-chiplog/${version}` };
+    // forecasts near a recent departure, and the landmarks of the areas
+    // sailed through, each on its own chain rather than inside detection.
+    const networkOptions = { db: database, settings, userAgent: `signalk-chiplog/${version}` };
     const log = (level, message) => (level === 'error' ? app.error(message) : app.debug(message));
     lastActiveEntryId = null;
-    forecasts = [
-      createForecastSchedule({
-        label: 'Tide',
-        forecaster: createTideForecaster(forecastOptions),
+    schedules = [
+      createBackgroundSchedule({
+        label: 'Tide forecast',
+        resolver: createTideForecaster(networkOptions),
         log,
         firstDelayMs: FIRST_FORECAST_DELAY_MS
       }),
-      createForecastSchedule({
-        label: 'Weather',
-        forecaster: createWeatherForecaster(forecastOptions),
+      createBackgroundSchedule({
+        label: 'Weather forecast',
+        resolver: createWeatherForecaster(networkOptions),
         log,
         firstDelayMs: FIRST_FORECAST_DELAY_MS
+      }),
+      createBackgroundSchedule({
+        label: 'Landmark lookup',
+        resolver: createLandmarkFinder(networkOptions),
+        log,
+        firstDelayMs: FIRST_LANDMARK_DELAY_MS
       })
     ];
     lastStatus = null;
@@ -455,8 +481,8 @@ module.exports = function (app) {
     clearTimeout(namingTimer);
     namer?.stop();
     namer = null;
-    forecasts.forEach((schedule) => schedule.stop());
-    forecasts = [];
+    schedules.forEach((schedule) => schedule.stop());
+    schedules = [];
     usbExport?.stop();
     usbExport = null;
     replayJob?.cancel();

package/lib/api.js

@@ -4,6 +4,7 @@ const { ApiError, badRequest, conflict, notFound } = require('./errors');
 const entries = require('./entries');
 const events = require('./events');
 const { renderExport } = require('./export');
+const { listEntryLandmarks } = require('./landmarks');
 const { isTimeZone, PDF_LANGUAGES } = require('./logbook-pdf');
 const { toGeoJson, toGpx } = require('./formats');
 const manoeuvreTypes = require('./manoeuvre-types');
@@ -229,6 +230,20 @@ function registerRoutes(router, { getContext, logError }) {
     })
   );
 
+  // The amers a line of this passage's journal can be read against (SPEC
+  // §4.13); which one each line takes, and the bearing, is worked out where
+  // the line is shown. Empty until the area's landmarks have been fetched.
+  readonly.get(
+    '/api/entries/:id/landmarks',
+    handle(({ db }, req) => {
+      const id = entryId(req);
+      entries.requireEntryRow(db, id);
+      const { limit, offset } = v.parsePagination(req.query);
+      const items = listEntryLandmarks(db, id);
+      return { total: items.length, limit, offset, items: items.slice(offset, offset + limit) };
+    })
+  );
+
   readonly.get(
     '/api/entries/:id/tide',
     handle(({ db }, req) => {

package/lib/{forecast-schedule.js → background-schedule.js}

@@ -1,12 +1,12 @@
-// Runs a departure forecaster (tide, weather) as its own chain of timeouts:
-// each `resolveNext()` says when the next is due. `nudge()` runs it now --
-// when a passage opens, rather than leaving it to the idle poll or a retry
-// delay. A nudge during a fetch runs it again as soon as that one ends,
-// never a second chain alongside.
+// Runs a background resolver -- a departure forecast, a landmark lookup -- as
+// its own chain of timeouts: each `resolveNext()` says when the next is due.
+// `nudge()` runs it now -- when a passage opens, rather than leaving it to the
+// idle poll or a retry delay. A nudge during a fetch runs it again as soon as
+// that one ends, never a second chain alongside.
 
 const ERROR_RETRY_MS = 5 * 60 * 1000;
 
-function createForecastSchedule({ label, forecaster, log, firstDelayMs }) {
+function createBackgroundSchedule({ label, resolver, log, firstDelayMs }) {
   let timer = null;
   let running = false;
   let nudged = false;
@@ -23,9 +23,9 @@ function createForecastSchedule({ label, forecaster, log, firstDelayMs }) {
     nudged = false;
     let result;
     try {
-      result = await forecaster.resolveNext();
+      result = await resolver.resolveNext();
     } catch (err) {
-      log('error', `${label} forecast failed: ${err.stack ?? err}`);
+      log('error', `${label} failed: ${err.stack ?? err}`);
       result = { retryInMs: ERROR_RETRY_MS };
     }
     running = false;
@@ -36,7 +36,7 @@ function createForecastSchedule({ label, forecaster, log, firstDelayMs }) {
       // Expected whenever the boat is out of reach of a network.
       log(
         'debug',
-        `${label} forecast unavailable, retrying in ${Math.round(result.retryInMs / 60000)} min: ${result.error.message}`
+        `${label} unavailable, retrying in ${Math.round(result.retryInMs / 60000)} min: ${result.error.message}`
       );
     }
     schedule(nudged ? 0 : result.retryInMs);
@@ -59,9 +59,9 @@ function createForecastSchedule({ label, forecaster, log, firstDelayMs }) {
     stop() {
       stopped = true;
       clearTimeout(timer);
-      forecaster.stop();
+      resolver.stop();
     }
   };
 }
 
-module.exports = { createForecastSchedule };
+module.exports = { createBackgroundSchedule };

package/lib/database.js

@@ -314,6 +314,50 @@ const MIGRATIONS = [
   CREATE UNIQUE INDEX idx_log_entry_crew_unique_member
     ON log_entry_crew (entry_id, crew_member_id)
     WHERE crew_member_id IS NOT NULL;
+  `,
+  `
+  -- Landmarks -- amers (SPEC §4.13): the named features a journal line's
+  -- position is read against, "1.2 nm NE (053°) of Phare du Cap-Ferret".
+  -- Fetched from OpenStreetMap area by area and kept: the bearing itself is
+  -- worked out at read time, so a past passage fills in as soon as its area
+  -- is known, and nothing here is part of the logbook's record.
+  CREATE TABLE landmarks (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    osm_type TEXT NOT NULL CHECK (osm_type IN ('node', 'way', 'relation')),
+    osm_id INTEGER NOT NULL,
+    name TEXT NOT NULL,
+    kind TEXT NOT NULL CHECK (
+      kind IN ('lighthouse', 'light', 'cape', 'landmark', 'beacon', 'harbour')
+    ),
+    lat REAL NOT NULL,
+    lon REAL NOT NULL,
+    -- The nominal range of its light in metres, when OpenStreetMap gives one:
+    -- how far out this amer is still worth naming a position from.
+    light_range REAL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  );
+
+  CREATE UNIQUE INDEX idx_landmarks_osm ON landmarks (osm_type, osm_id);
+
+  -- Supports the bounding-box prefilter, as for places.
+  CREATE INDEX idx_landmarks_position ON landmarks (lat, lon);
+
+  -- The half-degree cells landmarks have already been fetched for. A fetch
+  -- covers its cell plus a margin, so every position inside the cell has all
+  -- the amers within range in the table -- one request per cell, ever.
+  CREATE TABLE landmark_areas (
+    cell_lat INTEGER NOT NULL,
+    cell_lon INTEGER NOT NULL,
+    fetched_at TEXT NOT NULL,
+    PRIMARY KEY (cell_lat, cell_lon)
+  );
+
+  -- Cleared once every cell a closed passage sailed through has been fetched.
+  -- An open passage stays pending: it keeps moving into new cells. Existing
+  -- passages default to pending, so their areas are fetched too.
+  ALTER TABLE log_entries ADD COLUMN landmarks_pending INTEGER NOT NULL DEFAULT 1
+    CHECK (landmarks_pending IN (0, 1));
   `
 ];
 

package/lib/entries.js

@@ -216,13 +216,16 @@ function updateEntry(db, id, patch, { placeMatchRadius, now }) {
       next.distance = patch.distance;
     }
 
+    // landmarks_pending: an edited departure or arrival position may sit in an
+    // area no landmarks have been fetched for (SPEC §4.13); the lookup checks
+    // and clears it again.
     db.prepare(
       `UPDATE log_entries SET
          start_time = ?, end_time = ?,
          start_lat = ?, start_lon = ?, end_lat = ?, end_lon = ?,
          start_place_id = ?, end_place_id = ?, start_place_name = ?, end_place_name = ?,
          start_place_pending = ?, end_place_pending = ?,
-         distance = ?, updated_at = ?
+         distance = ?, landmarks_pending = 1, updated_at = ?
        WHERE id = ?`
     ).run(
       next.start_time,
@@ -361,11 +364,13 @@ function mergeEntries(db, id, otherId, now) {
     // index would otherwise reject the update below.
     db.prepare('DELETE FROM log_entries WHERE id = ?').run(later.id);
 
+    // landmarks_pending: the merged passage now covers the later one's track
+    // as well, which may reach areas no landmarks have been fetched for.
     db.prepare(
       `UPDATE log_entries SET
          state = ?, end_time = ?, stopped_since = ?, closed_by = ?,
          end_lat = ?, end_lon = ?, end_place_id = ?, end_place_name = ?, end_place_pending = ?,
-         distance = ?, updated_at = ?
+         distance = ?, landmarks_pending = 1, updated_at = ?
        WHERE id = ?`
     ).run(
       later.state,

package/lib/event-watcher.js

@@ -1,14 +1,12 @@
 const { createFreshnessTracker } = require('./detection');
 const { activeEntryId, entryNearArrival } = require('./entries');
+const { CRITICAL_STATES } = require('./events');
 
 const METRES_PER_SECOND_PER_KNOT = 1852 / 3600;
 
 const EVENT_DEFAULTS = { windSpeedThresholds: [20, 30], pressureDropThreshold: 4 };
 
 const CHECK_INTERVAL_MS = 1000;
-
-// Any notification reaching these states is critical, whatever its path.
-const CRITICAL_STATES = new Set(['alarm', 'emergency']);
 const NOTIFICATION_METADATA_KEYS = new Set([
   'meta',
   'values',

package/lib/events.js

@@ -27,6 +27,11 @@ const EVENT_TYPES = [
 // or from corrections, never posted by a client.
 const CLIENT_EVENT_TYPES = ['manoeuvre', 'text_annotation', 'handwritten_annotation'];
 
+// A `sk_alarm` event reaching one of these states is the alarm itself; any
+// other state (usually `normal`) is what cleared it. Shared with
+// event-watcher.js, which decides what is worth logging in the first place.
+const CRITICAL_STATES = new Set(['alarm', 'emergency']);
+
 // An entry logged after the fact — typically replayed from the tablet's offline
 // queue — takes the position the track recorded at its time.
 const TRACK_POSITION_WINDOW_MS = 2 * 60 * 1000;
@@ -277,10 +282,35 @@ function updateEvent(db, id, patch) {
   return toEvent(requireEventRow(db, id));
 }
 
+// An alarm is logged as two lines — the notification reaching `alarm` or
+// `emergency`, and the one that later cleared it (SPEC §4.6) — so deleting
+// either alone would leave the other referring to nothing. Its pair is the
+// adjacent `sk_alarm` line for the same notification whose criticality
+// differs: an escalation (`alarm` to `emergency`) is not a pair, both being
+// critical, and is left alone.
+function pairedAlarmEvent(db, row) {
+  if (row.type !== 'sk_alarm') {
+    return null;
+  }
+  const siblings = db
+    .prepare(
+      `SELECT * FROM events WHERE entry_id = ? AND type = 'sk_alarm' AND subtype = ?
+       ORDER BY time, id`
+    )
+    .all(row.entry_id, row.subtype);
+  const index = siblings.findIndex((sibling) => sibling.id === row.id);
+  const critical = CRITICAL_STATES.has(JSON.parse(row.payload).state);
+  const neighbour = critical ? siblings[index + 1] : siblings[index - 1];
+  if (!neighbour || CRITICAL_STATES.has(JSON.parse(neighbour.payload).state) === critical) {
+    return null;
+  }
+  return neighbour;
+}
+
 // Undoing the departure that opened a passage, before the vessel moved and
 // before anything else was logged in it, takes the passage away too.
 function deleteEvent(db, id) {
-  requireEventRow(db, id);
+  const row = requireEventRow(db, id);
   withTransaction(db, () => {
     const opened = db
       .prepare(
@@ -291,15 +321,20 @@ function deleteEvent(db, id) {
       .get(id, id);
     if (opened) {
       db.prepare('DELETE FROM log_entries WHERE id = ?').run(opened.id);
-    } else {
-      db.prepare('DELETE FROM events WHERE id = ?').run(id);
+      return;
+    }
+    const paired = pairedAlarmEvent(db, row);
+    if (paired) {
+      db.prepare('DELETE FROM events WHERE id = ?').run(paired.id);
     }
+    db.prepare('DELETE FROM events WHERE id = ?').run(id);
   });
 }
 
 module.exports = {
   EVENT_TYPES,
   CLIENT_EVENT_TYPES,
+  CRITICAL_STATES,
   listEvents,
   allEvents,
   createEvent,

package/lib/export.js

@@ -7,6 +7,7 @@ const { conflict } = require('./errors');
 const { toEntry } = require('./entries');
 const { allEvents } = require('./events');
 const { toCsv, toGpx } = require('./formats');
+const { listEntryLandmarks } = require('./landmarks');
 const { renderLogbookPdf } = require('./logbook-pdf');
 const { allSegments } = require('./propulsion');
 const { allTrackPoints, allObservations } = require('./track');
@@ -34,6 +35,7 @@ function bundleOf(db, row) {
     observations: allObservations(db, row.id),
     propulsion: allSegments(db, row.id),
     events: allEvents(db, row.id),
+    landmarks: listEntryLandmarks(db, row.id),
     tide: getTideForecast(db, row.id),
     weather: getWeatherForecast(db, row.id),
     crew: listEntryCrew(db, row.id)
@@ -137,6 +139,12 @@ function passageFingerprint(db, row, pdf) {
     const forecast = db.prepare(`SELECT fetched_at FROM ${table} WHERE entry_id = ?`).get(row.id);
     hash.update(JSON.stringify(forecast?.fetched_at ?? null));
   }
+  // The landmarks a passage is read against arrive area by area, well after
+  // the sailing, and the PDF prints them: a copy already on the drive is worth
+  // rewriting once they do.
+  for (const landmark of listEntryLandmarks(db, row.id)) {
+    hash.update(JSON.stringify([landmark.id, landmark.updatedAt]));
+  }
   for (const table of ['propulsion_segments', 'events']) {
     for (const item of db
       .prepare(`SELECT * FROM ${table} WHERE entry_id = ? ORDER BY id`)