From d919fb12db40c7eaee1eee37a0bd7e3a6509143a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 13:25:37 +0100
Subject: [PATCH 001/113] Add control to filter out archived projects in
 ProjectList

---
 lib/www/client/source/src/views/ProjectList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectList.vue b/lib/www/client/source/src/views/ProjectList.vue
index 9fd7a82..8594057 100644
--- a/lib/www/client/source/src/views/ProjectList.vue
+++ b/lib/www/client/source/src/views/ProjectList.vue
@@ -110,7 +110,6 @@ export default {
   },
 
   computed: {
-
     displayItems () {
       return this.showArchived
         ? this.items

From e7c29ba14c7aa4df902d19c0589506939cc61b3c Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 15:12:19 +0100
Subject: [PATCH 002/113] Add file browsing components.

Essentially, these are a file selection dialog.
---
 .../file-browser/file-browser-dialog.vue      |  83 ++++++++++
 .../components/file-browser/file-browser.vue  | 150 ++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 lib/www/client/source/src/components/file-browser/file-browser-dialog.vue
 create mode 100644 lib/www/client/source/src/components/file-browser/file-browser.vue

diff --git a/lib/www/client/source/src/components/file-browser/file-browser-dialog.vue b/lib/www/client/source/src/components/file-browser/file-browser-dialog.vue
new file mode 100644
index 0000000..52a03fa
--- /dev/null
+++ b/lib/www/client/source/src/components/file-browser/file-browser-dialog.vue
@@ -0,0 +1,83 @@
+<template>
+  <v-dialog
+    max-width="600"
+    v-model="open"
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <v-icon
+        v-bind="attrs"
+        v-on="on"
+        :title="title"
+      >mdi-folder-network-outline</v-icon>
+    </template>
+    <v-card>
+      <v-card-title>File picker</v-card-title>
+      <v-divider></v-divider>
+      <v-card-text>
+        <dougal-file-browser
+          v-model="selected"
+          :mimetypes="mimetypes"
+          :root="root"
+          ref="browser"
+        >
+        </dougal-file-browser>
+      </v-card-text>
+      <v-card-actions>
+        <v-btn text @click="save" :disabled="!selected">
+          <v-icon small flat color="primary" class="mr-2">mdi-content-save</v-icon>
+          Ok
+        </v-btn>
+        <v-spacer></v-spacer>
+        <v-btn text @click="refresh">
+          <v-icon small flat class="mr-2">mdi-reload</v-icon>
+          Refresh
+        </v-btn>
+        <v-spacer></v-spacer>
+        <v-btn text @click="close">
+          <v-icon small flat color="red" class="mr-2">mdi-close</v-icon>
+          Cancel
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import DougalFileBrowser from './file-browser';
+
+export default {
+  name: "DougalFileBrowserDialog",
+
+  components: { DougalFileBrowser },
+
+  props: [ "path", "mimetypes", "root", "title" ],
+
+  data () {
+    return {
+      open: false,
+      selected: ""
+    }
+  },
+
+  methods: {
+
+    refresh () {
+      this.$refs.browser.refresh();
+    },
+
+    close () {
+      this.open = false;
+    },
+
+    save () {
+      this.$emit('input', this.selected);
+      this.close();
+    }
+
+  },
+
+  mounted () {
+    this.selected = this.path;
+  }
+}
+</script>
diff --git a/lib/www/client/source/src/components/file-browser/file-browser.vue b/lib/www/client/source/src/components/file-browser/file-browser.vue
new file mode 100644
index 0000000..92fbc37
--- /dev/null
+++ b/lib/www/client/source/src/components/file-browser/file-browser.vue
@@ -0,0 +1,150 @@
+<template>
+  <v-layout fill-height style="overflow-y:auto;max-height:400px;">
+    <v-progress-circular v-if="loading && !items.length"></v-progress-circular>
+    <v-treeview v-else
+      activatable
+      :active.sync="active"
+      :items="items"
+      item-key="path"
+      item-name="basename"
+      :load-children="readdir"
+      @update:active="activeChanged"
+      style="min-width:100%"
+    >
+      <template v-slot:label="{item}">
+        <div style="cursor:pointer;">
+          {{ item.basename }}
+        </div>
+      </template>
+    </v-treeview>
+  </v-layout>
+</template>
+
+<script>
+import { mapActions, mapGetters } from 'vuex';
+
+function find(haystack, needle) {
+  for (const item of haystack) {
+    if (item.path == needle) {
+      return item;
+    } else if (item.children) {
+      const found = find(item.children, needle);
+      if (found) {
+        return found;
+      }
+    }
+  }
+}
+
+export default {
+  name: "DougalFileBrowser",
+
+  props: [ "value", "mimetypes", "root" ],
+
+  data () {
+    return {
+      loading: false,
+      items: [],
+      active: [],
+      selected: null,
+      path: "",
+    };
+  },
+
+  computed: {
+
+    dirsAreSelectable () {
+      return !this.mimetypes ||
+        this.mimetypes == "inode/directory" ||
+        (Array.isArray(this.mimetypes) && this.mimetypes.includes("inode/directory"));
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    activeChanged (active) {
+      const candidate = find(this.items, active[0]);
+      if (!this.dirsAreSelectable && this.isDirectory(candidate)) {
+        this.selected = null;
+      } else {
+        this.selected = candidate;
+      }
+      this.$emit("input", this.selected?.path);
+    },
+
+    isDirectory (item) {
+      return item && item["Content-Type"] == "inode/directory";
+    },
+
+    filterMimetypes (item) {
+      if (!this.mimetypes) {
+        return true;
+      } else if (Array.isArray(this.mimetypes)) {
+        return item["Content-Type"] == "inode/directory" ||
+          this.mimetypes.includes(item["Content-Type"].split(";")[0]) ||
+          this.filterGlob(item);
+      } else {
+        return item["Content-Type"] == "inode/directory" ||
+          this.mimetypes == item["Content-Type"].split(";")[0];
+      }
+      return false;
+    },
+
+    filterGlob (item) {
+      const globs = (Array.isArray(this.mimetypes)
+        ? this.mimetypes
+        : [ this.mimetypes ])
+      .filter(i => /^\*\..+$/.test(i));
+
+      for (const glob of globs) {
+        const ext = (glob.match(/^\*\.(.+)$/)||[])[1];
+        if (item.path.toLowerCase().endsWith(ext.toLowerCase())) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+
+    async readdir (item) {
+      this.loading = true;
+      const url = `/files/${item? item.path : (this.root || this.path || "")}`;
+      const list = await this.api([url]);
+      this.loading = false;
+      const items = list.map(item => {
+        if (item["Content-Type"] == "inode/directory") {
+          item.children = [];
+        }
+        item.id = item.path;
+        item.name = item.basename;
+        return item;
+      }).filter(this.filterMimetypes);
+      if (item) {
+        item.children = items;
+      } else {
+        this.items = items;
+      }
+    },
+
+    async refresh () {
+      this.items = []
+      this.$nextTick(this.readdir);
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    if (this.value) {
+      this.path = this.value;
+    }
+    this.readdir();
+  }
+}
+
+</script>

From 642f5a758578129c56614a5d6cae8db17ac8466a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 15:13:01 +0100
Subject: [PATCH 003/113] Add project configuration components.

The configuration settings are quite complex so we divide the
GUI into modular components.
---
 .../src/components/project-settings/asaqc.vue |  94 +++++
 .../components/project-settings/binning.vue   | 172 ++++++++++
 .../file-matching-parameters.vue              | 249 ++++++++++++++
 .../components/project-settings/file-path.vue |  85 +++++
 .../project-settings/fixed-width-format.vue   | 322 ++++++++++++++++++
 .../components/project-settings/geodetics.vue |  78 +++++
 .../components/project-settings/groups.vue    | 158 +++++++++
 .../project-settings/input-final-p111.vue     |  85 +++++
 .../project-settings/input-final-pending.vue  |  85 +++++
 .../project-settings/input-raw-ntbp.vue       |  85 +++++
 .../project-settings/input-raw-p111.vue       |  85 +++++
 .../project-settings/input-smartsource.vue    |  85 +++++
 .../components/project-settings/name-id.vue   |  85 +++++
 .../project-settings/not-implemented.vue      |  65 ++++
 .../online-line-name-format.vue               |  80 +++++
 .../components/project-settings/planner.vue   | 107 ++++++
 .../components/project-settings/preplots.vue  | 182 ++++++++++
 .../project-settings/production.vue           |  79 +++++
 .../regex-pattern-captures.vue                | 117 +++++++
 19 files changed, 2298 insertions(+)
 create mode 100644 lib/www/client/source/src/components/project-settings/asaqc.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/binning.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/file-path.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/fixed-width-format.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/geodetics.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/groups.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/input-final-p111.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/input-final-pending.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/input-raw-p111.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/input-smartsource.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/name-id.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/not-implemented.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/online-line-name-format.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/planner.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/preplots.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/production.vue
 create mode 100644 lib/www/client/source/src/components/project-settings/regex-pattern-captures.vue

diff --git a/lib/www/client/source/src/components/project-settings/asaqc.vue b/lib/www/client/source/src/components/project-settings/asaqc.vue
new file mode 100644
index 0000000..d5adb57
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/asaqc.vue
@@ -0,0 +1,94 @@
+<template>
+  <v-card>
+    <v-card-title>ASAQC</v-card-title>
+    <v-card-subtitle>Equinor's cloud API configuration.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="ASAQC ID"
+          hint="ID number for this survey in ASAQC"
+          persistent-hint
+          type="number"
+          v-model.number="id"
+        >
+        </v-text-field>
+        <v-text-field
+          label="IMO"
+          hint="Project vessel's International Maritime Organisation's identification number"
+          persistent-hint
+          v-model.number="imo"
+        >
+        </v-text-field>
+        <v-text-field
+          label="MMSI"
+          hint="Maritime Mobile Service Identities (MMSI) number"
+          persistent-hint
+          v-model.number="mmsi"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsASAQC",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      id: null,
+      imo: null,
+      mmsi: null,
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/binning.vue b/lib/www/client/source/src/components/project-settings/binning.vue
new file mode 100644
index 0000000..b2aaf28
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/binning.vue
@@ -0,0 +1,172 @@
+<template>
+  <v-card>
+    <v-card-title>Binning parameters</v-card-title>
+    <!-- <v-card-subtitle></v-card-subtitle> -->
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Azimuth"
+          hint="Direction of I (inline) axis"
+          persistent-hint
+          suffix="°"
+          type="number"
+          v-model.number="theta"
+        >
+        </v-text-field>
+        <v-text-field
+          label="I increment"
+          hint="Bin number increment along the inline axis"
+          persistent-hint
+          type="number"
+          min="0"
+          step="1"
+          v-model.number="I_inc"
+        >
+        </v-text-field>
+        <v-text-field
+          label="J increment"
+          hint="Bin number increment along the crossline axis"
+          persistent-hint
+          type="number"
+          min="0"
+          step="1"
+          v-model.number="J_inc"
+        >
+        </v-text-field>
+        <v-text-field
+          label="I width"
+          hint="Inline bin width (can be negative)"
+          persistent-hint
+          type="number"
+          v-model.number="I_width"
+        >
+        </v-text-field>
+        <v-text-field
+          label="J width"
+          hint="Crossline bin width (can be negative)"
+          persistent-hint
+          type="number"
+          v-model.number="J_width"
+        >
+        </v-text-field>
+        <fieldset class="pa-3 mt-3">
+          <legend>Origin</legend>
+          <v-row>
+            <v-col>
+              <v-text-field
+                label="Easting"
+                hint="Bin origin easting"
+                persistent-hint
+                type="number"
+                v-model.number="origin.easting"
+              >
+              </v-text-field>
+            </v-col>
+            <v-col>
+              <v-text-field
+                label="Northing"
+                hint="Bin origin northing"
+                persistent-hint
+                type="number"
+                v-model.number="origin.northing"
+              >
+              </v-text-field>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col>
+              <v-text-field
+                label="I"
+                hint="Bin origin inline"
+                persistent-hint
+                type="number"
+                step="1"
+                v-model.number="origin.I"
+              >
+              </v-text-field>
+            </v-col>
+            <v-col>
+              <v-text-field
+                label="J"
+                hint="Bin origin crossline"
+                persistent-hint
+                type="number"
+                step="1"
+                v-model.number="origin.J"
+              >
+              </v-text-field>
+            </v-col>
+          </v-row>
+        </fieldset>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsBinning",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      theta: null,
+      I_inc: 1,
+      J_inc: 1,
+      I_width: -12.50,
+      J_width: 12.50,
+      origin: {
+        easting: null,
+        northing: null,
+        I: null,
+        J: null
+      }
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+  },
+
+  mounted () {
+    this.reset();
+  }
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
new file mode 100644
index 0000000..84bee15
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
@@ -0,0 +1,249 @@
+<template>
+  <v-card>
+    <v-card-title v-text="title"></v-card-title>
+    <v-card-subtitle v-text="subtitle"></v-card-subtitle>
+    <v-card-text>
+      <v-tabs v-model="tab">
+        <v-tab>Paths</v-tab>
+        <v-tab>Globs</v-tab>
+        <v-tab>Pattern</v-tab>
+      </v-tabs>
+
+      <v-tabs-items v-model="tab">
+
+        <v-tab-item>
+          <v-card flat>
+            <v-card-subtitle>
+              A list of directories which are searched for matching files.
+            </v-card-subtitle>
+            <v-card-text>
+              <v-form>
+                <v-text-field v-for="(item, index) in paths" :key="index"
+                  v-model="paths[index]"
+                >
+                  <dougal-file-browser-dialog
+                    slot="append"
+                    v-model="paths[index]"
+                    :root="value.rootPath"
+                    :mimetypes="[ 'inode/directory' ]"
+                    title="Select a directory"
+                  ></dougal-file-browser-dialog>
+                  <v-btn slot="append-outer"
+                    fab
+                    x-small text
+                    dark
+                    color="red"
+                    title="Remove"
+                    @click="() => paths.splice(index, 1)"
+                  >
+                    <v-icon>mdi-minus</v-icon>
+                  </v-btn>
+                </v-text-field>
+                <v-btn
+                  class="mx-2"
+                  fab dark
+                  x-small text
+                  color="primary"
+                  title="Add path"
+                  @click="() => paths.push('')"
+                >
+                  <v-icon dark>mdi-plus</v-icon>
+                </v-btn>
+              </v-form>
+            </v-card-text>
+          </v-card>
+        </v-tab-item>
+
+        <v-tab-item>
+          <v-card flat>
+            <v-card-subtitle>
+              A list of <a href="https://en.wikipedia.org/wiki/Glob_(programming)" target="_blank">glob patterns</a> expanding to match the files of interest. Note that Linux is case-sensitive.
+            </v-card-subtitle>
+            <v-card-text>
+              <v-form>
+                <v-text-field v-for="(item, index) in globs" :key="index"
+                  v-model="globs[index]"
+                >
+                  <v-btn slot="append-outer"
+                    fab
+                    x-small text
+                    dark
+                    color="red"
+                    title="Remove"
+                    @click="() => globs.splice(index, 1)"
+                  >
+                    <v-icon>mdi-minus</v-icon>
+                  </v-btn>
+                </v-text-field>
+                <v-btn
+                  class="mx-2"
+                  fab dark
+                  x-small text
+                  color="primary"
+                  title="Add glob pattern"
+                  @click="() => globs.push('')"
+                >
+                  <v-icon dark>mdi-plus</v-icon>
+                </v-btn>
+              </v-form>
+            </v-card-text>
+          </v-card>
+        </v-tab-item>
+
+        <v-tab-item>
+          <v-card flat>
+            <v-card-subtitle>
+              Regular expression that describes the file format definition. Used to capture information such as line and sequence number, etc.
+            </v-card-subtitle>
+            <v-card-text>
+              <v-form>
+                <v-text-field
+                  class="mb-5"
+                  label="Regular expression"
+                  v-model="pattern.regex"
+                  persistent-hint
+                  hint="Regular expression"
+                >
+                </v-text-field>
+
+                <fieldset class="pa-3 mb-5">
+                  <legend>Captures</legend>
+
+                  <v-text-field v-for="(item, index) in pattern.captures" :key="index"
+                    v-model="pattern.captures[index]"
+                  >
+                    <v-btn slot="append-outer"
+                      fab
+                      x-small text
+                      dark
+                      color="red"
+                      title="Remove"
+                      @click="() => pattern.captures.splice(index, 1)"
+                    >
+                      <v-icon>mdi-minus</v-icon>
+                    </v-btn>
+                  </v-text-field>
+                  <v-btn
+                    class="mx-2"
+                    fab dark
+                    x-small text
+                    color="primary"
+                    title="Add capture"
+                    @click="() => pattern.captures.push('')"
+                  >
+                    <v-icon dark>mdi-plus</v-icon>
+                  </v-btn>
+                </fieldset>
+
+                <v-text-field
+                  class="mb-5"
+                  label="Flags"
+                  v-model="pattern.flags"
+                  persistent-hint
+                  hint="Regular expression modifier flags"
+                >
+                </v-text-field>
+              </v-form>
+            </v-card-text>
+          </v-card>
+        </v-tab-item>
+
+      </v-tabs-items>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        :disabled="!isValid"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsFileMatchingParameters",
+
+  components: {
+    DougalFileBrowserDialog
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  data () {
+    return {
+      tab: null,
+      globs: [],
+      paths: [],
+      pattern: {
+        flags: "i",
+        regex: null,
+        captures: []
+      }
+    }
+  },
+
+  computed: {
+
+    isValid () {
+      return false;
+      // return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.globs = this.value.globs;
+      this.paths = this.value.paths;
+      this.pattern = this.value.pattern;
+    },
+
+    save () {
+      this.$emit('input', this.data);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/file-path.vue b/lib/www/client/source/src/components/project-settings/file-path.vue
new file mode 100644
index 0000000..06b8501
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/file-path.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-card>
+    <v-card-title>Files</v-card-title>
+    <v-card-subtitle>File path configuration for this project.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Project folder"
+          hint="Root file path for this project"
+          persistent-hint
+          v-model="path"
+        >
+          <dougal-file-browser-dialog
+            slot="append"
+            v-model="path"
+            mimetypes="inode/directory"
+          ></dougal-file-browser-dialog>
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
+
+export default {
+  name: "DougalProjectSettingsFilePath",
+
+  components: { DougalFileBrowserDialog },
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      path: ""
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/fixed-width-format.vue b/lib/www/client/source/src/components/project-settings/fixed-width-format.vue
new file mode 100644
index 0000000..0a4fdb8
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/fixed-width-format.vue
@@ -0,0 +1,322 @@
+<template>
+  <v-card flat>
+    <v-card-text>
+      <div class="sample" v-html="sampleHtml" ref="sample">
+      </div>
+
+      <v-divider></v-divider>
+
+      <v-form>
+        <v-container>
+
+          <v-row no-gutters v-for="(field, key) in {line, point, easting, northing}" :key="key">
+            <v-col>
+              <v-chip outlined :color="field.colour">{{field.label}}</v-chip>
+            </v-col>
+            <v-col>
+              <v-text-field
+                class="ml-3"
+                dense
+                label="From"
+                type="number"
+                min="0"
+                :ref="key"
+                v-model.number="field.offset"
+              ></v-text-field>
+            </v-col>
+            <v-col>
+              <v-text-field
+                class="ml-3"
+                dense
+                label="Width"
+                type="number"
+                min="0"
+                v-model.number="field.width"
+              ></v-text-field>
+            </v-col>
+          </v-row>
+
+        </v-container>
+      </v-form>
+
+    </v-card-text>
+    <v-card-actions>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+</style>
+
+<script>
+
+
+function arraysAreEqual(arr0, arr1) {
+  return (arr0 && arr1 && arr0.length == arr1.length) &&
+    arr0.reduce( (acc, cur, idx) =>
+      acc && (arr1[idx] == cur), true );
+}
+
+function repeatsLength(arr, comparator=(a, b) => a == b) {
+  function checkRepeat(arr) {
+    let idx = 0;
+    if (arr.length) {
+      while (comparator(arr[idx], arr[++idx]));
+    }
+    return idx;
+  }
+
+  const repeats = [];
+  let offset = 0;
+  let count;
+  while (count = checkRepeat(arr.slice(offset))) {
+    repeats.push(count);
+    offset += count;
+  }
+
+  return repeats;
+}
+
+export default {
+  name: "DougalProjectSettingsFixedWidthFormat",
+
+  props: [ "value", "sample" ],
+
+  data () {
+    return {
+      line: {
+        name: "line_name",
+        type: "int",
+        label: "Line",
+        offset: 0,
+        width: 4,
+        colour: "green"
+      },
+      point: {
+        name: "point_number",
+        type: "int",
+        label: "Point",
+        offset: 4,
+        width: 4,
+        colour: "blue"
+      },
+      easting: {
+        name: "easting",
+        type: "float",
+        label: "Easting",
+        offset: 8,
+        width: 12,
+        colour: "red"
+      },
+      northing: {
+        name: "northing",
+        type: "float",
+        label: "Northing",
+        offset: 20,
+        width: 12,
+        colour: "orange"
+      }
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    },
+
+    fields: {
+      handler () {
+        if (this.overlappingFields) {
+          this.$emit("input", null);
+        } else {
+          this.$emit("input", {
+            names: this.names,
+            types: this.types,
+            widths: this.widths
+          });
+        }
+      },
+      deep: true
+    }
+  },
+
+  computed: {
+
+    sampleHtml () {
+      if (!this.sample) {
+        return "";
+      }
+
+      const parts = this.fieldsDescending;
+
+      const partsForColumn = (col) => {
+        return parts.filter(part =>
+          part.offset <= col && part.offset+part.width > col
+        );
+      }
+
+      const partsForLine = (line) => {
+        return Array.from({length: line.length}, (_, idx) => partsForColumn(idx));
+      }
+
+      function getDecorators(arr, comparator, specialValue) {
+        const repeats = repeatsLength(arr, comparator);
+        let sum = 0;
+        const res = [];
+        repeats.slice(0, -1).forEach( count => {
+          const idx = sum;
+          sum += count;
+          const el = arr[idx];
+          if (el.length) {
+            if (el.length == 1) {
+              // Only one field, return it
+              res.push({
+                ...el[0],
+                offset: idx,
+                width: Math.min(Math.min(el[0].offset+el[0].width, sum+idx) - idx, sum-idx)
+              });
+            } else {
+              // More than one element, return special value
+              res.push({
+                ...specialValue,
+                offset: idx,
+                width: sum-idx
+              });
+            }
+          }
+        });
+
+        return res.sort( (a, b) => b.offset-a.offset );
+      }
+
+      const lines = this.sample.split("\n").map( line => {
+        const decorators = getDecorators(partsForLine(line), arraysAreEqual, {name: "Overlap", colour: "grey"});
+        let s = line;
+        for (const part of decorators) {
+          const s0 = s.slice(0, part.offset);
+          const s1 = s.slice(part.offset, part.offset+part.width);
+          const s2 = s.slice(part.offset+part.width);
+          s = s0+`<span class="${part.colour}--text" title="${part.name}" style="border: 1px solid;">${s1}</span>${s2}`;
+        }
+        return s;
+      });
+
+      return lines.join("<br/>");
+    },
+
+    overlappingFields () {
+      function isOverlapping (a, b) {
+        return a.offset < b.offset+b.width && b.offset < a.offset+a.width;
+      }
+
+      for (const field of this.fields) {
+        for (const otherField of this.fields) {
+          if (field != otherField && isOverlapping(field, otherField)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    },
+
+    names () {
+      return this.fieldsAscending.map(f => f.name);
+    },
+
+    types () {
+      return this.fieldsAscending.map(f => f.type);
+    },
+
+    widths () {
+      if (this.overlappingFields) {
+        return [];
+      }
+
+      const fields = this.fieldsAscending;
+      const w = [ ];
+
+      if (fields[0].offset) {
+        w.push(-fields[0].offset);
+      }
+      w.push(fields[0].width);
+
+      for (let idx=1; idx<fields.length; idx++) {
+        const f0 = fields[idx-1];
+        const f1 = fields[idx];
+        const gap = f0.offset+f0.width-f1.offset;
+
+        if (gap) {
+          w.push(gap);
+        }
+        w.push(f1.width);
+      }
+      return w;
+    },
+
+    fields () {
+      return [ this.line, this.point, this.easting, this.northing ];
+    },
+
+    fieldsAscending () {
+      return Object.values(this.fields).sort( (a, b) => a.offset - b.offset );
+    },
+
+    fieldsDescending () {
+      return Object.values(this.fields).sort( (a, b) => b.offset - a.offset );
+    }
+
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+
+      const fieldFor = (index) => {
+        return this.fields.find(field => field.name == this.value.names[index]);
+      }
+
+      let offset=0;
+      let index=0;
+
+      for (const width of this.value.widths) {
+        if (width < 0) {
+          offset -= width;
+        } else {
+          fieldFor(index).offset = offset;
+          fieldFor(index).width = width;
+          offset += width;
+          index++;
+        }
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data.values});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+    document.addEventListener("selectionchange", this.handleSelection);
+  },
+
+   beforeUnmount () {
+    document.removeEventListener("selectionchange", this.handleSelection);
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/geodetics.vue b/lib/www/client/source/src/components/project-settings/geodetics.vue
new file mode 100644
index 0000000..c31ead4
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/geodetics.vue
@@ -0,0 +1,78 @@
+<template>
+  <v-card>
+    <v-card-title>Geodetics</v-card-title>
+    <v-card-subtitle>Geodetic parameters.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="EPSG code"
+          hint="EPSG code of the project's coordinate reference system"
+          persistent-hint
+          type="number"
+          v-model.number="epsg"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsGeodetics",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      epsg: null
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/groups.vue b/lib/www/client/source/src/components/project-settings/groups.vue
new file mode 100644
index 0000000..fa3fb5a
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/groups.vue
@@ -0,0 +1,158 @@
+<template>
+  <v-card>
+    <v-card-title>Groups</v-card-title>
+    <v-card-subtitle>For <abbr title="Permanent Reservoir Monitoring">PRM</abbr> and 4D operations, each project can be assigned to one or more groups sharing the same (or substantially the same) preplots.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-combobox
+          v-model="groups"
+          :items="items"
+          multiple
+          :search-input.sync="search"
+          :hide-no-data="!search"
+          hide-selected
+          chips
+          hint="Project group(s). Type a value to create a new group (case sensitive)"
+          persistent-hint
+        >
+          <template v-slot:no-data>
+            <v-list-item>
+              <small>New group: </small>
+              <v-chip class="ml-3"
+                :color="`grey lighten-2`"
+                label
+                small
+              >
+                {{ search }}
+              </v-chip>
+            </v-list-item>
+          </template>
+          <template v-slot:selection="{ attrs, item, parent, selected }">
+            <v-chip
+              v-if="item === Object(item)"
+              v-bind="attrs"
+              :color="`${item.colour} lighten-3`"
+              :input-value="selected"
+              label
+              small
+            >
+              <span class="pr-2">
+                {{ item.text }}
+              </span>
+              <v-icon
+                small
+                @click="parent.selectItem(item)"
+              >
+                $delete
+              </v-icon>
+            </v-chip>
+          </template>
+          <template v-slot:item="{ index, item }">
+            <v-chip
+              :color="`${item.colour} lighten-3`"
+              label
+              small
+            >{{ item.text }}</v-chip>
+          </template>
+        </v-combobox>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "DougalProjectSettingsGroups",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      groups: [],
+      search: null
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    },
+
+    groups (cur, prev) {
+      if (cur?.length == prev?.length) {
+        return;
+      }
+
+      this.groups = cur?.map(i => {
+        return typeof i === "string"
+          ? { text: i, colour: this.nextColour}
+          : i
+      });
+
+    }
+  },
+
+  computed: {
+
+    colours () {
+      return [ "green", "purple", "indigo", "cyan", "teal", "orange" ];
+    },
+
+    nextColour () {
+      return this.colours[(this.items.length + (this.groups?.length ?? 0)) % this.colours.length];
+    },
+
+    items () {
+      return this.projectGroups.map((item, idx) => {
+        return {
+          text: item,
+          colour: this.colours[idx % this.colours.length]
+        };
+      });
+    },
+
+    ...mapGetters(["projectGroups"])
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {groups: this.groups?.map(i => i.text)});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-final-p111.vue b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
new file mode 100644
index 0000000..d54623a
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
@@ -0,0 +1,85 @@
+<template>
+  <dougal-project-settings-file-matching-parameters
+    :value="value" title="Final P1/11" subtitle="Final P1/11 files location and parameters."
+  >
+  </dougal-project-settings-file-matching-parameters>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsFinal111",
+
+  components: {
+    DougalProjectSettingsFileMatchingParameters
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  data () {
+    return {
+      tab: null,
+      globs: [],
+      paths: [],
+      pattern: {
+        flags: "i",
+        regex: null,
+        captures: []
+      }
+    }
+  },
+
+  computed: {
+
+    isValid () {
+      return false;
+      // return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.globs = this.value.globs;
+      this.paths = this.value.paths;
+      this.pattern = this.value.pattern;
+    },
+
+    save () {
+      this.$emit('input', this.data);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-final-pending.vue b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
new file mode 100644
index 0000000..d23bc44
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-card>
+    <v-card-title>Pending sequence detection</v-card-title>
+    <v-card-subtitle>Sequences which are pending acceptance (e.g., due to marginal quality) can be marked as such by the naming of their <b>final</b> files or parent directory. Dougal uses regular expression matching against the full path, not just the file name. This pattern applies to both P1/90 and P1/11 files.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Pattern"
+          hint="Regular expression text"
+          persistent-hint
+          v-model="regex"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Flags"
+          hint="Regular expression modifier flags"
+          persistent-hint
+          v-model="flags"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsFinalPending",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      regex: "PENDING",
+      flags: "i"
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
new file mode 100644
index 0000000..a46c268
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-card>
+    <v-card-title>NTBP detection</v-card-title>
+    <v-card-subtitle><abbr title="Not to be processed">NTBP</abbr> sequences are denoted by the naming of its files or any of its parent directories. Dougal uses regular expression matching against the full path, not just the file name. This pattern applies to both P1/90 and P1/11 files.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Pattern"
+          hint="Regular expression text"
+          persistent-hint
+          v-model="regex"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Flags"
+          hint="Regular expression modifier flags"
+          persistent-hint
+          v-model="flags"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsRawNTBP",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      regex: "NTBP",
+      flags: "i"
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
new file mode 100644
index 0000000..ef68701
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
@@ -0,0 +1,85 @@
+<template>
+  <dougal-project-settings-file-matching-parameters
+    :value="value" title="Raw P1/11" subtitle="Raw P1/11 files location and parameters."
+  >
+  </dougal-project-settings-file-matching-parameters>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsRaw111",
+
+  components: {
+    DougalProjectSettingsFileMatchingParameters
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  data () {
+    return {
+      tab: null,
+      globs: [],
+      paths: [],
+      pattern: {
+        flags: "i",
+        regex: null,
+        captures: []
+      }
+    }
+  },
+
+  computed: {
+
+    isValid () {
+      return false;
+      // return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.globs = this.value.globs;
+      this.paths = this.value.paths;
+      this.pattern = this.value.pattern;
+    },
+
+    save () {
+      this.$emit('input', this.data);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource.vue b/lib/www/client/source/src/components/project-settings/input-smartsource.vue
new file mode 100644
index 0000000..e1ead07
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-smartsource.vue
@@ -0,0 +1,85 @@
+<template>
+  <dougal-project-settings-file-matching-parameters
+    :value="value" title="Smartsource" subtitle="Smartsource data files location and parameters."
+  >
+  </dougal-project-settings-file-matching-parameters>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsSmartsource",
+
+  components: {
+    DougalProjectSettingsFileMatchingParameters
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  data () {
+    return {
+      tab: null,
+      globs: [],
+      paths: [],
+      pattern: {
+        flags: "i",
+        regex: null,
+        captures: []
+      }
+    }
+  },
+
+  computed: {
+
+    isValid () {
+      return false;
+      // return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.globs = this.value.globs;
+      this.paths = this.value.paths;
+      this.pattern = this.value.pattern;
+    },
+
+    save () {
+      this.$emit('input', this.data);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/name-id.vue b/lib/www/client/source/src/components/project-settings/name-id.vue
new file mode 100644
index 0000000..62c91f1
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/name-id.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-card>
+    <v-card-title>Name &amp; ID</v-card-title>
+    <v-card-subtitle>The survey's name and short ID. The latter must match the value used in ASAQC, if applicable.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="ID"
+          hint="Short survey ID"
+          persistent-hint
+          v-model="id"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Name"
+          hint="Survey name"
+          persistent-hint
+          v-model="name"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsNameId",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      id: "",
+      name: ""
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/not-implemented.vue b/lib/www/client/source/src/components/project-settings/not-implemented.vue
new file mode 100644
index 0000000..9488eb7
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/not-implemented.vue
@@ -0,0 +1,65 @@
+<template>
+  <v-card>
+    <v-card-title>Not implemented</v-card-title>
+    <v-card-text>
+      The code for this configuration section has not yet been implemented.
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        disabled
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        disabled
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsNotImplemented",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+    },
+
+    save () {
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
new file mode 100644
index 0000000..7049c7a
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
@@ -0,0 +1,80 @@
+<template>
+  <dougal-project-settings-regex-pattern-captures
+    v-model="pattern" title="Line name format" subtitle="Format of line names as configured in the navigation system"
+  >
+  </dougal-project-settings-regex-pattern-captures>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalProjectSettingsRegexPatternCaptures from '@/components/project-settings/regex-pattern-captures';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsOnlineLineNameFormat",
+
+  components: {
+    DougalProjectSettingsRegexPatternCaptures
+  },
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      pattern: {
+        flags: "i",
+        regex: null,
+        captures: []
+      }
+    }
+  },
+
+  computed: {
+
+    isValid () {
+      return false;
+      // return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.pattern = {...this.value};
+    },
+
+    save () {
+      this.$emit('input', this.pattern);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/planner.vue b/lib/www/client/source/src/components/project-settings/planner.vue
new file mode 100644
index 0000000..29c1a03
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/planner.vue
@@ -0,0 +1,107 @@
+<template>
+  <v-card>
+    <v-card-title>Planner settings</v-card-title>
+    <v-card-subtitle>Default values when creating new sequences in the planner. These values can then be changed for each individual entry.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Default line change duration"
+          suffix="min"
+          type="number"
+          hint="Expected line change time in minutes"
+          persistent-hint
+          v-model.number="defaultLineChangeDuration"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Default acquisition speed"
+          suffix="kt"
+          type="number"
+          hint="Expected acquisition speed in knots"
+          persistent-hint
+          v-model.number="defaultAcquisitionSpeed"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Overlap before"
+          type="number"
+          hint="Default number of shots to overlap before the FGSP, for reshoots"
+          persistent-hint
+          v-model.number="overlapBefore"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Overlap after"
+          type="number"
+          hint="Default number of shots to overlap after the LGSP, for reshoots"
+          persistent-hint
+          v-model.number="overlapAfter"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsPlanner",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      defaultLineChangeDuration: null,
+      defaultAcquisitionSpeed: null,
+      overlapBefore: null,
+      overlapAfter: null
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/preplots.vue b/lib/www/client/source/src/components/project-settings/preplots.vue
new file mode 100644
index 0000000..a8ad9a1
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/preplots.vue
@@ -0,0 +1,182 @@
+<template>
+  <v-card>
+    <v-card-title>Preplots</v-card-title>
+    <v-card-subtitle>Preplot files location and format.</v-card-subtitle>
+    <v-card-text>
+      <v-tabs v-model="tab">
+        <v-tab v-for="item in preplots">{{tabNameFor(item)}}</v-tab>
+      </v-tabs>
+
+      <v-tabs-items v-model="tab">
+        <v-tab-item v-for="item in preplots">
+          <v-card flat>
+            <v-card-text>
+              <v-form>
+                <v-text-field
+                  label="Path"
+                  v-model="item.path"
+                >
+                  <dougal-file-browser-dialog
+                    slot="append"
+                    v-model="item.path"
+                    :root="value.rootPath"
+                    :mimetypes="[ 'text/plain', '*.sps' ]"
+                  ></dougal-file-browser-dialog>
+                </v-text-field>
+
+                <v-text-field v-if="item.class == 'S'"
+                  class="mb-3"
+                  label="Sailline offset"
+                  prefix="±"
+                  type="number"
+                  hint="The value to add/substract to source lines to get to the corresponding sailline"
+                  v-model.number="item.saillineOffset"
+                >
+                </v-text-field>
+
+                <v-expansion-panels :value="head.length ? 0 : null">
+                <v-expansion-panel>
+                  <v-expansion-panel-header>Column settings</v-expansion-panel-header>
+                  <v-expansion-panel-content>
+                    <dougal-fixed-width-format v-model="item.format" :sample="head">
+                    </dougal-fixed-width-format>
+                  </v-expansion-panel-content>
+                </v-expansion-panel>
+                </v-expansion-panels>
+              </v-form>
+            </v-card-text>
+          </v-card>
+        </v-tab-item>
+      </v-tabs-items>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        :disabled="!isValid"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
+import DougalFixedWidthFormat from './fixed-width-format';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsPreplots",
+
+  components: {
+    DougalFileBrowserDialog,
+    DougalFixedWidthFormat
+  },
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      tab: null,
+      preplots: [],
+      head: ""
+    }
+  },
+
+  computed: {
+
+    currentItem () {
+      if (this.tab !== null) {
+        return this.preplots[this.tab];
+      }
+    },
+
+    isValid () {
+      return this.preplots && this.preplots.every( item => item.format != null );
+    }
+
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    },
+
+    currentItem: {
+      handler (newValue) {
+        if (newValue) {
+          this.getHead();
+        }
+      },
+      deep: true
+    }
+  },
+
+  methods: {
+
+    tabNameFor (item) {
+      switch (item.class) {
+        case "S":
+          return "Source";
+        case "V":
+          return "Vessel";
+        default:
+          return item.class || "?";
+      }
+    },
+
+    async getHead () {
+      if (this.currentItem) {
+        const url = `/files/${this.currentItem.path}`;
+        const init = {
+          text: true,
+          headers: {
+            "Range": "bytes=0-1024"
+          }
+        };
+        this.head = await this.api([url, init]);
+        this.head = this.head?.substring(0, this.head.lastIndexOf("\n")) || "";
+      }
+    },
+
+    reset () {
+      if (!this.value) {
+        return;
+      }
+      this.preplots = JSON.parse(JSON.stringify(this.value.preplots));
+    },
+
+    save () {
+      this.$emit('input', {preplots: [...this.preplots]});
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/production.vue b/lib/www/client/source/src/components/project-settings/production.vue
new file mode 100644
index 0000000..39b3c69
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/production.vue
@@ -0,0 +1,79 @@
+<template>
+  <v-card>
+    <v-card-title>Production settings</v-card-title>
+    <v-card-subtitle></v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Nominal line change duration"
+          hint="Duration of the nominal elapsed time circling between lines, in minutes. If this time is exceeded between one sequence and the next, an entry will be made in the events log"
+          persistent-hint
+          suffix="min"
+          type="number"
+          v-model.number="nominalLineChangeDuration"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsProduction",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      nominalLineChangeDuration: null
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/regex-pattern-captures.vue b/lib/www/client/source/src/components/project-settings/regex-pattern-captures.vue
new file mode 100644
index 0000000..944f6ef
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/regex-pattern-captures.vue
@@ -0,0 +1,117 @@
+<template>
+  <v-card>
+    <v-card-title v-text="title"></v-card-title>
+    <v-card-subtitle v-text="subtitle"></v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          class="mb-5"
+          label="Regular expression"
+          v-model="regex"
+          persistent-hint
+          hint="Regular expression"
+        >
+        </v-text-field>
+
+        <fieldset class="pa-3 mb-5">
+          <legend>Captures</legend>
+
+          <v-text-field v-for="(item, index) in captures" :key="index"
+            v-model="captures[index]"
+          >
+            <v-btn slot="append-outer"
+              fab
+              x-small text
+              dark
+              color="red"
+              title="Remove"
+              @click="() => captures.splice(index, 1)"
+            >
+              <v-icon>mdi-minus</v-icon>
+            </v-btn>
+          </v-text-field>
+          <v-btn
+            class="mx-2"
+            fab dark
+            x-small text
+            color="primary"
+            title="Add capture"
+            @click="() => captures.push('')"
+          >
+            <v-icon dark>mdi-plus</v-icon>
+          </v-btn>
+        </fieldset>
+
+        <v-text-field
+          class="mb-5"
+          label="Flags"
+          v-model="flags"
+          persistent-hint
+          hint="Regular expression modifier flags"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+  </v-card>
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+export default {
+  name: "DougalProjectSettingsRegexPatternCaptures",
+
+  props: [ "value", "title", "subtitle" ],
+
+  data () {
+    return {
+      regex: "",
+      flags: "",
+      captures: []
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    },
+
+    regex () {
+      this.save();
+    },
+
+    flags () {
+      this.save();
+    },
+
+    captures () {
+      this.save();
+    }
+  },
+
+  methods: {
+
+    reset () {
+
+      this.regex = this.value?.regex;
+      this.flags = this.value?.flags;
+      this.captures = this.value?.captures ?? [];
+    },
+
+    save () {
+      this.$emit('input', {regex: this.regex, flags: this.flags, captures: this.captures});
+    },
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 4595dddc2453a58f0c72fb9c7cbb81e6a165673c Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 15:14:15 +0100
Subject: [PATCH 004/113] Add ProjectSettings view

---
 .../source/src/views/ProjectSettings.vue      | 607 ++++++++++++++++++
 1 file changed, 607 insertions(+)
 create mode 100644 lib/www/client/source/src/views/ProjectSettings.vue

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
new file mode 100644
index 0000000..c18b01a
--- /dev/null
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -0,0 +1,607 @@
+<template>
+  <v-container fluid>
+
+    <v-overlay :value="loading && !configuration" absolute>
+      <v-progress-circular
+        indeterminate
+        size="64"
+      ></v-progress-circular>
+    </v-overlay>
+
+    <v-overlay :value="!configuration && !loading" absolute opacity="0.8">
+      <v-row justify="center">
+        <v-alert
+          type="error"
+        >
+          The configuration could not be loaded.
+        </v-alert>
+      </v-row>
+      <v-row justify="center">
+        <v-btn color="primary" @click="getConfiguration">Retry</v-btn>
+      </v-row>
+    </v-overlay>
+
+    <v-row>
+      <v-col>
+        <v-dialog
+          max-width="600px"
+          :value="dialog"
+          @input="closeDialog"
+        >
+          <template v-slot:activator="{ on, attrs }">
+            <v-btn v-if="writeaccess"
+              small
+              color="teal" dark
+              v-bind="attrs"
+              v-on="on"
+              title="Create a new survey based on this one by changing only a few settings"
+            >Clone survey</v-btn>
+          </template>
+          <v-card>
+            <v-card-title>Create a survey based on this one</v-card-title>
+            <v-card-text>
+              <p>Only a subset of fields will be changed.</p>
+              <v-container>
+                <v-row>
+                  <v-col cols="12">
+                  </v-col>
+                </v-row>
+              </v-container>
+            </v-card-text>
+          </v-card>
+        </v-dialog>
+      </v-col>
+    </v-row>
+    <v-row>
+      <v-col cols="4">
+        <v-toolbar
+          dense
+          flat
+        >
+          <v-toolbar-title>
+            Survey configuration
+          </v-toolbar-title>
+        </v-toolbar>
+
+        <v-switch
+          dense
+          label="Active"
+          title="Inactive surveys do not take new data, but changes to the logs can still be made."
+          :disabled="!configuration"
+          v-model="surveyState"
+        ></v-switch>
+
+        <v-treeview
+          dense
+          activatable
+          hoverable
+          :multiple-active="false"
+          :active.sync="active"
+          :open.sync="open"
+          :items="treeview"
+          style="cursor:pointer;"
+        >
+        </v-treeview>
+
+      </v-col>
+
+      <v-col cols="8" v-if="activeComponent">
+        <component :is="activeComponent" :value="activeValues" @input="save" @close="deselect"></component>
+      </v-col>
+      <v-col cols="8" v-else>
+        <v-card>
+          <v-card-text>
+            <p>Select a configuration section to change its settings. When clicking <v-btn small color="primary">Save</v-btn> the changes are immediately saved to the server and start to take effect.</p>
+
+            <v-divider class="my-5"></v-divider>
+
+            <v-alert border="left" type="warning">
+              Be careful when changing configuration settings! It is rather easy to break things.
+            </v-alert>
+
+            <v-alert border="left" type="info">
+              On the first save, the survey will be switched to <em>inactive</em> if not already so. This means that no new data will be read. Remember to switch back to <strong>active</strong> when satisfied with your changes.
+            </v-alert>
+
+            <v-divider class="my-5"></v-divider>
+
+            <p>It is recommended that you download a backup of your configuration before making any changes.</p>
+
+            <v-divider class="my-5"></v-divider>
+
+          </v-card-text>
+          <v-card-actions>
+            <v-btn outlined
+              color="primary"
+              title="Any unsaved changes you might have will be lost."
+              @click="getConfiguration"
+            >
+              <v-icon small left>mdi-cloud-refresh</v-icon>
+              Refresh
+            </v-btn>
+
+            <v-spacer></v-spacer>
+
+            <v-btn
+              class="ml-2"
+              color="primary"
+              :disabled="!configuration"
+              :href="`/api/project/${this.$route.params.project}/configuration?mime=application/yaml`"
+              :download="`${this.$route.params.project}.yaml`"
+            >
+              <v-icon small left>mdi-cloud-download</v-icon>
+              Download
+            </v-btn>
+            <v-dialog
+              max-width="400px"
+            >
+              <template v-slot:activator="{ on, attrs }">
+                <v-btn
+                  class="ml-2"
+                  color="warning"
+                  v-bind="attrs"
+                  v-on="on"
+                >
+                  <v-icon small left>mdi-cloud-upload</v-icon>
+                  Upload
+                </v-btn>
+              </template>
+              <v-card flat>
+                <v-card-text class="pt-5">
+                  <v-file-input
+                    class="mt-4"
+                    show-size
+                    accept="application/json"
+                    label="Select configuration file"
+                    append-outer-icon="mdi-cloud-upload"
+                    @click-append-outer="upload"
+                  ></v-file-input>
+                </v-card-text>
+              </v-card>
+            </v-dialog>
+          </v-card-actions>
+        </v-card>
+      </v-col>
+    </v-row>
+  </v-container>
+</template>
+
+
+<script>
+import { mapActions, mapGetters } from 'vuex';
+
+import DougalProjectSettingsNameId from '@/components/project-settings/name-id';
+import DougalProjectSettingsGroups from '@/components/project-settings/groups';
+import DougalProjectSettingsGeodetics from '@/components/project-settings/geodetics';
+import DougalProjectSettingsBinning from '@/components/project-settings/binning';
+import DougalProjectSettingsFilePath from '@/components/project-settings/file-path';
+import DougalProjectSettingsPreplots from '@/components/project-settings/preplots';
+import DougalProjectSettingsRawP111 from '@/components/project-settings/input-raw-p111';
+import DougalProjectSettingsFinalP111 from '@/components/project-settings/input-final-p111';
+import DougalProjectSettingsRawNTBP from '@/components/project-settings/input-raw-ntbp';
+import DougalProjectSettingsFinalPending from '@/components/project-settings/input-final-pending';
+import DougalProjectSettingsSmartsource from '@/components/project-settings/input-smartsource';
+import DougalProjectSettingsPlanner from '@/components/project-settings/planner';
+import DougalProjectSettingsOnlineLineNameFormat from '@/components/project-settings/online-line-name-format';
+import DougalProjectSettingsASAQC from '@/components/project-settings/asaqc';
+import DougalProjectSettingsProduction from '@/components/project-settings/production';
+// Temporary placeholder component
+import DougalProjectSettingsNotImplemented from '@/components/project-settings/not-implemented';
+
+const components = {
+  name_id:  DougalProjectSettingsNameId,
+  groups: DougalProjectSettingsGroups,
+  geodetics: DougalProjectSettingsGeodetics,
+  binning: DougalProjectSettingsBinning,
+  input_files:  DougalProjectSettingsFilePath,
+  preplots:  DougalProjectSettingsPreplots,
+  //raw_data: DougalProjectSettingsNotImplemented,
+  raw_data_p111: DougalProjectSettingsRawP111,
+  raw_data_smartsource: DougalProjectSettingsSmartsource,
+  raw_data_ntbp: DougalProjectSettingsRawNTBP,
+  //final_data: DougalProjectSettingsNotImplemented,
+  final_data_p111: DougalProjectSettingsFinalP111,
+  final_data_pending: DougalProjectSettingsFinalPending,
+  line_name_format: DougalProjectSettingsOnlineLineNameFormat,
+  planner_settings: DougalProjectSettingsPlanner,
+  logging: DougalProjectSettingsNotImplemented,
+  logging_preset_comments: DougalProjectSettingsNotImplemented,
+  logging_labels: DougalProjectSettingsNotImplemented,
+  asaqc: DougalProjectSettingsASAQC,
+  production: DougalProjectSettingsProduction
+}
+
+export default {
+  name: "DougalProjectSettings",
+
+  data () {
+    return {
+      configuration: null,
+      active: [],
+      open: [],
+      treeview: [
+      /*
+        {
+          id: 0,
+          name: "Archive",
+          values: (cfg) => cfg.archived,
+          save: (data, cfg) => {
+            cfg.archived = data.archived;
+            return cfg;
+          }
+        },
+      */
+        {
+          id: "name_id",
+          name: "Name and ID",
+          values: (obj) => ({
+            id: obj?.id,
+            name: obj?.name
+          }),
+          save: async (data, cfg) => {
+            await this.patch({
+              id: data.id,
+              name: data.name,
+            });
+          }
+        },
+        {
+          id: "groups",
+          name: "Groups",
+          values: (obj) => ({
+            groups: obj?.groups
+          }),
+          save: async (data, cfg) => {
+            await this.patch({
+              groups: data.groups,
+            });
+          }
+        },
+        {
+          id: "geodetics",
+          name: "Geodetics",
+          values: (obj) => ({
+            epsg: obj?.epsg
+          }),
+          save: async (data, cfg) => {
+            await this.patch({
+              epsg: data.epsg
+            });
+          }
+        },
+        {
+          id: "binning",
+          name: "Binning",
+          values: (obj) => {
+            const data = {...obj.binning};
+            data.origin = {...obj.binning.origin};
+            return data;
+          },
+          save: async (data, cfg) => {
+            await this.patch({binning: {...data}});
+          }
+        },
+        {
+          id: "input_files",
+          name: "Input files",
+          values: obj => ({ path: obj.rootPath}),
+          save: async (data, cfg) => {
+            await this.patch({rootPath: data.path});
+          },
+          children: [
+            {
+              id: "preplots",
+              name: "Preplots",
+              values: (obj) => ({
+                preplots: obj.preplots,
+                rootPath: obj.rootPath
+              }),
+              save: async (data, cfg) => {
+                await this.patch({preplots: {...data.preplots}})
+              }
+            },
+            {
+              id: "raw_data",
+              name: "Raw data",
+              children: [
+                {
+                  id: "raw_data_p111",
+                  name: "P1/11",
+                  values: (obj) => ({
+                    rootPath: obj.rootPath,
+                    globs: [...obj.raw.p111.globs],
+                    paths: [...obj.raw.p111.paths],
+                    pattern: structuredClone(obj.raw.p111.pattern)
+                  }),
+                  save: async (data, cfg) => {
+                    await this.patch({raw: {p111: {...data}}});
+                  }
+                },
+                {
+                  id: "raw_data_smartsource",
+                  name: "Smartsource",
+                  values: (obj) => ({
+                    rootPath: obj.rootPath,
+                    globs: [...obj.raw.smsrc.globs],
+                    paths: [...obj.raw.smsrc.paths],
+                    pattern: structuredClone(obj.raw.smsrc.pattern)
+                  }),
+                  save: async (data, cfg) => {
+                    await this.patch({raw: {smsrc: {...data}}});
+                  }
+                },
+                {
+                  id: "raw_data_ntbp",
+                  name: "NTBP detection",
+                  values: (obj) => ({
+                    regex: obj.raw.ntbp?.pattern?.regex,
+                    flags: obj.raw.ntbp?.pattern?.flags
+                  }),
+                  save: async (data, cfg) => {
+                    await this.patch({
+                      raw:{
+                        ntbp: {
+                          pattern: {
+                            regex: data.regex,
+                            flags: data.flags
+                          }
+                        }
+                      }
+                    })
+                  }
+                }
+              ]
+            },
+            {
+              id: "final_data",
+              name: "Final data",
+              children: [
+                {
+                  id: "final_data_p111",
+                  name: "P1/11",
+                  values: (obj) => ({
+                    rootPath: obj.rootPath,
+                    globs: [...obj.final.p111.globs],
+                    paths: [...obj.final.p111.paths],
+                    pattern: structuredClone(obj.final.p111.pattern)
+                  }),
+                  save: async (data, cfg) => {
+                    await this.patch({final: {p111: {...data}}});
+                  }
+                },
+                {
+                  id: "final_data_pending",
+                  name: "Pending line detection",
+                  values: (obj) => ({
+                    regex: obj.final.pending?.pattern?.regex,
+                    flags: obj.final.pending?.pattern?.flags
+                  }),
+                  save: async (data, cfg) => {
+                    await this.patch({
+                      final:{
+                        pending: {
+                          pattern: {
+                            regex: data.regex,
+                            flags: data.flags
+                          }
+                        }
+                      }
+                    })
+                  }
+                }
+              ]
+            },
+          ]
+        },
+        {
+          id: "line_name_format",
+          name: "Line name format",
+          values: (obj) => ({...obj.online?.line?.pattern}),
+          save: async (data, cfg) => {
+            await this.patch({
+              online: {
+                line: {
+                  pattern: {
+                    ...data
+                  }
+                }
+              }
+            });
+          }
+        },
+        {
+          id: "planner_settings",
+          name: "Planner settings",
+          values: (obj) => ({...obj.planner}),
+          save: async (data, cfg) => {
+            await this.patch({
+              planner: {...data}
+            });
+          }
+        },
+        {
+          id: "production",
+          name: "Production settings",
+          values: (obj) => ({...obj.production}),
+          save: async (data, cfg) => {
+            await this.patch({
+              production: {...data}
+            });
+          }
+        },
+        {
+          id: "logging",
+          name: "Logging",
+          children: [
+            {
+              id: "logging_preset_comments",
+              name: "Preset comments"
+            },
+            {
+              id: "logging_labels",
+              name: "Labels"
+            }
+          ]
+        },
+        {
+          id: "cloud_apis",
+          name: "Cloud APIs",
+          children: [
+            {
+              id: "asaqc",
+              name: "ASAQC",
+              values: (obj) => ({...obj.asaqc}),
+              save: async (data, cfg) => {
+                await this.patch({asaqc: {...cfg}});
+              }
+            }
+          ]
+        }
+      ],
+
+      dialog: false
+    };
+  },
+
+  watch: {
+    active (cur, prev) {
+      if (cur == prev) {
+        return;
+      }
+
+      console.log("Current", cur);
+      console.log("Item", this.activeItem);
+      console.log("Component", this.activeComponent);
+      if (!this.activeComponent && this.activeItem?.children?.length) {
+        // Automatically expand this item
+        if (!this.open.includes(cur)) {
+          this.open.push(cur);
+        }
+        this.$nextTick( () => {
+          const idx = this.active.findIndex(i => i == cur);
+          if (idx != -1) {
+            this.active.push(this.activeItem.children[0].id);
+            this.active.splice(cur, 1);
+          }
+        });
+      }
+
+    }
+  },
+
+  computed: {
+
+    activeComponent () {
+      return components[this.active[0]];
+    },
+
+    activeItem () {
+      function walk (tree) {
+        const list = [];
+        for (const leaf of tree) {
+          if (leaf.children) {
+            list.push(...walk(leaf.children));
+          }
+          list.push(leaf);
+        }
+        return list;
+      }
+      return walk(this.treeview).find(i => i.id === this.active[0]);
+    },
+
+    activeValues () {
+      return this.activeItem?.values &&
+        this.activeItem.values(this.configuration);
+    },
+
+    surveyState: {
+      get () {
+        return this.configuration && !this.configuration.archived;
+      },
+
+      async set (value) {
+        if (this.configuration) {
+          await this.patch({archived: !value});
+          // this.configuration.archived = !value;
+        }
+      }
+    },
+
+    ...mapGetters(['user', 'writeaccess', 'loading', 'serverEvent'])
+  },
+
+  methods: {
+
+    async getConfiguration () {
+      this.configuration = null;
+      const url = `/project/${this.$route.params.project}/configuration/`;
+      this.configuration = await this.api([url]);
+    },
+
+    makeTree (obj, id=0) {
+      const isObject = typeof obj === "object" && !Array.isArray(obj) && obj !== null;
+      return isObject
+        ? Object.keys(obj).map(k => {
+          const children = this.makeTree(obj[k], id); //.filter(i => i !== null);
+          return {
+            id: id++,
+            name: k,
+            children
+          }
+        })
+        : null;
+    },
+
+    deselect () {
+      this.active.pop();
+    },
+
+    async save (data) {
+      console.log("SAVING", data);
+      if (this.activeItem?.save) {
+        await this.activeItem.save(data, this.configuration);
+        /*
+        const cfg = this.activeItem.save(data, this.configuration);
+        this.configuration = {...cfg};
+
+        this.surveyState = false;
+        */
+        // TODO And now push to the server
+      }
+    },
+
+    async patch (data) {
+      const url = `/project/${this.$route.params.project}/configuration/`;
+      const init = {
+        method: "PATCH",
+        body: data
+      };
+      const callback = async (err, res) => {
+        if (!err && res.ok) {
+          this.showSnack(["Configuration saved", "success"]);
+        }
+      };
+
+      const refreshedConfiguration = await this.api([url, init, callback]);
+      if (refreshedConfiguration) {
+        this.configuration == refreshedConfiguration;
+      }
+    },
+
+    upload () {
+      console.log("UPLOAD");
+    },
+
+    closeDialog () {
+    },
+
+    ...mapActions(["api", "showSnack"])
+
+  },
+
+  async mounted () {
+    this.getConfiguration();
+  },
+
+}
+</script>

From 3d42ce6fbc10c85d2ae00216545402689cf91673 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 15:25:45 +0100
Subject: [PATCH 005/113] =?UTF-8?q?Add=20context=20menu=20with=20=E2=80=98?=
 =?UTF-8?q?Edit=20project=20settings=E2=80=99=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/source/src/views/ProjectList.vue   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/www/client/source/src/views/ProjectList.vue b/lib/www/client/source/src/views/ProjectList.vue
index 8594057..009b5c2 100644
--- a/lib/www/client/source/src/views/ProjectList.vue
+++ b/lib/www/client/source/src/views/ProjectList.vue
@@ -6,6 +6,7 @@
     :items="displayItems"
     :options.sync="options"
     :loading="loading"
+    @contextmenu:row="contextMenu"
     >
 
       <template v-slot:item.pid="{item, value}">
@@ -54,6 +55,21 @@
 
     </v-data-table>
 
+    <v-menu v-if="adminaccess"
+      v-model="contextMenuShow"
+      :position-x="contextMenuX"
+      :position-y="contextMenuY"
+      absolute
+      offset-y
+    >
+      <v-list dense v-if="contextMenuItem">
+        <v-list-item :href="`${contextMenuItem.pid}/configuration`">
+          <v-list-item-icon><v-icon>mdi-file-document-edit-outline</v-icon></v-list-item-icon>
+          <v-list-item-title class="warning--text">Edit project settings</v-list-item-title>
+        </v-list-item>
+      </v-list>
+    </v-menu>
+
   </v-container>
 </template>
 
@@ -106,6 +122,11 @@ export default {
 
       showArchived: true,
 
+      // Context menu stuff
+      contextMenuShow: false,
+      contextMenuX: 0,
+      contextMenuY: 0,
+      contextMenuItem: null
     }
   },
 
@@ -156,6 +177,15 @@ export default {
       }
     },
 
+    contextMenu (e, {item}) {
+      e.preventDefault();
+      this.contextMenuShow = false;
+      this.contextMenuX = e.clientX;
+      this.contextMenuY = e.clientY;
+      this.contextMenuItem = item;
+      this.$nextTick( () => this.contextMenuShow = true );
+    },
+
     ...mapActions(["api"])
   },
 

From f157f49312ed5bf46fd420d698aaafe02c379842 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 15:27:40 +0100
Subject: [PATCH 006/113] Use project list from Vuex

---
 lib/www/client/source/src/views/ProjectList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectList.vue b/lib/www/client/source/src/views/ProjectList.vue
index 009b5c2..97d9070 100644
--- a/lib/www/client/source/src/views/ProjectList.vue
+++ b/lib/www/client/source/src/views/ProjectList.vue
@@ -151,8 +151,9 @@ export default {
   },
 
   methods: {
+
     async list () {
-      this.items = await this.api(["/project"]) || [];
+      this.items = [...this.projects];
     },
 
     async summary (item) {

From 1b85b5cd4bad955d6eff2fb7d2d8ca056dc9bb14 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:15:02 +0100
Subject: [PATCH 007/113] Remove cloning control stub.

Cloning takes place from the project list, we don't really need
to duplicate that functionality here for the time being.
---
 .../source/src/views/ProjectSettings.vue      | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index c18b01a..7a547f9 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -21,37 +21,6 @@
       </v-row>
     </v-overlay>
 
-    <v-row>
-      <v-col>
-        <v-dialog
-          max-width="600px"
-          :value="dialog"
-          @input="closeDialog"
-        >
-          <template v-slot:activator="{ on, attrs }">
-            <v-btn v-if="writeaccess"
-              small
-              color="teal" dark
-              v-bind="attrs"
-              v-on="on"
-              title="Create a new survey based on this one by changing only a few settings"
-            >Clone survey</v-btn>
-          </template>
-          <v-card>
-            <v-card-title>Create a survey based on this one</v-card-title>
-            <v-card-text>
-              <p>Only a subset of fields will be changed.</p>
-              <v-container>
-                <v-row>
-                  <v-col cols="12">
-                  </v-col>
-                </v-row>
-              </v-container>
-            </v-card-text>
-          </v-card>
-        </v-dialog>
-      </v-col>
-    </v-row>
     <v-row>
       <v-col cols="4">
         <v-toolbar

From b4aed529766b59c74658a1c7ccdc2db62762f6f9 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:25:26 +0100
Subject: [PATCH 008/113] Add project settings cloning component.

Asks for the new ID, name and root file path.
---
 .../project-settings/name-id-rootpath.vue     | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 lib/www/client/source/src/components/project-settings/name-id-rootpath.vue

diff --git a/lib/www/client/source/src/components/project-settings/name-id-rootpath.vue b/lib/www/client/source/src/components/project-settings/name-id-rootpath.vue
new file mode 100644
index 0000000..43ead5f
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/name-id-rootpath.vue
@@ -0,0 +1,101 @@
+<template>
+  <v-card>
+    <v-card-title>Files</v-card-title>
+    <v-card-subtitle>File path configuration for this project.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="ID"
+          hint="Short survey ID"
+          persistent-hint
+          v-model="id"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Name"
+          hint="Survey name"
+          persistent-hint
+          v-model="name"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Project folder"
+          hint="Root file path for this project"
+          persistent-hint
+          v-model="path"
+        >
+          <dougal-file-browser-dialog
+            slot="append"
+            v-model="path"
+            mimetypes="inode/directory"
+          ></dougal-file-browser-dialog>
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
+
+export default {
+  name: "DougalProjectSettingsNameIdRootpath",
+
+  components: { DougalFileBrowserDialog },
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      id: "",
+      name: "",
+      path: ""
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 15242de2d95a58198311f587a789605138ab08ec Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:29:35 +0100
Subject: [PATCH 009/113] Add configuration settings tab to project navigation
 bar.

Only for admin users.
---
 .../src/components/app-bar-extension-project.vue     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/components/app-bar-extension-project.vue b/lib/www/client/source/src/components/app-bar-extension-project.vue
index 5ac8907..5bf35c7 100644
--- a/lib/www/client/source/src/components/app-bar-extension-project.vue
+++ b/lib/www/client/source/src/components/app-bar-extension-project.vue
@@ -1,6 +1,15 @@
 <template>
-  <v-tabs :value="tab" show-arrows>
+  <v-tabs :value="tab" show-arrows v-if="page != 'configuration'">
     <v-tab v-for="tab, index in tabs" :key="index" link :to="tabLink(tab.href)" v-text="tab.text"></v-tab>
+    <template v-if="adminaccess">
+      <v-spacer></v-spacer>
+      <v-tab :to="tabLink('configuration')" class="orange--text darken-3" title="Edit project settings"><v-icon small left color="orange darken-3">mdi-cog-outline</v-icon> Settings</v-tab>
+    </template>
+  </v-tabs>
+  <v-tabs optional :value="0" show-arrows align-with-title v-else>
+    <v-tab>Project settings</v-tab>
+    <v-spacer></v-spacer>
+    <v-tab :to="tabLink('summary')">Go to project</v-tab>
   </v-tabs>
 </template>
 
@@ -35,6 +44,7 @@ export default {
       return this.tabs.findIndex(t => t.href == this.page);
     },
 
+    ...mapGetters(["adminaccess"])
   },
 
   methods: {

From 2131cdf0c16f51ec019d6d5655d7e175656fba82 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:32:47 +0100
Subject: [PATCH 010/113] Add project cloning option to ProjectList

---
 .../client/source/src/views/ProjectList.vue   | 162 +++++++++++++++++-
 1 file changed, 161 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectList.vue b/lib/www/client/source/src/views/ProjectList.vue
index 97d9070..52944a8 100644
--- a/lib/www/client/source/src/views/ProjectList.vue
+++ b/lib/www/client/source/src/views/ProjectList.vue
@@ -67,9 +67,26 @@
           <v-list-item-icon><v-icon>mdi-file-document-edit-outline</v-icon></v-list-item-icon>
           <v-list-item-title class="warning--text">Edit project settings</v-list-item-title>
         </v-list-item>
+        <v-divider></v-divider>
+        <v-list-item @click="cloneDialogOpen = true">
+          <v-list-item-icon><v-icon>mdi-sheep</v-icon></v-list-item-icon>
+          <v-list-item-title class="warning--text">Clone project</v-list-item-title>
+        </v-list-item>
       </v-list>
     </v-menu>
 
+    <v-dialog
+      v-model="cloneDialogOpen"
+      max-width="600"
+    >
+      <dougal-project-settings-name-id-rootpath
+        v-model="cloneProjectDetails"
+        @input="cloneProject"
+        @close="cloneDialogOpen = false"
+      >
+      </dougal-project-settings-name-id-rootpath>
+    </v-dialog>
+
   </v-container>
 </template>
 
@@ -81,10 +98,15 @@ td p:last-of-type {
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
+import DougalProjectSettingsNameIdRootpath from '@/components/project-settings/name-id-rootpath'
 
 export default {
   name: "ProjectList",
 
+  components: {
+    DougalProjectSettingsNameIdRootpath
+  },
+
   data () {
     return {
       headers: [
@@ -120,8 +142,17 @@ export default {
       items: [],
       options: {},
 
+      // Whether or not to show archived projects
       showArchived: true,
 
+      // Cloned project stuff (admin only)
+      cloneDialogOpen: false,
+      cloneProjectDetails: {
+        name: null,
+        id: null,
+        path: null
+      },
+
       // Context menu stuff
       contextMenuShow: false,
       contextMenuX: 0,
@@ -187,7 +218,136 @@ export default {
       this.$nextTick( () => this.contextMenuShow = true );
     },
 
-    ...mapActions(["api"])
+
+    async cloneProject () {
+
+      /* Plan of action:
+       * 1. Pop up dialogue asking for new project name, ID and root path
+       * 2. Get source project configuration
+       * 3. Blank out non-clonable parameters (ASAQC, …)
+       * 4. Rewrite paths prefixed with source rootPath with dest rootPath
+       * 5. Replace name, ID and rootPath
+       * 6. Set archived=true
+       * 7. POST new project
+       * 8. Redirect to new project settings page
+       */
+
+      // 1. Pop up dialogue asking for new project name, ID and root path
+      // (already done, that's why we're here)
+
+      const pid = this.contextMenuItem?.pid;
+
+      if (!pid) return;
+
+      const tpl = this.cloneProjectDetails; // Shorter
+
+      if (!tpl.id || !tpl.name || !tpl.path) {
+        this.showSnack(["Missing project details. Cannot proceed", "warning"]);
+        return;
+      }
+
+      this.cloneDialogOpen = false;
+
+      /** Drills down an object and applies function fn(obj, key)
+       * on each recursive property [...keys].
+       */
+      function drill (obj, keys, fn) {
+        if (obj) {
+          if (Array.isArray(keys)) {
+            if (keys.length) {
+              const key = keys.shift();
+
+              if (keys.length == 0 && key != "*") { // After shift()
+                if (typeof fn == "function") {
+                  fn(obj, key);
+                }
+              }
+
+              if (key == "*") {
+                // Iterate through this object's keys
+                if (keys.length) {
+                  for (const k in obj) {
+                    drill(obj[k], [...keys], fn);
+                  }
+                } else {
+                  for (const k in obj) {
+                    drill(obj, [k], fn);
+                  }
+                }
+              } else {
+                drill(obj[key], keys, fn);
+              }
+            }
+          }
+        }
+      }
+
+      // 2. Get source project configuration
+      const src = await this.api([`/project/${pid}/configuration`]);
+
+      const blankList = [ "id", "name", "schema", "asaqc.id", "archived" ];
+
+      const prjPaths = [
+        "preplots.*.path",
+        "raw.p111.paths.*",
+        "raw.p190.paths.*",
+        "raw.smsrc.paths.*",
+        "final.p111.paths.*",
+        "final.p190.paths.*",
+        "qc.definitions",
+        "qc.parameters",
+        "imports.map.layers.*.*.path",
+        "rootPath" // Needs to go last because of lazy replacer() implementation below
+      ];
+
+      // Technically don't need this
+      const deleter = (obj, key) => {
+        delete obj[key];
+      }
+
+      const replacer = (obj, key) => {
+        if (src.rootPath && tpl.path) {
+          if (obj[key].startsWith(src.rootPath)) {
+            obj[key] = obj[key].replace(src.rootPath, tpl.path);
+          }
+        }
+      }
+
+      // 3. Blank out non-clonable parameters (ASAQC, …)
+      blankList.forEach( i => drill(src, i.split("."), deleter) );
+
+      // 4. Rewrite paths prefixed with source rootPath with dest rootPath
+      prjPaths.forEach( i => drill(src, i.split("."), replacer) );
+
+      // 5. Replace name, ID and rootPath
+      // Could use deepMerge, but meh!
+      src.name = tpl.name;
+      src.id = tpl.id;
+
+      // 6. Set archived=true
+      src.archived = true;
+
+      // 7. POST new project
+
+      const init = {
+        method: "POST",
+        body: src
+      };
+      const cb = (err, res) => {
+        if (!err && res) {
+          if (res.status == "201") {
+            // 8. Redirect to new project settings page
+            const settingsUrl = `/projects/${tpl.id.toLowerCase()}/configuration`;
+            this.$router.push(settingsUrl);
+
+          }
+        }
+      };
+      await this.api(["/project", init, cb]);
+
+    },
+
+    ...mapActions(["api", "showSnack"])
   },
 
   mounted () {

From be904d8a006c8609134286e2061e3f3dfd56c681 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:33:52 +0100
Subject: [PATCH 011/113] =?UTF-8?q?Add=20=E2=80=98groups=E2=80=99=20column?=
 =?UTF-8?q?=20to=20ProjectList=20table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/www/client/source/src/views/ProjectList.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/www/client/source/src/views/ProjectList.vue b/lib/www/client/source/src/views/ProjectList.vue
index 52944a8..da7d2e9 100644
--- a/lib/www/client/source/src/views/ProjectList.vue
+++ b/lib/www/client/source/src/views/ProjectList.vue
@@ -23,6 +23,13 @@
         </template>
       </template>
 
+      <template v-slot:item.groups="{item, value}">
+        <v-chip v-for="group in value"
+          label
+          small
+        >{{ group }}</v-chip>
+      </template>
+
       <template v-slot:item.shots="{item}">
         {{ item.total ? (item.prime + item.other) : "" }}
       </template>
@@ -118,6 +125,10 @@ export default {
           value: "name",
           text: "Name"
         },
+        {
+          value: "groups",
+          text: "Groups"
+        },
         {
           value: "lines",
           text: "Lines"

From 1801fdb052558a04b77c357dedfc07ba49038df5 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:35:35 +0100
Subject: [PATCH 012/113] Add project creation details component.

This is not usable at the moment as the backend requires even
more details, such as binning parameters, which this dialogue
does not provide.

It might be a matter of relaxing the rules on the backend or,
perhaps more likely, rethinking the project creation / editing
frontend. Maybe refactoring the frontend so that saves are done
in one go for the whole configuration as opposed to piecemeal as
currently done might make it easier to work on a configuration
(especially a new one) fully offline.
---
 .../project-settings/name-id-geodetics.vue    | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 lib/www/client/source/src/components/project-settings/name-id-geodetics.vue

diff --git a/lib/www/client/source/src/components/project-settings/name-id-geodetics.vue b/lib/www/client/source/src/components/project-settings/name-id-geodetics.vue
new file mode 100644
index 0000000..cfd9da5
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/name-id-geodetics.vue
@@ -0,0 +1,94 @@
+<template>
+  <v-card>
+    <v-card-title>Name, ID &amp; geodetics</v-card-title>
+    <v-card-subtitle>The survey's name, short ID and EPSG code. This is the minimum required to create a new survey. <b>These values cannot be changed once the project has been created!</b></v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="ID"
+          hint="Short survey ID"
+          persistent-hint
+          v-model="id"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Name"
+          hint="Survey name"
+          persistent-hint
+          v-model="name"
+        >
+        </v-text-field>
+        <v-text-field
+          label="EPSG code"
+          hint="EPSG code of the project's coordinate reference system"
+          persistent-hint
+          type="number"
+          v-model.number="epsg"
+        >
+        </v-text-field>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalProjectSettingsNameIdGeodetics",
+
+  props: [ "value" ],
+
+  data () {
+    return {
+      id: "",
+      name: "",
+      epsg: null
+    }
+  },
+
+  watch: {
+    value (newValue) {
+      this.reset();
+    }
+  },
+
+  methods: {
+
+    reset () {
+      for (const key of Object.keys(this.$data)) {
+        this[key] = this.value[key];
+      }
+    },
+
+    save () {
+      this.$emit('input', {...this.$data});
+    },
+
+    back () {
+      this.$emit('close');
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 402a3f9cce3801d598e5b0104db226f6035884da Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 29 Oct 2023 19:40:07 +0100
Subject: [PATCH 013/113] =?UTF-8?q?Add=20code=20for=20a=20=E2=80=98new=20p?=
 =?UTF-8?q?roject=E2=80=99=20button=20to=20project=20list=20navigation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is currently disabled though (value in route/index.js is
commented out) as it is not possible at the moment to create
new projects fully from scratch from the frontend. See comment
on previous commit.

NB: projects may be created fully from scratch by making an API
request with a suitable YAML / JSON configuration file, thusly:

curl -vs "https://[hostname]/api/project" -X POST \
    -H "Content-Type: application/yaml"
    --data-binary @/path/to/configuration.yaml
---
 .../app-bar-extension-project-list.vue        | 85 +++++++++++++++++++
 lib/www/client/source/src/router/index.js     | 12 ++-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 lib/www/client/source/src/components/app-bar-extension-project-list.vue

diff --git a/lib/www/client/source/src/components/app-bar-extension-project-list.vue b/lib/www/client/source/src/components/app-bar-extension-project-list.vue
new file mode 100644
index 0000000..fb2b252
--- /dev/null
+++ b/lib/www/client/source/src/components/app-bar-extension-project-list.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-dialog
+    v-model="dialogOpen"
+    @input="(e) => $emit('input', e)"
+    max-width="600"
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <v-btn v-if="adminaccess"
+        title="Create a new project from scratch. Generally, it's preferable to clone an existing project (right-click → ‘Clone’)"
+        small
+        outlined
+        color="warning"
+        v-bind="attrs"
+        v-on="on"
+      >
+        <span>Create new project</span>
+        <v-icon right small>mdi-file-document-plus-outline</v-icon>
+      </v-btn>
+    </template>
+
+    <dougal-project-settings-name-id-geodetics
+      :value="newProjectDetails"
+      @input="save"
+      @close="dialogOpen = false"
+    >
+    </dougal-project-settings-name-id-geodetics>
+
+  </v-dialog>
+</template>
+
+<script>
+import { mapActions, mapGetters } from 'vuex';
+import DougalProjectSettingsNameIdGeodetics from '@/components/project-settings/name-id-geodetics'
+
+export default {
+  name: 'DougalAppBarExtensionProjectList',
+
+  components: {
+    DougalProjectSettingsNameIdGeodetics
+  },
+
+  data() {
+    return {
+      dialogOpen: false,
+      newProjectDetails: {
+        name: null,
+        id: null,
+        epsg: null
+      }
+    };
+  },
+
+  computed: {
+    ...mapGetters(["adminaccess"])
+  },
+
+  methods: {
+    async save (data) {
+      this.dialogOpen = false;
+      data.archived = true; // Make the project inactive to start with
+      console.log("POST the new project data");
+      console.log(data);
+
+      const init = {
+        method: "POST",
+        body: data
+      };
+      const cb = (err, res) => {
+        if (!err && res) {
+          console.log(res);
+          if (res.status == "201") {
+            // Redirect to new project settings page
+            const settingsUrl = `/projects/${data.id.toLowerCase()}/configuration`;
+            this.$router.push(settingsUrl);
+
+          }
+        }
+      };
+      await this.api(["/project", init, cb]);
+    },
+
+    ...mapActions(["api"])
+  }
+}
+</script>
diff --git a/lib/www/client/source/src/router/index.js b/lib/www/client/source/src/router/index.js
index 199eae7..4cc2ddb 100644
--- a/lib/www/client/source/src/router/index.js
+++ b/lib/www/client/source/src/router/index.js
@@ -16,7 +16,9 @@ import Log from '../views/Log.vue'
 import QC from '../views/QC.vue'
 import Graphs from '../views/Graphs.vue'
 import Map from '../views/Map.vue'
+import ProjectSettings from '../views/ProjectSettings.vue'
 import DougalAppBarExtensionProject from '../components/app-bar-extension-project'
+import DougalAppBarExtensionProjectList from '../components/app-bar-extension-project-list'
 
 Vue.use(VueRouter)
 
@@ -80,7 +82,10 @@ Vue.use(VueRouter)
     meta: {
       breadcrumbs: [
         { text: "Projects", href: "/projects", disabled: true }
-      ]
+      ],
+      appBarExtension: {
+        // component: DougalAppBarExtensionProjectList
+      }
     }
   },
   {
@@ -168,6 +173,11 @@ Vue.use(VueRouter)
         path: "map",
         name: "map",
         component: Map
+      },
+      {
+        path: "configuration",
+        name: "configuration",
+        component: ProjectSettings
       }
     ]
   }

From a55d2cc6fc730885dcb31b3e63dfba9360aab5ba Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 2 Nov 2023 20:15:51 +0100
Subject: [PATCH 014/113] Update database templates to v0.4.5

---
 etc/db/database-version.sql |   4 +-
 etc/db/schema-template.sql  | 115 +++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/etc/db/database-version.sql b/etc/db/database-version.sql
index d4530ce..15ae342 100644
--- a/etc/db/database-version.sql
+++ b/etc/db/database-version.sql
@@ -1,5 +1,5 @@
 \connect dougal
 
-INSERT INTO public.info VALUES ('version', '{"db_schema": "0.4.2"}')
+INSERT INTO public.info VALUES ('version', '{"db_schema": "0.4.5"}')
 ON CONFLICT (key) DO UPDATE
-	SET value = public.info.value || '{"db_schema": "0.4.2"}' WHERE public.info.key = 'version';
+	SET value = public.info.value || '{"db_schema": "0.4.5"}' WHERE public.info.key = 'version';
diff --git a/etc/db/schema-template.sql b/etc/db/schema-template.sql
index 0f6ed68..02726e7 100644
--- a/etc/db/schema-template.sql
+++ b/etc/db/schema-template.sql
@@ -399,6 +399,62 @@ $$;
 
 ALTER FUNCTION _SURVEY__TEMPLATE_.clear_shot_qc() OWNER TO postgres;
 
+--
+-- Name: event_log_uid_seq; Type: SEQUENCE; Schema: _SURVEY__TEMPLATE_; Owner: postgres
+--
+
+CREATE SEQUENCE _SURVEY__TEMPLATE_.event_log_uid_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE _SURVEY__TEMPLATE_.event_log_uid_seq OWNER TO postgres;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: event_log_full; Type: TABLE; Schema: _SURVEY__TEMPLATE_; Owner: postgres
+--
+
+CREATE TABLE _SURVEY__TEMPLATE_.event_log_full (
+    uid integer DEFAULT nextval('_SURVEY__TEMPLATE_.event_log_uid_seq'::regclass) NOT NULL,
+    id integer NOT NULL,
+    tstamp timestamp with time zone,
+    sequence integer,
+    point integer,
+    remarks text DEFAULT ''::text NOT NULL,
+    labels text[] DEFAULT ARRAY[]::text[] NOT NULL,
+    meta jsonb DEFAULT '{}'::jsonb NOT NULL,
+    validity tstzrange NOT NULL,
+    CONSTRAINT event_log_full_check CHECK ((((tstamp IS NOT NULL) AND (sequence IS NOT NULL) AND (point IS NOT NULL)) OR ((tstamp IS NOT NULL) AND (sequence IS NULL) AND (point IS NULL)) OR ((tstamp IS NULL) AND (sequence IS NOT NULL) AND (point IS NOT NULL)))),
+    CONSTRAINT event_log_full_validity_check CHECK ((NOT isempty(validity)))
+);
+
+
+ALTER TABLE _SURVEY__TEMPLATE_.event_log_full OWNER TO postgres;
+
+--
+-- Name: event_log_changes(timestamp with time zone); Type: FUNCTION; Schema: _SURVEY__TEMPLATE_; Owner: postgres
+--
+
+CREATE FUNCTION _SURVEY__TEMPLATE_.event_log_changes(ts0 timestamp with time zone) RETURNS SETOF _SURVEY__TEMPLATE_.event_log_full
+    LANGUAGE sql
+    AS $$
+		SELECT *
+		FROM event_log_full
+		WHERE lower(validity) > ts0 OR upper(validity) IS NOT NULL AND upper(validity) > ts0
+		ORDER BY lower(validity);
+	$$;
+
+
+ALTER FUNCTION _SURVEY__TEMPLATE_.event_log_changes(ts0 timestamp with time zone) OWNER TO postgres;
+
 --
 -- Name: event_log_full_insert(); Type: FUNCTION; Schema: _SURVEY__TEMPLATE_; Owner: postgres
 --
@@ -881,46 +937,6 @@ $$;
 
 ALTER FUNCTION _SURVEY__TEMPLATE_.ij_error(line double precision, point double precision, geom public.geometry) OWNER TO postgres;
 
---
--- Name: event_log_uid_seq; Type: SEQUENCE; Schema: _SURVEY__TEMPLATE_; Owner: postgres
---
-
-CREATE SEQUENCE _SURVEY__TEMPLATE_.event_log_uid_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
-ALTER TABLE _SURVEY__TEMPLATE_.event_log_uid_seq OWNER TO postgres;
-
-SET default_tablespace = '';
-
-SET default_table_access_method = heap;
-
---
--- Name: event_log_full; Type: TABLE; Schema: _SURVEY__TEMPLATE_; Owner: postgres
---
-
-CREATE TABLE _SURVEY__TEMPLATE_.event_log_full (
-    uid integer DEFAULT nextval('_SURVEY__TEMPLATE_.event_log_uid_seq'::regclass) NOT NULL,
-    id integer NOT NULL,
-    tstamp timestamp with time zone,
-    sequence integer,
-    point integer,
-    remarks text DEFAULT ''::text NOT NULL,
-    labels text[] DEFAULT ARRAY[]::text[] NOT NULL,
-    meta jsonb DEFAULT '{}'::jsonb NOT NULL,
-    validity tstzrange NOT NULL,
-    CONSTRAINT event_log_full_check CHECK ((((tstamp IS NOT NULL) AND (sequence IS NOT NULL) AND (point IS NOT NULL)) OR ((tstamp IS NOT NULL) AND (sequence IS NULL) AND (point IS NULL)) OR ((tstamp IS NULL) AND (sequence IS NOT NULL) AND (point IS NOT NULL)))),
-    CONSTRAINT event_log_full_validity_check CHECK ((NOT isempty(validity)))
-);
-
-
-ALTER TABLE _SURVEY__TEMPLATE_.event_log_full OWNER TO postgres;
-
 --
 -- Name: event_log; Type: VIEW; Schema: _SURVEY__TEMPLATE_; Owner: postgres
 --
@@ -1519,9 +1535,9 @@ CREATE VIEW _SURVEY__TEMPLATE_.final_lines_summary AS
     s.ts1,
     (s.ts1 - s.ts0) AS duration,
     s.num_points,
-    ( SELECT count(*) AS count
-      FROM _SURVEY__TEMPLATE_.missing_sequence_final_points
-      WHERE missing_sequence_final_points.sequence = s.sequence) AS missing_shots,
+    (( SELECT count(*) AS count
+           FROM _SURVEY__TEMPLATE_.preplot_points
+          WHERE ((preplot_points.line = fl.line) AND (((preplot_points.point >= s.fsp) AND (preplot_points.point <= s.lsp)) OR ((preplot_points.point >= s.lsp) AND (preplot_points.point <= s.fsp))))) - s.num_points) AS missing_shots,
     s.length,
     s.azimuth,
     fl.remarks,
@@ -2077,10 +2093,10 @@ CREATE VIEW _SURVEY__TEMPLATE_.preplot_summary AS
 ALTER TABLE _SURVEY__TEMPLATE_.preplot_summary OWNER TO postgres;
 
 --
--- Name: project_summary; Type: VIEW; Schema: _SURVEY__TEMPLATE_; Owner: postgres
+-- Name: project_summary; Type: MATERIALIZED VIEW; Schema: _SURVEY__TEMPLATE_; Owner: postgres
 --
 
-CREATE VIEW _SURVEY__TEMPLATE_.project_summary AS
+CREATE MATERIALIZED VIEW _SURVEY__TEMPLATE_.project_summary AS
  WITH fls AS (
          SELECT avg((final_lines_summary.duration / ((final_lines_summary.num_points - 1))::double precision)) AS shooting_rate,
             avg((final_lines_summary.length / date_part('epoch'::text, final_lines_summary.duration))) AS speed,
@@ -2123,7 +2139,8 @@ CREATE VIEW _SURVEY__TEMPLATE_.project_summary AS
     fls.speed AS shooting_rate
    FROM _SURVEY__TEMPLATE_.preplot_summary ps,
     fls,
-    project;
+    project
+  WITH NO DATA;
 
 
 ALTER TABLE _SURVEY__TEMPLATE_.project_summary OWNER TO postgres;
@@ -2168,9 +2185,9 @@ CREATE VIEW _SURVEY__TEMPLATE_.raw_lines_summary AS
     (s.ts1 - s.ts0) AS duration,
     s.num_points,
     s.num_preplots,
-    (SELECT count(*) AS count
-      FROM _SURVEY__TEMPLATE_.missing_sequence_raw_points
-      WHERE missing_sequence_raw_points.sequence = s.sequence) AS missing_shots,
+    (( SELECT count(*) AS count
+           FROM _SURVEY__TEMPLATE_.preplot_points
+          WHERE ((preplot_points.line = rl.line) AND (((preplot_points.point >= s.fsp) AND (preplot_points.point <= s.lsp)) OR ((preplot_points.point >= s.lsp) AND (preplot_points.point <= s.fsp))))) - s.num_preplots) AS missing_shots,
     s.length,
     s.azimuth,
     rl.remarks,

From 4486fc4afc02b1758890d07daae6148cf32dd296 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 2 Nov 2023 20:44:07 +0100
Subject: [PATCH 015/113] Improve contrast of new group item

---
 lib/www/client/source/src/components/project-settings/groups.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/www/client/source/src/components/project-settings/groups.vue b/lib/www/client/source/src/components/project-settings/groups.vue
index fa3fb5a..31bcbaa 100644
--- a/lib/www/client/source/src/components/project-settings/groups.vue
+++ b/lib/www/client/source/src/components/project-settings/groups.vue
@@ -20,6 +20,7 @@
               <small>New group: </small>
               <v-chip class="ml-3"
                 :color="`grey lighten-2`"
+                light
                 label
                 small
               >

From 544c4ead76897314cfb50f940fcadc0b30ce5fae Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 2 Nov 2023 20:46:26 +0100
Subject: [PATCH 016/113] Remove trailing slash from URL

---
 lib/www/client/source/src/views/ProjectSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 7a547f9..0327fc1 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -503,7 +503,7 @@ export default {
 
     async getConfiguration () {
       this.configuration = null;
-      const url = `/project/${this.$route.params.project}/configuration/`;
+      const url = `/project/${this.$route.params.project}/configuration`;
       this.configuration = await this.api([url]);
     },
 
@@ -540,7 +540,7 @@ export default {
     },
 
     async patch (data) {
-      const url = `/project/${this.$route.params.project}/configuration/`;
+      const url = `/project/${this.$route.params.project}/configuration`;
       const init = {
         method: "PATCH",
         body: data

From beeba966dd55e006d01c18e1a14d03a39fbd82f0 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 2 Nov 2023 22:55:28 +0100
Subject: [PATCH 017/113] Cope with empty result

---
 .../client/source/src/components/file-browser/file-browser.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/components/file-browser/file-browser.vue b/lib/www/client/source/src/components/file-browser/file-browser.vue
index 92fbc37..2e578ee 100644
--- a/lib/www/client/source/src/components/file-browser/file-browser.vue
+++ b/lib/www/client/source/src/components/file-browser/file-browser.vue
@@ -115,7 +115,7 @@ export default {
       const url = `/files/${item? item.path : (this.root || this.path || "")}`;
       const list = await this.api([url]);
       this.loading = false;
-      const items = list.map(item => {
+      const items = list?.map(item => {
         if (item["Content-Type"] == "inode/directory") {
           item.children = [];
         }

From cd739e603f46839f3f671f74b483cba633f9c96a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 Nov 2023 16:31:02 +0100
Subject: [PATCH 018/113] Fix configuration object data corruption

---
 lib/www/client/source/src/views/ProjectSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 0327fc1..122837c 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -266,7 +266,7 @@ export default {
                 rootPath: obj.rootPath
               }),
               save: async (data, cfg) => {
-                await this.patch({preplots: {...data.preplots}})
+                await this.patch({preplots: [...data.preplots]})
               }
             },
             {

From cae57e2a64afbd86402ec3f3c6161c40bc78b5a2 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 Nov 2023 16:31:58 +0100
Subject: [PATCH 019/113] Ensure we get a fresh response

---
 lib/www/client/source/src/views/ProjectSettings.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 122837c..72c1ba2 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -504,7 +504,12 @@ export default {
     async getConfiguration () {
       this.configuration = null;
       const url = `/project/${this.$route.params.project}/configuration`;
-      this.configuration = await this.api([url]);
+      const init = {
+        headers: {
+          "If-None-Match": "" // Ensure we get a fresh response
+        }
+      };
+      this.configuration = await this.api([url, init]);
     },
 
     makeTree (obj, id=0) {

From b74419f770372982b87b4e4048cea14eabff1187 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:02:11 +0100
Subject: [PATCH 020/113] Reuse deepMerge.js from the backend libs

---
 lib/www/client/source/src/lib/deepMerge.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 lib/www/client/source/src/lib/deepMerge.js

diff --git a/lib/www/client/source/src/lib/deepMerge.js b/lib/www/client/source/src/lib/deepMerge.js
new file mode 120000
index 0000000..4df8a54
--- /dev/null
+++ b/lib/www/client/source/src/lib/deepMerge.js
@@ -0,0 +1 @@
+/home/dberge/Development/projects/dougal/software/lib/www/server/lib/utils/deepMerge.js
\ No newline at end of file

From 6d417a92720115ae3e9e29fe0506b89d99b08f09 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:03:18 +0100
Subject: [PATCH 021/113] Add utility functions.

The functions are:

- deepMerge()   Merge two objects
- deepCompare() Loose deep comparison
- deepEqual()   Strict deep comparison
- deepSet()     Set nested object property value
- deepValue()   Retrive nested object property value
---
 lib/www/client/source/src/lib/utils.js | 90 +++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/lib/utils.js b/lib/www/client/source/src/lib/utils.js
index 5ca7aa1..6a3ade8 100644
--- a/lib/www/client/source/src/lib/utils.js
+++ b/lib/www/client/source/src/lib/utils.js
@@ -133,9 +133,97 @@ function preferencesλ (preferences) {
 
 }
 
+/** Compare two possibly complex values for
+ * loose equality, going as deep as required in the
+ * case of complex objects.
+ */
+function deepCompare (a, b) {
+  if (typeof a == "object" && typeof b == "object") {
+    return !Object.entries(a).some( ([k, v]) => !deepCompare(v, b[k])) &&
+      !Object.entries(b).some( ([k, v]) => !deepCompare(v, a[k]));
+  } else {
+    return a == b;
+  }
+}
+
+/** Compare two possibly complex values for
+ * strict equality.
+ */
+function deepEqual (a, b) {
+  if (typeof a === "object" && typeof b === "object") {
+    return !Object.entries(a).some( ([k, v]) => !deepEqual(v, b[k])) &&
+      !Object.entries(b).some( ([k, v]) => !deepEqual(v, a[k]));
+  } else {
+    return a === b;
+  }
+}
+
+/** Traverses an object and sets a nested value.
+ *
+ * Example:
+ *
+ * const obj = {a: {b: {c: "X"} } }
+ * deepSet(obj, ["a", "b", "c"], "d")
+ * → {a: {b: {c: "d"} } }
+ *
+ * This would be the equivalent of:
+ *
+ * obj?.a?.b?.c = "d";
+ *
+ * Except that the above is not a legal expression.
+ *
+ * If a non-leaf property does not exist, this function
+ * creates it as an empty object ({}) and keeps traversing.
+ *
+ */
+function deepSet (obj, path, value) {
+  const key = path.shift();
+  if (!path.length) {
+    obj[key] = value;
+  } else {
+    if (!Object.hasOwn(obj, key)) {
+      obj[key] = {};
+    }
+    deepSet(obj[key], path, value);
+  }
+}
+
+/** Returns a nested property.
+ *
+ * Example:
+ *
+ * const obj = {a: {b: {c: "d"} } }
+ * deepSet(obj, ["a", "b", "c"])
+ * → "d"
+ *
+ * If `path` is known in advance, this is effectively
+ * the same as:
+ *
+ * obj?.a?.b?.c
+ *
+ * This might be useful when `path` is dynamic.
+ */
+function deepValue (obj, path) {
+  if (obj !== undefined) {
+    const key = path.shift();
+    if (!path.length) {
+      return obj[key];
+    } else {
+      return deepValue(obj[key], path);
+    }
+  }
+}
+
+// Just to have all the deep*()s in one place
+import deepMerge from './deepMerge'
 
 export {
   withParentProps,
   geometryAsString,
-  preferencesλ
+  preferencesλ,
+  deepMerge,
+  deepCompare,
+  deepEqual,
+  deepSet,
+  deepValue
 }

From b3dbc0f4179ff097696f2619d8d14d0234f170d2 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:05:50 +0100
Subject: [PATCH 022/113] Add utility function to create HSL colours

---
 lib/www/client/source/src/lib/hsl.js | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 lib/www/client/source/src/lib/hsl.js

diff --git a/lib/www/client/source/src/lib/hsl.js b/lib/www/client/source/src/lib/hsl.js
new file mode 100644
index 0000000..a3e342f
--- /dev/null
+++ b/lib/www/client/source/src/lib/hsl.js
@@ -0,0 +1,47 @@
+/** Return an HSL colour as a function of an input value
+  * `str`.
+  *
+  * Consider using as getHSL.bind(this) in Vue components
+  * in order to get access to the Vuetify theme configuration.
+  */
+function getHSL (str, saturation = 1, lightness = 0.25, offset = 0) {
+
+  function getHash (v) {
+    if (typeof (v??false)[Symbol.iterator] != "function") {
+      // Not an iterable, make it one
+      v = String(v);
+    }
+
+    return Math.abs([...v, ..." "].reduce( (acc, cur) => String(cur).charCodeAt(0) + ((acc << 5) - acc), 0 ));
+  }
+
+  const h = (getHash(str) + offset) % 360;
+  const s = saturation * 100;
+  const l = this?.$vuetify?.theme?.isDark
+    ? (1-lightness) * 100
+    : lightness * 100;
+
+  return {h, s, l};
+
+}
+
+/** Return a CSS hsl() or hsla() colour
+ * representation as a function of an input value.
+ *
+ * Consider using as getHSLColourFor.bind(this) – See
+ * note for getHSL() above.
+ */
+function getHSLColourFor (str, opacity = 1, saturation, lightness, offset) {
+  const _getHSL = getHSL.bind(this);
+  const {h, s, l} = _getHSL(str, saturation, lightness, offset);
+  if (opacity == 1) {
+    return `hsl(${h},${s}%,${l}%)`;
+  } else {
+    return `hsla(${h},${s}%,${l}%, ${opacity})`;
+  }
+}
+
+export {
+  getHSL,
+  getHSLColourFor
+}

From 436a9b8289a17ee47440399715f49113ba3b90e3 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:06:20 +0100
Subject: [PATCH 023/113] Add utility function to truncate long strings

---
 lib/www/client/source/src/lib/truncate-text.js | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/www/client/source/src/lib/truncate-text.js

diff --git a/lib/www/client/source/src/lib/truncate-text.js b/lib/www/client/source/src/lib/truncate-text.js
new file mode 100644
index 0000000..554190b
--- /dev/null
+++ b/lib/www/client/source/src/lib/truncate-text.js
@@ -0,0 +1,10 @@
+
+function truncateText (text, length=20) {
+  if (text?.length <= length) {
+    return text;
+  } else {
+    return text.slice(0, length/2)+"…"+text.slice(-(length/2));
+  }
+}
+
+export default truncateText;

From 12b28cbb8df82d6c9cdc60b8114e61653de2f271 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:08:54 +0100
Subject: [PATCH 024/113] Add csv-parse dependency to frontend.

Also requires a Buffer polyfill.
---
 lib/www/client/source/package-lock.json | 74 +++++++++++++++++++------
 lib/www/client/source/package.json      |  2 +
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/lib/www/client/source/package-lock.json b/lib/www/client/source/package-lock.json
index 8f0f191..7189b50 100644
--- a/lib/www/client/source/package-lock.json
+++ b/lib/www/client/source/package-lock.json
@@ -10,7 +10,9 @@
       "license": "UNLICENSED",
       "dependencies": {
         "@mdi/font": "^7.2.96",
+        "buffer": "^6.0.3",
         "core-js": "^3.6.5",
+        "csv-parse": "^5.5.2",
         "d3": "^7.0.1",
         "jwt-decode": "^3.0.0",
         "leaflet": "^1.7.1",
@@ -3457,7 +3459,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3508,6 +3509,30 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -3647,10 +3672,9 @@
       }
     },
     "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "funding": [
         {
           "type": "github",
@@ -3667,7 +3691,7 @@
       ],
       "dependencies": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/buffer-from": {
@@ -4632,6 +4656,11 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/csv-parse": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.2.tgz",
+      "integrity": "sha512-YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA=="
+    },
     "node_modules/d3": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.3.0.tgz",
@@ -6448,7 +6477,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -13920,8 +13948,7 @@
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "batch": {
       "version": "0.6.1",
@@ -13950,6 +13977,18 @@
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        }
       }
     },
     "bluebird": {
@@ -14060,13 +14099,12 @@
       }
     },
     "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "requires": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "buffer-from": {
@@ -14765,6 +14803,11 @@
         "css-tree": "^1.1.2"
       }
     },
+    "csv-parse": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.2.tgz",
+      "integrity": "sha512-YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA=="
+    },
     "d3": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.3.0.tgz",
@@ -16108,8 +16151,7 @@
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
       "version": "5.2.4",
diff --git a/lib/www/client/source/package.json b/lib/www/client/source/package.json
index 004831a..694232e 100644
--- a/lib/www/client/source/package.json
+++ b/lib/www/client/source/package.json
@@ -8,7 +8,9 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
+    "buffer": "^6.0.3",
     "core-js": "^3.6.5",
+    "csv-parse": "^5.5.2",
     "d3": "^7.0.1",
     "jwt-decode": "^3.0.0",
     "leaflet": "^1.7.1",

From 2fa9d99eebf96a8e50714f89a810217dc5d582f4 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 18:09:56 +0100
Subject: [PATCH 025/113] Add YAML frontend dependency.

To download / upload configurations.
---
 lib/www/client/source/package-lock.json | 53 ++++++++++++++++++++-----
 lib/www/client/source/package.json      |  3 +-
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/lib/www/client/source/package-lock.json b/lib/www/client/source/package-lock.json
index 7189b50..779629e 100644
--- a/lib/www/client/source/package-lock.json
+++ b/lib/www/client/source/package-lock.json
@@ -28,7 +28,8 @@
         "vue-debounce": "^2.6.0",
         "vue-router": "^3.5.1",
         "vuetify": "^2.5.0",
-        "vuex": "^3.6.2"
+        "vuex": "^3.6.2",
+        "yaml": "^2.3.4"
       },
       "devDependencies": {
         "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
@@ -4307,6 +4308,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -4644,6 +4654,15 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/cssnano/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/csso": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@@ -11369,12 +11388,11 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
@@ -14556,6 +14574,14 @@
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
         "yaml": "^1.10.0"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
       }
     },
     "cross-spawn": {
@@ -14748,6 +14774,14 @@
         "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
       }
     },
     "cssnano-preset-default": {
@@ -19742,10 +19776,9 @@
       "dev": true
     },
     "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="
     },
     "yargs": {
       "version": "16.2.0",
diff --git a/lib/www/client/source/package.json b/lib/www/client/source/package.json
index 694232e..36aa669 100644
--- a/lib/www/client/source/package.json
+++ b/lib/www/client/source/package.json
@@ -26,7 +26,8 @@
     "vue-debounce": "^2.6.0",
     "vue-router": "^3.5.1",
     "vuetify": "^2.5.0",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "yaml": "^2.3.4"
   },
   "devDependencies": {
     "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",

From 873d7cfea718c6af87d9cd5b66dd5d32f013e5f7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 19:13:03 +0100
Subject: [PATCH 026/113] Add utility Vue components.

This commit adds <dougal-field-content/> and
<dougal-field-content-dialog/>, which can be
used to configure certain properties of an
object. Intended for use while editing project
configurations.
---
 .../fields/field-content-dialog.vue           | 109 ++++++++
 .../src/components/fields/field-content.vue   | 242 ++++++++++++++++++
 2 files changed, 351 insertions(+)
 create mode 100644 lib/www/client/source/src/components/fields/field-content-dialog.vue
 create mode 100644 lib/www/client/source/src/components/fields/field-content.vue

diff --git a/lib/www/client/source/src/components/fields/field-content-dialog.vue b/lib/www/client/source/src/components/fields/field-content-dialog.vue
new file mode 100644
index 0000000..70e94e0
--- /dev/null
+++ b/lib/www/client/source/src/components/fields/field-content-dialog.vue
@@ -0,0 +1,109 @@
+<template>
+  <v-dialog
+    max-width="600"
+    :close-on-content-click="false"
+    offset-y
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <v-chip
+        class="ml-3"
+        small
+        :light="$vuetify.theme.isDark"
+        :dark="!$vuetify.theme.isDark"
+        :title="getFriendlyTypeName(value.type)"
+        :color="getHSLColourFor(value.type||'str', .4, .5)"
+        v-bind="attrs"
+        v-on="on"
+      >
+        <v-icon small>{{ getTypeIcon(value.type||'str') }}</v-icon>
+        <v-icon small v-if="value.enum"
+          :title="'Values: '+Object.entries(value.enum).map(i => `${i[0]}=${i[1]}`).join('; ')+'\nDefault: '+value.default"
+        >mdi-format-list-group</v-icon>
+      </v-chip>
+    </template>
+
+    <dougal-field-content
+      :readonly="readonly"
+      :value="value"
+      @input="$emit('input', $event)"
+    ></dougal-field-content>
+
+  </v-dialog>
+</template>
+
+<script>
+import DougalFieldContent from './field-content'
+
+export default {
+
+  name: "DougalFieldContentDialog",
+
+  components: {
+    DougalFieldContent
+  },
+
+  props: {
+    value: Object,
+    readonly: Boolean
+  },
+
+  data () {
+    return {
+    };
+  },
+
+  computed: {
+  },
+
+  methods: {
+
+    getFriendlyTypeName (type) {
+      switch (type) {
+        case "str":
+          return "Text";
+        case "int":
+          return "Integer";
+        case "float":
+          return "Float";
+        case "bool":
+          return "Boolean";
+        default:
+          return type ?? "Text (default)";
+      }
+    },
+
+    getTypeIcon (type) {
+      switch (type) {
+        case "str":
+          return "mdi-format-text-variant";
+        case "int":
+          return "mdi-numeric";
+        case "float":
+          return "mdi-decimal";
+        case "bool":
+          return "mdi-format-list-checks";
+        default:
+          return "mdi-format-text";
+      }
+    },
+
+    getHSLColourFor (str, saturation = 1, lightness = 0.25, offset = 0) {
+
+      function getHash (v) {
+        return [...v].reduce( (acc, cur) => String(cur).charCodeAt(0) + ((acc << 5) - acc), 0 );
+      }
+
+      const h = (getHash(str) + offset) % 360;
+      const s = saturation * 100;
+      const l = this.$vuetify.theme.isDark
+        ? (1-lightness) * 100
+        : lightness * 100;
+
+      return `hsl(${h},${s}%,${l}%)`;
+    }
+
+  }
+
+}
+
+</script>
diff --git a/lib/www/client/source/src/components/fields/field-content.vue b/lib/www/client/source/src/components/fields/field-content.vue
new file mode 100644
index 0000000..682c9d7
--- /dev/null
+++ b/lib/www/client/source/src/components/fields/field-content.vue
@@ -0,0 +1,242 @@
+<template>
+  <v-card flat elevation="0">
+    <v-card-subtitle>Item options</v-card-subtitle>
+    <v-card-text>
+      <v-select
+        label="Value type"
+        v-model="type"
+        :items="types"
+        value="int"
+        :readonly="readonly"
+      ></v-select>
+
+      <v-checkbox
+        label="Enumerated values"
+        v-model="enumerated"
+        :readonly="readonly"
+      ></v-checkbox>
+    </v-card-text>
+
+    <template v-if="enumerated">
+      <v-card-subtitle>Valid options</v-card-subtitle>
+      <v-card-text>
+        <v-list dense>
+          <v-list-item v-for="(out, key) in value.enum" :key=key
+          >
+            <v-list-item-content class="mr-1">
+              <v-text-field
+                dense
+                hide-details="auto"
+                v-model="key"
+                :readonly="readonly"
+              ></v-text-field>
+            </v-list-item-content>
+            <v-list-item-content class="ml-1">
+              <v-select v-if="type == 'bool'"
+                dense
+                hide-details="auto"
+                :items="[ true, false ]"
+                v-model="value.enum[key]"
+                :readonly="readonly"
+              ></v-select>
+              <v-text-field v-else
+                dense
+                hide-details="auto"
+                v-model="value.enum[key]"
+                :readonly="readonly"
+              ></v-text-field>
+            </v-list-item-content>
+            <v-list-item-action>
+              <v-icon
+                small
+                color="error"
+                :disabled="readonly"
+                @click="removeEnum(key)"
+              >mdi-minus-circle</v-icon>
+            </v-list-item-action>
+          </v-list-item>
+
+          <v-list-item v-if="!readonly"
+          >
+            <v-list-item-content class="mr-1">
+              <v-text-field
+                dense
+                hide-details="auto"
+                label="New input value"
+                v-model="newEnumKey"
+              ></v-text-field>
+            </v-list-item-content>
+            <v-list-item-content class="ml-1">
+              <v-select v-if="type == 'bool'"
+                dense
+                hide-details="auto"
+                label="New output value"
+                :items="[ true, false ]"
+                v-model="newEnumValue"
+              ></v-select>
+              <v-text-field v-else
+                dense
+                hide-details="auto"
+                label="New output value"
+                v-model="newEnumValue"
+              ></v-text-field>
+            </v-list-item-content>
+            <v-list-item-action>
+              <v-icon
+                small
+                color="primary"
+                :disabled="!isNewEnumValid"
+                @click="addEnum"
+                >mdi-plus-circle</v-icon>
+            </v-list-item-action>
+          </v-list-item>
+
+          <v-list-item>
+            <v-list-item-content>
+              <v-select v-if="type == 'bool'"
+                dense
+                hide-details="auto"
+                label="Default value"
+                hint="Value to use if none matches"
+                :items="[ true, false ]"
+                v-model="defaultValue"
+                :readonly="readonly"
+              ></v-select>
+              <v-text-field v-else
+                label="Default value"
+                hint="Value to use if none matches"
+                persistent-hint
+                v-model="defaultValue"
+                :readonly="readonly"
+              ></v-text-field>
+            </v-list-item-content>
+            <v-list-item-action>
+              <v-icon
+                small
+                color="secondary"
+                :disabled="readonly"
+                @click="defaultValue = null"
+              >mdi-backspace</v-icon>
+            </v-list-item-action>
+          </v-list-item>
+
+        </v-list>
+
+      </v-card-text>
+    </template>
+  </v-card>
+</template>
+
+<script>
+
+export default {
+  name: "DougalFieldContent",
+
+  props: {
+    value: Object,
+    readonly: Boolean
+  },
+
+  data () {
+    return {
+      newEnumKey: null,
+      newEnumValue: null,
+      types: [
+        { text: "Text", value: "str" },
+        { text: "Integer", value: "int" },
+        { text: "Float", value: "float" },
+        { text: "Boolean", value: "bool" },
+      ]
+    }
+  },
+
+  computed: {
+
+    type: {
+      get () {
+        return this.value?.type ?? "str";
+      },
+
+      set (v) {
+          this.$emit("input", {
+            ...this.value,
+            type: v
+          })
+      }
+    },
+
+    enumerated: {
+      get () {
+        return typeof this.value?.enum === "object";
+      },
+
+      set (v) {
+        if (v) {
+          this.$emit("input", {
+            enum: {},
+            ...this.value
+          })
+        } else {
+          const obj = {...this.value};
+          delete obj.enum;
+          this.$emit("input", obj)
+        }
+      }
+    },
+
+    defaultValue: {
+
+      get () {
+        return this.value?.default;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          "default": v
+        });
+      }
+
+    },
+
+    isNewEnumValid () {
+      return !!(this.newEnumKey &&
+        !Object.keys(this.value.enum).includes(this.newEnumKey) &&
+        (typeof this.newEnumValue == "boolean" || this.newEnumValue));
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    addEnum () {
+      this.$emit("input", {
+        ...this.value,
+        enum: {
+          ...this.value.enum,
+          [this.newEnumKey]: this.newEnumValue
+        }
+      });
+      this.newEnumKey = null;
+      this.newEnumValue = null;
+    },
+
+    removeEnum (key) {
+      const obj = {...this.value.enum};
+      delete obj[key];
+      this.$emit("input", {
+        ...this.value,
+        enum: obj
+      });
+    }
+
+  },
+
+  mounted () {
+  }
+
+}
+</script>

From 9f1fc3d19cf02925e863dfe6e651af50058642be Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 19:16:35 +0100
Subject: [PATCH 027/113] Make Vue component reusable.

This converts <dougal-fixed-width-format/> into a more reusable
<dougal-fixed-string-decoder/> component.
---
 .../decoder/fixed-string-decoder-field.vue    | 140 +++++++
 .../decoder/fixed-string-decoder.vue          | 370 ++++++++++++++++++
 .../project-settings/fixed-width-format.vue   | 322 ---------------
 3 files changed, 510 insertions(+), 322 deletions(-)
 create mode 100644 lib/www/client/source/src/components/decoder/fixed-string-decoder-field.vue
 create mode 100644 lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
 delete mode 100644 lib/www/client/source/src/components/project-settings/fixed-width-format.vue

diff --git a/lib/www/client/source/src/components/decoder/fixed-string-decoder-field.vue b/lib/www/client/source/src/components/decoder/fixed-string-decoder-field.vue
new file mode 100644
index 0000000..b9b3f84
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/fixed-string-decoder-field.vue
@@ -0,0 +1,140 @@
+<template>
+  <v-row dense no-gutters>
+
+    <v-col cols="1">
+      <slot name="prepend"></slot>
+    </v-col>
+
+    <v-col cols="2">
+      <v-chip outlined label small :color="colour">{{name}}</v-chip>
+    </v-col>
+
+    <v-col cols="2">
+      <v-text-field
+        class="ml-3"
+        dense
+        label="From"
+        type="number"
+        min="0"
+        v-model.number="value.offset"
+        :readonly="readonly"
+      ></v-text-field>
+    </v-col>
+
+    <v-col cols="2">
+      <v-text-field
+        class="ml-3"
+        dense
+        label="Length"
+        type="number"
+        min="0"
+        v-model.number="value.length"
+        :readonly="readonly"
+      ></v-text-field>
+    </v-col>
+
+    <v-col cols="2">
+      <dougal-field-content-dialog
+        :readonly="readonly"
+        :value="value"
+        @input="$emit('input', $event)"
+      ></dougal-field-content-dialog>
+
+    </v-col>
+
+    <v-col cols="1">
+      <slot name="append"></slot>
+    </v-col>
+
+  </v-row>
+
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+}
+
+.input >>> .chunk {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+</style>
+
+<script>
+import DougalFieldContentDialog from '../fields/field-content-dialog'
+
+export default {
+  name: "DougalFixedStringDecoderField",
+
+  components: {
+    DougalFieldContentDialog
+  },
+
+  props: {
+    value: Object,
+    name: String,
+    colour: String,
+    readonly: Boolean,
+  },
+
+  data () {
+    return {
+      name_: "",
+    }
+  },
+
+  computed: {
+  },
+
+  watch: {
+
+    name () {
+      if (this.name != this.name_) {
+        this.name_ = this.name;
+      }
+    },
+  },
+
+  methods: {
+
+    addField () {
+      if (!this.fieldNameErrors) {
+        this.$emit("update:fields", {
+          ...this.fields,
+          [this.fieldName]: { offset: 0, length: 0 }
+        });
+        this.fieldName = "";
+      }
+    },
+
+    reset () {
+      this.text_ = this.text;
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
new file mode 100644
index 0000000..09d2c98
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
@@ -0,0 +1,370 @@
+<template>
+  <v-card flat elevation="0">
+    <v-card-title v-if="title">{{ title }}</v-card-title>
+    <v-card-subtitle v-if="subtitle">{{ subtitle }}</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <div v-if="isMultiline"
+          class="multiline mb-5"
+          :style="multilineElementStyle"
+          v-html="html"
+        >
+        </div>
+        <v-input v-else
+          class="v-text-field"
+          :hint="hint"
+          persistent-hint
+          v-model="text_"
+        >
+          <label
+            class="v-label"
+            :class="[ $vuetify.theme.isDark && 'theme--dark', text_ && text_.length && 'v-label--active' ]"
+            style="left: 0px; right: auto; position: absolute;"
+          >{{ label }}</label>
+          <div class="input"
+            :class="isMultiline ? 'multiline' : ''"
+            v-html="html"
+          >
+          </div>
+        </v-input>
+
+        <v-container>
+
+          <dougal-fixed-string-decoder-field v-for="(field, key) in fields" :key="key"
+            v-model="fields[key]"
+            :name="key"
+            :colour="getHSLColourFor(key)"
+            :readonly="readonly"
+          >
+            <template v-slot:append v-if="editableFieldList && !readonly">
+              <v-btn
+                class="ml-3"
+                fab
+                text
+                small
+                title="Remove this property"
+              >
+                <v-icon
+                  color="error"
+                  @click="removeField(key)"
+                >mdi-minus</v-icon>
+              </v-btn>
+            </template>
+          </dougal-fixed-string-decoder-field>
+
+          <v-row dense no-gutters v-if="editableFieldList && !readonly">
+            <v-col cols="3">
+              <v-text-field
+                label="Add new field"
+                hint="Enter the name of a new field"
+                :error-messages="fieldNameErrors"
+                v-model="fieldName"
+                append-outer-icon="mdi-plus-circle"
+                @keydown.enter.prevent="addField"
+              >
+                <template v-slot:append-outer>
+                  <v-icon
+                    color="primary"
+                    :disabled="fieldName && !!fieldNameErrors"
+                    @click="addField"
+                  >mdi-plus</v-icon>
+                </template>
+              </v-text-field>
+            </v-col>
+          </v-row>
+
+        </v-container>
+
+
+
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+}
+
+.multiline {
+  font-family: mono;
+  white-space: pre;
+  overflow-x: auto;
+  overflow-y: auto;
+}
+
+.multiline >>> .line-number {
+  display: inline-block;
+  font-size: 75%;
+  width: 5ex;
+  margin-inline-end: 1ex;
+  text-align: right;
+  border: none;
+  position: relative;
+  top: -1px;
+}
+
+.input, .multiline >>> .chunk {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input, .multiline >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input, .multiline >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+</style>
+
+<script>
+import { getHSLColourFor } from '@/lib/hsl'
+import DougalFixedStringDecoderField from './fixed-string-decoder-field'
+
+export default {
+  name: "DougalFixedStringDecoder",
+
+  components: {
+    DougalFixedStringDecoderField
+  },
+
+  mixins: [
+    {
+      methods: {
+        getHSLColourFor
+      }
+    }
+  ],
+
+  props: {
+    text: String,
+    fields: Object,
+    multiline: Boolean,
+    numberedLines: [ Boolean, Number ],
+    maxHeight: String,
+    editableFieldList: { type: Boolean, default: true },
+    readonly: Boolean,
+    title: String,
+    subtitle: String,
+    label: String,
+    hint: String,
+  },
+
+  data () {
+    return {
+      //< The reason for not using this.text directly is that at some point
+      //< we might extend this component to allow editing the sample text.
+      text_: "",
+      //< The name of a new field to add.
+      fieldName: ""
+    }
+  },
+
+  computed: {
+
+    /** Whether to treat the sample text as multiline.
+     */
+    isMultiline () {
+      return this.multiline === true || this.text.includes("\n");
+    },
+
+    /* Return the fields as an array sorted by offset
+     */
+    parts () {
+      return Object.entries(this.fields).sort( (a, b) => a.offset - b.offset );
+    },
+
+    /* Transform this.parts into {start, end} intervals.
+     */
+    chunks () {
+      const chunks = [];
+      const chunk_num = 0;
+      for (const [name, part] of this.parts) {
+        const chunk = {};
+        chunk.start = part.offset;
+        chunk.end = part.offset + part.length - 1;
+        //chunk.text = this.text_.slice(chunk.start, chunk.end);
+        chunk.colour = this.getHSLColourFor(name)
+
+        chunks.push(chunk);
+      }
+
+      return chunks;
+    },
+
+    multilineElementStyle () {
+      if (this.maxHeight) {
+        return `max-height: ${this.maxHeight};`;
+      }
+      return "";
+    },
+
+    /** Return a colourised HTML version of this.text.
+     */
+    html () {
+      if (!this.text_) {
+        return;
+      }
+
+      if (this.isMultiline) {
+        if (typeof this.numberedLines == "number" || this.numberedLines) {
+          const offset = typeof this.numberedLines == "number" ? Math.abs(this.numberedLines) : 0;
+          return this.text_.split("\n").map( (line, idx) =>
+            this.numberLine(offset+idx, this.renderTextLine(line))).join("<br/>");
+        } else {
+          return this.text_.split("\n").map(this.renderTextLine).join("<br/>");
+        }
+      } else {
+        return this.renderTextLine(this.text_);
+      }
+
+    },
+
+    fieldNameErrors () {
+      return this.parts.find( i => i[0] == this.fieldName )
+        ? "A field with this name already exists"
+        : null;
+    }
+
+  },
+
+  watch: {
+
+    text () {
+      if (this.text != this.text_) {
+        this.reset();
+      }
+    }
+
+  },
+
+  methods: {
+
+    addField () {
+      if (!this.fieldNameErrors) {
+        this.$emit("update:fields", {
+          ...this.fields,
+          [this.fieldName]: { offset: 0, length: 0 }
+        });
+        this.fieldName = "";
+      }
+    },
+
+    // NOTE Not used
+    updateField (field, key, value) {
+      const fields = {
+        ...this.fields,
+        [field]: {
+          ...this.fields[field],
+          [key]: value
+        }
+      };
+      this.$emit("update:fields", fields);
+    },
+
+    removeField (key) {
+      const fields = {...this.fields};
+      delete fields[key];
+      this.$emit("update:fields", fields);
+    },
+
+    /** Return an HSL colour as a function of an input value
+     * `str`.
+     */
+    xgetHSLColourFor () {
+      console.log("WILL BE DEFINED ON MOUNT");
+    },
+
+    /** Return a `<span>` opening tag.
+     */
+    style (name, colour) {
+      return colour
+        ? `<span class="${name}" style="color:${colour};border-color:${colour}">`
+        : `<span class="${name}">`;
+    },
+
+    /** Return an array of the intervals that intersect `pos`.
+     * May be empty.
+     */
+    chunksFor (pos) {
+      return this.chunks.filter( chunk =>
+        pos >= chunk.start &&
+        pos <= chunk.end
+      )
+    },
+
+    /*
+     * Algorithm:
+     *
+     * Go through every character of one line of text and determine in which
+     * part(s) it falls in, if any. Collect adjacent same parts into <span/>
+     * elements.
+     */
+    renderTextLine (text) {
+      const parts = [];
+
+      let prevStyle;
+
+      for (const pos in text) {
+        const chunks = this.chunksFor(pos);
+        const isEmpty = chunks.length == 0;
+        const isOverlap = chunks.length > 1;
+
+        const style = isEmpty
+          ? this.style("chunk-empty")
+          : isOverlap
+            ? this.style("chunk-overlap")
+            : this.style("chunk", chunks[0].colour);
+
+        if (style != prevStyle) {
+          if (prevStyle) {
+            parts.push("</span>");
+          }
+          parts.push(style);
+        }
+        parts.push(text[pos]);
+        prevStyle = style;
+      }
+
+      if (parts.length) {
+        parts.push("</span>");
+      }
+
+      return parts.join("");
+    },
+
+    numberLine (number, line) {
+      return `<span class="line-number">${number}</span>${line}`;
+    },
+
+    setText (v) {
+      //console.log(v);
+      this.text_ = v;
+    },
+
+    reset () {
+      this.text_ = this.text.replaceAll("\r", "");
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/fixed-width-format.vue b/lib/www/client/source/src/components/project-settings/fixed-width-format.vue
deleted file mode 100644
index 0a4fdb8..0000000
--- a/lib/www/client/source/src/components/project-settings/fixed-width-format.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
-  <v-card flat>
-    <v-card-text>
-      <div class="sample" v-html="sampleHtml" ref="sample">
-      </div>
-
-      <v-divider></v-divider>
-
-      <v-form>
-        <v-container>
-
-          <v-row no-gutters v-for="(field, key) in {line, point, easting, northing}" :key="key">
-            <v-col>
-              <v-chip outlined :color="field.colour">{{field.label}}</v-chip>
-            </v-col>
-            <v-col>
-              <v-text-field
-                class="ml-3"
-                dense
-                label="From"
-                type="number"
-                min="0"
-                :ref="key"
-                v-model.number="field.offset"
-              ></v-text-field>
-            </v-col>
-            <v-col>
-              <v-text-field
-                class="ml-3"
-                dense
-                label="Width"
-                type="number"
-                min="0"
-                v-model.number="field.width"
-              ></v-text-field>
-            </v-col>
-          </v-row>
-
-        </v-container>
-      </v-form>
-
-    </v-card-text>
-    <v-card-actions>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<style scoped>
-.sample {
-  font-family: mono;
-  white-space: pre;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-</style>
-
-<script>
-
-
-function arraysAreEqual(arr0, arr1) {
-  return (arr0 && arr1 && arr0.length == arr1.length) &&
-    arr0.reduce( (acc, cur, idx) =>
-      acc && (arr1[idx] == cur), true );
-}
-
-function repeatsLength(arr, comparator=(a, b) => a == b) {
-  function checkRepeat(arr) {
-    let idx = 0;
-    if (arr.length) {
-      while (comparator(arr[idx], arr[++idx]));
-    }
-    return idx;
-  }
-
-  const repeats = [];
-  let offset = 0;
-  let count;
-  while (count = checkRepeat(arr.slice(offset))) {
-    repeats.push(count);
-    offset += count;
-  }
-
-  return repeats;
-}
-
-export default {
-  name: "DougalProjectSettingsFixedWidthFormat",
-
-  props: [ "value", "sample" ],
-
-  data () {
-    return {
-      line: {
-        name: "line_name",
-        type: "int",
-        label: "Line",
-        offset: 0,
-        width: 4,
-        colour: "green"
-      },
-      point: {
-        name: "point_number",
-        type: "int",
-        label: "Point",
-        offset: 4,
-        width: 4,
-        colour: "blue"
-      },
-      easting: {
-        name: "easting",
-        type: "float",
-        label: "Easting",
-        offset: 8,
-        width: 12,
-        colour: "red"
-      },
-      northing: {
-        name: "northing",
-        type: "float",
-        label: "Northing",
-        offset: 20,
-        width: 12,
-        colour: "orange"
-      }
-    }
-  },
-
-  watch: {
-    value (newValue) {
-      this.reset();
-    },
-
-    fields: {
-      handler () {
-        if (this.overlappingFields) {
-          this.$emit("input", null);
-        } else {
-          this.$emit("input", {
-            names: this.names,
-            types: this.types,
-            widths: this.widths
-          });
-        }
-      },
-      deep: true
-    }
-  },
-
-  computed: {
-
-    sampleHtml () {
-      if (!this.sample) {
-        return "";
-      }
-
-      const parts = this.fieldsDescending;
-
-      const partsForColumn = (col) => {
-        return parts.filter(part =>
-          part.offset <= col && part.offset+part.width > col
-        );
-      }
-
-      const partsForLine = (line) => {
-        return Array.from({length: line.length}, (_, idx) => partsForColumn(idx));
-      }
-
-      function getDecorators(arr, comparator, specialValue) {
-        const repeats = repeatsLength(arr, comparator);
-        let sum = 0;
-        const res = [];
-        repeats.slice(0, -1).forEach( count => {
-          const idx = sum;
-          sum += count;
-          const el = arr[idx];
-          if (el.length) {
-            if (el.length == 1) {
-              // Only one field, return it
-              res.push({
-                ...el[0],
-                offset: idx,
-                width: Math.min(Math.min(el[0].offset+el[0].width, sum+idx) - idx, sum-idx)
-              });
-            } else {
-              // More than one element, return special value
-              res.push({
-                ...specialValue,
-                offset: idx,
-                width: sum-idx
-              });
-            }
-          }
-        });
-
-        return res.sort( (a, b) => b.offset-a.offset );
-      }
-
-      const lines = this.sample.split("\n").map( line => {
-        const decorators = getDecorators(partsForLine(line), arraysAreEqual, {name: "Overlap", colour: "grey"});
-        let s = line;
-        for (const part of decorators) {
-          const s0 = s.slice(0, part.offset);
-          const s1 = s.slice(part.offset, part.offset+part.width);
-          const s2 = s.slice(part.offset+part.width);
-          s = s0+`<span class="${part.colour}--text" title="${part.name}" style="border: 1px solid;">${s1}</span>${s2}`;
-        }
-        return s;
-      });
-
-      return lines.join("<br/>");
-    },
-
-    overlappingFields () {
-      function isOverlapping (a, b) {
-        return a.offset < b.offset+b.width && b.offset < a.offset+a.width;
-      }
-
-      for (const field of this.fields) {
-        for (const otherField of this.fields) {
-          if (field != otherField && isOverlapping(field, otherField)) {
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-
-    names () {
-      return this.fieldsAscending.map(f => f.name);
-    },
-
-    types () {
-      return this.fieldsAscending.map(f => f.type);
-    },
-
-    widths () {
-      if (this.overlappingFields) {
-        return [];
-      }
-
-      const fields = this.fieldsAscending;
-      const w = [ ];
-
-      if (fields[0].offset) {
-        w.push(-fields[0].offset);
-      }
-      w.push(fields[0].width);
-
-      for (let idx=1; idx<fields.length; idx++) {
-        const f0 = fields[idx-1];
-        const f1 = fields[idx];
-        const gap = f0.offset+f0.width-f1.offset;
-
-        if (gap) {
-          w.push(gap);
-        }
-        w.push(f1.width);
-      }
-      return w;
-    },
-
-    fields () {
-      return [ this.line, this.point, this.easting, this.northing ];
-    },
-
-    fieldsAscending () {
-      return Object.values(this.fields).sort( (a, b) => a.offset - b.offset );
-    },
-
-    fieldsDescending () {
-      return Object.values(this.fields).sort( (a, b) => b.offset - a.offset );
-    }
-
-  },
-
-  methods: {
-
-    reset () {
-      if (!this.value) {
-        return;
-      }
-
-      const fieldFor = (index) => {
-        return this.fields.find(field => field.name == this.value.names[index]);
-      }
-
-      let offset=0;
-      let index=0;
-
-      for (const width of this.value.widths) {
-        if (width < 0) {
-          offset -= width;
-        } else {
-          fieldFor(index).offset = offset;
-          fieldFor(index).width = width;
-          offset += width;
-          index++;
-        }
-      }
-    },
-
-    save () {
-      this.$emit('input', {...this.$data.values});
-    },
-
-    back () {
-      this.$emit('close');
-    }
-
-  },
-
-  mounted () {
-    this.reset();
-    document.addEventListener("selectionchange", this.handleSelection);
-  },
-
-   beforeUnmount () {
-    document.removeEventListener("selectionchange", this.handleSelection);
-  }
-
-}
-</script>

From f82f2c78c727d1d68f61f75ca081fa8d748b14f3 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 19:18:53 +0100
Subject: [PATCH 028/113] Add Vue component for handling delimited strings.

<dougal-delimited-string-decoder/> is intended for providing a UI
for configuring text-delimited import settings (such as CSV imports).
---
 .../delimited-string-decoder-field.vue        |  82 ++++
 .../decoder/delimited-string-decoder.vue      | 366 ++++++++++++++++++
 2 files changed, 448 insertions(+)
 create mode 100644 lib/www/client/source/src/components/decoder/delimited-string-decoder-field.vue
 create mode 100644 lib/www/client/source/src/components/decoder/delimited-string-decoder.vue

diff --git a/lib/www/client/source/src/components/decoder/delimited-string-decoder-field.vue b/lib/www/client/source/src/components/decoder/delimited-string-decoder-field.vue
new file mode 100644
index 0000000..7f714f0
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/delimited-string-decoder-field.vue
@@ -0,0 +1,82 @@
+<template>
+  <v-row
+    dense
+    no-gutters
+    align="center"
+  >
+
+    <v-col cols="1">
+      <slot name="prepend"></slot>
+    </v-col>
+
+    <v-col cols="2">
+      <v-chip outlined label small :color="colour || getHSLColourFor(key)">{{name}}</v-chip>
+    </v-col>
+
+    <v-col cols="4">
+      <v-text-field
+        dense
+        label="Column"
+        type="number"
+        min="0"
+        clearable
+        :value="value.column"
+        @input="$emit('input', {...value, column: Number($event)})"
+      >
+        <template v-slot:append-outer>
+          <dougal-field-content-dialog
+            :readonly="readonly"
+            :value="value"
+            @input="$emit('input', $event)"
+          ></dougal-field-content-dialog>
+        </template>
+      </v-text-field>
+    </v-col>
+
+    <v-col cols="1">
+      <slot name="append"></slot>
+    </v-col>
+
+  </v-row>
+</template>
+
+<style scoped>
+</style>
+
+<script>
+import { parse } from 'csv-parse/sync'
+import { getHSLColourFor } from '@/lib/hsl'
+import DougalFieldContentDialog from '../fields/field-content-dialog'
+
+export default {
+  name: "DougalDelimitedStringDecoderField",
+
+  components: {
+    //DougalFixedStringDecoderField,
+    DougalFieldContentDialog
+  },
+
+  props: {
+    value: Object,
+    name: String,
+    colour: String,
+    readonly: Boolean,
+  },
+
+  data () {
+    return {
+    }
+  },
+
+  computed: {
+  },
+
+  watch: {
+  },
+
+  methods: {
+    getHSLColourFor: getHSLColourFor.bind(this),
+  },
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/decoder/delimited-string-decoder.vue b/lib/www/client/source/src/components/decoder/delimited-string-decoder.vue
new file mode 100644
index 0000000..960afa8
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/delimited-string-decoder.vue
@@ -0,0 +1,366 @@
+<template>
+  <v-card flat elevation="0">
+    <v-card-title v-if="title">{{ title }}</v-card-title>
+    <v-card-subtitle v-if="subtitle">{{ subtitle }}</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+
+        <v-container>
+
+          <dougal-delimited-string-decoder-field v-for="(field, key) in fields" :key="key"
+            :colour="getHSLColourFor(key)"
+            :readonly="readonly"
+            :name="key"
+            :value="fields[key]"
+            @input="$emit('update:fields', {...fields, [key]: $event})"
+          >
+            <template v-slot:append v-if="editableFieldList && !readonly">
+              <v-btn
+                class="ml-3"
+                fab
+                text
+                small
+                title="Remove this property"
+              >
+                <v-icon
+                  color="error"
+                  @click="removeField(key)"
+                >mdi-minus</v-icon>
+              </v-btn>
+            </template>
+          </dougal-delimited-string-decoder-field>
+          <v-row dense no-gutters v-if="editableFieldList && !readonly">
+            <v-col cols=6 offset=1>
+              <v-text-field
+                label="Add new field"
+                hint="Enter the name of a new field"
+                :error-messages="fieldNameErrors"
+                v-model="fieldName"
+                append-outer-icon="mdi-plus-circle"
+                @keydown.enter.prevent="addField"
+              >
+                <template v-slot:append-outer>
+                  <v-icon
+                    color="primary"
+                    :disabled="fieldName && !!fieldNameErrors"
+                    @click="addField"
+                  >mdi-plus</v-icon>
+                </template>
+              </v-text-field>
+            </v-col>
+          </v-row>
+
+          <v-row>
+            <v-col cols="6">
+              <v-combobox
+                label="Field delimiter"
+                hint="How are the fields separated from each other?"
+                :items="delimiters"
+                v-model="delimiter_"
+              ></v-combobox>
+            </v-col>
+          </v-row>
+
+          <v-row>
+            <v-col cols="6">
+              <v-text-field
+                class="ml-3"
+                label="Skip lines"
+                hint="This lets you to skip file headers if present"
+                type="number"
+                min="0"
+                :value.number="numberedLines"
+                @input="$emit('update:numbered-lines', Number($event))"
+              ></v-text-field>
+            </v-col>
+            <v-col cols="6">
+              <v-checkbox
+                v-ripple
+                label="First non-skipped line are field names"
+                :value="headerRow"
+                @change="$emit('update:header-row', $event)"
+              ></v-checkbox>
+            </v-col>
+          </v-row>
+
+          <v-row>
+            <v-col>
+              <v-simple-table dense>
+                <template v-slot:default>
+                  <colgroup v-if="showLineNumbers">
+                    <col class="line_no"/>
+                  </colgroup>
+                  <thead>
+                    <tr>
+                      <th class="line_no">
+                        <v-simple-checkbox
+                          off-icon="mdi-format-list-numbered"
+                          title="Show line numbers"
+                          v-model="showLineNumbers"
+                        >
+                        </v-simple-checkbox>
+                      </th>
+                      <th v-for="(header, idx) in headers" :key="idx"
+                        :style="`color:${header.colour};`"
+                      >
+                        <v-select
+                          dense
+                          clearable
+                          :items="fieldsAvailableFor(idx)"
+                          :value="header.fieldName"
+                          @input="fieldSelected(idx, $event)"
+                        >
+                        </v-select>
+                      </th>
+                    </tr>
+                    <tr>
+                      <th class="line_no">
+                        <small v-if="showLineNumbers && headers.length">Line no.</small>
+                      </th>
+                      <th v-for="(header, idx) in headers" :key="idx"
+                        :style="`color:${header.colour};`"
+                      >
+                        {{ header.text }}
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr v-for="(row, ridx) in rows" :key="ridx">
+                      <td class="line_no"">
+                        <small v-if="showLineNumbers">
+                          {{ ridx + (typeof numberedLines == "number" ? numberedLines : 0)+1 }}
+                        </small>
+                      </td>
+                      <td v-for="(cell, cidx) in row" :key="cidx"
+                        :style="`background-color:${cell.colour};`"
+                      >
+                        {{ cell.text }}
+                      </td>
+                    </tr>
+                  </tbody>
+                </template>
+              </v-simple-table>
+            </v-col>
+          </v-row>
+
+        </v-container>
+
+
+
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+/*.v-data-table table tbody tr td*/
+th {
+  border: 1px solid hsl(0, 0%, 33.3%);
+}
+
+td {
+  border-inline: 1px solid hsl(0, 0%, 33.3%);
+}
+
+.line_no {
+  text-align: right;
+  width: 4ex;
+  border: none !important;
+}
+</style>
+
+<script>
+import { parse } from 'csv-parse/sync'
+import { getHSLColourFor } from '@/lib/hsl'
+import truncateText from '@/lib/truncate-text'
+import DougalDelimitedStringDecoderField from './delimited-string-decoder-field'
+
+export default {
+  name: "DougalDelimitedStringDecoder",
+
+  components: {
+    DougalDelimitedStringDecoderField
+  },
+
+  props: {
+    text: String,
+    fields: Object,
+    delimiter: String,
+    headerRow: { type: [ Boolean, Number ], default: false},
+    numberedLines: [ Boolean, Number ],
+    maxHeight: String,
+    editableFieldList: { type: Boolean, default: true },
+    readonly: Boolean,
+    title: String,
+    subtitle: String
+  },
+
+  data () {
+    return {
+      //< The reason for not using this.text directly is that at some point
+      //< we might extend this component to allow editing the sample text.
+      text_: "",
+      //< The name of a new field to add.
+      fieldName: "",
+      showLineNumbers: null,
+      delimiters: [
+        { text: "Comma (,)", value: "," },
+        { text: "Tabulator (⇥)", value: "\x09" },
+        { text: "Semicolon (;)", value: ";" }
+      ]
+    }
+  },
+
+  computed: {
+
+    /** The index of the last column.
+     *
+     * This will be the higher of the number of columns available
+     * in the sample text or the highest column number defined in
+     * this.fields.
+     *
+     * NOTE: May return NaN
+     */
+    numberOfColumns () {
+      const lastIndex = Object.values(this.fields)
+        .reduce( (acc, cur) => Math.max(acc, cur.column), this.cells[0]?.length-1);
+      return isNaN(lastIndex) ? 0 : (lastIndex + 1);
+    },
+
+    cells () {
+      return parse(this.text_, {delimiter: this.delimiter, trim: true});
+    },
+
+    headers () {
+
+      const headerNames = typeof this.headerRow == "number"
+        ? this.cells[this.headerRow]
+        : this.headerRow === true
+          ? this.cells[0]
+          : Array.from(this.cells[0] ?? [], (_, ι) => `Column ${ι}`);
+
+      return headerNames?.map((c, ι) => {
+        const fieldName = Object.keys(this.fields).find(i => this.fields[i].column == ι);
+        const field = this.fields[fieldName] ?? {}
+        const colour = this.headerRow === false
+          ? this.getHSLColourFor(ι*10)
+          : this.getHSLColourFor(c);
+
+        return {
+          text: c,
+          colour: this.getHSLColourFor(c),
+          fieldName,
+          field
+        } ?? {}
+      }) ?? [];
+    },
+
+    rows () {
+      // NOTE It doesn't matter if headerRow is boolean, it works just the same.
+      return [...this.cells].slice(this.headerRow).map(r =>
+        r.map( (c, ι) => ({
+          text: truncateText(c),
+          colour: this.headers.length
+            ? this.getHSLColourFor(this.headers[ι]?.text, 0.2)
+            : this.getHSLColourFor(ι*10, 0.2)
+        })));
+    },
+
+    fieldNameErrors () {
+      return Object.keys(this.fields).includes(this.fieldName)
+        ? "A field with this name already exists"
+        : null;
+    },
+
+    delimiter_: {
+      get () {
+        return this.delimiters.find(i => i.value == this.delimiter) ?? this.delimiter;
+      },
+
+      set (v) {
+        this.$emit("update:delimiter", typeof v == "object" ? v.value : v);
+      }
+    }
+
+  },
+
+  watch: {
+
+    text () {
+      if (this.text != this.text_) {
+        this.reset();
+      }
+    },
+
+    numberedLines (cur, prev) {
+      if (cur != prev) {
+        this.showLineNumbers = typeof cur == "number" || cur;
+      }
+    }
+
+  },
+
+  methods: {
+
+
+
+    fieldsAvailableFor (idx) {
+      return Object.keys(this.fields).filter( i =>
+        this.fields[i].column === idx || this.fields[i].column === null) ?? [];
+    },
+
+    fieldSelected (col, key) {
+
+      const fields = {};
+      for (const k in this.fields) {
+        const field = {...this.fields[k]};
+        if (k === key) {
+          field.column = col
+        } else {
+          if (field.column === col) {
+            field.column = null;
+          }
+        }
+        fields[k] = field;
+      }
+
+      this.$emit("update:fields", fields);
+
+    },
+
+    addField () {
+      if (!this.fieldNameErrors) {
+        this.$emit("update:fields", {
+          ...this.fields,
+          [this.fieldName]: { column: null }
+        });
+        this.fieldName = "";
+      }
+    },
+
+    removeField (key) {
+      const fields = {...this.fields};
+      delete fields[key];
+      this.$emit("update:fields", fields);
+    },
+
+    getHSLColourFor: getHSLColourFor.bind(this),
+
+    numberLine (number, line) {
+      return `<span class="line-number">${number}</span>${line}`;
+    },
+
+    reset () {
+      this.text_ = this.text.replaceAll("\r", "");
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 0137bd84d5d3361ee1daf6187b5264b576de1305 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 19:22:19 +0100
Subject: [PATCH 029/113] Add Vue component for configuring sailline CSV
 imports.

Sailline CSV imports are related to issue #264. Not yet implemented
server-side.
---
 .../decoder/saillines-string-decoder.vue      | 295 ++++++++++++++++++
 1 file changed, 295 insertions(+)
 create mode 100644 lib/www/client/source/src/components/decoder/saillines-string-decoder.vue

diff --git a/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue b/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue
new file mode 100644
index 0000000..49e1e85
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue
@@ -0,0 +1,295 @@
+<template>
+  <v-card flat elevation="0">
+    <v-card-title v-if="title">{{ title }}</v-card-title>
+    <v-card-subtitle v-if="subtitle">{{ subtitle }}</v-card-subtitle>
+    <v-card-text>
+
+      <v-tabs v-model="viewTab">
+        <v-tab>Text</v-tab>
+        <v-tab>Parsed</v-tab>
+      </v-tabs>
+
+      <v-tabs-items v-model="viewTab">
+        <v-tab-item>
+          <v-simple-table dense class="text">
+            <template v-slot:default>
+              <colgroup v-if="showLineNumbers">
+                <col class="line_no"/>
+              </colgroup>
+              <thead>
+                <tr>
+                  <th class="line_no">
+                    <v-simple-checkbox
+                      v-ripple
+                      off-icon="mdi-format-list-numbered"
+                      title="Show line numbers"
+                      v-model="showLineNumbers"
+                    >
+                    </v-simple-checkbox>
+                  </th>
+                  <th v-for="(header, idx) in headers" :key="idx"
+                    :style="`color:${header.colour};`"
+                  >
+                    {{ header.text }}
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(row, ridx) in rows" :key="ridx">
+                  <td class="line_no"">
+                    <small v-if="showLineNumbers">
+                      {{ ridx + (typeof numberedLines == "number" ? numberedLines : 0)+1 }}
+                    </small>
+                  </td>
+                  <td v-for="(cell, cidx) in row" :key="cidx"
+                    :style="`background-color:${cell.colour};`"
+                  >
+                    {{ cell.text }}
+                  </td>
+                </tr>
+              </tbody>
+            </template>
+          </v-simple-table>
+        </v-tab-item>
+
+        <v-tab-item>
+          <!-- Parsed view -->
+          <v-simple-table dense class="parsed">
+            <template v-slot:default>
+              <thead>
+                <tr>
+                  <th
+                    title="The line along which the vessel will nominally sail"
+                  >Sail line</th>
+                  <th
+                    title="Whether the line will be acquired in the incrementing or decrementing shot points direction"
+                  >Direction</th>
+                  <th
+                    title="Whether the line is planned to be acquired. Some lines may be in the preplot but not intended to be shot in a particular campaign"
+                  >Acquire?</th>
+                  <th
+                    title="The source lines that will be shot from this vessel line. Typically there is one source line per source array."
+                  >Source lines</th>
+                  <th
+                    title="Any general remarks concerning this sail line (supports Markdown)"
+                  >Remarks</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(line, line_no) in saillines" :key="line_no">
+                  <td>{{ line_no }}</td>
+                  <td v-if="line.incr" title="Incrementing">▲</td>
+                  <td v-else title="Decrementing">▼</td>
+                  <td v-if="line.ntba" title="Not to be acquired" class="ko">✘</td>
+                  <td v-else title="Line acquisition planned" class="ok">✔</td>
+                  <td v-html="line.source_line.join('<br/>')"></td>
+                  <td v-if="line['meta.colour']"
+                    :style="`background-color:${line['meta.colour']};`"
+                    v-html="$options.filters.markdown(line.remarks)"></td>
+                  <td v-else
+                    v-html="$options.filters.markdown(line.remarks)"></td>
+                </tr>
+              </tbody>
+            </template>
+          </v-simple-table>
+        </v-tab-item>
+      </v-tabs-items>
+
+    </v-card-text>
+    <v-card-actions>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+/*.v-data-table table tbody tr td*/
+.text th {
+  border: 1px solid hsl(0, 0%, 33.3%);
+}
+
+.text td {
+  border-inline: 1px solid hsl(0, 0%, 33.3%);
+}
+
+.parsed td {
+  vertical-align: top;
+}
+
+.line_no {
+  text-align: right;
+  width: 4ex;
+  border: none !important;
+}
+
+.ok {
+  color: green;
+}
+
+.ko {
+  color: red;
+}
+</style>
+
+<script>
+import { parse } from 'csv-parse/sync'
+import { getHSLColourFor } from '@/lib/hsl'
+import truncateText from '@/lib/truncate-text'
+
+export default {
+  name: "DougalSaillinesStringDecoder",
+
+  components: {
+  },
+
+  props: {
+    text: String,
+    fields: Object,
+    //delimiter: String,
+    headerRow: { type: [ Boolean, Number ], default: false},
+    numberedLines: [ Boolean, Number ],
+    maxHeight: String,
+    editableFieldList: { type: Boolean, default: true },
+    readonly: Boolean,
+    title: String,
+    subtitle: String
+  },
+
+  data () {
+    return {
+      delimiter: ",",
+      showLineNumbers: null,
+      text_: "",
+      viewTab: null
+    }
+  },
+
+  computed: {
+
+    cells () {
+      return parse(this.text_, {delimiter: this.delimiter, trim: true});
+    },
+
+    headers () {
+      return this.cells[0]?.map(cell => ({
+        text: cell,
+        colour: this.getHSLColourFor(cell),
+        backgroundColour: this.getHSLColourFor(cell, 0.2),
+      })) ?? [];
+    },
+
+    rows () {
+      return [...this.cells].slice(1).map(r =>
+        r.map( (c, ι) => ({
+          text: truncateText(c),
+          colour: this.headers[ι]?.backgroundColour
+        })));
+    },
+
+    /*
+     * A saillines object looks like:
+     *
+     * {
+     *  [sail_line]: {
+     *    incr: true, // or false
+     *    ntba: true, // or false
+     *    remarks: "",
+     *    source_line: [ 1000, 1001, …],
+     *    "meta.colour": ""
+     *  },
+     *  …
+     * }
+     */
+    saillines () {
+      // Return an array of the column numbers
+      // corresponding to `key`.
+      // This file accepts duplicate column numbers,
+      // notably for `source_line`.
+      const key_indices = (key) =>
+        this.headers.reduce( (acc, cur, ι) => {
+          if (cur.text == key) {
+            acc.push(ι)
+          }
+          return acc;
+        }, []);
+
+      // Properties of the sailline object
+      const keys = [ "incr", "ntba", "remarks", "source_line", "meta.colour" ];
+
+      // To transform the input text into the required format for each field
+      const transformer = (key) => {
+        const transformers = {
+          incr: (v) => Boolean(Number(v)),
+          ntba: (v) => Boolean(Number(v)),
+          remarks: String,
+          source_line: Number,
+        };
+        return transformers[key] ?? String;
+      };
+
+      // This is the saillines object
+      const lines = {};
+
+      // The column numbers for each property
+      const columns = keys.map( k => [ k, key_indices(k) ] );
+
+      // The column number for the sail_line property, which
+      // we use as a key.
+      const sail_line_idx = key_indices("sail_line")[0];
+
+      // Transform each line in the input file into a
+      // sailline object (just for display purposes,
+      // this is not exactly how the server will do it).
+      for (const row of this.rows) {
+        const sail_line = row[sail_line_idx]?.text;
+        const values = columns.map(i => [
+          i[0],
+          i[0] == "source_line"
+            ? i[1].map(idx => transformer(i[0])(row[idx]?.text))
+            : transformer(i[0])(row[i[1][0]]?.text)
+        ]);
+
+        lines[sail_line] = Object.fromEntries(values);
+      }
+
+      return lines;
+    }
+
+  },
+
+  watch: {
+
+    text () {
+      if (this.text != this.text_) {
+        this.reset();
+      }
+    },
+
+    numberedLines (cur, prev) {
+      if (cur != prev) {
+        this.showLineNumbers = typeof cur == "number" || cur;
+      }
+    }
+
+  },
+
+  methods: {
+
+
+    getHSLColourFor: getHSLColourFor.bind(this),
+
+    numberLine (number, line) {
+      return `<span class="line-number">${number}</span>${line}`;
+    },
+
+    reset () {
+      this.text_ = this.text.replaceAll("\r", "");
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 09fb65381227959ebef1053cea5b6c4584983ad0 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 Nov 2023 20:59:58 +0100
Subject: [PATCH 030/113] Strip whitespace

---
 lib/www/client/source/src/lib/utils.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/www/client/source/src/lib/utils.js b/lib/www/client/source/src/lib/utils.js
index 6a3ade8..3b55302 100644
--- a/lib/www/client/source/src/lib/utils.js
+++ b/lib/www/client/source/src/lib/utils.js
@@ -93,25 +93,25 @@ function geometryAsString (item, opts = {}) {
 }
 
 /** Extract preferences by prefix.
- * 
+ *
  * This function returns a lambda which, given
  * a key or a prefix, extracts the relevant
  * preferences from the designated preferences
  * store.
- * 
+ *
  * For instance, assume preferences = {
  *   "a.b.c.d": 1,
  *   "a.b.e.f": 2,
  *   "g.h": 3
  * }
- * 
+ *
  * And λ = preferencesλ(preferences). Then:
- * 
+ *
  * λ("a.b") → { "a.b.c.d": 1, "a.b.e.f": 2 }
  * λ("a.b.e.f") → { "a.b.e.f": 2 }
  * λ("g.x", {"g.x.": 99}) → { "g.x.": 99 }
  * λ("a.c", {"g.x.": 99}) → { "g.x.": 99 }
- * 
+ *
  * Note from the last  two examples that a default value
  * may be provided and will be returned if a key does
  * not exist or is not searched for.

From 313e9687bd31219749ab95b08b8c8da0431e85a5 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 18:11:58 +0100
Subject: [PATCH 031/113] Bring all the lib/utils from the frontend to the
 backend.

The idea being that eventually we will symlink the lib/utils
directory so that the same routines are available on both the
frontend and the backend.
---
 lib/www/server/lib/utils/FormatTimestamp.js |  13 ++
 lib/www/server/lib/utils/deep.js            | 168 ++++++++++++++++++++
 lib/www/server/lib/utils/hsl.js             |  47 ++++++
 lib/www/server/lib/utils/index.js           |  23 ++-
 lib/www/server/lib/utils/markdown.js        |  11 ++
 lib/www/server/lib/utils/preferencesλ.js   |  44 +++++
 lib/www/server/lib/utils/throttle.js        |  33 ++++
 lib/www/server/lib/utils/truncateText.js    |  10 ++
 lib/www/server/lib/utils/unpack.js          |  35 ++++
 lib/www/server/lib/utils/withParentProps.js |  28 ++++
 10 files changed, 406 insertions(+), 6 deletions(-)
 create mode 100644 lib/www/server/lib/utils/FormatTimestamp.js
 create mode 100644 lib/www/server/lib/utils/deep.js
 create mode 100644 lib/www/server/lib/utils/hsl.js
 create mode 100644 lib/www/server/lib/utils/markdown.js
 create mode 100644 lib/www/server/lib/utils/preferencesλ.js
 create mode 100644 lib/www/server/lib/utils/throttle.js
 create mode 100644 lib/www/server/lib/utils/truncateText.js
 create mode 100644 lib/www/server/lib/utils/unpack.js
 create mode 100644 lib/www/server/lib/utils/withParentProps.js

diff --git a/lib/www/server/lib/utils/FormatTimestamp.js b/lib/www/server/lib/utils/FormatTimestamp.js
new file mode 100644
index 0000000..1ed936f
--- /dev/null
+++ b/lib/www/server/lib/utils/FormatTimestamp.js
@@ -0,0 +1,13 @@
+
+
+function FormatTimestamp (str) {
+  const d = new Date(str);
+  if (isNaN(d)) {
+    return str;
+  } else {
+    // Get rid of milliseconds
+    return d.toISOString().substring(0,19)+"Z";
+  }
+}
+
+module.exports = FormatTimestamp;
diff --git a/lib/www/server/lib/utils/deep.js b/lib/www/server/lib/utils/deep.js
new file mode 100644
index 0000000..f33ce56
--- /dev/null
+++ b/lib/www/server/lib/utils/deep.js
@@ -0,0 +1,168 @@
+
+/** Compare two possibly complex values for
+ * loose equality, going as deep as required in the
+ * case of complex objects.
+ */
+function deepCompare (a, b) {
+  if (typeof a == "object" && typeof b == "object") {
+    return !Object.entries(a).some( ([k, v]) => !deepCompare(v, b[k])) &&
+      !Object.entries(b).some( ([k, v]) => !deepCompare(v, a[k]));
+  } else {
+    return a == b;
+  }
+}
+
+
+/** Compare two possibly complex values for
+ * strict equality.
+ */
+function deepEqual (a, b) {
+  if (typeof a === "object" && typeof b === "object") {
+    return !Object.entries(a).some( ([k, v]) => !deepEqual(v, b[k])) &&
+      !Object.entries(b).some( ([k, v]) => !deepEqual(v, a[k]));
+  } else {
+    return a === b;
+  }
+}
+
+/** Traverses an object and sets a nested value.
+ *
+ * Example:
+ *
+ * const obj = {a: {b: {c: "X"} } }
+ * deepSet(obj, ["a", "b", "c"], "d")
+ * → {a: {b: {c: "d"} } }
+ *
+ * This would be the equivalent of:
+ *
+ * obj?.a?.b?.c = "d";
+ *
+ * Except that the above is not a legal expression.
+ *
+ * If a non-leaf property does not exist, this function
+ * creates it as an empty object ({}) and keeps traversing.
+ *
+ * The last member of `path` may be `null`, in which case,
+ * if the object pointed to by the next to last member is
+ * an array, an insert operation will take place.
+ *
+ */
+function deepSet (obj, path, value) {
+  const key = path.shift();
+  if (!path.length) {
+    if (key === null && Array.isArray(obj)) {
+      obj.push(value);
+    } else {
+      obj[key] = value;
+    }
+  } else {
+    if (!Object.hasOwn(obj, key)) {
+      obj[key] = {};
+    }
+    deepSet(obj[key], path, value);
+  }
+}
+
+/** Returns a nested property.
+ *
+ * Example:
+ *
+ * const obj = {a: {b: {c: "d"} } }
+ * deepSet(obj, ["a", "b", "c"])
+ * → "d"
+ *
+ * If `path` is known in advance, this is effectively
+ * the same as:
+ *
+ * obj?.a?.b?.c
+ *
+ * This might be useful when `path` is dynamic.
+ */
+function deepValue (obj, path) {
+  if (obj !== undefined) {
+    const key = path.shift();
+    if (!path.length) {
+      if (key === undefined) {
+        return obj;
+      } else {
+        return obj[key];
+      }
+    } else {
+      return deepValue(obj[key], path);
+    }
+  }
+}
+
+// Copied from:
+// https://gomakethings.com/how-to-deep-merge-arrays-and-objects-with-javascript/
+
+/*!
+ * Deep merge two or more objects or arrays.
+ * (c) 2023 Chris Ferdinandi, MIT License, https://gomakethings.com
+ * @param   {*} ...objs  The arrays or objects to merge
+ * @returns {*}          The merged arrays or objects
+ */
+function deepMerge (...objs) {
+
+	/**
+	 * Get the object type
+	 * @param  {*}       obj The object
+	 * @return {String}      The object type
+	 */
+	function getType (obj) {
+		return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();
+	}
+
+	/**
+	 * Deep merge two objects
+	 * @return {Object}
+	 */
+	function mergeObj (clone, obj) {
+		for (let [key, value] of Object.entries(obj)) {
+			let type = getType(value);
+			if (clone[key] !== undefined && getType(clone[key]) === type && ['array', 'object'].includes(type)) {
+				clone[key] = deepMerge(clone[key], value);
+			} else {
+				clone[key] = structuredClone(value);
+			}
+		}
+	}
+
+	// Create a clone of the first item in the objs array
+	let clone = structuredClone(objs.shift());
+
+	// Loop through each item
+	for (let obj of objs) {
+
+		// Get the object type
+		let type = getType(obj);
+
+		// If the current item isn't the same type as the clone, replace it
+		if (getType(clone) !== type) {
+			clone = structuredClone(obj);
+			continue;
+		}
+
+		// Otherwise, merge
+		if (type === 'array') {
+			// Replace old array with new
+			clone = [...structuredClone(obj)];
+		} else if (type === 'object') {
+			mergeObj(clone, obj);
+		} else {
+			clone = obj;
+		}
+
+	}
+
+	return clone;
+
+}
+
+module.exports = {
+	deepCompare,
+	deepEqual,
+	deepSet,
+	deepValue,
+	deepMerge
+};
diff --git a/lib/www/server/lib/utils/hsl.js b/lib/www/server/lib/utils/hsl.js
new file mode 100644
index 0000000..5d6de6f
--- /dev/null
+++ b/lib/www/server/lib/utils/hsl.js
@@ -0,0 +1,47 @@
+/** Return an HSL colour as a function of an input value
+  * `str`.
+  *
+  * Consider using as getHSL.bind(this) in Vue components
+  * in order to get access to the Vuetify theme configuration.
+  */
+function getHSL (str, saturation = 1, lightness = 0.25, offset = 0) {
+
+  function getHash (v) {
+    if (typeof (v??false)[Symbol.iterator] != "function") {
+      // Not an iterable, make it one
+      v = String(v);
+    }
+
+    return Math.abs([...v, ..." "].reduce( (acc, cur) => String(cur).charCodeAt(0) + ((acc << 5) - acc), 0 ));
+  }
+
+  const h = (getHash(str) + offset) % 360;
+  const s = saturation * 100;
+  const l = this?.$vuetify?.theme?.isDark
+    ? (1-lightness) * 100
+    : lightness * 100;
+
+  return {h, s, l};
+
+}
+
+/** Return a CSS hsl() or hsla() colour
+ * representation as a function of an input value.
+ *
+ * Consider using as getHSLColourFor.bind(this) – See
+ * note for getHSL() above.
+ */
+function getHSLColourFor (str, opacity = 1, saturation, lightness, offset) {
+  const _getHSL = getHSL.bind(this);
+  const {h, s, l} = _getHSL(str, saturation, lightness, offset);
+  if (opacity == 1) {
+    return `hsl(${h},${s}%,${l}%)`;
+  } else {
+    return `hsla(${h},${s}%,${l}%, ${opacity})`;
+  }
+}
+
+module.exports = {
+  getHSL,
+  getHSLColourFor
+}
diff --git a/lib/www/server/lib/utils/index.js b/lib/www/server/lib/utils/index.js
index bae0fee..42a47c8 100644
--- a/lib/www/server/lib/utils/index.js
+++ b/lib/www/server/lib/utils/index.js
@@ -1,13 +1,24 @@
 
 module.exports = {
-	geometryAsString: require('./geometryAsString'),
+	...require('./deep'),
 	dms: require('./dms'),
-	replaceMarkers: require('./replaceMarkers'),
+	...require('./flatEntries'),
 	flattenQCDefinitions: require('./flattenQCDefinitions'),
-	deepMerge: require('./deepMerge'),
+	FormatTimestamp: require('./FormatTimestamp'),
+	geometryAsString: require('./geometryAsString'),
+	...require('./hsl'),
+	...require('./logicalPath'), // FIXME Breaking change (used to be logicalPath.…)
+	logicalPath: require('./logicalPath'), // NOTE For compatibility, see above
+	...require('./markdown'),
+	preferencesλ: require('./preferencesλ'),
+	...require('./ranges'), // FIXME Breaking change (used to be ranges.…)
+	ranges: require('./ranges'), // NOTE For compatibility, see above.
 	removeNulls: require('./removeNulls'),
-	logicalPath: require('./logicalPath'),
-	ranges: require('./ranges'),
+	replaceMarkers: require('./replaceMarkers'),
+	setContentDisposition: require('./setContentDisposition'),
+	throttle: require('./throttle'),
+	truncateText: require('./truncateText'),
 	unique: require('./unique'),
-	setContentDisposition: require('./setContentDisposition')
+	unpack: require('./unpack'),
+	withParentProps: require('./withParentProps')
 };
diff --git a/lib/www/server/lib/utils/markdown.js b/lib/www/server/lib/utils/markdown.js
new file mode 100644
index 0000000..4957207
--- /dev/null
+++ b/lib/www/server/lib/utils/markdown.js
@@ -0,0 +1,11 @@
+const { marked, parseInline } = require('marked');
+
+function markdown (str) {
+  return marked(String(str));
+}
+
+function markdownInline (str) {
+  return parseInline(String(str));
+}
+
+module.exports = { markdown, markdownInline };
diff --git a/lib/www/server/lib/utils/preferencesλ.js b/lib/www/server/lib/utils/preferencesλ.js
new file mode 100644
index 0000000..429a252
--- /dev/null
+++ b/lib/www/server/lib/utils/preferencesλ.js
@@ -0,0 +1,44 @@
+
+
+/** Extract preferences by prefix.
+ *
+ * This function returns a lambda which, given
+ * a key or a prefix, extracts the relevant
+ * preferences from the designated preferences
+ * store.
+ *
+ * For instance, assume preferences = {
+ *   "a.b.c.d": 1,
+ *   "a.b.e.f": 2,
+ *   "g.h": 3
+ * }
+ *
+ * And λ = preferencesλ(preferences). Then:
+ *
+ * λ("a.b") → { "a.b.c.d": 1, "a.b.e.f": 2 }
+ * λ("a.b.e.f") → { "a.b.e.f": 2 }
+ * λ("g.x", {"g.x.": 99}) → { "g.x.": 99 }
+ * λ("a.c", {"g.x.": 99}) → { "g.x.": 99 }
+ *
+ * Note from the last  two examples that a default value
+ * may be provided and will be returned if a key does
+ * not exist or is not searched for.
+ */
+function preferencesλ (preferences) {
+
+  return function (key, defaults={}) {
+    const keys = Object.keys(preferences).filter(str => str.startsWith(key+".") || str == key);
+
+    const settings = {...defaults};
+    for (const str of keys) {
+      const k = str == key ? str : str.substring(key.length+1);
+      const v = preferences[str];
+      settings[k] = v;
+    }
+
+    return settings;
+  }
+
+}
+
+module.exports = preferencesλ;
diff --git a/lib/www/server/lib/utils/throttle.js b/lib/www/server/lib/utils/throttle.js
new file mode 100644
index 0000000..ff9a90e
--- /dev/null
+++ b/lib/www/server/lib/utils/throttle.js
@@ -0,0 +1,33 @@
+/**
+ * Throttle a function call.
+ *
+ * It delays `callback` by `delay` ms and ignores any
+ * repeated calls from `caller` within at most `maxWait`
+ * milliseconds.
+ *
+ * Used to react to server events in cases where we get
+ * a separate notification for each row of a bulk update.
+ */
+function throttle (callback, caller, delay = 100, maxWait = 500) {
+
+  const schedule = async () => {
+    caller.triggeredAt = Date.now();
+    caller.timer = setTimeout(async () => {
+      await callback();
+      caller.timer = null;
+    }, delay);
+  }
+
+  if (!caller.timer) {
+    schedule();
+  } else {
+    const elapsed = Date.now() - caller.triggeredAt;
+    if (elapsed > maxWait) {
+      cancelTimeout(caller.timer);
+      schedule();
+    }
+  }
+
+}
+
+module.exports = throttle;
diff --git a/lib/www/server/lib/utils/truncateText.js b/lib/www/server/lib/utils/truncateText.js
new file mode 100644
index 0000000..a38ce71
--- /dev/null
+++ b/lib/www/server/lib/utils/truncateText.js
@@ -0,0 +1,10 @@
+
+function truncateText (text, length=20) {
+  if (text?.length <= length) {
+    return text;
+  } else {
+    return text.slice(0, length/2)+"…"+text.slice(-(length/2));
+  }
+}
+
+module.exports = truncateText;
diff --git a/lib/www/server/lib/utils/unpack.js b/lib/www/server/lib/utils/unpack.js
new file mode 100644
index 0000000..1728eb1
--- /dev/null
+++ b/lib/www/server/lib/utils/unpack.js
@@ -0,0 +1,35 @@
+/** Unpacks attributes from array items.
+ *
+ * At it simplest, given an array of objects,
+ * the call unpack(rows, "x") returns an array
+ * of the "x" attribute of every item in rows.
+ *
+ * `key` may also be:
+ *
+ * - a function with the signature
+ *   (Object) => any
+ *   the result of applying the function to
+ *   the object will be used as the unpacked
+ *   value.
+ *
+ * - an array of strings, functions or other
+ *   arrays. In this case, it does a recursive
+ *   fold operation. NOTE: it mutates `key`.
+ *
+ */
+function unpack(rows, key) {
+  if (typeof key === "function") {
+    return rows && rows.map( row => key(row) );
+  } else if (Array.isArray(key)) {
+    const car = key.shift();
+    if (key.length) {
+      return unpack(unpack(rows, car), key);
+    } else {
+      return unpack(rows, car);
+    }
+  } else {
+    return rows && rows.map( row => row?.[key] );
+  }
+};
+
+module.exports = unpack;
diff --git a/lib/www/server/lib/utils/withParentProps.js b/lib/www/server/lib/utils/withParentProps.js
new file mode 100644
index 0000000..e813a59
--- /dev/null
+++ b/lib/www/server/lib/utils/withParentProps.js
@@ -0,0 +1,28 @@
+
+function withParentProps(item, parent, childrenKey, prop, currentValue) {
+	if (!Array.isArray(parent)) {
+		return;
+	}
+
+	let currentPropValue = currentValue || parent[prop];
+
+	for (const entry of parent) {
+		if (entry[prop]) {
+			currentPropValue = entry[prop];
+		}
+
+		if (entry === item) {
+			return [item, currentPropValue];
+		}
+
+		if (entry[childrenKey]) {
+			const res = withParentProps(item, entry[childrenKey], childrenKey, prop, currentPropValue);
+            if (res[1]) {
+              return res;
+            }
+		}
+	}
+	return [];
+}
+
+module.exports = withParentProps;

From efe64f0a8c5c0d0b39a54afb9be50218bbe656bf Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 20:18:17 +0100
Subject: [PATCH 032/113] Implement PUT method for project configuration
 endpoint.

In short:

POST creates a new project
PUT overwrites a project configuration with a new one
PATCH merges the request body with the existing configuration
---
 lib/www/server/api/index.js                   |  1 +
 .../middleware/project/configuration/index.js |  2 +-
 .../middleware/project/configuration/put.js   | 16 +++++
 .../lib/db/project/configuration/index.js     |  2 +-
 .../lib/db/project/configuration/put.js       | 58 +++++++++++++++++++
 5 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 lib/www/server/api/middleware/project/configuration/put.js
 create mode 100644 lib/www/server/lib/db/project/configuration/put.js

diff --git a/lib/www/server/api/index.js b/lib/www/server/api/index.js
index 3065a0b..fa94437 100644
--- a/lib/www/server/api/index.js
+++ b/lib/www/server/api/index.js
@@ -114,6 +114,7 @@ app.map({
 	'/project/:project/configuration': {
 		get: [ mw.project.configuration.get ],	// Get project configuration
 		patch: [ mw.auth.access.admin, mw.project.configuration.patch ],	// Modify project configuration
+		put: [ mw.auth.access.admin, mw.project.configuration.put ],	// Overwrite configuration
 	},
 
 	/*
diff --git a/lib/www/server/api/middleware/project/configuration/index.js b/lib/www/server/api/middleware/project/configuration/index.js
index 6b40791..821d84c 100644
--- a/lib/www/server/api/middleware/project/configuration/index.js
+++ b/lib/www/server/api/middleware/project/configuration/index.js
@@ -2,7 +2,7 @@
 module.exports = {
 	get: require('./get'),
 	// post: require('./post'),
-	// put: require('./put'),
+	put: require('./put'),
 	patch: require('./patch'),
 	// delete: require('./delete'),
 };
diff --git a/lib/www/server/api/middleware/project/configuration/put.js b/lib/www/server/api/middleware/project/configuration/put.js
new file mode 100644
index 0000000..082877b
--- /dev/null
+++ b/lib/www/server/api/middleware/project/configuration/put.js
@@ -0,0 +1,16 @@
+
+const { project } = require('../../../../lib/db');
+
+module.exports = async function (req, res, next) {
+
+	try {
+		// TODO
+		// Implement If-Match header requirements
+		res.send(await project.configuration.put(req.params.project, req.body));
+		next();
+	} catch (err) {
+		next(err);
+	}
+
+
+};
diff --git a/lib/www/server/lib/db/project/configuration/index.js b/lib/www/server/lib/db/project/configuration/index.js
index 6b40791..821d84c 100644
--- a/lib/www/server/lib/db/project/configuration/index.js
+++ b/lib/www/server/lib/db/project/configuration/index.js
@@ -2,7 +2,7 @@
 module.exports = {
 	get: require('./get'),
 	// post: require('./post'),
-	// put: require('./put'),
+	put: require('./put'),
 	patch: require('./patch'),
 	// delete: require('./delete'),
 };
diff --git a/lib/www/server/lib/db/project/configuration/put.js b/lib/www/server/lib/db/project/configuration/put.js
new file mode 100644
index 0000000..ace06cc
--- /dev/null
+++ b/lib/www/server/lib/db/project/configuration/put.js
@@ -0,0 +1,58 @@
+const { setSurvey } = require('../../connection');
+const { deepMerge, removeNulls } = require('../../../utils');
+const { modify } = require('../create');
+
+
+async function put (projectId, payload, opts = {}) {
+	let client;
+	try {
+		client = await setSurvey(); // Use public schema
+
+		const text = `
+			SELECT meta
+			FROM projects
+			WHERE pid = $1;
+		`;
+
+		const res = await client.query(text, [projectId]);
+
+		const source = res.rows[0].meta;
+
+		if (!source) {
+			throw { status: 404, message: "Not found" };
+		}
+
+		console.log("PAYLOAD ID", payload.id, typeof payload);
+		if (("id" in payload) && (projectId.toLowerCase() != payload.id.toLowerCase())) {
+			throw {
+				status: 422,
+				message: "Project ID cannot be changed in this Dougal version"
+			}
+		}
+
+		if (("name" in payload) && source.name && (source.name != payload.name)) {
+			throw {
+				status: 422,
+				message: "Project name cannot be changed in this Dougal version"
+			}
+		}
+
+		// We do not allow users to change the schema
+		delete payload.schema;
+
+		const dest = removeNulls(payload);
+		await modify(projectId, dest);
+		return dest;
+
+	} catch (err) {
+		if (err.code == "42P01") {
+			throw { status: 404, message: "Not found" };
+		} else {
+			throw err;
+		}
+	} finally {
+		client.release();
+	}
+}
+
+module.exports = put;

From 53e7a06a18a5cbe4138b415ece4b2b1522c95719 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 20:21:37 +0100
Subject: [PATCH 033/113] Add Vue watch mixin to update a variable on changes
 to another.

To be used where adding .sync to props is not convenient for
one reason or another.
---
 lib/www/client/source/src/lib/watcher-mixin.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lib/www/client/source/src/lib/watcher-mixin.js

diff --git a/lib/www/client/source/src/lib/watcher-mixin.js b/lib/www/client/source/src/lib/watcher-mixin.js
new file mode 100644
index 0000000..f0ab525
--- /dev/null
+++ b/lib/www/client/source/src/lib/watcher-mixin.js
@@ -0,0 +1,14 @@
+import { deepCompare } from './utils';
+
+function setIfDifferent(propsLocals) {
+  return Object.fromEntries(Object.entries(propsLocals).map( ([prop, local]) => [
+    local,
+    () => {
+      if (!deepCompare(this[prop], this[local])){
+        this[local] = structuredClone(this[prop]);
+      }
+    }
+  ]));
+}
+
+export default setIfDifferent;

From 26a487aa4788e48489c70978b81ce4433dc01835 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 20:50:02 +0100
Subject: [PATCH 034/113] Add json-builder component.

It displays a JSON object as a <v-treeview/>, with editing
capabilities.
---
 .../components/json-builder/json-builder.vue  | 557 ++++++++++++++++++
 .../json-builder/property-dialog.vue          | 125 ++++
 2 files changed, 682 insertions(+)
 create mode 100644 lib/www/client/source/src/components/json-builder/json-builder.vue
 create mode 100644 lib/www/client/source/src/components/json-builder/property-dialog.vue

diff --git a/lib/www/client/source/src/components/json-builder/json-builder.vue b/lib/www/client/source/src/components/json-builder/json-builder.vue
new file mode 100644
index 0000000..ed3bdca
--- /dev/null
+++ b/lib/www/client/source/src/components/json-builder/json-builder.vue
@@ -0,0 +1,557 @@
+<template>
+  <v-container>
+    <v-row>
+        <v-treeview
+          dense
+          activatable
+          hoverable
+          :multiple-active="false"
+          :active.sync="active"
+          :open.sync="open"
+          :items="treeview"
+          style="cursor:pointer;width:100%;"
+        >
+          <template v-slot:prepend="{item}">
+            <template v-if="item.icon">
+              <v-icon
+                small
+                left
+                :title="item.leaf ? item.type : `${item.type} (${item.children.length} children)`"
+              >{{item.icon}}</v-icon>
+            </template>
+          </template>
+
+          <template v-slot:label="{item}">
+            <template v-if="!('path' in item)">
+              {{item.name}}
+            </template>
+            <template v-else-if="item.leaf">
+              <v-chip
+                small
+                label
+                outlined
+                :color="item.isArrayItem ? 'secondary' : 'primary'"
+              >
+                {{item.name}}
+              </v-chip>
+              <code class="ml-4" v-if="item.type == 'bigint'">{{item.value+"n"}}</code>
+              <code class="ml-4" v-else-if="item.type == 'boolean'"><b>{{item.value}}</b></code>
+              <code class="ml-4" v-else>{{item.value}}</code>
+              <v-icon v-if="item.type == 'string' && (/^#[0-9a-fA-F]{3}([0-9a-fA-F]{3}([0-9a-fA-F]{2})?)?$/.test(item.value) || item.name == 'colour' || item.name == 'color')"
+                right
+                :color="item.value"
+              >mdi-square</v-icon>
+            </template>
+            <template v-else>
+              <v-chip
+                small
+                label
+                outlined
+                :color="item.isArrayItem ? 'secondary' : 'primary'"
+              >
+                {{item.name}}
+              </v-chip>
+            </template>
+          </template>
+
+          <template v-slot:append="{item}">
+            <template>
+              <v-icon v-if="item.type == 'array'"
+                small
+                right
+                outline
+                color="primary"
+                title="Add item"
+                @click="itemAddDialog(item)"
+              >mdi-plus</v-icon>
+              <v-icon v-if="item.type == 'object'"
+                small
+                right
+                outline
+                color="primary"
+                title="Add property"
+                @click="itemAddDialog(item)"
+              >mdi-plus</v-icon>
+              <v-icon v-if="item.type == 'boolean'"
+                small
+                right
+                outline
+                color="primary"
+                title="Toggle value"
+                @click="itemToggle(item)"
+              >{{ item.value ? "mdi-checkbox-blank-outline" : "mdi-checkbox-marked-outline" }}</v-icon>
+              <v-icon v-if="item.type == 'string' || item.type == 'number'"
+                small
+                right
+                outline
+                color="primary"
+                title="Edit value"
+                @click="itemAddDialog(item, true)"
+              >mdi-pencil-outline</v-icon>
+              <v-icon
+                small
+                right
+                outlined
+                color="red"
+                title="Delete"
+                :disabled="item.id == rootId"
+                @click="itemDelete(item)"
+              >mdi-minus</v-icon>
+            </template>
+          </template>
+        </v-treeview>
+        <dougal-json-builder-property-dialog
+          :open="editor"
+          v-model="edit"
+          v-bind="editorProperties"
+          @save="editorSave"
+          @close="editorClose"
+        ></dougal-json-builder-property-dialog>
+    </v-row>
+  </v-container>
+
+</template>
+
+<script>
+import { deepValue, deepSet } from '@/lib/utils';
+import DougalJsonBuilderPropertyDialog from './property-dialog';
+
+export default {
+  name: "DougalJsonBuilder",
+
+  components: {
+    DougalJsonBuilderPropertyDialog
+  },
+
+  props: {
+    value: Object,
+    name: String,
+    sort: String
+  },
+
+  data () {
+    const rootId = Symbol("rootNode");
+    return {
+      rootId,
+      active: [],
+      open: [ rootId ],
+      editor: false,
+      editorProperties: {
+        nameShown: true,
+        nameEditable: true,
+        typeShown: true,
+        typeEditable: true,
+        valueShown: true,
+        serialisable: true
+      },
+      onEditorSave: (evt) => {},
+      edit: {
+        name: null,
+        type: null,
+        value: null
+      }
+    };
+  },
+
+  computed: {
+
+    treeview () {
+
+      function sorter (key) {
+        return function λ (a, b) {
+          return a?.[key] > b?.[key]
+            ? 1
+            : a?.[key] < b?.[key]
+              ? -1
+              : 0;
+        }
+      }
+
+      function getType (value) {
+        const t = typeof value;
+        switch (t) {
+          case "symbol":
+          case "string":
+          case "bigint":
+          case "number":
+          case "boolean":
+          case "undefined":
+            return t;
+          case "object":
+            return value === null
+              ? "null"
+              : Array.isArray(value)
+                ? "array"
+                : t;
+        }
+      }
+
+      function getIcon (type) {
+        switch (type) {
+          case "symbol":
+            return "mdi-symbol";
+          case "string":
+            return "mdi-format-text";
+          case "bigint":
+            return "mdi-numeric";
+          case "number":
+            return "mdi-numeric";
+          case "boolean":
+            return "mdi-checkbox-intermediate-variant";
+          case "undefined":
+            return "mdi-border-none-variant";
+          case "null":
+            return "mdi-null";
+          case "array":
+            return "mdi-list-box-outline";
+          case "object":
+            return "mdi-format-list-bulleted-type";
+        }
+        return "mdi-help";
+      }
+
+      const leaf = ([key, value], parent) => {
+        const id = parent
+          ? parent.id+"."+key
+          : key;
+        const name = key;
+        const type = getType(value);
+        const icon = getIcon(type);
+        const isArrayItem = parent?.type == "array";
+
+        const obj = {
+          id,
+          name,
+          type,
+          icon,
+          isArrayItem,
+        };
+
+        if (parent) {
+          obj.path = [...parent.path, key];
+        } else {
+          obj.path = [ key ];
+        }
+
+        if (type == "object" || type == "array") {
+          const children = [];
+          for (const child of Object.entries(value)) {
+            children.push(leaf(child, obj));
+          }
+          if (this.sort) {
+            children.sort(sorter(this.sort));
+          }
+          obj.children = children;
+        } else {
+          obj.leaf = true;
+          obj.value = value;
+          /*
+          obj.children = [{
+            id: id+".value",
+            name: String(value)
+          }]
+          */
+        }
+
+        return obj;
+      }
+
+      const rootNode = {
+        id: this.rootId,
+        name: this.name,
+        type: getType(this.value),
+        icon: getIcon(getType(this.value)),
+        children: []
+      };
+      const view = [rootNode];
+
+      if (this.value) {
+        for (const child of Object.entries(this.value)) {
+          rootNode.children.push(leaf(child));
+        }
+        if (this.sort) {
+          rootNode.children.sort(sorter(this.sort));
+        }
+      }
+
+      return view;
+    }
+
+  },
+
+  watch: {
+    treeview () {
+      if (!this.open.includes(this.rootId)) {
+        this.open.push(this.rootId);
+      }
+    }
+  },
+
+  methods: {
+
+    openAll (open = true) {
+      const walk = (obj) => {
+        if (obj?.children) {
+          for (const child of obj.children) {
+            walk(child);
+          }
+          if (obj?.id) {
+            this.open.push(obj.id);
+          }
+        }
+      }
+      for (const item of this.treeview) {
+        walk (item);
+      }
+    },
+
+    itemDelete (item) {
+      const parents = [...item.path];
+      const key = parents.pop();
+
+      if (key) {
+
+        const value = structuredClone(this.value);
+        const obj = parents.length ? deepValue(value, parents) : value;
+
+        if (Array.isArray(obj)) {
+          obj.splice(key, 1);
+        } else {
+          delete obj[key];
+        }
+
+        this.$emit("input", value);
+
+      } else {
+
+        this.$emit("input", {});
+
+      }
+    },
+
+    itemToggle (item, state) {
+      const parents = [...item.path];
+      const value = structuredClone(this.value);
+
+      if (parents.length) {
+        deepSet(value, parents, state ?? !item.value)
+      } else {
+        value = state ?? !item.value;
+      }
+
+      this.$emit("input", value);
+    },
+
+    itemSet (path, content) {
+      const parents = [...(path??[])];
+      const key = parents.pop();
+
+      if (key !== undefined) {
+
+        const value = structuredClone(this.value);
+        const obj = parents.length ? deepValue(value, parents) : value;
+
+        if (Array.isArray(obj)) {
+          if (key === null) {
+            obj.push(content);
+          } else {
+            obj[key] = content;
+          }
+        } else {
+          obj[key] = content;
+        }
+
+        this.$emit("input", value);
+
+      } else {
+        this.$emit("input", content);
+
+      }
+    },
+
+    itemAdd (path, content) {
+      let value = structuredClone(this.value);
+      let path_ = [...(path??[])];
+
+      if (path_.length) {
+        try {
+          deepSet(value, path_, content);
+        } catch (err) {
+          if (err instanceof TypeError) {
+            this.itemSet(path, content);
+            return;
+          }
+        }
+      } else {
+        value = content;
+      }
+
+      this.$emit("input", value);
+    },
+
+    itemAddDialog (item, edit=false) {
+
+      if (!this.open.includes(item.id)) {
+        this.open.push(item.id);
+      }
+
+      if (edit) {
+        this.editorReset({
+          name: item.name,
+          type: item.type,
+          value: item.value
+        }, {nameEditable: false});
+      } else {
+        this.editorReset({}, {
+          nameShown: item.type != "array",
+          nameRequired: item.type != "array"
+        });
+      }
+
+      this.onEditorSave = (evt) => {
+        this.editor = false;
+
+        let transformer;
+        switch(this.edit.type) {
+          case "symbol":
+            transformer = Symbol;
+            break;
+          case "string":
+            transformer = String;
+            break;
+          case "bigint":
+            transformer = BigInt;
+            break;
+          case "number":
+            transformer = Number;
+            break;
+          case "boolean":
+            transformer = Boolean;
+            break;
+          case "undefined":
+            transformer = () => { return undefined; };
+            break;
+          case "object":
+            transformer = (v) =>
+              typeof v == "object"
+                ? v
+                : (typeof v == "string" && v.length)
+                  ? JSON.parse(v)
+                  : {};
+            break;
+          case "null":
+            transformer = () => null;
+            break;
+          case "array":
+            // FIXME not great
+            transformer = (v) =>
+              Array.isArray(v)
+                ? v
+                : [];
+            break;
+        }
+
+        const value = transformer(this.edit.value);
+
+        const path = [...(item.path??[])];
+
+        if (!edit) {
+          if (item.type == "array") {
+            path.push(null);
+          } else {
+            path.push(this.edit.name);
+          }
+        }
+        this.itemAdd(path, value);
+      };
+      this.editor = true;
+
+    },
+
+    XXitemEditDialog (item) {
+
+      this.editorReset({
+        name: item.name,
+        type: item.type,
+        value: item.value}, {nameEditable: false});
+
+      this.onEditorSave = (evt) => {
+        this.editor = false;
+
+        let transformer;
+        switch(this.edit.type) {
+          case "symbol":
+            transformer = Symbol;
+            break;
+          case "string":
+            transformer = String;
+            break;
+          case "bigint":
+            transformer = BigInt;
+            break;
+          case "number":
+            transformer = Number;
+            break;
+          case "boolean":
+            transformer = Boolean;
+            break;
+          case "undefined":
+            transformer = () => { return undefined; };
+            break;
+          case "object":
+            transformer = (v) =>
+              typeof v == "object"
+                ? v
+                : (typeof v == "string" && v.length)
+                  ? JSON.parse(v)
+                  : {};
+            break;
+          case "null":
+            transformer = () => null;
+            break;
+          case "array":
+            // FIXME not great
+            transformer = (v) =>
+              Array.isArray(v)
+                ? v
+                : [];
+            break;
+        }
+
+        const key = this.edit.name;
+        const value = transformer(this.edit.value);
+        this.itemAdd(item, key, value);
+      }
+      this.editor = true;
+
+    },
+
+    editorReset (values, props) {
+      this.edit = {
+        name: values?.name,
+        type: values?.type,
+        value: values?.value
+      };
+
+      this.editorProperties = {
+        nameShown: props?.nameShown ?? true,
+        nameEditable: props?.nameEditable ?? true,
+        nameRequired: props?.nameRequired ?? true,
+        typeShown: props?.typeShown ?? true,
+        typeEditable: props?.typeEditable ?? true,
+        valueShown: props?.valueShown ?? true,
+        serialisable: props?.serialisable ?? true
+      };
+    },
+
+    editorSave (evt) {
+      this.onEditorSave?.(evt);
+    },
+
+    editorClose () {
+      this.editor = false;
+    }
+  }
+}
+
+</script>
diff --git a/lib/www/client/source/src/components/json-builder/property-dialog.vue b/lib/www/client/source/src/components/json-builder/property-dialog.vue
new file mode 100644
index 0000000..db5de0c
--- /dev/null
+++ b/lib/www/client/source/src/components/json-builder/property-dialog.vue
@@ -0,0 +1,125 @@
+<template>
+  <v-dialog :value="open" @input="$emit('close')">
+    <v-card>
+      <v-card-title>
+      </v-card-title>
+
+      <v-card-text>
+
+        <v-text-field v-if="nameShown"
+          label="Name"
+          :disabled="!nameEditable"
+          v-model.sync="value.name"
+        ></v-text-field>
+
+        <v-select v-if="typeShown"
+          label="Type"
+          :items="types"
+          :disabled="!typeEditable"
+          v-model.sync="value.type"
+        ></v-select>
+
+        <template v-if="valueShown">
+          <v-text-field v-if="value.type == 'number' || value.type == 'bigint'"
+            label="Value"
+            type="number"
+            v-model.sync="value.value"
+          ></v-text-field>
+
+          <v-textarea v-else-if="value.type == 'string'"
+            label="Value"
+            v-model.sync="value.value"
+          ></v-textarea>
+
+          <v-radio-group v-else-if="value.type == 'boolean'"
+            v-model.sync="value.value"
+          >
+            <v-radio
+              label="true"
+              :value="true"
+            ></v-radio>
+            <v-radio
+              label="false"
+              :value="false"
+            ></v-radio>
+          </v-radio-group>
+        </template>
+
+      </v-card-text>
+
+      <v-card-actions>
+        <v-btn
+          :disabled="!canSave"
+          @click="$emit('save')"
+        >Save</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+
+
+</template>
+
+<script>
+
+export default {
+  name: "DougalJsonBuilderPropertyDialog",
+
+  props: {
+    open: Boolean,
+    value: Object,
+    nameRequired: {type: Boolean, default: true},
+    nameEditable: Boolean,
+    nameShown: {type: Boolean, default: true},
+    typeEditable: Boolean,
+    typeShown: {type: Boolean, default: true},
+    valueShown: {type: Boolean, default: true},
+    serialisable: {type: Boolean, default: true},
+    allowedTypes: Array
+  },
+
+  data () {
+    return {
+      //key: null,
+      //type: null,
+      allTypes: [
+        "symbol",
+        "string",
+        "bigint",
+        "number",
+        "boolean",
+        "undefined",
+        "object",
+        "null",
+        "array"
+      ],
+      serialisableTypes: [
+        "string",
+        "number",
+        "boolean",
+        "object",
+        "null",
+        "array"
+      ],
+    };
+  },
+
+  computed: {
+
+    types () {
+      return this.allowedTypes
+        ? this.allowedTypes
+        : this.serialisable
+          ? this.serialisableTypes
+          : this.allTypes;
+    },
+
+    canSave () {
+      return this.value.type && (this.value.name || this.nameRequired === false);
+    }
+
+  }
+
+
+}
+
+</script>

From 80de0c1bb01f3a17b1fd094e96f2be08ba749441 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 20:52:08 +0100
Subject: [PATCH 035/113] Modify deepSet() to allow appending to arrays

---
 lib/www/client/source/src/lib/utils.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/lib/utils.js b/lib/www/client/source/src/lib/utils.js
index 3b55302..415d4f2 100644
--- a/lib/www/client/source/src/lib/utils.js
+++ b/lib/www/client/source/src/lib/utils.js
@@ -175,11 +175,19 @@ function deepEqual (a, b) {
  * If a non-leaf property does not exist, this function
  * creates it as an empty object ({}) and keeps traversing.
  *
+ * The last member of `path` may be `null`, in which case,
+ * if the object pointed to by the next to last member is
+ * an array, an insert operation will take place.
+ *
  */
 function deepSet (obj, path, value) {
   const key = path.shift();
   if (!path.length) {
-    obj[key] = value;
+    if (key === null && Array.isArray(obj)) {
+      obj.push(value);
+    } else {
+      obj[key] = value;
+    }
   } else {
     if (!Object.hasOwn(obj, key)) {
       obj[key] = {};

From 13f68d731442959f4583b5042169c9ca1bdaefe7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 20:52:33 +0100
Subject: [PATCH 036/113] deepValue with an empty path returns the object
 itself

---
 lib/www/client/source/src/lib/utils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/lib/utils.js b/lib/www/client/source/src/lib/utils.js
index 415d4f2..a88095c 100644
--- a/lib/www/client/source/src/lib/utils.js
+++ b/lib/www/client/source/src/lib/utils.js
@@ -215,7 +215,11 @@ function deepValue (obj, path) {
   if (obj !== undefined) {
     const key = path.shift();
     if (!path.length) {
-      return obj[key];
+      if (key === undefined) {
+        return obj;
+      } else {
+        return obj[key];
+      }
     } else {
       return deepValue(obj[key], path);
     }

From 399e86be874815ba70ad925ca893a0ebcd401f4b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:00:07 +0100
Subject: [PATCH 037/113] Refactor the interface between ProjectSettings and
 subcomponents.

This is still not set in stone and not fully consistent from one
subcomponent to another, but the general idea is that instead of
passing everything in one property via v-model we use v-bind
instead with a variable list of props depending on the needs of
the subcomponent.

We listen for @input and a new @merge event in order to apply
any changes to the *local* configuration. The local configuration
then needs to be uploaded to the server via a separate step. We
might change this in a later commit, so that changes made in
subcomponents are automatically applied to the local configuration.
---
 .../source/src/views/ProjectSettings.vue      | 169 ++++--------------
 1 file changed, 37 insertions(+), 132 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 72c1ba2..165fc35 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -55,7 +55,12 @@
       </v-col>
 
       <v-col cols="8" v-if="activeComponent">
-        <component :is="activeComponent" :value="activeValues" @input="save" @close="deselect"></component>
+        <component
+          :is="activeComponent"
+          v-bind="activeValues"
+          @merge="merge"
+          @close="deselect"
+        ></component>
       </v-col>
       <v-col cols="8" v-else>
         <v-card>
@@ -206,68 +211,41 @@ export default {
           values: (obj) => ({
             id: obj?.id,
             name: obj?.name
-          }),
-          save: async (data, cfg) => {
-            await this.patch({
-              id: data.id,
-              name: data.name,
-            });
-          }
+          })
         },
         {
           id: "groups",
           name: "Groups",
           values: (obj) => ({
             groups: obj?.groups
-          }),
-          save: async (data, cfg) => {
-            await this.patch({
-              groups: data.groups,
-            });
-          }
+          })
         },
         {
           id: "geodetics",
           name: "Geodetics",
           values: (obj) => ({
             epsg: obj?.epsg
-          }),
-          save: async (data, cfg) => {
-            await this.patch({
-              epsg: data.epsg
-            });
-          }
+          })
         },
         {
           id: "binning",
           name: "Binning",
-          values: (obj) => {
-            const data = {...obj.binning};
-            data.origin = {...obj.binning.origin};
-            return data;
-          },
-          save: async (data, cfg) => {
-            await this.patch({binning: {...data}});
-          }
+          values: (obj) => ({
+            ...obj.binning
+          })
         },
         {
           id: "input_files",
           name: "Input files",
-          values: obj => ({ path: obj.rootPath}),
-          save: async (data, cfg) => {
-            await this.patch({rootPath: data.path});
-          },
+          values: obj => ({ rootPath: obj.rootPath}),
           children: [
             {
               id: "preplots",
               name: "Preplots",
               values: (obj) => ({
-                preplots: obj.preplots,
+                preplots: structuredClone(obj.preplots),
                 rootPath: obj.rootPath
-              }),
-              save: async (data, cfg) => {
-                await this.patch({preplots: [...data.preplots]})
-              }
+              })
             },
             {
               id: "raw_data",
@@ -278,16 +256,14 @@ export default {
                   name: "P1/11",
                   values: (obj) => ({
                     rootPath: obj.rootPath,
-                    globs: [...obj.raw.p111.globs],
-                    paths: [...obj.raw.p111.paths],
-                    pattern: structuredClone(obj.raw.p111.pattern)
-                  }),
-                  save: async (data, cfg) => {
-                    await this.patch({raw: {p111: {...data}}});
-                  }
+                    globs: obj.raw.p111.globs,
+                    paths: obj.raw.p111.paths,
+                    pattern: obj.raw?.p111?.pattern,
+                    lineNameInfo: obj.raw?.p111?.lineNameInfo
+                  })
                 },
                 {
-                  id: "raw_data_smartsource",
+                  id: "raw_data_smsrc",
                   name: "Smartsource",
                   values: (obj) => ({
                     rootPath: obj.rootPath,
@@ -305,19 +281,7 @@ export default {
                   values: (obj) => ({
                     regex: obj.raw.ntbp?.pattern?.regex,
                     flags: obj.raw.ntbp?.pattern?.flags
-                  }),
-                  save: async (data, cfg) => {
-                    await this.patch({
-                      raw:{
-                        ntbp: {
-                          pattern: {
-                            regex: data.regex,
-                            flags: data.flags
-                          }
-                        }
-                      }
-                    })
-                  }
+                  })
                 }
               ]
             },
@@ -330,13 +294,10 @@ export default {
                   name: "P1/11",
                   values: (obj) => ({
                     rootPath: obj.rootPath,
-                    globs: [...obj.final.p111.globs],
-                    paths: [...obj.final.p111.paths],
-                    pattern: structuredClone(obj.final.p111.pattern)
-                  }),
-                  save: async (data, cfg) => {
-                    await this.patch({final: {p111: {...data}}});
-                  }
+                    globs: obj.final.p111.globs,
+                    paths: obj.final.p111.paths,
+                    pattern: obj.final.p111.pattern
+                  })
                 },
                 {
                   id: "final_data_pending",
@@ -344,19 +305,7 @@ export default {
                   values: (obj) => ({
                     regex: obj.final.pending?.pattern?.regex,
                     flags: obj.final.pending?.pattern?.flags
-                  }),
-                  save: async (data, cfg) => {
-                    await this.patch({
-                      final:{
-                        pending: {
-                          pattern: {
-                            regex: data.regex,
-                            flags: data.flags
-                          }
-                        }
-                      }
-                    })
-                  }
+                  })
                 }
               ]
             },
@@ -365,52 +314,19 @@ export default {
         {
           id: "line_name_format",
           name: "Line name format",
-          values: (obj) => ({...obj.online?.line?.pattern}),
-          save: async (data, cfg) => {
-            await this.patch({
-              online: {
-                line: {
-                  pattern: {
-                    ...data
-                  }
-                }
-              }
-            });
-          }
+          values: (obj) => ({
+            lineNameInfo: obj?.online?.line?.lineNameInfo
+          })
         },
         {
           id: "planner_settings",
           name: "Planner settings",
-          values: (obj) => ({...obj.planner}),
-          save: async (data, cfg) => {
-            await this.patch({
-              planner: {...data}
-            });
-          }
+          values: (obj) => ({planner: obj?.planner})
         },
         {
           id: "production",
           name: "Production settings",
-          values: (obj) => ({...obj.production}),
-          save: async (data, cfg) => {
-            await this.patch({
-              production: {...data}
-            });
-          }
-        },
-        {
-          id: "logging",
-          name: "Logging",
-          children: [
-            {
-              id: "logging_preset_comments",
-              name: "Preset comments"
-            },
-            {
-              id: "logging_labels",
-              name: "Labels"
-            }
-          ]
+          values: (obj) => ({production: obj?.production})
         },
         {
           id: "cloud_apis",
@@ -419,10 +335,7 @@ export default {
             {
               id: "asaqc",
               name: "ASAQC",
-              values: (obj) => ({...obj.asaqc}),
-              save: async (data, cfg) => {
-                await this.patch({asaqc: {...cfg}});
-              }
+              values: (obj) => ({value: obj?.cloud?.asaqc}),
             }
           ]
         }
@@ -530,20 +443,12 @@ export default {
       this.active.pop();
     },
 
-    async save (data) {
-      console.log("SAVING", data);
-      if (this.activeItem?.save) {
-        await this.activeItem.save(data, this.configuration);
-        /*
-        const cfg = this.activeItem.save(data, this.configuration);
-        this.configuration = {...cfg};
-
-        this.surveyState = false;
-        */
-        // TODO And now push to the server
-      }
+    merge ([path, value]) {
+      console.log("MERGING", path, value);
+      deepSet(this.configuration, path, value);
     },
 
+    // Use to change the project's archival status
     async patch (data) {
       const url = `/project/${this.$route.params.project}/configuration`;
       const init = {

From d1c041995d53d7709cbcfdeaf4803b2cb700e390 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:08:06 +0100
Subject: [PATCH 038/113] Refactor <dougal-project-settings-name-id/>

---
 .../components/project-settings/name-id.vue   | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/name-id.vue b/lib/www/client/source/src/components/project-settings/name-id.vue
index 62c91f1..d60f27c 100644
--- a/lib/www/client/source/src/components/project-settings/name-id.vue
+++ b/lib/www/client/source/src/components/project-settings/name-id.vue
@@ -8,14 +8,14 @@
           label="ID"
           hint="Short survey ID"
           persistent-hint
-          v-model="id"
+          v-model="id_"
         >
         </v-text-field>
         <v-text-field
           label="Name"
           hint="Survey name"
           persistent-hint
-          v-model="name"
+          v-model="name_"
         >
         </v-text-field>
       </v-form>
@@ -44,31 +44,41 @@
 export default {
   name: "DougalProjectSettingsNameId",
 
-  props: [ "value" ],
+  props: {
+    id: String,
+    name: String
+  },
 
   data () {
     return {
-      id: "",
-      name: ""
+      id_: "",
+      name_: ""
     }
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+    id () {
+      if (this.id != this.id_) {
+        this.id_ = this.id;
+      }
+    },
+
+    name () {
+      if (this.name != this.name_) {
+        this.name_ = this.name;
+      }
     }
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.id_ = this.id;
+      this.name_ = this.name;
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('input', {id: this.id_, name: this.name_});
     },
 
     back () {

From 2f56d377c510829f23f621f1eb5f3eaf9e3f11cc Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:09:42 +0100
Subject: [PATCH 039/113] Refactor <dougal-project-settings-groups/>

---
 .../components/project-settings/groups.vue    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/groups.vue b/lib/www/client/source/src/components/project-settings/groups.vue
index 31bcbaa..1404051 100644
--- a/lib/www/client/source/src/components/project-settings/groups.vue
+++ b/lib/www/client/source/src/components/project-settings/groups.vue
@@ -1,11 +1,11 @@
 <template>
   <v-card>
     <v-card-title>Groups</v-card-title>
-    <v-card-subtitle>For <abbr title="Permanent Reservoir Monitoring">PRM</abbr> and 4D operations, each project can be assigned to one or more groups sharing the same (or substantially the same) preplots.</v-card-subtitle>
+    <v-card-subtitle>For <abbr title="Permanent Reservoir Monitoring">PRM</abbr> and 4D operations, each project can be assigned to one or more groups_ sharing the same (or substantially the same) preplots.</v-card-subtitle>
     <v-card-text>
       <v-form>
         <v-combobox
-          v-model="groups"
+          v-model="groups_"
           :items="items"
           multiple
           :search-input.sync="search"
@@ -83,11 +83,11 @@ import { mapGetters } from 'vuex'
 export default {
   name: "DougalProjectSettingsGroups",
 
-  props: [ "value" ],
+  props: [ "groups" ],
 
   data () {
     return {
-      groups: [],
+      groups_: [],
       search: null
     }
   },
@@ -102,12 +102,7 @@ export default {
         return;
       }
 
-      this.groups = cur?.map(i => {
-        return typeof i === "string"
-          ? { text: i, colour: this.nextColour}
-          : i
-      });
-
+      this.setGroups(cur);
     }
   },
 
@@ -118,7 +113,7 @@ export default {
     },
 
     nextColour () {
-      return this.colours[(this.items.length + (this.groups?.length ?? 0)) % this.colours.length];
+      return this.colours[(this.items.length + (this.groups_?.length ?? 0)) % this.colours.length];
     },
 
     items () {
@@ -135,14 +130,20 @@ export default {
 
   methods: {
 
+    setGroups (groups) {
+      this.groups_ = groups?.map(i => {
+        return typeof i === "string"
+          ? { text: i, colour: this.nextColour}
+          : i
+      });
+    },
+
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.setGroups(this.groups);
     },
 
     save () {
-      this.$emit('input', {groups: this.groups?.map(i => i.text)});
+      this.$emit('input', {groups: this.groups_?.map(i => i.text)});
     },
 
     back () {

From 7ab6be5c67518d213636ee4596f69b4bf3f2b4a7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:10:24 +0100
Subject: [PATCH 040/113] Refactor <dougal-project-settings-binning/>

---
 .../components/project-settings/binning.vue   | 91 ++++++++++++++-----
 1 file changed, 69 insertions(+), 22 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/binning.vue b/lib/www/client/source/src/components/project-settings/binning.vue
index b2aaf28..ca6bc1e 100644
--- a/lib/www/client/source/src/components/project-settings/binning.vue
+++ b/lib/www/client/source/src/components/project-settings/binning.vue
@@ -10,7 +10,7 @@
           persistent-hint
           suffix="°"
           type="number"
-          v-model.number="theta"
+          v-model.number="theta_"
         >
         </v-text-field>
         <v-text-field
@@ -20,7 +20,7 @@
           type="number"
           min="0"
           step="1"
-          v-model.number="I_inc"
+          v-model.number="I_inc_"
         >
         </v-text-field>
         <v-text-field
@@ -30,7 +30,7 @@
           type="number"
           min="0"
           step="1"
-          v-model.number="J_inc"
+          v-model.number="J_inc_"
         >
         </v-text-field>
         <v-text-field
@@ -38,7 +38,7 @@
           hint="Inline bin width (can be negative)"
           persistent-hint
           type="number"
-          v-model.number="I_width"
+          v-model.number="I_width_"
         >
         </v-text-field>
         <v-text-field
@@ -46,7 +46,7 @@
           hint="Crossline bin width (can be negative)"
           persistent-hint
           type="number"
-          v-model.number="J_width"
+          v-model.number="J_width_"
         >
         </v-text-field>
         <fieldset class="pa-3 mt-3">
@@ -58,7 +58,7 @@
                 hint="Bin origin easting"
                 persistent-hint
                 type="number"
-                v-model.number="origin.easting"
+                v-model.number="origin_.easting"
               >
               </v-text-field>
             </v-col>
@@ -68,7 +68,7 @@
                 hint="Bin origin northing"
                 persistent-hint
                 type="number"
-                v-model.number="origin.northing"
+                v-model.number="origin_.northing"
               >
               </v-text-field>
             </v-col>
@@ -81,7 +81,7 @@
                 persistent-hint
                 type="number"
                 step="1"
-                v-model.number="origin.I"
+                v-model.number="origin_.I"
               >
               </v-text-field>
             </v-col>
@@ -92,7 +92,7 @@
                 persistent-hint
                 type="number"
                 step="1"
-                v-model.number="origin.J"
+                v-model.number="origin_.J"
               >
               </v-text-field>
             </v-col>
@@ -124,16 +124,16 @@
 export default {
   name: "DougalProjectSettingsBinning",
 
-  props: [ "value" ],
+  props: [ "theta", "I_inc", "J_inc", "I_width", "J_width", "origin" ],
 
   data () {
     return {
-      theta: null,
-      I_inc: 1,
-      J_inc: 1,
-      I_width: -12.50,
-      J_width: 12.50,
-      origin: {
+      theta_: null,
+      I_inc_: 1,
+      J_inc_: 1,
+      I_width_: -12.50,
+      J_width_: 12.50,
+      origin_: {
         easting: null,
         northing: null,
         I: null,
@@ -143,21 +143,68 @@ export default {
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+
+    theta () {
+      if (this.theta != this.theta_) {
+        this.theta_ = this.theta;
+      }
+    },
+
+    I_inc () {
+      if (this.I_inc != this.I_inc_) {
+        this.I_inc_ = this.I_inc;
+      }
+    },
+
+    J_inc () {
+      if (this.J_inc != this.J_inc_) {
+        this.J_inc_ = this.J_inc;
+      }
+    },
+
+    I_width () {
+      if (this.I_width != this.I_width_) {
+        this.I_width_ = this.I_width;
+      }
+    },
+
+    J_width () {
+      if (this.J_width != this.J_width_) {
+        this.J_width_ = this.J_width;
+      }
+    },
+
+    origin () {
+      if (Object.entries(this.origin).some(i => this.origin_[i[0]] != i[1])) {
+        this.origin_ = {...this.origin};
+      }
     }
+
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.theta_ = this.theta;
+      this.I_inc_ = this.I_inc;
+      this.J_inc_ = this.J_inc;
+      this.I_width_ = this.I_width;
+      this.J_width_ = this.J_width;
+      this.origin_ = {...this.origin};
+      this.origin_.origin = {...this.origin.origin};
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('input', {
+        binning: {
+          theta: this.theta_,
+          I_inc: this.I_inc_,
+          J_inc: this.J_inc_,
+          I_width: this.I_width_,
+          J_width: this.J_width_,
+          origin: this.origin_
+        }
+      });
     },
 
     back () {

From ad48ac99989a5ea2e9482e40ceb383db4b95a181 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:12:45 +0100
Subject: [PATCH 041/113] Refactor <dougal-project-settings-file-path/>

---
 .../components/project-settings/file-path.vue | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/file-path.vue b/lib/www/client/source/src/components/project-settings/file-path.vue
index 06b8501..3324915 100644
--- a/lib/www/client/source/src/components/project-settings/file-path.vue
+++ b/lib/www/client/source/src/components/project-settings/file-path.vue
@@ -8,11 +8,11 @@
           label="Project folder"
           hint="Root file path for this project"
           persistent-hint
-          v-model="path"
+          v-model="rootPath_"
         >
           <dougal-file-browser-dialog
             slot="append"
-            v-model="path"
+            v-model="rootPath_"
             mimetypes="inode/directory"
           ></dougal-file-browser-dialog>
         </v-text-field>
@@ -45,30 +45,32 @@ export default {
 
   components: { DougalFileBrowserDialog },
 
-  props: [ "value" ],
+  props: [ "rootPath" ],
 
   data () {
     return {
-      path: ""
+      rootPath_: ""
     }
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+
+    rootPath () {
+      if (this.rootPath != this.rootPath_) {
+        this.reset();
+      }
     }
+
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.rootPath_ = this.rootPath;
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('input', {rootPath: this.rootPath_});
     },
 
     back () {

From 18fcf42bc3fc5f05dc6ef51540d03825abbe9c95 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:14:26 +0100
Subject: [PATCH 042/113] Refactor <dougal-project-settings-planner/>

---
 .../components/project-settings/planner.vue   | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/planner.vue b/lib/www/client/source/src/components/project-settings/planner.vue
index 29c1a03..be5c21b 100644
--- a/lib/www/client/source/src/components/project-settings/planner.vue
+++ b/lib/www/client/source/src/components/project-settings/planner.vue
@@ -10,7 +10,7 @@
           type="number"
           hint="Expected line change time in minutes"
           persistent-hint
-          v-model.number="defaultLineChangeDuration"
+          v-model.number="planner_.defaultLineChangeDuration"
         >
         </v-text-field>
         <v-text-field
@@ -19,7 +19,7 @@
           type="number"
           hint="Expected acquisition speed in knots"
           persistent-hint
-          v-model.number="defaultAcquisitionSpeed"
+          v-model.number="planner_.defaultAcquisitionSpeed"
         >
         </v-text-field>
         <v-text-field
@@ -27,7 +27,7 @@
           type="number"
           hint="Default number of shots to overlap before the FGSP, for reshoots"
           persistent-hint
-          v-model.number="overlapBefore"
+          v-model.number="planner_.overlapBefore"
         >
         </v-text-field>
         <v-text-field
@@ -35,7 +35,7 @@
           type="number"
           hint="Default number of shots to overlap after the LGSP, for reshoots"
           persistent-hint
-          v-model.number="overlapAfter"
+          v-model.number="planner_.overlapAfter"
         >
         </v-text-field>
       </v-form>
@@ -60,23 +60,35 @@
 </template>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 
 export default {
   name: "DougalProjectSettingsPlanner",
 
-  props: [ "value" ],
+  mixins: [
+    setIfDifferent({
+      planner: "planner_"
+    })
+  ],
+
+  props: {
+    planner: Object
+  },
 
   data () {
     return {
-      defaultLineChangeDuration: null,
-      defaultAcquisitionSpeed: null,
-      overlapBefore: null,
-      overlapAfter: null
+      planner_: {
+        defaultLineChangeDuration: null,
+        defaultAcquisitionSpeed: null,
+        overlapBefore: null,
+        overlapAfter: null
+      }
     }
   },
 
   watch: {
-    value (newValue) {
+    planner (newValue) {
       this.reset();
     }
   },
@@ -84,13 +96,19 @@ export default {
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+
+      this.planner_ = deepMerge({
+        defaultLineChangeDuration: null,
+        defaultAcquisitionSpeed: null,
+        overlapBefore: null,
+        overlapAfter: null
+      }, structuredClone(this.planner ?? {}));
+
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit("merge", [ [ ], this.planner_ ]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From c3a56bf7e2920d784e447e81e114235866460ba7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 21:15:12 +0100
Subject: [PATCH 043/113] Refactor <dougal-project-settings-production/>

---
 .../project-settings/production.vue           | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/production.vue b/lib/www/client/source/src/components/project-settings/production.vue
index 39b3c69..e14e724 100644
--- a/lib/www/client/source/src/components/project-settings/production.vue
+++ b/lib/www/client/source/src/components/project-settings/production.vue
@@ -10,7 +10,7 @@
           persistent-hint
           suffix="min"
           type="number"
-          v-model.number="nominalLineChangeDuration"
+          v-model.number="production_.nominalLineChangeDuration"
         >
         </v-text-field>
       </v-form>
@@ -35,20 +35,32 @@
 </template>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 
 export default {
   name: "DougalProjectSettingsProduction",
 
-  props: [ "value" ],
+  mixins: [
+    setIfDifferent({
+      production: "production_"
+    })
+  ],
+
+  props: {
+    production: Object
+  },
 
   data () {
     return {
-      nominalLineChangeDuration: null
+      production_: {
+        nominalLineChangeDuration: null
+      }
     }
   },
 
   watch: {
-    value (newValue) {
+    production (newValue) {
       this.reset();
     }
   },
@@ -56,13 +68,15 @@ export default {
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+
+      this.production_ = deepMerge({
+        nominalLineChangeDuration: null
+      }, structuredClone(this.production ?? {}));
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit("merge", [ [], this.production_ ]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From afe04f569330c63878a1874f93c453b1a188ad9b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:13:40 +0100
Subject: [PATCH 044/113] Refactor <dougal-project-settings-binning/>

---
 .../components/project-settings/geodetics.vue  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/geodetics.vue b/lib/www/client/source/src/components/project-settings/geodetics.vue
index c31ead4..dc87875 100644
--- a/lib/www/client/source/src/components/project-settings/geodetics.vue
+++ b/lib/www/client/source/src/components/project-settings/geodetics.vue
@@ -9,7 +9,7 @@
           hint="EPSG code of the project's coordinate reference system"
           persistent-hint
           type="number"
-          v-model.number="epsg"
+          v-model.number="epsg_"
         >
         </v-text-field>
       </v-form>
@@ -38,30 +38,30 @@
 export default {
   name: "DougalProjectSettingsGeodetics",
 
-  props: [ "value" ],
+  props: [ "epsg" ],
 
   data () {
     return {
-      epsg: null
+      epsg_: null
     }
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+    epsg () {
+      if (this.epsg != this.epsg_) {
+        this.epsg_ = this.epsg;
+      }
     }
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.epsg_ = this.epsg;
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('input', {epsg: this.epsg_});
     },
 
     back () {

From 8895a948cf0ecae5722af44d25c5b1a61fe16439 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:18:03 +0100
Subject: [PATCH 045/113] Refactor preplots configuration GUI.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This introduces a number of changes, most notably an easier way
to specify fixed width formats and support for configuring
multiple import options (actual SPSv1, SPSv2.1, P1/90, CSV, …)

Note that only the configuration GUI is done, support for actually
importing those formats has not been implemented as of this commit.
---
 .../decoder/saillines-string-decoder.vue      |  14 +-
 .../project-settings/preplots-preplot.vue     | 520 ++++++++++++++++++
 .../components/project-settings/preplots.vue  | 194 ++++---
 3 files changed, 640 insertions(+), 88 deletions(-)
 create mode 100644 lib/www/client/source/src/components/project-settings/preplots-preplot.vue

diff --git a/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue b/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue
index 49e1e85..b4cdf21 100644
--- a/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue
+++ b/lib/www/client/source/src/components/decoder/saillines-string-decoder.vue
@@ -143,7 +143,7 @@ export default {
 
   props: {
     text: String,
-    fields: Object,
+    //fields: Object,
     //delimiter: String,
     headerRow: { type: [ Boolean, Number ], default: false},
     numberedLines: [ Boolean, Number ],
@@ -215,12 +215,18 @@ export default {
       // Properties of the sailline object
       const keys = [ "incr", "ntba", "remarks", "source_line", "meta.colour" ];
 
+      function to_bool (v, missing=false) {
+        return (v === undefined || v === null)
+          ? missing // Missing value meaning
+          : /^t(rue)|^[1-9-]+$/i.test(String(v).trim())
+      }
+
       // To transform the input text into the required format for each field
       const transformer = (key) => {
         const transformers = {
-          incr: (v) => Boolean(Number(v)),
-          ntba: (v) => Boolean(Number(v)),
-          remarks: String,
+          incr: (v) => to_bool(v, true),
+          ntba: (v) => to_bool(v, false),
+          remarks: (v) => (v === undefined || v === null) ? "" : String,
           source_line: Number,
         };
         return transformers[key] ?? String;
diff --git a/lib/www/client/source/src/components/project-settings/preplots-preplot.vue b/lib/www/client/source/src/components/project-settings/preplots-preplot.vue
new file mode 100644
index 0000000..f36fed3
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/preplots-preplot.vue
@@ -0,0 +1,520 @@
+<template>
+  <v-card flat>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Path"
+          v-model="value.path"
+        >
+          <dougal-file-browser-dialog
+            slot="append"
+            v-model="value.path"
+            :root="rootPath"
+          ></dougal-file-browser-dialog>
+        </v-text-field>
+
+        <v-select
+          label="Preplot class"
+          :items="fileClasses"
+          v-model="fileClass"
+        ></v-select>
+
+        <v-select
+          label="File format"
+          :items="preplotFileTypes"
+          v-model="fileType"
+        ></v-select>
+
+        <v-text-field v-if="value.class == 'S'"
+          class="mb-3"
+          label="Sailline offset"
+          prefix="±"
+          type="number"
+          hint="The value to add/substract to source lines to get to the corresponding sailline"
+          v-model.number="value.saillineOffset"
+        >
+        </v-text-field>
+
+        <v-expansion-panels v-if="isFixedWidthFormat"
+          :value="head.length ? 0 : null"
+        >
+          <v-expansion-panel>
+            <v-expansion-panel-header>Column settings</v-expansion-panel-header>
+            <v-expansion-panel-content>
+              <div class="mb-3" style="max-width:fit-content;">
+                <v-select v-if="head"
+                  label="Sample text size"
+                  hint="Choose how much of the file to display"
+                  :items="sampleSizeItems"
+                  v-model="sampleSize"
+                ></v-select>
+              </div>
+
+              <v-text-field
+                label="Skip lines"
+                hint="This lets you to skip file headers if present"
+                type="number"
+                min="0"
+                v-model.number="firstRow"
+              ></v-text-field>
+
+              <dougal-fixed-string-decoder
+                :text="rows"
+                :fields="fields"
+                :multiline="true"
+                :numbered-lines="firstRow"
+                max-height="300px"
+                :editable-field-list="false"
+              ></dougal-fixed-string-decoder>
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+
+        <v-expansion-panels v-else-if="isDelimitedFormat"
+          :value="head.length ? 0 : null"
+        >
+          <v-expansion-panel>
+            <v-expansion-panel-header>Column settings</v-expansion-panel-header>
+            <v-expansion-panel-content>
+
+              <v-container>
+                <v-row>
+                  <v-col cols="6">
+                    <div class="mb-3" style="max-width:fit-content;">
+                      <v-select v-if="head"
+                        label="Sample text size"
+                        hint="Choose how much of the file to display"
+                        :items="sampleSizeItems"
+                        v-model="sampleSize"
+                      ></v-select>
+                    </div>
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="12">
+
+                    <dougal-delimited-string-decoder
+                      title="Fields"
+                      :text="rows"
+                      :fields.sync="fields"
+                      :header-row.sync="headerRow"
+                      :numbered-lines.sync="firstRow"
+                      :editable-field-list="false"
+                      :delimiter.sync="delimiter"
+                    ></dougal-delimited-string-decoder>
+
+                  </v-col>
+                </v-row>
+
+              </v-container>
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+        <v-expansion-panels v-else-if="fileClass == 'saillines'"
+          :value="head.length ? 0 : null"
+        >
+          <v-expansion-panel>
+            <v-expansion-panel-header>Column settings</v-expansion-panel-header>
+            <v-expansion-panel-content>
+
+              <v-container>
+                <v-row>
+                  <v-col cols="6">
+                    <div class="mb-3" style="max-width:fit-content;">
+                      <v-select v-if="head"
+                        label="Sample text size"
+                        hint="Choose how much of the file to display"
+                        :items="sampleSizeItems"
+                        v-model="sampleSize"
+                      ></v-select>
+                    </div>
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="12">
+
+                    <dougal-saillines-string-decoder
+                      subtitle="Sailline data"
+                      :text="head"
+                    ></dougal-saillines-string-decoder>
+
+                  </v-col>
+                </v-row>
+
+              </v-container>
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-form>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script>
+import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog'
+import DougalFixedStringDecoder from '@/components/decoder/fixed-string-decoder'
+import DougalDelimitedStringDecoder from '@/components/decoder/delimited-string-decoder';
+import DougalSaillinesStringDecoder from '@/components/decoder/saillines-string-decoder';
+
+import { mapActions, mapGetters } from 'vuex'
+
+export default {
+  name: "DougalProjectSettingsPreplotsPreplot",
+
+  components: {
+    DougalFileBrowserDialog,
+    DougalFixedStringDecoder,
+    DougalDelimitedStringDecoder,
+    DougalSaillinesStringDecoder
+  },
+
+  props: {
+    value: Object,
+    rootPath: String
+  },
+
+  data () {
+    return {
+      fileClasses: [
+        { text: "Source points", value: "S" },
+        { text: "Vessel points", value: "V" },
+        { text: "Sail lines", value: "saillines" }
+      ],
+
+      preplotFileTypeList: {
+        "S": [
+          { header: "Fixed width" },
+          { text: "SPS v1", value: "sps1", fixedWidth: true },
+          { text: "SPS v2.1", value: "sps2.1", fixedWidth: true },
+          { text: "P1/90", value: "p190", fixedWidth: true },
+          { text: "Other fixed width", value: "fixed-width", fixedWidth: true },
+          { header: "Delimited values" },
+          { text: "P1/11", value: "p111", delimited: true },
+          { text: "CSV", value: "csv", delimited: true },
+        ],
+        "V": [
+          { header: "Fixed width" },
+          { text: "SPS v1", value: "sps1", fixedWidth: true },
+          { text: "SPS v2.1", value: "sps2.1", fixedWidth: true },
+          { text: "P1/90", value: "p190", fixedWidth: true },
+          { text: "Other fixed width", value: "fixed-width", fixedWidth: true },
+          { header: "Delimited values" },
+          { text: "P1/11", value: "p111", delimited: true },
+          { text: "CSV", value: "csv", delimited: true },
+        ],
+        "saillines": [
+          { text: "Sail lines CSV", value: "x-sl+csv" }
+        ]
+      },
+
+      head: "",
+      sampleSize: 8192, //1024;
+      sampleSizeItems: [
+        { text: "512 bytes", value: 512 },
+        { text: "1 kiB", value: 1024 },
+        { text: "2 kiB", value: 1024*2 },
+        { text: "4 kiB", value: 1024*4 },
+        { text: "8 kiB", value: 1024*8 },
+        { text: "16 kiB", value: 1024*16 },
+        { text: "32 kiB", value: 1024*32 },
+      ],
+    };
+  },
+
+  computed: {
+
+    preplotFileTypes () {
+      return this.preplotFileTypeList[this.fileClass] ?? [];
+    },
+
+    isFixedWidthFormat () {
+      return this.preplotFileTypes.find(i => i.value == this.fileType)?.fixedWidth;
+    },
+
+    isDelimitedFormat () {
+      return this.preplotFileTypes.find(i => i.value == this.fileType)?.delimited;
+    },
+
+    rows () {
+      if (this.head) {
+        if (this.firstRow) {
+          return this.head.split("\n").slice(this.firstRow).join("\n");
+        }
+        return this.head;
+      }
+      return "";
+    },
+
+    fields: {
+      get () {
+        return (this.value?.fields && Object.keys(this.value.fields).length)
+          ? this.value.fields
+          : {
+            line_name: {
+              type: "int"
+            },
+            point_number: {
+              type: "int"
+            },
+            easting: {
+              type: "float"
+            },
+            northing: {
+              type: "float"
+            }
+          };
+      },
+
+      set (v) {
+        // console.log("set fields", v);
+        this.$emit("input", {
+          ...this.value,
+          fields: {...v}
+        });
+      }
+    },
+
+    fileClass: {
+      get () {
+        return this.value?.class;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          class: v
+        });
+      }
+    },
+
+    fileType: {
+      get () {
+        return this.value?.type;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          type: v
+        });
+      }
+    },
+
+    firstRow: {
+      get () {
+        return this.value?.firstRow ?? 0;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          firstRow: v
+        });
+      }
+    },
+
+    headerRow: {
+      get () {
+        return this.value?.headerRow ?? false;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          headerRow: v
+        });
+      }
+    },
+
+    delimiter: {
+      get () {
+        return this.value?.delimiter;
+      },
+
+      set (v) {
+        this.$emit("input", {
+          ...this.value,
+          delimiter: v
+        });
+      }
+    }
+
+  },
+
+  watch: {
+
+    async "value.path" (cur, prev) {
+      if (cur != prev) {
+        this.head = await this.getHead();
+      }
+    },
+
+    async sampleSize (cur, prev) {
+      if (cur && cur != prev) {
+        this.head = await this.getHead();
+      }
+    },
+
+    fileClass (cur, prev) {
+      if (cur != prev && cur == "saillines") {
+        this.fileType = "x-sl+csv"
+      }
+    },
+
+    fileType (cur, prev) {
+      switch (cur) {
+        case prev:
+          return;
+        case "sps1":
+          this.fields = {
+            line_name: {
+              offset: 1,
+              length: 16,
+              type: "int"
+            },
+            point_number: {
+              offset: 17,
+              length: 8,
+              type: "int"
+            },
+            easting: {
+              offset: 46,
+              length: 9,
+              type: "float"
+            },
+            northing: {
+              offset: 55,
+              length: 10,
+              type: "float"
+            }
+          };
+          break;
+        case "sps2.1":
+          this.fields = {
+            line_name: {
+              offset: 1,
+              length: 7,
+              type: "int" // SPS v2.1 has this as float but Dougal doesn't support that
+            },
+            point_number: {
+              offset: 11,
+              length: 7,
+              type: "int" // Ditto
+            },
+            easting: {
+              offset: 46,
+              length: 9,
+              type: "float"
+            },
+            northing: {
+              offset: 55,
+              length: 10,
+              type: "float"
+            }
+          };
+          break;
+        case "p190":
+          this.fields = {
+            line_name: {
+              offset: 1,
+              length: 12,
+              type: "int"
+            },
+            point_number: {
+              offset: 19,
+              length: 6,
+              type: "int"
+            },
+            easting: {
+              offset: 46,
+              length: 9,
+              type: "float"
+            },
+            northing: {
+              offset: 55,
+              length: 9,
+              type: "float"
+            }
+          };
+          break;
+        case "fixed-width":
+          this.fields = {
+            line_name: {
+              offset: 1,
+              length: 4,
+              type: "int"
+            },
+            point_number: {
+              offset: 11,
+              length: 4,
+              type: "int"
+            },
+            easting: {
+              offset: 44,
+              length: 8,
+              type: "float"
+            },
+            northing: {
+              offset: 53,
+              length: 9,
+              type: "float"
+            }
+          };
+        case "csv":
+          this.fields = {
+            line_name: {
+              column: 0,
+              type: "int"
+            },
+            point_number: {
+              column: 1,
+              type: "int"
+            },
+            easting: {
+              column: 2,
+              type: "float"
+            },
+            northing: {
+              column: 3,
+              type: "float"
+            }
+          };
+          break
+        case "x-sl+csv":
+          this.fields = null;
+          break;
+      }
+    }
+
+  },
+
+  methods: {
+
+    async getHead () {
+      console.log("getHead", this.value?.path);
+      if (this.value?.path) {
+        const url = `/files/${this.value.path}`;
+        const init = {
+          text: true,
+          headers: {
+            "Range": `bytes=0-${this.sampleSize}`
+          }
+        };
+        const head = await this.api([url, init]);
+        return head?.substring(0, head.lastIndexOf("\n")) || "";
+      }
+      return "";
+    },
+
+    ...mapActions(["api"])
+  },
+
+  created () {
+    this.$nextTick(async () => {
+      this.head = await this.getHead();
+    });
+  }
+
+}
+
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/preplots.vue b/lib/www/client/source/src/components/project-settings/preplots.vue
index a8ad9a1..3893c37 100644
--- a/lib/www/client/source/src/components/project-settings/preplots.vue
+++ b/lib/www/client/source/src/components/project-settings/preplots.vue
@@ -3,51 +3,43 @@
     <v-card-title>Preplots</v-card-title>
     <v-card-subtitle>Preplot files location and format.</v-card-subtitle>
     <v-card-text>
-      <v-tabs v-model="tab">
-        <v-tab v-for="item in preplots">{{tabNameFor(item)}}</v-tab>
-      </v-tabs>
 
-      <v-tabs-items v-model="tab">
-        <v-tab-item v-for="item in preplots">
-          <v-card flat>
-            <v-card-text>
-              <v-form>
-                <v-text-field
-                  label="Path"
-                  v-model="item.path"
-                >
-                  <dougal-file-browser-dialog
-                    slot="append"
-                    v-model="item.path"
-                    :root="value.rootPath"
-                    :mimetypes="[ 'text/plain', '*.sps' ]"
-                  ></dougal-file-browser-dialog>
-                </v-text-field>
+      <v-expansion-panels v-model="panel">
+        <v-expansion-panel v-for="(preplot, idx) in preplots_" :key="idx">
+          <v-expansion-panel-header>
+            {{ titleFor(preplot) }}
+          </v-expansion-panel-header>
+          <v-expansion-panel-content>
+            <dougal-project-settings-preplots-preplot
+              v-model="preplots_[idx]"
+              :root-path="rootPath"
+            ></dougal-project-settings-preplots-preplot>
 
-                <v-text-field v-if="item.class == 'S'"
-                  class="mb-3"
-                  label="Sailline offset"
-                  prefix="±"
-                  type="number"
-                  hint="The value to add/substract to source lines to get to the corresponding sailline"
-                  v-model.number="item.saillineOffset"
-                >
-                </v-text-field>
+            <v-btn
+              outlined
+              color="red"
+              title="Delete this preplot definition"
+              @click.stop="deletePreplot(preplot)"
+            >
+              <v-icon left>mdi-delete-outline</v-icon>
+              Delete
+            </v-btn>
+
+
+          </v-expansion-panel-content>
+        </v-expansion-panel>
+      </v-expansion-panels>
+
+      <v-btn
+        class="mt-5"
+        color="primary"
+        :disabled="!lastPreplotIsValid"
+        @click="newPreplot"
+      >
+        <v-icon left>mdi-file-document-plus-outline</v-icon>
+        New preplot
+      </v-btn>
 
-                <v-expansion-panels :value="head.length ? 0 : null">
-                <v-expansion-panel>
-                  <v-expansion-panel-header>Column settings</v-expansion-panel-header>
-                  <v-expansion-panel-content>
-                    <dougal-fixed-width-format v-model="item.format" :sample="head">
-                    </dougal-fixed-width-format>
-                  </v-expansion-panel-content>
-                </v-expansion-panel>
-                </v-expansion-panels>
-              </v-form>
-            </v-card-text>
-          </v-card>
-        </v-tab-item>
-      </v-tabs-items>
     </v-card-text>
     <v-card-actions>
       <v-btn
@@ -77,45 +69,42 @@
 </style>
 
 <script>
-import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
-import DougalFixedWidthFormat from './fixed-width-format';
-import { mapActions, mapGetters } from 'vuex';
+import DougalProjectSettingsPreplotsPreplot from '@/components/project-settings/preplots-preplot';
 
 export default {
   name: "DougalProjectSettingsPreplots",
 
   components: {
-    DougalFileBrowserDialog,
-    DougalFixedWidthFormat
+    DougalProjectSettingsPreplotsPreplot,
   },
 
-  props: [ "value" ],
+  props: [ "rootPath", "preplots" ],
 
   data () {
     return {
-      tab: null,
-      preplots: [],
-      head: ""
+      preplots_: [],
+      panel: null
     }
   },
 
   computed: {
 
-    currentItem () {
-      if (this.tab !== null) {
-        return this.preplots[this.tab];
-      }
+    lastPreplotIsValid () {
+      return this.preplots_.length == 0 || this.validPreplot(this.preplots_[this.preplots_.length-1]);
     },
 
     isValid () {
-      return this.preplots && this.preplots.every( item => item.format != null );
+      return this.preplots_.every(preplot => this.validPreplot(preplot));
     }
 
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+
+    preplots () {
+      if (this.preplots.some( (i, idx) => i != this.preplots_[idx] )) {
+        this.preplots_ = structuredClone(this.preplots);
+      }
     },
 
     currentItem: {
@@ -130,47 +119,84 @@ export default {
 
   methods: {
 
-    tabNameFor (item) {
-      switch (item.class) {
-        case "S":
-          return "Source";
-        case "V":
-          return "Vessel";
-        default:
-          return item.class || "?";
+    titleFor (preplot) {
+      let str = "";
+
+      if (preplot?.path) {
+        str += preplot.path;
+      } else {
+        const idx = this.preplots_.findIndex(i => i == preplot);
+        if (idx != -1) {
+          str += `Preplot ${idx}`;
+        } else {
+          str += "Preplot <no path>";
+        }
+      }
+
+      if (preplot?.class || preplot?.type) {
+        str += " (" + [preplot.class, preplot.type].join("; ") + ")";
+      }
+
+      return str;
+    },
+
+    validPreplot (preplot) {
+
+      const predefined_formats = [ "sps1", "sps2.1", "p190", "p111", "x-sl+csv" ]
+
+      const common = (preplot?.path &&
+        preplot?.type &&
+        preplot?.class &&
+        preplot?.fields);
+
+      if (common) {
+        if (predefined_formats.includes(preplot.class)) {
+          // Predefined formats do not require a field definition
+          return true;
+        } else {
+          return !!(preplot?.fields?.line_name &&
+            preplot?.fields?.point_number &&
+            preplot?.fields?.easting &&
+            preplot?.fields?.northing);
+        }
+      }
+      return false;
+    },
+
+    deletePreplot (preplot) {
+      const idx = this.preplots_.find(i => i == preplot);
+      if (idx != -1) {
+        this.preplots_.splice(idx, 1);
       }
     },
 
-    async getHead () {
-      if (this.currentItem) {
-        const url = `/files/${this.currentItem.path}`;
-        const init = {
-          text: true,
-          headers: {
-            "Range": "bytes=0-1024"
-          }
+    newPreplot () {
+      if (this.lastPreplotIsValid) {
+        const preplot = {
+          path: "",
+          type: "",
+          format: "",
+          fields: {},
         };
-        this.head = await this.api([url, init]);
-        this.head = this.head?.substring(0, this.head.lastIndexOf("\n")) || "";
+        this.preplots_.push(preplot);
+        this.panel = this.preplots_.length - 1;
       }
     },
 
+
     reset () {
-      if (!this.value) {
-        return;
-      }
-      this.preplots = JSON.parse(JSON.stringify(this.value.preplots));
+      this.preplots_ = this.preplots;
     },
 
     save () {
-      this.$emit('input', {preplots: [...this.preplots]});
+      this.$emit('input', {
+        preplots: this.preplots_
+      });
     },
 
     back () {
       this.$emit('close');
-    },
-
-    ...mapActions(["api"])
+    }
 
   },
 

From a0b3568a10d51194674f4d68c98b3d5f1c8c1ce4 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:21:07 +0100
Subject: [PATCH 046/113] Refactor
 <dougal-project-settings-online-line-name-format/>.

Uses a fixed width specification instead of regular expressions
to decode line names from the navigation system.
---
 .../online-line-name-format.vue               | 101 ++++++++++++++----
 1 file changed, 83 insertions(+), 18 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
index 7049c7a..874b701 100644
--- a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
+++ b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
@@ -1,9 +1,42 @@
 <template>
-  <dougal-project-settings-regex-pattern-captures
-    v-model="pattern" title="Line name format" subtitle="Format of line names as configured in the navigation system"
-  >
-  </dougal-project-settings-regex-pattern-captures>
+  <v-card>
+    <v-card-title>Files</v-card-title>
+    <v-card-subtitle>File path configuration for this project.</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+        <v-text-field
+          label="Example file name"
+          hint="Enter the name of a representative file to make it easier to visualise your configuration"
+          persistent-hint
+          v-model="lineNameInfo_.example"
+        ></v-text-field>
 
+        <dougal-fixed-string-decoder
+          title="Line name format"
+          subtitle="Format of line names as configured in the navigation system"
+          :multiline="true"
+          :text="lineNameInfo_.example"
+          :fields="lineNameInfo_.fields"
+        ></dougal-fixed-string-decoder>
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+      <v-btn
+        color="primary"
+        @click="save"
+      >Save</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="warning"
+        @click="reset"
+      >Reset</v-btn>
+      <v-spacer></v-spacer>
+      <v-btn
+        color="secondary"
+        @click="back"
+      >Back</v-btn>
+    </v-card-actions>
+  </v-card>
 </template>
 
 <style scoped>
@@ -14,24 +47,33 @@
 </style>
 
 <script>
-import DougalProjectSettingsRegexPatternCaptures from '@/components/project-settings/regex-pattern-captures';
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
+import DougalFixedStringDecoder from '@/components/decoder/fixed-string-decoder';
 import { mapActions, mapGetters } from 'vuex';
 
 export default {
   name: "DougalProjectSettingsOnlineLineNameFormat",
 
   components: {
-    DougalProjectSettingsRegexPatternCaptures
+    DougalFixedStringDecoder
   },
 
-  props: [ "value" ],
+  mixins: [
+    setIfDifferent({
+      lineNameInfo: "lineNameInfo_"
+    })
+  ],
+
+  props: {
+    lineNameInfo: Object
+  },
 
   data () {
     return {
-      pattern: {
-        flags: "i",
-        regex: null,
-        captures: []
+      lineNameInfo_: {
+        example: "",
+        fields: {}
       }
     }
   },
@@ -39,8 +81,10 @@ export default {
   computed: {
 
     isValid () {
-      return false;
-      // return this.preplots && this.preplots.every( item => item.format != null );
+      return !!(this.lineNameInfo_ &&
+          this.lineNameInfo_?.fields &&
+            [ "line", "sequence", "incr" ].every( i =>
+              ["offset", "length"].every( j => j in this.lineNameInfo_.fields[i] )));
     }
 
   },
@@ -54,14 +98,35 @@ export default {
   methods: {
 
     reset () {
-      if (!this.value) {
-        return;
-      }
-      this.pattern = {...this.value};
+
+      this.lineNameInfo_ = deepMerge({
+          example: "",
+          fields: {
+            line: {
+              length: 4,
+              type: "int"
+            },
+            sequence: {
+              length: 3,
+              type: "int"
+            },
+            incr: {
+              length: 1,
+              type: "bool"
+            },
+            attempt: {
+              length: 1,
+              type: "int"
+            },
+          }
+        }, structuredClone(this.lineNameInfo ?? {}));
     },
 
     save () {
-      this.$emit('input', this.pattern);
+      this.$emit("merge", [ ["online", "line"], {
+        lineNameInfo: this.lineNameInfo_
+      }]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From 8b47fc4753c2e77f47cacb5e064411e1881042f5 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:22:37 +0100
Subject: [PATCH 047/113] Refactor <dougal-project-settings-asaqc/>.

- Uses the new interface with the main component
- Changes the path where ASAQC related settings are saved,
  from $.asaqc to $.cloud.asaqc.
- Adds field for configuring the subscription key.
---
 .../src/components/project-settings/asaqc.vue | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/asaqc.vue b/lib/www/client/source/src/components/project-settings/asaqc.vue
index d5adb57..38a86e5 100644
--- a/lib/www/client/source/src/components/project-settings/asaqc.vue
+++ b/lib/www/client/source/src/components/project-settings/asaqc.vue
@@ -9,21 +9,31 @@
           hint="ID number for this survey in ASAQC"
           persistent-hint
           type="number"
-          v-model.number="id"
+          v-model.number="value_.id"
         >
         </v-text-field>
         <v-text-field
           label="IMO"
           hint="Project vessel's International Maritime Organisation's identification number"
           persistent-hint
-          v-model.number="imo"
+          v-model.number="value_.imo"
         >
         </v-text-field>
         <v-text-field
           label="MMSI"
           hint="Maritime Mobile Service Identities (MMSI) number"
           persistent-hint
-          v-model.number="mmsi"
+          v-model.number="value_.mmsi"
+        >
+        </v-text-field>
+        <v-text-field
+          label="Subscription key"
+          hint="Key to authenticate to ASAQC, provided by Equinor"
+          persistent-hint
+          :type="subscriptionKeyVisible ? 'text' : 'password'"
+          :append-icon="subscriptionKeyVisible ? 'mdi-eye' : 'mdi-eye-off'"
+          v-model="value_.subscriptionKey"
+          @click:append="subscriptionKeyVisible = !subscriptionKeyVisible"
         >
         </v-text-field>
       </v-form>
@@ -48,17 +58,29 @@
 </template>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 
 export default {
   name: "DougalProjectSettingsASAQC",
 
+  mixins: [
+    setIfDifferent({
+      value: "value_"
+    })
+  ],
+
   props: [ "value" ],
 
   data () {
     return {
-      id: null,
-      imo: null,
-      mmsi: null,
+      value_: {
+        id: null,
+        imo: null,
+        mmsi: null,
+        subscriptionKey: null
+      },
+      subscriptionKeyVisible: false
     }
   },
 
@@ -71,13 +93,19 @@ export default {
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+
+      this.value_ = deepMerge({
+        id: null,
+        imo: null,
+        mmsi: null,
+        subscriptionKey: null
+      }, structuredClone(this.value??{}));
+
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit("merge", [ [ "cloud", "asaqc" ], this.value_ ]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From d93b8f8a9c6f1aff0f74728a83be59ac25cd3b6e Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:25:46 +0100
Subject: [PATCH 048/113] Refactor
 <dougal-project-settings-file-matching-parameters/>.

It uses a fixed width format specification instead of a regular
expression.

It shows a preview of what parts of the string are decoded as what.
---
 .../file-matching-parameters.vue              | 102 ++++++++++++++----
 1 file changed, 80 insertions(+), 22 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
index 84bee15..5c8a0d6 100644
--- a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
+++ b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
@@ -6,7 +6,8 @@
       <v-tabs v-model="tab">
         <v-tab>Paths</v-tab>
         <v-tab>Globs</v-tab>
-        <v-tab>Pattern</v-tab>
+        <v-tab v-if="pattern">Pattern</v-tab>
+        <v-tab v-if="lineNameInfo">Line info</v-tab>
       </v-tabs>
 
       <v-tabs-items v-model="tab">
@@ -24,7 +25,7 @@
                   <dougal-file-browser-dialog
                     slot="append"
                     v-model="paths[index]"
-                    :root="value.rootPath"
+                    :root="rootPath"
                     :mimetypes="[ 'inode/directory' ]"
                     title="Select a directory"
                   ></dougal-file-browser-dialog>
@@ -90,10 +91,11 @@
           </v-card>
         </v-tab-item>
 
-        <v-tab-item>
+        <v-tab-item v-if="pattern">
           <v-card flat>
             <v-card-subtitle>
               Regular expression that describes the file format definition. Used to capture information such as line and sequence number, etc.
+              <b v-if="lineNameInfo">Note: Use the <a @click.stop="tab=3">line info</a> tab preferentially.</b>
             </v-card-subtitle>
             <v-card-text>
               <v-form>
@@ -148,6 +150,31 @@
           </v-card>
         </v-tab-item>
 
+        <v-tab-item v-if="lineNameInfo">
+          <v-card flat>
+            <v-card-subtitle>
+              Line information that will be extracted from file names
+            </v-card-subtitle>
+            <v-card-text>
+              <v-form>
+                <v-text-field
+                  label="Example file name"
+                  hint="Enter the name of a representative file to make it easier to visualise your configuration"
+                  persistent-hint
+                  v-model="lineNameInfo.example"
+                ></v-text-field>
+
+                <dougal-fixed-string-decoder
+                  :multiline="true"
+                  :text="lineNameInfo.example"
+                  :fields.sync="lineNameInfo.fields"
+                ></dougal-fixed-string-decoder>
+
+              </v-form>
+            </v-card-text>
+          </v-card>
+        </v-tab-item>
+
       </v-tabs-items>
     </v-card-text>
     <v-card-actions>
@@ -178,24 +205,39 @@
 </style>
 
 <script>
+import { deepCompare } from '@/lib/utils';
 import DougalFileBrowserDialog from '@/components/file-browser/file-browser-dialog';
+import DougalFixedStringDecoder from '@/components/decoder/fixed-string-decoder';
 import { mapActions, mapGetters } from 'vuex';
 
 export default {
   name: "DougalProjectSettingsFileMatchingParameters",
 
   components: {
-    DougalFileBrowserDialog
+    DougalFileBrowserDialog,
+    DougalFixedStringDecoder
   },
 
-  props: [ "value", "title", "subtitle" ],
+  props: {
+    title: String,
+    subtitle: String,
+    isValid: { type: Boolean, default: true },
+    save: Function,
+
+    rootPath: String,
+    paths: Array,
+    globs: Array,
+    lineNameInfo: Object,
+    pattern: Object
+  },
 
   data () {
     return {
       tab: null,
-      globs: [],
-      paths: [],
-      pattern: {
+      globs_: [],
+      paths_: [],
+      lineNameInfo_: {},
+      pattern_: {
         flags: "i",
         regex: null,
         captures: []
@@ -204,34 +246,50 @@ export default {
   },
 
   computed: {
-
-    isValid () {
-      return false;
-      // return this.preplots && this.preplots.every( item => item.format != null );
-    }
-
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
+
+    globs () {
+      if (!deepCompare(this.globs, this.globs_)) {
+        this.globs_ = this.globs;
+      }
+    },
+
+    paths () {
+      if (!deepCompare(this.paths, this.paths_)) {
+        this.paths_ = this.paths;
+      }
+    },
+
+    lineNameInfo () {
+      if (!deepCompare(this.lineNameInfo, this.lineNameInfo_)) {
+        this.lineNameInfo_ = this.lineNameInfo;
+      }
+    },
+
+    pattern () {
+      if (!deepCompare(this.pattern, this.pattern_)) {
+        this.pattern_ = this.pattern;
+      }
     }
+
   },
 
   methods: {
 
     reset () {
-      if (!this.value) {
-        return;
-      }
-      this.globs = this.value.globs;
-      this.paths = this.value.paths;
-      this.pattern = this.value.pattern;
+      this.globs_ = this.globs;
+      this.paths_ = this.paths;
+      this.lineNameInfo_ = this.lineNameInfo;
+      this.pattern_ = this.pattern;
     },
 
+    /*
     save () {
       this.$emit('input', this.data);
     },
+    */
 
     back () {
       this.$emit('close');

From 5245e6a135ff4da50eefec39dc4c94bcbfef8a03 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:27:22 +0100
Subject: [PATCH 049/113] Refactor <dougal-project-settings-raw-ntbp/>

---
 .../project-settings/input-raw-ntbp.vue       | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
index a46c268..2a488d7 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
@@ -8,14 +8,14 @@
           label="Pattern"
           hint="Regular expression text"
           persistent-hint
-          v-model="regex"
+          v-model="regex_"
         >
         </v-text-field>
         <v-text-field
           label="Flags"
           hint="Regular expression modifier flags"
           persistent-hint
-          v-model="flags"
+          v-model="flags_"
         >
         </v-text-field>
       </v-form>
@@ -40,35 +40,44 @@
 </template>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 
 export default {
   name: "DougalProjectSettingsRawNTBP",
 
-  props: [ "value" ],
+  mixins: [
+    setIfDifferent({
+      regex: "regex_",
+      flags: "flags_"
+    })
+  ],
+
+  props: [ "regex", "flags" ],
 
   data () {
     return {
-      regex: "NTBP",
-      flags: "i"
+      regex_: "NTBP",
+      flags_: "i"
     }
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
-    }
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.regex_ = this.regex;
+      this.flags_ = this.flags;
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('merge', [ ["raw", "ntbp"], {
+        regex: this.regex_,
+        flags: this.flags_
+      }]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From 2357381ee62b38bfa974b7dddf819d78a29edc76 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:28:20 +0100
Subject: [PATCH 050/113] Refactor <dougal-project-settings-raw-p111/>.

Use fixed width name decoding instead of regular expression.
---
 .../project-settings/input-raw-p111.vue       | 106 ++++++++++++++----
 1 file changed, 85 insertions(+), 21 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
index ef68701..0c43068 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
@@ -1,6 +1,11 @@
 <template>
   <dougal-project-settings-file-matching-parameters
-    :value="value" title="Raw P1/11" subtitle="Raw P1/11 files location and parameters."
+    title="Raw P1/11"
+    subtitle="Raw P1/11 files location and parameters."
+    v-bind="{rootPath}"
+    v-bind.sync="bind"
+    :is-valid="isValid"
+    :save="save"
   >
   </dougal-project-settings-file-matching-parameters>
 
@@ -14,6 +19,8 @@
 </style>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -24,49 +31,106 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  props: [ "value", "title", "subtitle" ],
+  mixins: [
+    setIfDifferent({
+      globs: "globs_",
+      paths: "paths_",
+      pattern: "pattern_",
+      lineNameInfo: "lineNameInfo_"
+    })
+  ],
+
+  props: {
+    title: String,
+    subtitle: String,
+    rootPath: String,
+    paths: Array,
+    globs: Array,
+    lineNameInfo: Object,
+    pattern: Object
+  },
 
   data () {
     return {
       tab: null,
-      globs: [],
-      paths: [],
-      pattern: {
-        flags: "i",
-        regex: null,
-        captures: []
-      }
+      paths_: [],
+      globs_: [],
+      pattern_: {},
+      lineNameInfo_: {}
     }
   },
 
   computed: {
 
+    bind () {
+      return {
+        globs: this.globs_,
+        paths: this.paths_,
+        pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      };
+    },
+
     isValid () {
-      return false;
-      // return this.preplots && this.preplots.every( item => item.format != null );
+      return !!(this.paths_.length && this.globs_.length && (
+        this.pattern_?.regex &&
+          ["direction", "line", "sequence"].every( i => this.pattern_?.captures?.includes(i) )) || (
+        this.lineNameInfo_ &&
+          this.lineNameInfo_?.fields &&
+            [ "line", "sequence", "incr" ].every( i =>
+              ["offset", "length"].every( j => j in this.lineNameInfo_.fields[i] ))));
     }
 
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
-    }
   },
 
   methods: {
 
     reset () {
-      if (!this.value) {
-        return;
-      }
-      this.globs = this.value.globs;
-      this.paths = this.value.paths;
-      this.pattern = this.value.pattern;
+
+      this.paths_ = [...this.paths];
+
+      this.globs_ = [...this.globs];
+
+      this.lineNameInfo_ = deepMerge({
+          example: "",
+          fields: {
+            line: {
+              length: 4,
+              type: "int"
+            },
+            sequence: {
+              length: 3,
+              type: "int"
+            },
+            incr: {
+              length: 1,
+              type: "bool"
+            },
+            attempt: {
+              length: 1,
+              type: "int"
+            },
+            file_no: {
+              length: 3,
+              type: "int"
+            }
+          }
+        }, structuredClone(this.lineNameInfo ?? {}));
+
+      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit('input', this.data);
+      this.$emit("merge", [ ["raw", "p111"], {
+        paths: this.paths_,
+        globs: this.globs_,
+        pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      }]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From 02adbdf5307b1c70ab14a1e5f746369da745aadd Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:29:30 +0100
Subject: [PATCH 051/113] Refactor <dougal-project-settings-final-p111/>.

Use fixed width name decoding instead of regular expression.
---
 .../project-settings/input-final-p111.vue     | 107 ++++++++++++++----
 1 file changed, 86 insertions(+), 21 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-final-p111.vue b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
index d54623a..392a620 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
@@ -1,6 +1,11 @@
 <template>
   <dougal-project-settings-file-matching-parameters
-    :value="value" title="Final P1/11" subtitle="Final P1/11 files location and parameters."
+    title="Final P1/11"
+    subtitle="Final P1/11 files location and parameters."
+    v-bind="{rootPath}"
+    v-bind.sync="bind"
+    :is-valid="isValid"
+    :save="save"
   >
   </dougal-project-settings-file-matching-parameters>
 
@@ -14,6 +19,8 @@
 </style>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -24,49 +31,107 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  props: [ "value", "title", "subtitle" ],
+  mixins: [
+    setIfDifferent({
+      globs: "globs_",
+      paths: "paths_",
+      pattern: "pattern_",
+      lineNameInfo: "lineNameInfo_"
+    })
+  ],
+
+  props: {
+    title: String,
+    subtitle: String,
+    rootPath: String,
+    paths: Array,
+    globs: Array,
+    lineNameInfo: Object,
+    pattern: Object
+  },
 
   data () {
     return {
       tab: null,
-      globs: [],
-      paths: [],
-      pattern: {
-        flags: "i",
-        regex: null,
-        captures: []
-      }
+      paths_: [],
+      globs_: [],
+      pattern_: {},
+      lineNameInfo_: {}
     }
   },
 
   computed: {
 
+    bind () {
+      return {
+        globs: this.globs_,
+        paths: this.paths_,
+        pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      };
+    },
+
     isValid () {
-      return false;
-      // return this.preplots && this.preplots.every( item => item.format != null );
+      return true;
+      return !!(this.paths.length && this.globs.length && (
+        this.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
+        this.lineNameInfo &&
+          this.lineNameInfo?.fields &&
+            [ "line", "sequence", "incr" ].every( i =>
+              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
     }
 
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
-    }
   },
 
   methods: {
 
     reset () {
-      if (!this.value) {
-        return;
-      }
-      this.globs = this.value.globs;
-      this.paths = this.value.paths;
-      this.pattern = this.value.pattern;
+
+      this.paths_ = [...this.paths];
+
+      this.globs_ = [...this.globs];
+
+      this.lineNameInfo_ = deepMerge({
+          example: "",
+          fields: {
+            line: {
+              length: 4,
+              type: "int"
+            },
+            sequence: {
+              length: 3,
+              type: "int"
+            },
+            incr: {
+              length: 1,
+              type: "bool"
+            },
+            attempt: {
+              length: 1,
+              type: "int"
+            },
+            file_no: {
+              length: 3,
+              type: "int"
+            }
+          }
+        }, structuredClone(this.lineNameInfo ?? {}));
+
+      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit('input', this.data);
+      this.$emit("merge", [ ["final", "p111"], {
+        paths: this.paths_,
+        globs: this.globs_,
+        pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      }]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From 6cebf376d0cc81e42c844974376bc59633e328c6 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:30:08 +0100
Subject: [PATCH 052/113] Refactor <dougal-project-settings-final-pending/>

---
 .../project-settings/input-final-pending.vue  | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-final-pending.vue b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
index d23bc44..517633d 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-pending.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
@@ -8,14 +8,14 @@
           label="Pattern"
           hint="Regular expression text"
           persistent-hint
-          v-model="regex"
+          v-model="regex_"
         >
         </v-text-field>
         <v-text-field
           label="Flags"
           hint="Regular expression modifier flags"
           persistent-hint
-          v-model="flags"
+          v-model="flags_"
         >
         </v-text-field>
       </v-form>
@@ -40,35 +40,44 @@
 </template>
 
 <script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
 
 export default {
   name: "DougalProjectSettingsFinalPending",
 
-  props: [ "value" ],
+  mixins: [
+    setIfDifferent({
+      regex: "regex_",
+      flags: "flags_"
+    })
+  ],
+
+  props: [ "regex", "flags" ],
 
   data () {
     return {
-      regex: "PENDING",
-      flags: "i"
+      regex_: "NTBP",
+      flags_: "i"
     }
   },
 
   watch: {
-    value (newValue) {
-      this.reset();
-    }
   },
 
   methods: {
 
     reset () {
-      for (const key of Object.keys(this.$data)) {
-        this[key] = this.value[key];
-      }
+      this.regex_ = this.regex;
+      this.flags_ = this.flags;
     },
 
     save () {
-      this.$emit('input', {...this.$data});
+      this.$emit('merge', [ ["final", "pending"], {
+        regex: this.regex_,
+        flags: this.flags_
+      }]);
+      this.$nextTick(this.reset);
     },
 
     back () {

From 66a758d91f1de4e3da46162ea2b81cd1c7b02a35 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:34:15 +0100
Subject: [PATCH 053/113] Refactor Smartsource header reading configuration.

- Use a fixed width name parser rather than regular expressions
- Move the Smartsource header files configuration to a different
  part of the configuration object.
---
 .../input-smartsource-header.vue              | 135 ++++++++++++++++++
 .../project-settings/input-smartsource.vue    |  85 -----------
 .../source/src/views/ProjectSettings.vue      |  26 ++--
 3 files changed, 150 insertions(+), 96 deletions(-)
 create mode 100644 lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
 delete mode 100644 lib/www/client/source/src/components/project-settings/input-smartsource.vue

diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue b/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
new file mode 100644
index 0000000..a7a131c
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
@@ -0,0 +1,135 @@
+<template>
+  <dougal-project-settings-file-matching-parameters
+    title="Smartsource header data"
+    subtitle="Smartsource header data files location and parameters."
+    v-bind.sync="bind"
+    :is-valid="isValid"
+    :save="save"
+  >
+  </dougal-project-settings-file-matching-parameters>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
+import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsSmartsourceHeader",
+
+  components: {
+    DougalProjectSettingsFileMatchingParameters
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  mixins: [
+    setIfDifferent({
+      globs: "globs_",
+      paths: "paths_",
+      pattern: "pattern_",
+      lineNameInfo: "lineNameInfo_"
+    })
+  ],
+
+  props: {
+    title: String,
+    subtitle: String,
+    rootPath: String,
+    paths: Array,
+    globs: Array,
+    lineNameInfo: Object,
+    pattern: Object
+  },
+
+  data () {
+    return {
+      tab: null,
+      paths_: [],
+      globs_: [],
+      pattern_: {},
+      lineNameInfo_: {}
+    }
+  },
+
+  computed: {
+
+    bind () {
+      return {
+        globs: this.globs_,
+        paths: this.paths_,
+        //pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      };
+    },
+
+    isValid () {
+      return true;
+      return !!(this.paths.length && this.globs.length && (
+        this.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
+        this.lineNameInfo &&
+          this.lineNameInfo?.fields &&
+            [ "line", "sequence", "incr" ].every( i =>
+              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    reset () {
+
+      this.paths_ = [...this.paths];
+
+      this.globs_ = [...this.globs];
+
+      this.lineNameInfo_ = deepMerge({
+          example: "",
+          fields: {
+            sequence: {
+              length: 3,
+              type: "int"
+            },
+          }
+        }, structuredClone(this.lineNameInfo ?? {}));
+
+      this.pattern_ = structuredClone(this.pattern ?? {});
+    },
+
+    save () {
+      this.$emit("merge", [ ["raw", "source", "smsrc", "header"], {
+        paths: this.paths_,
+        globs: this.globs_,
+        pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      }]);
+      this.$nextTick(this.reset);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource.vue b/lib/www/client/source/src/components/project-settings/input-smartsource.vue
deleted file mode 100644
index e1ead07..0000000
--- a/lib/www/client/source/src/components/project-settings/input-smartsource.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <dougal-project-settings-file-matching-parameters
-    :value="value" title="Smartsource" subtitle="Smartsource data files location and parameters."
-  >
-  </dougal-project-settings-file-matching-parameters>
-
-</template>
-
-<style scoped>
-.sample {
-  font-family: mono;
-  white-space: pre;
-}
-</style>
-
-<script>
-import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
-import { mapActions, mapGetters } from 'vuex';
-
-export default {
-  name: "DougalProjectSettingsSmartsource",
-
-  components: {
-    DougalProjectSettingsFileMatchingParameters
-  },
-
-  props: [ "value", "title", "subtitle" ],
-
-  data () {
-    return {
-      tab: null,
-      globs: [],
-      paths: [],
-      pattern: {
-        flags: "i",
-        regex: null,
-        captures: []
-      }
-    }
-  },
-
-  computed: {
-
-    isValid () {
-      return false;
-      // return this.preplots && this.preplots.every( item => item.format != null );
-    }
-
-  },
-
-  watch: {
-    value (newValue) {
-      this.reset();
-    }
-  },
-
-  methods: {
-
-    reset () {
-      if (!this.value) {
-        return;
-      }
-      this.globs = this.value.globs;
-      this.paths = this.value.paths;
-      this.pattern = this.value.pattern;
-    },
-
-    save () {
-      this.$emit('input', this.data);
-    },
-
-    back () {
-      this.$emit('close');
-    },
-
-    ...mapActions(["api"])
-
-  },
-
-  mounted () {
-    this.reset();
-  }
-
-}
-</script>
diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 165fc35..f7e99d4 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -154,7 +154,7 @@ import DougalProjectSettingsRawP111 from '@/components/project-settings/input-ra
 import DougalProjectSettingsFinalP111 from '@/components/project-settings/input-final-p111';
 import DougalProjectSettingsRawNTBP from '@/components/project-settings/input-raw-ntbp';
 import DougalProjectSettingsFinalPending from '@/components/project-settings/input-final-pending';
-import DougalProjectSettingsSmartsource from '@/components/project-settings/input-smartsource';
+import DougalProjectSettingsSmartsourceHeader from '@/components/project-settings/input-smartsource-header';
 import DougalProjectSettingsPlanner from '@/components/project-settings/planner';
 import DougalProjectSettingsOnlineLineNameFormat from '@/components/project-settings/online-line-name-format';
 import DougalProjectSettingsASAQC from '@/components/project-settings/asaqc';
@@ -171,7 +171,7 @@ const components = {
   preplots:  DougalProjectSettingsPreplots,
   //raw_data: DougalProjectSettingsNotImplemented,
   raw_data_p111: DougalProjectSettingsRawP111,
-  raw_data_smartsource: DougalProjectSettingsSmartsource,
+  raw_data_smsrc_header: DougalProjectSettingsSmartsourceHeader,
   raw_data_ntbp: DougalProjectSettingsRawNTBP,
   //final_data: DougalProjectSettingsNotImplemented,
   final_data_p111: DougalProjectSettingsFinalP111,
@@ -265,15 +265,19 @@ export default {
                 {
                   id: "raw_data_smsrc",
                   name: "Smartsource",
-                  values: (obj) => ({
-                    rootPath: obj.rootPath,
-                    globs: [...obj.raw.smsrc.globs],
-                    paths: [...obj.raw.smsrc.paths],
-                    pattern: structuredClone(obj.raw.smsrc.pattern)
-                  }),
-                  save: async (data, cfg) => {
-                    await this.patch({raw: {smsrc: {...data}}});
-                  }
+                  children: [
+                    {
+                      id: "raw_data_smsrc_header",
+                      name: "Headers",
+                      values: (obj) => ({
+                        rootPath: obj.rootPath,
+                        globs: obj?.raw?.source?.smsrc?.header?.globs,
+                        paths: obj?.raw?.source?.smsrc?.header?.paths,
+                        pattern: obj?.raw?.source?.smsrc?.header?.pattern,
+                        lineNameInfo: obj?.raw?.source?.smsrc?.header?.lineNameInfo
+                      })
+                    },
+                  ]
                 },
                 {
                   id: "raw_data_ntbp",

From 3fbc2668099ac5e94868764aa272d0c239df1cbe Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:42:08 +0100
Subject: [PATCH 054/113] Add configuration GUI for SEG-Y near field hydrophone
 data

---
 .../input-smartsource-segy.vue                | 135 ++++++++++++++++++
 .../source/src/views/ProjectSettings.vue      |  13 ++
 2 files changed, 148 insertions(+)
 create mode 100644 lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue

diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue b/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue
new file mode 100644
index 0000000..9711da3
--- /dev/null
+++ b/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue
@@ -0,0 +1,135 @@
+<template>
+  <dougal-project-settings-file-matching-parameters
+    title="Smartsource hydrophone data"
+    subtitle="Smartsource SEG-Y hydrophone data files location and parameters."
+    v-bind.sync="bind"
+    :is-valid="isValid"
+    :save="save"
+  >
+  </dougal-project-settings-file-matching-parameters>
+
+</template>
+
+<style scoped>
+.sample {
+  font-family: mono;
+  white-space: pre;
+}
+</style>
+
+<script>
+import { deepCompare, deepMerge } from '@/lib/utils';
+import setIfDifferent from '@/lib/watcher-mixin';
+import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+  name: "DougalProjectSettingsSmartsourceSegy",
+
+  components: {
+    DougalProjectSettingsFileMatchingParameters
+  },
+
+  props: [ "value", "title", "subtitle" ],
+
+  mixins: [
+    setIfDifferent({
+      globs: "globs_",
+      paths: "paths_",
+      pattern: "pattern_",
+      lineNameInfo: "lineNameInfo_"
+    })
+  ],
+
+  props: {
+    title: String,
+    subtitle: String,
+    rootPath: String,
+    paths: Array,
+    globs: Array,
+    lineNameInfo: Object,
+    pattern: Object
+  },
+
+  data () {
+    return {
+      tab: null,
+      paths_: [],
+      globs_: [],
+      pattern_: {},
+      lineNameInfo_: {}
+    }
+  },
+
+  computed: {
+
+    bind () {
+      return {
+        globs: this.globs_,
+        paths: this.paths_,
+        //pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      };
+    },
+
+    isValid () {
+      return true;
+      return !!(this.paths.length && this.globs.length && (
+        this.pattern?.regex &&
+          ["sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
+        this.lineNameInfo &&
+          this.lineNameInfo?.fields &&
+            [ "sequence" ].every( i =>
+              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    reset () {
+
+      this.paths_ = [...this.paths];
+
+      this.globs_ = [...this.globs];
+
+      this.lineNameInfo_ = deepMerge({
+          example: "",
+          fields: {
+            sequence: {
+              length: 3,
+              type: "int"
+            },
+          }
+        }, structuredClone(this.lineNameInfo ?? {}));
+
+      this.pattern_ = structuredClone(this.pattern ?? {});
+    },
+
+    save () {
+      this.$emit("merge", [ ["raw", "source", "smsrc", "segy"], {
+        paths: this.paths_,
+        globs: this.globs_,
+        //pattern: this.pattern_,
+        lineNameInfo: this.lineNameInfo_
+      }]);
+      this.$nextTick(this.reset);
+    },
+
+    back () {
+      this.$emit('close');
+    },
+
+    ...mapActions(["api"])
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index f7e99d4..e0303ca 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -155,6 +155,7 @@ import DougalProjectSettingsFinalP111 from '@/components/project-settings/input-
 import DougalProjectSettingsRawNTBP from '@/components/project-settings/input-raw-ntbp';
 import DougalProjectSettingsFinalPending from '@/components/project-settings/input-final-pending';
 import DougalProjectSettingsSmartsourceHeader from '@/components/project-settings/input-smartsource-header';
+import DougalProjectSettingsSmartsourceSegy from '@/components/project-settings/input-smartsource-segy';
 import DougalProjectSettingsPlanner from '@/components/project-settings/planner';
 import DougalProjectSettingsOnlineLineNameFormat from '@/components/project-settings/online-line-name-format';
 import DougalProjectSettingsASAQC from '@/components/project-settings/asaqc';
@@ -172,6 +173,7 @@ const components = {
   //raw_data: DougalProjectSettingsNotImplemented,
   raw_data_p111: DougalProjectSettingsRawP111,
   raw_data_smsrc_header: DougalProjectSettingsSmartsourceHeader,
+  raw_data_smsrc_segy: DougalProjectSettingsSmartsourceSegy,
   raw_data_ntbp: DougalProjectSettingsRawNTBP,
   //final_data: DougalProjectSettingsNotImplemented,
   final_data_p111: DougalProjectSettingsFinalP111,
@@ -277,6 +279,17 @@ export default {
                         lineNameInfo: obj?.raw?.source?.smsrc?.header?.lineNameInfo
                       })
                     },
+                    {
+                      id: "raw_data_smsrc_segy",
+                      name: "Hydrophone data",
+                      values: (obj) => ({
+                        rootPath: obj.rootPath,
+                        globs: obj?.raw?.source?.smsrc?.segy?.globs,
+                        paths: obj?.raw?.source?.smsrc?.segy?.paths,
+                        pattern: obj?.raw?.source?.smsrc?.segy?.pattern,
+                        lineNameInfo: obj?.raw?.source?.smsrc?.segy?.lineNameInfo
+                      })
+                    }
                   ]
                 },
                 {

From 53b4213a056fbe92b9a447787859c289f1f426cb Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 22:58:41 +0100
Subject: [PATCH 055/113] Fix configuration not being refreshed

---
 lib/www/client/source/src/views/ProjectSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index e0303ca..cfb64ef 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -480,7 +480,7 @@ export default {
 
       const refreshedConfiguration = await this.api([url, init, callback]);
       if (refreshedConfiguration) {
-        this.configuration == refreshedConfiguration;
+        this.configuration = refreshedConfiguration;
       }
     },
 

From fd84eb1ebb71f408396b442e537c9338f27f6c27 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:01:44 +0100
Subject: [PATCH 056/113] Add "advanced configuration" view.

This view shows a tree view of the raw JSON configuration
object, allowing the user to add / edit / delete any properties
whatsoever. It is semi-hidden behind a context menu. The user
has to right-click on the header of the left-hand column showing
the list of configuration sections and then click on the red
"advanced configuration" button. In the advanced configuration
view there is another button to go back to normal configuration.

It is only possible to save / refresh the configuration from the
normal view.
---
 .../source/src/views/ProjectSettings.vue      | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index cfb64ef..020212c 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -21,11 +21,14 @@
       </v-row>
     </v-overlay>
 
+    <v-window v-model="viewMode">
+      <v-window-item>
     <v-row>
       <v-col cols="4">
         <v-toolbar
           dense
           flat
+          @contextmenu="showContextMenu"
         >
           <v-toolbar-title>
             Survey configuration
@@ -137,12 +140,64 @@
         </v-card>
       </v-col>
     </v-row>
+      </v-window-item>
+
+      <v-window-item>
+        <v-row>
+          <v-col cols="12">
+            <v-toolbar
+              dense
+              flat
+              @contextmenu="showContextMenu"
+            >
+              <v-toolbar-title>
+                Advanced survey configuration
+              </v-toolbar-title>
+              <v-spacer/>
+              <v-btn small outlined @click="viewMode=0">Go to normal configuration</v-btn>
+            </v-toolbar>
+          </v-col>
+        </v-row>
+        <v-row>
+          <v-col cols="12">
+            <dougal-json-builder
+              name="Dougal configuration"
+              v-model="configuration"
+            ></dougal-json-builder>
+          </v-col>
+        </v-row>
+      </v-window-item>
+
+    </v-window>
+
+    <v-menu
+      v-model="contextMenu"
+      :position-x="contextMenuX"
+      :position-y="contextMenuY"
+      absolute
+      offset-y
+    >
+      <v-list dense>
+        <v-list-item>
+          <v-btn
+            small
+            outlined
+            color="red"
+            title="Not a good idea"
+            @click="viewMode=1"
+          >Advanced configuration…</v-btn>
+        </v-list-item>
+      </v-list>
+    </v-menu>
   </v-container>
 </template>
 
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
+import { deepSet } from '@/lib/utils';
+
+import DougalJsonBuilder from '@/components/json-builder/json-builder';
 
 import DougalProjectSettingsNameId from '@/components/project-settings/name-id';
 import DougalProjectSettingsGroups from '@/components/project-settings/groups';
@@ -190,6 +245,10 @@ const components = {
 export default {
   name: "DougalProjectSettings",
 
+  components: {
+    DougalJsonBuilder
+  },
+
   data () {
     return {
       configuration: null,
@@ -358,7 +417,12 @@ export default {
         }
       ],
 
-      dialog: false
+
+      viewMode: 0,
+      dialog: false,
+      contextMenu: false,
+      contextMenuX: null,
+      contextMenuY: null
     };
   },
 
@@ -491,6 +555,16 @@ export default {
     closeDialog () {
     },
 
+    showContextMenu (e) {
+      e.preventDefault();
+      this.contextMenu = false
+      this.contextMenuX = e.clientX
+      this.contextMenuY = e.clientY
+      this.$nextTick(() => {
+        this.contextMenu = true
+      })
+    },
+
     ...mapActions(["api", "showSnack"])
 
   },

From 8dd971ffec776d4a2ee8fe2f5e90afdc118823d1 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:18:55 +0100
Subject: [PATCH 057/113] Add option to save local copy of configuration to
 local file

---
 .../source/src/views/ProjectSettings.vue      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 020212c..5a48c73 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -103,8 +103,8 @@
               class="ml-2"
               color="primary"
               :disabled="!configuration"
-              :href="`/api/project/${this.$route.params.project}/configuration?mime=application/yaml`"
-              :download="`${this.$route.params.project}.yaml`"
+              @click="saveToFile"
+              title="Save the current configuration to a file, including any changes you might have made but not yet sent to the server."
             >
               <v-icon small left>mdi-cloud-download</v-icon>
               Download
@@ -194,6 +194,7 @@
 
 
 <script>
+import YAML from 'yaml';
 import { mapActions, mapGetters } from 'vuex';
 import { deepSet } from '@/lib/utils';
 
@@ -550,6 +551,22 @@ export default {
 
     upload () {
       console.log("UPLOAD");
+    async saveToFile () {
+      const payload = YAML.stringify(this.configuration);
+      const blob = new Blob([payload], {type: "application/yaml"});
+      const url = URL.createObjectURL(blob);
+      const filename = `${this.$route.params.project}-configuration.yaml`;
+
+      console.log(payload);
+      console.log(filename);
+      console.log(url);
+
+      const element = document.createElement('a');
+      element.download = filename;
+      element.href = url;
+      element.click();
+      console.log("Download complete. Cleaning up.");
+      URL.revokeObjectURL(url);
     },
 
     closeDialog () {

From 69fce0e0dc923a644ceddc0e42f0438d813ec0aa Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:24:26 +0100
Subject: [PATCH 058/113] Add option to load configuration from local file.

Supports both JSON and YAML.
---
 .../source/src/views/ProjectSettings.vue      | 50 +++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 5a48c73..ff43dc6 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -111,6 +111,7 @@
             </v-btn>
             <v-dialog
               max-width="400px"
+              v-model.sync="fileLoadDialog"
             >
               <template v-slot:activator="{ on, attrs }">
                 <v-btn
@@ -126,12 +127,14 @@
               <v-card flat>
                 <v-card-text class="pt-5">
                   <v-file-input
+                    v-model="files"
                     class="mt-4"
                     show-size
-                    accept="application/json"
+                    accept="application/json,application/yaml,.json,.yaml"
                     label="Select configuration file"
-                    append-outer-icon="mdi-cloud-upload"
-                    @click-append-outer="upload"
+                    append-outer-icon="mdi-folder-open-outline"
+                    :error-messages="fileInputErrors"
+                    @click:append-outer="loadFromFile"
                   ></v-file-input>
                 </v-card-text>
               </v-card>
@@ -255,6 +258,7 @@ export default {
       configuration: null,
       active: [],
       open: [],
+      files: [],
       treeview: [
       /*
         {
@@ -418,6 +422,7 @@ export default {
         }
       ],
 
+      fileLoadDialog: false,
 
       viewMode: 0,
       dialog: false,
@@ -491,6 +496,29 @@ export default {
       }
     },
 
+    fileInputErrors () {
+      const messages = [];
+
+      const validTypes = [
+        "application/json",
+        "application/yaml",
+        "application/x-yaml"
+      ];
+
+      if (this.files instanceof File) {
+        if (!validTypes.includes(this.files.type)) {
+          messages.push(`Invalid file type: ${this.files.type}`);
+          messages.push("Please select a JSON or YAML file");
+        } else if (this.files.size < 32) { // 32 is an arbitrary small value
+          messages.push("File too small to be a valid Dougal configuration");
+        }
+      } else if (this.files && this.files.length) {
+        messages.push("Invalid file path");
+      }
+
+      return messages;
+    },
+
     ...mapGetters(['user', 'writeaccess', 'loading', 'serverEvent'])
   },
 
@@ -551,6 +579,22 @@ export default {
 
     upload () {
       console.log("UPLOAD");
+
+    async loadFromFile () {
+      if (!this.fileInputErrors.length) {
+        if (this.files.type == "application/json") {
+          this.configuration = JSON.parse(await this.files.text());
+          this.showSnack(["Configuration loaded from file", "primary"]);
+        } else if (this.files.type == "application/yaml" || this.files.type == "application/x-yaml") {
+          this.configuration = YAML.parse(await this.files.text());
+          this.showSnack(["Configuration loaded from file", "primary"]);
+        } else {
+          console.error("Unknown file format (shouldn't happen)", this.files.type);
+        }
+        this.fileLoadDialog = false;
+      }
+    },
+
     async saveToFile () {
       const payload = YAML.stringify(this.configuration);
       const blob = new Blob([payload], {type: "application/yaml"});

From b64a99ab193873b5bb40b0786f3b1dadd7fd779a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:25:34 +0100
Subject: [PATCH 059/113] Add option to upload the configuration to the server

---
 .../source/src/views/ProjectSettings.vue      | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index ff43dc6..a161447 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -139,6 +139,19 @@
                 </v-card-text>
               </v-card>
             </v-dialog>
+
+            <v-spacer></v-spacer>
+
+            <v-btn
+              class="ml-2"
+              color="warning"
+              :disabled="!configuration"
+              title="Save the configuration on the server. This will replace the existing configuration. The project will be set to INACTIVE. Change its state back to active once you're satisfied with your changes."
+              @click="upload"
+            >
+              <v-icon small left>mdi-cloud-upload</v-icon>
+              Upload
+            </v-btn>
           </v-card-actions>
         </v-card>
       </v-col>
@@ -577,8 +590,23 @@ export default {
       }
     },
 
-    upload () {
-      console.log("UPLOAD");
+    async upload () {
+      const url = `/project/${this.$route.params.project}/configuration`;
+      const init = {
+        method: "PUT",
+        headers: {
+          //"If-Match": "" // Ensure we're not overwriting someone else's changes
+          "Content-Type": "application/json"
+        },
+        body: {...this.configuration, archived: true}
+      };
+      const res = await this.api([url, init]);
+      if (res && res.id == this.configuration.id) {
+        // In case the server decided to apply any changes
+        this.showSnack(["Configuration uploaded to server", "success"]);
+        this.$nextTick( () => this.configuration = res );
+      }
+    },
 
     async loadFromFile () {
       if (!this.fileInputErrors.length) {

From 60aaaf9e043bd3a2b085a1f97bec8348ff3ecc6a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:26:59 +0100
Subject: [PATCH 060/113] Aesthetic changes

---
 .../source/src/views/ProjectSettings.vue      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index a161447..6c3a3e5 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -24,7 +24,7 @@
     <v-window v-model="viewMode">
       <v-window-item>
     <v-row>
-      <v-col cols="4">
+      <v-col cols="4" max-height="100%">
         <v-toolbar
           dense
           flat
@@ -88,9 +88,10 @@
 
           </v-card-text>
           <v-card-actions>
-            <v-btn outlined
+            <v-btn
+              outlined
               color="primary"
-              title="Any unsaved changes you might have will be lost."
+              title="Fetch the configuration from the server anew. Any unsaved changes you might have will be lost."
               @click="getConfiguration"
             >
               <v-icon small left>mdi-cloud-refresh</v-icon>
@@ -100,28 +101,32 @@
             <v-spacer></v-spacer>
 
             <v-btn
+              outlined
               class="ml-2"
               color="primary"
               :disabled="!configuration"
               @click="saveToFile"
               title="Save the current configuration to a file, including any changes you might have made but not yet sent to the server."
             >
-              <v-icon small left>mdi-cloud-download</v-icon>
-              Download
+              <v-icon small left>mdi-content-save-outline</v-icon>
+              Save
             </v-btn>
+
             <v-dialog
               max-width="400px"
               v-model.sync="fileLoadDialog"
             >
               <template v-slot:activator="{ on, attrs }">
                 <v-btn
+                  outlined
                   class="ml-2"
-                  color="warning"
+                  color="primary lighten-2"
+                  title="Load the configuration from a file. It will overwrite any changes that you might have made so far but it won't upload the configuration to the server. You can review the configuration and make changes before using the upload button."
                   v-bind="attrs"
                   v-on="on"
                 >
-                  <v-icon small left>mdi-cloud-upload</v-icon>
-                  Upload
+                  <v-icon small left>mdi-folder-open-outline</v-icon>
+                  Load
                 </v-btn>
               </template>
               <v-card flat>

From 867a5349100c946a8c4ad3e0192a885bf48cee7d Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:27:19 +0100
Subject: [PATCH 061/113] Remove debugging statements

---
 lib/www/client/source/src/views/ProjectSettings.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 6c3a3e5..0fa813d 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -456,9 +456,6 @@ export default {
         return;
       }
 
-      console.log("Current", cur);
-      console.log("Item", this.activeItem);
-      console.log("Component", this.activeComponent);
       if (!this.activeComponent && this.activeItem?.children?.length) {
         // Automatically expand this item
         if (!this.open.includes(cur)) {
@@ -572,7 +569,6 @@ export default {
     },
 
     merge ([path, value]) {
-      console.log("MERGING", path, value);
       deepSet(this.configuration, path, value);
     },
 
@@ -634,15 +630,10 @@ export default {
       const url = URL.createObjectURL(blob);
       const filename = `${this.$route.params.project}-configuration.yaml`;
 
-      console.log(payload);
-      console.log(filename);
-      console.log(url);
-
       const element = document.createElement('a');
       element.download = filename;
       element.href = url;
       element.click();
-      console.log("Download complete. Cleaning up.");
       URL.revokeObjectURL(url);
     },
 

From 2dffd93cfeadad7b68cba8c492ec89b87d59f615 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 13 Nov 2023 23:27:36 +0100
Subject: [PATCH 062/113] Simplify expression

---
 lib/www/client/source/src/views/ProjectSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 0fa813d..d00dbed 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -500,7 +500,7 @@ export default {
 
     surveyState: {
       get () {
-        return this.configuration && !this.configuration.archived;
+        return !this.configuration?.archived;
       },
 
       async set (value) {

From c7270febfc9d34308a35376c763d6e70565996e7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Tue, 14 Nov 2023 12:17:39 +0100
Subject: [PATCH 063/113] Add project configurations upgrade script.

This script rewrites project configurations to take into account
various structural changes in the configuration object.

The script can be run without arguments, in which case it will
upgrade the configuration of every project found in the local
database, or one or more project IDs can be given as command
line arguments in order to upgrade only those projects.

Configurations that have already been upgraded will not be
touched.

For other projects, both the original and new configurations will
be saved to file in the current directory, as well as two scripts:
one commits the new configuration to the server, and the other
restores the original one.

This script connects directly to the database, using the same
mechanisms as the Dougal server. It is recommended to run it
locally on the server host.

The restore scripts use the HTTP API, which they expect to find
on http://localhost:3000/api, so it is also recommended to run
them in the local server.

Closes #290.
Closes #291.
Closes #292.
Closes #293.
Closes #294.
Closes #295.
Closes #296.
Closes #297.
Closes #298.
---
 ...upgrade-project-configurations-20231113.js | 924 ++++++++++++++++++
 1 file changed, 924 insertions(+)
 create mode 100644 sbin/upgrade-project-configurations-20231113.js

diff --git a/sbin/upgrade-project-configurations-20231113.js b/sbin/upgrade-project-configurations-20231113.js
new file mode 100644
index 0000000..66271ae
--- /dev/null
+++ b/sbin/upgrade-project-configurations-20231113.js
@@ -0,0 +1,924 @@
+#!/usr/bin/node
+
+const path = require('path');
+const fs = require('fs');
+const YAML = dougal_require("yaml");
+const db = dougal_require("db");
+const { deepSet } = dougal_require("utils");
+
+function dougal_require(id) {
+	try {
+		return require(path.join(__dirname, "../lib/www/server/lib", id));
+	} catch (err) {
+		if (err.code == "MODULE_NOT_FOUND") {
+			console.log("Trying alternative path");
+			return require(path.join(__dirname, "../lib/www/server/node_modules", id));
+		} else {
+			console.error(err);
+			throw err;
+		}
+	}
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/291
+//
+
+function check_asaqc (cfg) {
+	if (!cfg.cloud?.asaqc?.id) {
+		return apply_cloud_asaqc;
+	}
+}
+
+function apply_cloud_asaqc (cfg) {
+	const asaqc = cfg.asaqc;
+	if (asaqc) {
+		console.log("Applying ASAQC changes");
+		deepSet(cfg, [ "cloud", "asaqc" ], asaqc);
+	} else {
+		console.log("ASAQC configuration not found. Will create empty ASAQC object");
+		deepSet(cfg, [ "cloud", "asaqc" ], {
+			id: null,
+			imo: null,
+			mmsi: null
+		});
+	}
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/296
+//
+
+function check_asaqc_subscription_key (cfg) {
+	if (!cfg.cloud?.asaqc?.subscriptionKey) {
+		return apply_asaqc_subscription_key;
+	}
+}
+
+function apply_asaqc_subscription_key (cfg) {
+	console.log("Adding subscriptionKey to ASAQC configuration");
+	const subscriptionKey = process.env.DOUGAL_ASAQC_SUBSCRIPTION_KEY;
+	if (subscriptionKey) {
+		deepSet(cfg, [ "cloud", "asaqc", "subscriptionKey" ] , subscriptionKey);
+	} else {
+		throw new Error("The ASAQC subscription key must be supplied via the DOUGAL_ASAQC_SUBSCRIPTION_KEY environment variable");
+	}
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/297
+//
+
+function check_online_line_name_info (cfg) {
+	if (!cfg.online?.line?.lineNameInfo?.fields) {
+		return apply_online_line_name_info;
+	}
+}
+
+function apply_online_line_name_info (cfg) {
+	console.log("Applying online line name info changes");
+	let lineNameInfo = {
+		example: null,
+		fields: {
+			line: {
+				offset: null,
+				length: 4,
+				type: "int",
+			},
+			sequence: {
+				offset: null,
+				length: 3,
+				type: "int"
+			},
+			incr: {
+				offset: null,
+				length: 2,
+				type: "bool",
+				enum: {}
+			},
+			attempt: {
+				offset: null,
+				length: 1,
+				type: "int"
+			}
+		}
+	};
+	switch (process.env.HOST) {
+		case "dougal04":
+			lineNameInfo = {
+				"example": "EQ22200-2213130-007",
+				"fields": {
+					"line": {
+						"length": 4,
+						"type": "int",
+						"offset": 10
+					},
+					"sequence": {
+						"length": 3,
+						"type": "int",
+						"offset": 16
+					},
+					"incr": {
+						"enum": {
+							"1": true,
+							"2": false
+						},
+						"length": 1,
+						"type": "bool",
+						"offset": 8
+					},
+					"attempt": {
+						"length": 1,
+						"type": "int",
+						"offset": 14
+					},
+					"file_no": {
+						"length": 3,
+						"type": "int",
+						"offset": 20
+					},
+					"year": {
+						"offset": 2,
+						"length": 2,
+						"type": "int"
+					},
+					"survey_type": {
+						"enum": {
+							"0": "Marine",
+							"2": "OBS/PRM"
+						},
+						"offset": 4,
+						"length": 1,
+						"default": "Unknown",
+						"type": "str"
+					},
+					"project_number": {
+						"offset": 5,
+						"length": 2,
+						"type": "int"
+					},
+					"num_sources": {
+						"enum": {
+							"0": "2",
+							"1": "1",
+							"2": "3"
+						},
+						"offset": 9,
+						"length": 1,
+						"type": "int"
+					}
+				}
+			}
+			break;
+		case "dougal03":
+			// Don't know what they use
+			break;
+		case "dougal02":
+		case "dougal01":
+		default: // Includes dev servers
+			lineNameInfo = {
+				example: "1054282180S00000",
+				fields: {
+					line: {
+						offset: 2,
+						length: 4,
+						type: "int",
+					},
+					sequence: {
+						offset: 7,
+						length: 3,
+						type: "int"
+					},
+					incr: {
+						offset: 0,
+						length: 2,
+						type: "bool",
+						enum: {
+							"10": true,
+							"20": false
+						}
+					},
+					attempt: {
+						offset: 6,
+						length: 1,
+						type: "int"
+					}
+				}
+			};
+	}
+
+	deepSet(cfg, [ "online", "line", "lineNameInfo" ], lineNameInfo);
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/292
+//
+
+function check_raw_p111_line_name_info (cfg) {
+	if (!cfg.raw?.p111?.lineNameInfo?.fields) {
+		return apply_raw_p111_line_name_info;
+	}
+}
+
+function apply_raw_p111_line_name_info (cfg) {
+	console.log("Applying raw P1/11 name info changes");
+	let lineNameInfo = {
+		example: null,
+		fields: {
+			line: {
+				offset: null,
+				length: 4,
+				type: "int",
+			},
+			sequence: {
+				offset: null,
+				length: 3,
+				type: "int"
+			},
+			incr: {
+				offset: null,
+				length: 2,
+				type: "bool",
+				enum: {}
+			},
+			attempt: {
+				offset: null,
+				length: 1,
+				type: "int"
+			}
+		}
+	};
+	switch (process.env.HOST) {
+		case "dougal04":
+			lineNameInfo = {
+				"example": "EQ22200-2213130-007.000.P111",
+				"fields": {
+					"line": {
+						"length": 4,
+						"type": "int",
+						"offset": 10
+					},
+					"sequence": {
+						"length": 3,
+						"type": "int",
+						"offset": 16
+					},
+					"incr": {
+						"enum": {
+							"1": true,
+							"2": false
+						},
+						"length": 1,
+						"type": "bool",
+						"offset": 8
+					},
+					"attempt": {
+						"length": 1,
+						"type": "int",
+						"offset": 14
+					},
+					"file_no": {
+						"length": 3,
+						"type": "int",
+						"offset": 20
+					},
+					"year": {
+						"offset": 2,
+						"length": 2,
+						"type": "int"
+					},
+					"survey_type": {
+						"enum": {
+							"0": "Marine",
+							"2": "OBS/PRM"
+						},
+						"offset": 4,
+						"length": 1,
+						"default": "Unknown",
+						"type": "str"
+					},
+					"project_number": {
+						"offset": 5,
+						"length": 2,
+						"type": "int"
+					},
+					"num_sources": {
+						"enum": {
+							"0": "2",
+							"1": "1",
+							"2": "3"
+						},
+						"offset": 9,
+						"length": 1,
+						"type": "int"
+					}
+				}
+			}
+			break;
+		case "dougal03":
+			// Don't know what they use
+			break;
+		case "dougal02":
+		case "dougal01":
+		default: // Includes dev servers
+			lineNameInfo = {
+				example: "1054282180S00000.000.p111",
+				fields: {
+					line: {
+						offset: 2,
+						length: 4,
+						type: "int",
+					},
+					sequence: {
+						offset: 7,
+						length: 3,
+						type: "int"
+					},
+					incr: {
+						offset: 0,
+						length: 2,
+						type: "bool",
+						enum: {
+							"10": true,
+							"20": false
+						}
+					},
+					attempt: {
+						offset: 6,
+						length: 1,
+						type: "int"
+					}
+				}
+			};
+	}
+
+	deepSet(cfg, [ "raw", "p111", "lineNameInfo" ], lineNameInfo);
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/293
+//
+
+function check_final_p111_line_name_info (cfg) {
+	if (!cfg.final?.p111?.lineNameInfo?.fields) {
+		return apply_final_p111_line_name_info;
+	}
+}
+
+function apply_final_p111_line_name_info (cfg) {
+	console.log("Applying final P1/11 name info changes");
+	let lineNameInfo = {
+		example: null,
+		fields: {
+			line: {
+				offset: null,
+				length: 4,
+				type: "int",
+			},
+			sequence: {
+				offset: null,
+				length: 3,
+				type: "int"
+			},
+			incr: {
+				offset: null,
+				length: 2,
+				type: "bool",
+				enum: {}
+			},
+			attempt: {
+				offset: null,
+				length: 1,
+				type: "int"
+			}
+		}
+	};
+	switch (process.env.HOST) {
+		case "dougal04":
+			lineNameInfo = {
+				"example": "EQ22200-2213130-007.000.P111",
+				"fields": {
+					"line": {
+						"length": 4,
+						"type": "int",
+						"offset": 10
+					},
+					"sequence": {
+						"length": 3,
+						"type": "int",
+						"offset": 16
+					},
+					"incr": {
+						"enum": {
+							"1": true,
+							"2": false
+						},
+						"length": 1,
+						"type": "bool",
+						"offset": 8
+					},
+					"attempt": {
+						"length": 1,
+						"type": "int",
+						"offset": 14
+					},
+					"file_no": {
+						"length": 3,
+						"type": "int",
+						"offset": 20
+					},
+					"year": {
+						"offset": 2,
+						"length": 2,
+						"type": "int"
+					},
+					"survey_type": {
+						"enum": {
+							"0": "Marine",
+							"2": "OBS/PRM"
+						},
+						"offset": 4,
+						"length": 1,
+						"default": "Unknown",
+						"type": "str"
+					},
+					"project_number": {
+						"offset": 5,
+						"length": 2,
+						"type": "int"
+					},
+					"num_sources": {
+						"enum": {
+							"0": "2",
+							"1": "1",
+							"2": "3"
+						},
+						"offset": 9,
+						"length": 1,
+						"type": "int"
+					}
+				}
+			}
+			break;
+		case "dougal03":
+			// Don't know what they use
+			break;
+		case "dougal02":
+		case "dougal01":
+		default: // Includes dev servers
+			lineNameInfo = {
+				example: "1054282180S00000.000.p111",
+				fields: {
+					line: {
+						offset: 2,
+						length: 4,
+						type: "int",
+					},
+					sequence: {
+						offset: 7,
+						length: 3,
+						type: "int"
+					},
+					incr: {
+						offset: 0,
+						length: 2,
+						type: "bool",
+						enum: {
+							"10": true,
+							"20": false
+						}
+					},
+					attempt: {
+						offset: 6,
+						length: 1,
+						type: "int"
+					}
+				}
+			};
+	}
+
+	deepSet(cfg, [ "final", "p111", "lineNameInfo" ], lineNameInfo);
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/294
+//
+
+function check_smsrc_headers_glob_path (cfg) {
+	if (!cfg.raw?.source?.smsrc?.header?.glob?.length) {
+		return apply_smsrc_headers_glob_path;
+	}
+}
+
+function apply_smsrc_headers_glob_path (cfg) {
+	console.log("Copying Smartsource header glob and path values to new location");
+
+	const globs = cfg?.raw?.smsrc?.globs;
+	const paths = cfg?.raw?.smsrc?.paths;
+
+	if (globs) {
+		deepSet(cfg, [ "raw", "source", "smsrc", "header", "globs" ], globs);
+	}
+
+	if (paths) {
+		deepSet(cfg, [ "raw", "source", "smsrc", "header", "paths" ], paths);
+	}
+
+	return cfg;
+}
+
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/294
+//
+
+function check_smsrc_headers_line_name_info (cfg) {
+	if (!cfg.raw?.source?.smsrc?.header?.lineNameInfo?.fields) {
+		return apply_smsrc_headers_line_name_info;
+	}
+}
+
+function apply_smsrc_headers_line_name_info (cfg) {
+	console.log("Applying raw P1/11 name info changes");
+	let lineNameInfo = {
+		example: null,
+		fields: {
+			line: {
+				offset: null,
+				length: 4,
+				type: "int",
+			},
+			sequence: {
+				offset: null,
+				length: 3,
+				type: "int"
+			},
+			incr: {
+				offset: null,
+				length: 2,
+				type: "bool",
+				enum: {}
+			},
+			attempt: {
+				offset: null,
+				length: 1,
+				type: "int"
+			}
+		}
+	};
+	switch (process.env.HOST) {
+		case "dougal04":
+			lineNameInfo = {
+				"example": "EQ22200-2213130-007.000.P111",
+				"fields": {
+					"line": {
+						"length": 4,
+						"type": "int",
+						"offset": 10
+					},
+					"sequence": {
+						"length": 3,
+						"type": "int",
+						"offset": 16
+					},
+					"incr": {
+						"enum": {
+							"1": true,
+							"2": false
+						},
+						"length": 1,
+						"type": "bool",
+						"offset": 8
+					},
+					"attempt": {
+						"length": 1,
+						"type": "int",
+						"offset": 14
+					},
+					"file_no": {
+						"length": 3,
+						"type": "int",
+						"offset": 20
+					},
+					"year": {
+						"offset": 2,
+						"length": 2,
+						"type": "int"
+					},
+					"survey_type": {
+						"enum": {
+							"0": "Marine",
+							"2": "OBS/PRM"
+						},
+						"offset": 4,
+						"length": 1,
+						"default": "Unknown",
+						"type": "str"
+					},
+					"project_number": {
+						"offset": 5,
+						"length": 2,
+						"type": "int"
+					},
+					"num_sources": {
+						"enum": {
+							"0": "2",
+							"1": "1",
+							"2": "3"
+						},
+						"offset": 9,
+						"length": 1,
+						"type": "int"
+					}
+				}
+			}
+			break;
+		case "dougal03":
+			// Don't know what they use
+			break;
+		case "dougal02":
+		case "dougal01":
+		default: // Includes dev servers
+			lineNameInfo = {
+				example: "1054282180S00000.HDR",
+				fields: {
+					line: {
+						offset: 2,
+						length: 4,
+						type: "int",
+					},
+					sequence: {
+						offset: 7,
+						length: 3,
+						type: "int"
+					},
+					incr: {
+						offset: 0,
+						length: 2,
+						type: "bool",
+						enum: {
+							"10": true,
+							"20": false
+						}
+					},
+					attempt: {
+						offset: 6,
+						length: 1,
+						type: "int"
+					}
+				}
+			};
+	}
+
+	deepSet(cfg, [ "raw", "source", "smsrc", "header", "lineNameInfo" ], lineNameInfo);
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/295
+//
+
+function check_smsrc_segy (cfg) {
+	// We only do this on installations where we know there is, or there
+	// might be, SEG-Y data available.
+	const supported_hosts = [
+		"dougal02",
+		"dougal01"
+	];
+	if (supported_hosts.includes(process.env.HOST)) {
+		if (!cfg.raw?.source?.smsrc?.segy?.lineNameInfo?.fields) {
+			return apply_smsrc_segy;
+		}
+	}
+}
+
+function apply_smsrc_segy (cfg) {
+	// We don't need to run a switch() for hosts here, since
+	// we've already done that in check_smsrc_segy().
+
+	// Use the paths for *.HDR files as a reference
+	const paths = cfg.raw?.source?.smsrc?.header?.paths?.map( p =>
+		path.join(path.dirname(p), "10 SEG-Y"));
+	const globs = [ "**/*-hyd.sgy" ];
+	const lineNameInfo = {
+		"example": "1051460070S00000-hyd.sgy",
+		"fields": {
+			"sequence": {
+				"length": 3,
+				"type": "int",
+				"offset": 7
+			},
+			"line": {
+				"length": 4,
+				"offset": 2
+			}
+		}
+	};
+	const segy = { paths, globs, lineNameInfo };
+
+	deepSet(cfg, [ "raw", "source", "smsrc", "segy" ], segy);
+
+	return cfg;
+}
+
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/298
+//
+
+function check_preplots_fields (cfg) {
+	if (cfg.preplots?.length) {
+		const indices = [];
+		for (const idx in cfg.preplots) {
+			const preplot = cfg.preplots[idx];
+			if (!preplot?.fields?.line_name) {
+				indices.push(idx);
+			}
+		}
+		if (indices.length) {
+			return apply_preplots_fieldsλ(indices);
+		}
+	}
+}
+
+function apply_preplots_fieldsλ (indices) {
+	function fix_preplot (preplot) {
+		const names = preplot.format.names;
+		const types = preplot.format.types;
+		const widths = preplot.format.widths;
+		const offsets_widths = widths.reduce ((acc, cur) => {
+			if (cur < 0) {
+				acc.p -= cur; // Advances the position by -cur
+			} else {
+				acc.f.push({offset: acc.p, width: cur});
+				acc.p += cur;
+			}
+			return acc;
+		}, {f: [], p: 0})
+
+		const fields = {};
+		names.forEach( (name, ι) => {
+			const field = {
+				type: types[ι],
+				 ...offsets_widths[ι]
+			};
+			fields[name] = field;
+		});
+		preplot.fields = fields;
+		return preplot;
+	}
+
+	return function apply_preplots_fields (cfg) {
+		for (const idx of indices) {
+			console.log("Fixing preplot", idx);
+			const preplot = fix_preplot(cfg.preplots[idx]);
+			cfg.preplots.splice(idx, 1, preplot);
+		}
+	}
+}
+
+
+/* Template for more upgrade actions
+
+//
+// https://gitlab.com/wgp/dougal/software/-/work_items/
+//
+
+function check_ (cfg) {
+}
+
+function apply_ (cfg) {
+}
+
+*/
+
+
+const checkers = [
+	check_asaqc,
+	check_asaqc_subscription_key,
+	check_online_line_name_info,
+	check_raw_p111_line_name_info,
+	check_final_p111_line_name_info,
+	check_smsrc_headers_glob_path,
+	check_smsrc_headers_line_name_info,
+	check_smsrc_segy,
+	check_preplots_fields
+]
+
+const now = new Date();
+const tstamp = now.toISOString().substr(0, 19)+"Z";
+
+function fnames(pid) {
+	return {
+		backup: `${pid}-configuration-${tstamp}.yaml`,
+		upgrade: `NEW-${pid}-configuration-${tstamp}.yaml`
+	};
+}
+
+function save_scripts (pid) {
+	const cwd = process.cwd();
+	const fn_backup = path.resolve(path.join(cwd, fnames(pid).backup));
+	const fn_upgrade = path.resolve(path.join(cwd, fnames(pid).upgrade));
+
+	console.log("Creating script to restore old / new configurations");
+	const backup = `# Restore pre-upgrade configuration for ${pid}
+curl -vs "http://localhost:3000/api/project/${pid}/configuration" -X PUT -H "Content-Type: application/yaml" --data-binary @${fn_backup}\n`;
+	const upgrade = `# Restore post-upgrade configuration for ${pid}
+curl -vs "http://localhost:3000/api/project/${pid}/configuration" -X PUT -H "Content-Type: application/yaml" --data-binary @${fn_upgrade}\n`;
+
+	fs.writeFileSync(`restore-20231113-pre-${pid}.sh`, backup);
+	fs.writeFileSync(`restore-20231113-post-${pid}.sh`, upgrade);
+}
+
+async function backup (pid, cfg) {
+	const fname = fnames(pid).backup;
+	console.log(`Backing up configuration for ${pid} as ${fname} into current directory`);
+	const text = YAML.stringify(cfg);
+	fs.writeFileSync(fname, text);
+}
+
+async function save_configuration (pid, cfg) {
+	console.log("Saving configuration for", pid);
+
+	console.log("Saving copy of NEW configuration to file");
+	const fname = fnames(pid).upgrade;
+	const text = YAML.stringify(cfg);
+	fs.writeFileSync(fname, text);
+	save_scripts(pid);
+
+	//console.log("Uploading configuration to server");
+	try {
+		//await db.project.configuration.put(pid);
+	} catch (err) {
+		console.log("Configuration upload failed");
+		console.error(err);
+		throw err;
+	}
+}
+
+async function upgrade_configuration (pid) {
+	const configuration = await db.project.configuration.get(pid);
+
+	console.log(`Checking configuration for ${configuration.id} (${configuration.schema})`);
+
+	const appliers = checkers.map( checker => checker(configuration) ).filter( i => !!i );
+
+	if (appliers.length) {
+		console.log("Configuration needs changes.");
+		await backup(pid, configuration);
+
+		console.log("Applying changes");
+		console.log(appliers);
+		for (const applier of appliers) {
+			applier(configuration);
+		}
+
+		await save_configuration(pid, configuration);
+	}
+
+}
+
+async function main () {
+
+	const cla = process.argv.slice(2).map(i => i.toLowerCase());
+
+	function project_filter (project) {
+		if (cla.length == 0)
+			return true;
+		return cla.includes(project.pid.toLowerCase());
+	}
+
+	const projects = (await db.project.get()).filter(project_filter);
+
+	projects.sort( (a, b) =>
+		a.pid > b.pid
+			? 1
+			: a.pid < b.pid
+				? -1
+				: 0);
+
+	console.log(projects);
+
+	for (const project of projects) {
+		await upgrade_configuration(project.pid);
+	}
+
+	console.log("All done");
+	process.exit(0);
+}
+
+
+main();

From 62ab06b4a762619fecc8ca96cea40e857a65e29d Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 15 Nov 2023 16:19:09 +0100
Subject: [PATCH 064/113] Refactor configuration GUI.

Another refactoring. What we're doing now is eliminating the
need to save individually on each section. Configuration changes
are done directly on the local configuration and then the local
configuration is saved, downloaded or discarded in one go.
---
 .../src/components/project-settings/asaqc.vue |  72 +++++----
 .../components/project-settings/binning.vue   | 119 ++++++--------
 .../file-matching-parameters.vue              |   4 +-
 .../components/project-settings/file-path.vue |  36 +++--
 .../components/project-settings/geodetics.vue |  34 ++--
 .../components/project-settings/groups.vue    |  55 ++++---
 .../project-settings/input-final-p111.vue     | 147 +++++++++---------
 .../project-settings/input-final-pending.vue  |  63 +++++---
 .../project-settings/input-raw-ntbp.vue       |  63 +++++---
 .../project-settings/input-raw-p111.vue       | 146 ++++++++---------
 .../input-smartsource-header.vue              | 120 +++++++-------
 .../input-smartsource-segy.vue                | 121 +++++++-------
 .../components/project-settings/name-id.vue   |  41 ++---
 .../online-line-name-format.vue               | 111 +++++++------
 .../components/project-settings/planner.vue   |  71 +++++----
 .../components/project-settings/preplots.vue  |  74 +++++----
 .../project-settings/production.vue           |  54 ++++---
 .../source/src/views/ProjectSettings.vue      |   2 +-
 18 files changed, 707 insertions(+), 626 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/asaqc.vue b/lib/www/client/source/src/components/project-settings/asaqc.vue
index 38a86e5..e0fb85d 100644
--- a/lib/www/client/source/src/components/project-settings/asaqc.vue
+++ b/lib/www/client/source/src/components/project-settings/asaqc.vue
@@ -9,21 +9,21 @@
           hint="ID number for this survey in ASAQC"
           persistent-hint
           type="number"
-          v-model.number="value_.id"
+          v-model.number="cwo.id"
         >
         </v-text-field>
         <v-text-field
           label="IMO"
           hint="Project vessel's International Maritime Organisation's identification number"
           persistent-hint
-          v-model.number="value_.imo"
+          v-model.number="cwo.imo"
         >
         </v-text-field>
         <v-text-field
           label="MMSI"
           hint="Maritime Mobile Service Identities (MMSI) number"
           persistent-hint
-          v-model.number="value_.mmsi"
+          v-model.number="cwo.mmsi"
         >
         </v-text-field>
         <v-text-field
@@ -32,13 +32,14 @@
           persistent-hint
           :type="subscriptionKeyVisible ? 'text' : 'password'"
           :append-icon="subscriptionKeyVisible ? 'mdi-eye' : 'mdi-eye-off'"
-          v-model="value_.subscriptionKey"
+          v-model="cwo.subscriptionKey"
           @click:append="subscriptionKeyVisible = !subscriptionKeyVisible"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -48,6 +49,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -58,54 +60,60 @@
 </template>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsASAQC",
 
-  mixins: [
-    setIfDifferent({
-      value: "value_"
-    })
-  ],
-
-  props: [ "value" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      value_: {
-        id: null,
-        imo: null,
-        mmsi: null,
-        subscriptionKey: null
-      },
       subscriptionKeyVisible: false
     }
   },
 
-  watch: {
-    value (newValue) {
-      this.reset();
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.cloud?.asaqc) {
+            deepSet(this.value, [ "cloud", "asaqc" ], {
+              id: null,
+              imo: null,
+              mmsi: null,
+              subscriptionKey: null
+            });
+          }
+          return this.value.cloud.asaqc;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "cloud", "asaqc" ], v);
+        }
+      }
+
     }
   },
 
   methods: {
 
     reset () {
-
-      this.value_ = deepMerge({
-        id: null,
-        imo: null,
-        mmsi: null,
-        subscriptionKey: null
-      }, structuredClone(this.value??{}));
-
     },
 
     save () {
-      this.$emit("merge", [ [ "cloud", "asaqc" ], this.value_ ]);
-      this.$nextTick(this.reset);
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/binning.vue b/lib/www/client/source/src/components/project-settings/binning.vue
index ca6bc1e..88e536f 100644
--- a/lib/www/client/source/src/components/project-settings/binning.vue
+++ b/lib/www/client/source/src/components/project-settings/binning.vue
@@ -10,7 +10,7 @@
           persistent-hint
           suffix="°"
           type="number"
-          v-model.number="theta_"
+          v-model.number="cwo.theta"
         >
         </v-text-field>
         <v-text-field
@@ -20,7 +20,7 @@
           type="number"
           min="0"
           step="1"
-          v-model.number="I_inc_"
+          v-model.number="cwo.I_inc"
         >
         </v-text-field>
         <v-text-field
@@ -30,7 +30,7 @@
           type="number"
           min="0"
           step="1"
-          v-model.number="J_inc_"
+          v-model.number="cwo.J_inc"
         >
         </v-text-field>
         <v-text-field
@@ -38,7 +38,7 @@
           hint="Inline bin width (can be negative)"
           persistent-hint
           type="number"
-          v-model.number="I_width_"
+          v-model.number="cwo.I_width"
         >
         </v-text-field>
         <v-text-field
@@ -46,7 +46,7 @@
           hint="Crossline bin width (can be negative)"
           persistent-hint
           type="number"
-          v-model.number="J_width_"
+          v-model.number="cwo.J_width"
         >
         </v-text-field>
         <fieldset class="pa-3 mt-3">
@@ -58,7 +58,7 @@
                 hint="Bin origin easting"
                 persistent-hint
                 type="number"
-                v-model.number="origin_.easting"
+                v-model.number="cwo.origin.easting"
               >
               </v-text-field>
             </v-col>
@@ -68,7 +68,7 @@
                 hint="Bin origin northing"
                 persistent-hint
                 type="number"
-                v-model.number="origin_.northing"
+                v-model.number="cwo.origin.northing"
               >
               </v-text-field>
             </v-col>
@@ -81,7 +81,7 @@
                 persistent-hint
                 type="number"
                 step="1"
-                v-model.number="origin_.I"
+                v-model.number="cwo.origin.I"
               >
               </v-text-field>
             </v-col>
@@ -92,7 +92,7 @@
                 persistent-hint
                 type="number"
                 step="1"
-                v-model.number="origin_.J"
+                v-model.number="cwo.origin.J"
               >
               </v-text-field>
             </v-col>
@@ -101,6 +101,7 @@
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -110,6 +111,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -120,91 +122,66 @@
 </template>
 
 <script>
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsBinning",
 
-  props: [ "theta", "I_inc", "J_inc", "I_width", "J_width", "origin" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      theta_: null,
-      I_inc_: 1,
-      J_inc_: 1,
-      I_width_: -12.50,
-      J_width_: 12.50,
-      origin_: {
-        easting: null,
-        northing: null,
-        I: null,
-        J: null
-      }
     }
   },
 
-  watch: {
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
 
-    theta () {
-      if (this.theta != this.theta_) {
-        this.theta_ = this.theta;
-      }
-    },
+      get () {
+        if (this.value) {
+          if (!this.value?.binning) {
+            deepSet(this.value, [ "binning" ], {
+              theta: null,
+              Iinc: 1,
+              Jinc: 1,
+              Iwidth: null,
+              Jwidth: null,
+              origin: {
+                easting: null,
+                northing: null,
+                I: null,
+                J: null
+              }
+            });
+          }
+          return this.value.binning;
+        } else {
+          return {};
+        }
+      },
 
-    I_inc () {
-      if (this.I_inc != this.I_inc_) {
-        this.I_inc_ = this.I_inc;
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "binning" ], v);
+        }
       }
-    },
 
-    J_inc () {
-      if (this.J_inc != this.J_inc_) {
-        this.J_inc_ = this.J_inc;
-      }
-    },
-
-    I_width () {
-      if (this.I_width != this.I_width_) {
-        this.I_width_ = this.I_width;
-      }
-    },
-
-    J_width () {
-      if (this.J_width != this.J_width_) {
-        this.J_width_ = this.J_width;
-      }
-    },
-
-    origin () {
-      if (Object.entries(this.origin).some(i => this.origin_[i[0]] != i[1])) {
-        this.origin_ = {...this.origin};
-      }
     }
-
   },
 
   methods: {
 
     reset () {
-      this.theta_ = this.theta;
-      this.I_inc_ = this.I_inc;
-      this.J_inc_ = this.J_inc;
-      this.I_width_ = this.I_width;
-      this.J_width_ = this.J_width;
-      this.origin_ = {...this.origin};
-      this.origin_.origin = {...this.origin.origin};
     },
 
     save () {
-      this.$emit('input', {
-        binning: {
-          theta: this.theta_,
-          I_inc: this.I_inc_,
-          J_inc: this.J_inc_,
-          I_width: this.I_width_,
-          J_width: this.J_width_,
-          origin: this.origin_
-        }
-      });
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
index 5c8a0d6..5b62d80 100644
--- a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
+++ b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
@@ -178,6 +178,7 @@
       </v-tabs-items>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         :disabled="!isValid"
@@ -188,6 +189,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -295,8 +297,6 @@ export default {
       this.$emit('close');
     },
 
-    ...mapActions(["api"])
-
   },
 
   mounted () {
diff --git a/lib/www/client/source/src/components/project-settings/file-path.vue b/lib/www/client/source/src/components/project-settings/file-path.vue
index 3324915..a392147 100644
--- a/lib/www/client/source/src/components/project-settings/file-path.vue
+++ b/lib/www/client/source/src/components/project-settings/file-path.vue
@@ -8,17 +8,18 @@
           label="Project folder"
           hint="Root file path for this project"
           persistent-hint
-          v-model="rootPath_"
+          v-model="cwo.rootPath"
         >
           <dougal-file-browser-dialog
             slot="append"
-            v-model="rootPath_"
+            v-model="cwo.rootPath"
             mimetypes="inode/directory"
           ></dougal-file-browser-dialog>
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -28,6 +29,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -45,32 +47,44 @@ export default {
 
   components: { DougalFileBrowserDialog },
 
-  props: [ "rootPath" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      rootPath_: ""
     }
   },
 
-  watch: {
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
 
-    rootPath () {
-      if (this.rootPath != this.rootPath_) {
-        this.reset();
+      get () {
+        if (this.value) {
+          return this.value;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        this.value = v;
       }
-    }
 
+    }
   },
 
   methods: {
 
     reset () {
-      this.rootPath_ = this.rootPath;
     },
 
     save () {
-      this.$emit('input', {rootPath: this.rootPath_});
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/geodetics.vue b/lib/www/client/source/src/components/project-settings/geodetics.vue
index dc87875..ebacebc 100644
--- a/lib/www/client/source/src/components/project-settings/geodetics.vue
+++ b/lib/www/client/source/src/components/project-settings/geodetics.vue
@@ -9,12 +9,13 @@
           hint="EPSG code of the project's coordinate reference system"
           persistent-hint
           type="number"
-          v-model.number="epsg_"
+          v-model.number="cwo.epsg"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -24,6 +25,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -38,30 +40,44 @@
 export default {
   name: "DougalProjectSettingsGeodetics",
 
-  props: [ "epsg" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      epsg_: null
     }
   },
 
-  watch: {
-    epsg () {
-      if (this.epsg != this.epsg_) {
-        this.epsg_ = this.epsg;
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          return this.value;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        this.value = v;
       }
+
     }
   },
 
   methods: {
 
     reset () {
-      this.epsg_ = this.epsg;
     },
 
     save () {
-      this.$emit('input', {epsg: this.epsg_});
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/groups.vue b/lib/www/client/source/src/components/project-settings/groups.vue
index 1404051..4b8bde7 100644
--- a/lib/www/client/source/src/components/project-settings/groups.vue
+++ b/lib/www/client/source/src/components/project-settings/groups.vue
@@ -1,11 +1,11 @@
 <template>
   <v-card>
     <v-card-title>Groups</v-card-title>
-    <v-card-subtitle>For <abbr title="Permanent Reservoir Monitoring">PRM</abbr> and 4D operations, each project can be assigned to one or more groups_ sharing the same (or substantially the same) preplots.</v-card-subtitle>
+    <v-card-subtitle>For <abbr title="Permanent Reservoir Monitoring">PRM</abbr> and 4D operations, each project can be assigned to one or more groups sharing the same (or substantially the same) preplots.</v-card-subtitle>
     <v-card-text>
       <v-form>
         <v-combobox
-          v-model="groups_"
+          v-model="groups"
           :items="items"
           multiple
           :search-input.sync="search"
@@ -59,6 +59,7 @@
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -68,6 +69,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -79,33 +81,19 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsGroups",
 
-  props: [ "groups" ],
+  props: [ "value" ],
 
   data () {
     return {
-      groups_: [],
       search: null
     }
   },
 
-  watch: {
-    value (newValue) {
-      this.reset();
-    },
-
-    groups (cur, prev) {
-      if (cur?.length == prev?.length) {
-        return;
-      }
-
-      this.setGroups(cur);
-    }
-  },
-
   computed: {
 
     colours () {
@@ -113,7 +101,8 @@ export default {
     },
 
     nextColour () {
-      return this.colours[(this.items.length + (this.groups_?.length ?? 0)) % this.colours.length];
+      // FIXME Fix colour when adding a new group
+      return this.colours[(this.items.length + (this.value?.groups?.length ?? 0)) % this.colours.length];
     },
 
     items () {
@@ -125,25 +114,33 @@ export default {
       });
     },
 
+    groups: {
+
+      get () {
+        return this.value?.groups?.map(i => {
+          return typeof i === "string"
+            ? { text: i, colour: this.nextColour}
+            : i
+        }) ?? [];
+      },
+
+      set (v) {
+        if (this.value) {
+          this.value.groups = v?.map( i => i?.text ?? i );
+        }
+      }
+
+    },
+
     ...mapGetters(["projectGroups"])
   },
 
   methods: {
 
-    setGroups (groups) {
-      this.groups_ = groups?.map(i => {
-        return typeof i === "string"
-          ? { text: i, colour: this.nextColour}
-          : i
-      });
-    },
-
     reset () {
-      this.setGroups(this.groups);
     },
 
     save () {
-      this.$emit('input', {groups: this.groups_?.map(i => i.text)});
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/input-final-p111.vue b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
index 392a620..2ef9f3c 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
@@ -2,7 +2,7 @@
   <dougal-project-settings-file-matching-parameters
     title="Final P1/11"
     subtitle="Final P1/11 files location and parameters."
-    v-bind="{rootPath}"
+    v-bind="{rootPath: value.rootPath}"
     v-bind.sync="bind"
     :is-valid="isValid"
     :save="save"
@@ -19,8 +19,7 @@
 </style>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -31,55 +30,97 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  mixins: [
-    setIfDifferent({
-      globs: "globs_",
-      paths: "paths_",
-      pattern: "pattern_",
-      lineNameInfo: "lineNameInfo_"
-    })
-  ],
-
   props: {
     title: String,
     subtitle: String,
-    rootPath: String,
-    paths: Array,
-    globs: Array,
-    lineNameInfo: Object,
-    pattern: Object
+    value: Object
   },
 
   data () {
     return {
       tab: null,
-      paths_: [],
-      globs_: [],
-      pattern_: {},
-      lineNameInfo_: {}
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.final?.p111) {
+            deepSet(this.value, [ "final", "p111" ], {
+              globs: [ "**/*.p111", "**/*.P111" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  },
+                  incr: {
+                    length: 1,
+                    type: "bool"
+                  },
+                  attempt: {
+                    length: 1,
+                    type: "int"
+                  },
+                  file_no: {
+                    length: 3,
+                    type: "int"
+                  }
+                }
+              }
+            });
+          }
+          return this.value.final.p111;
+        } else {
+          return {
+              globs: [ "**/*.p111", "**/*.P111" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                }
+              }
+            };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "final", "p111" ], v);
+        }
+      }
+    },
 
     bind () {
       return {
-        globs: this.globs_,
-        paths: this.paths_,
-        pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
+        globs: this.cwo?.globs,
+        paths: this.cwo?.paths,
+        pattern: this.cwo?.pattern,
+        lineNameInfo: this.cwo?.lineNameInfo
       };
     },
 
     isValid () {
-      return true;
-      return !!(this.paths.length && this.globs.length && (
-        this.pattern?.regex &&
-          ["direction", "line", "sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
-        this.lineNameInfo &&
-          this.lineNameInfo?.fields &&
+      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
+        this.cwo?.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
+        this.cwo?.lineNameInfo &&
+          this.cwo?.lineNameInfo?.fields &&
             [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
+              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
     }
 
   },
@@ -90,56 +131,14 @@ export default {
   methods: {
 
     reset () {
-
-      this.paths_ = [...this.paths];
-
-      this.globs_ = [...this.globs];
-
-      this.lineNameInfo_ = deepMerge({
-          example: "",
-          fields: {
-            line: {
-              length: 4,
-              type: "int"
-            },
-            sequence: {
-              length: 3,
-              type: "int"
-            },
-            incr: {
-              length: 1,
-              type: "bool"
-            },
-            attempt: {
-              length: 1,
-              type: "int"
-            },
-            file_no: {
-              length: 3,
-              type: "int"
-            }
-          }
-        }, structuredClone(this.lineNameInfo ?? {}));
-
-      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit("merge", [ ["final", "p111"], {
-        paths: this.paths_,
-        globs: this.globs_,
-        pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
       this.$emit('close');
     },
-
-    ...mapActions(["api"])
-
   },
 
   mounted () {
diff --git a/lib/www/client/source/src/components/project-settings/input-final-pending.vue b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
index 517633d..7193348 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-pending.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-pending.vue
@@ -8,19 +8,20 @@
           label="Pattern"
           hint="Regular expression text"
           persistent-hint
-          v-model="regex_"
+          v-model="cwo.pattern.regex"
         >
         </v-text-field>
         <v-text-field
           label="Flags"
           hint="Regular expression modifier flags"
           persistent-hint
-          v-model="flags_"
+          v-model="cwo.pattern.flags"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -30,6 +31,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -40,25 +42,51 @@
 </template>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsFinalPending",
 
-  mixins: [
-    setIfDifferent({
-      regex: "regex_",
-      flags: "flags_"
-    })
-  ],
-
-  props: [ "regex", "flags" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      regex_: "NTBP",
-      flags_: "i"
+    }
+  },
+
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.final?.pending.pattern) {
+            deepSet(this.value, [ "final", "pending", "pattern" ], {
+              flags: "i",
+              regex: "PENDING"
+            });
+          }
+          return this.value.final.pending;
+        } else {
+          return {
+            flags: "i",
+            regex: "PENDING"
+          };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "final", "pending", "pattern" ], v);
+        }
+      }
+
     }
   },
 
@@ -68,16 +96,9 @@ export default {
   methods: {
 
     reset () {
-      this.regex_ = this.regex;
-      this.flags_ = this.flags;
     },
 
     save () {
-      this.$emit('merge', [ ["final", "pending"], {
-        regex: this.regex_,
-        flags: this.flags_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
index 2a488d7..7d81227 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-ntbp.vue
@@ -8,19 +8,20 @@
           label="Pattern"
           hint="Regular expression text"
           persistent-hint
-          v-model="regex_"
+          v-model="cwo.pattern.regex"
         >
         </v-text-field>
         <v-text-field
           label="Flags"
           hint="Regular expression modifier flags"
           persistent-hint
-          v-model="flags_"
+          v-model="cwo.pattern.flags"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -30,6 +31,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -40,25 +42,51 @@
 </template>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsRawNTBP",
 
-  mixins: [
-    setIfDifferent({
-      regex: "regex_",
-      flags: "flags_"
-    })
-  ],
-
-  props: [ "regex", "flags" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      regex_: "NTBP",
-      flags_: "i"
+    }
+  },
+
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.raw?.ntbp.pattern) {
+            deepSet(this.value, [ "raw", "ntbp", "pattern" ], {
+              flags: "i",
+              regex: "NTBP"
+            });
+          }
+          return this.value.raw.ntbp;
+        } else {
+          return {
+            flags: "i",
+            regex: "NTBP"
+          };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "raw", "ntbp", "pattern" ], v);
+        }
+      }
+
     }
   },
 
@@ -68,16 +96,9 @@ export default {
   methods: {
 
     reset () {
-      this.regex_ = this.regex;
-      this.flags_ = this.flags;
     },
 
     save () {
-      this.$emit('merge', [ ["raw", "ntbp"], {
-        regex: this.regex_,
-        flags: this.flags_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
index 0c43068..edc8644 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
@@ -2,7 +2,7 @@
   <dougal-project-settings-file-matching-parameters
     title="Raw P1/11"
     subtitle="Raw P1/11 files location and parameters."
-    v-bind="{rootPath}"
+    v-bind="{rootPath: value.rootPath}"
     v-bind.sync="bind"
     :is-valid="isValid"
     :save="save"
@@ -19,8 +19,7 @@
 </style>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -31,54 +30,97 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  mixins: [
-    setIfDifferent({
-      globs: "globs_",
-      paths: "paths_",
-      pattern: "pattern_",
-      lineNameInfo: "lineNameInfo_"
-    })
-  ],
-
   props: {
     title: String,
     subtitle: String,
-    rootPath: String,
-    paths: Array,
-    globs: Array,
-    lineNameInfo: Object,
-    pattern: Object
+    value: Object
   },
 
   data () {
     return {
       tab: null,
-      paths_: [],
-      globs_: [],
-      pattern_: {},
-      lineNameInfo_: {}
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.raw?.p111) {
+            deepSet(this.value, [ "raw", "p111" ], {
+              globs: [ "**/*.p111", "**/*.P111" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  },
+                  incr: {
+                    length: 1,
+                    type: "bool"
+                  },
+                  attempt: {
+                    length: 1,
+                    type: "int"
+                  },
+                  file_no: {
+                    length: 3,
+                    type: "int"
+                  }
+                }
+              }
+            });
+          }
+          return this.value.raw.p111;
+        } else {
+          return {
+              globs: [ "**/*.p111", "**/*.P111" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                }
+              }
+            };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "raw", "p111" ], v);
+        }
+      }
+    },
 
     bind () {
       return {
-        globs: this.globs_,
-        paths: this.paths_,
-        pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
+        globs: this.cwo?.globs,
+        paths: this.cwo?.paths,
+        pattern: this.cwo?.pattern,
+        lineNameInfo: this.cwo?.lineNameInfo
       };
     },
 
     isValid () {
-      return !!(this.paths_.length && this.globs_.length && (
-        this.pattern_?.regex &&
-          ["direction", "line", "sequence"].every( i => this.pattern_?.captures?.includes(i) )) || (
-        this.lineNameInfo_ &&
-          this.lineNameInfo_?.fields &&
+      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
+        this.cwo?.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
+        this.cwo?.lineNameInfo &&
+          this.cwo?.lineNameInfo?.fields &&
             [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.lineNameInfo_.fields[i] ))));
+              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
     }
 
   },
@@ -89,56 +131,14 @@ export default {
   methods: {
 
     reset () {
-
-      this.paths_ = [...this.paths];
-
-      this.globs_ = [...this.globs];
-
-      this.lineNameInfo_ = deepMerge({
-          example: "",
-          fields: {
-            line: {
-              length: 4,
-              type: "int"
-            },
-            sequence: {
-              length: 3,
-              type: "int"
-            },
-            incr: {
-              length: 1,
-              type: "bool"
-            },
-            attempt: {
-              length: 1,
-              type: "int"
-            },
-            file_no: {
-              length: 3,
-              type: "int"
-            }
-          }
-        }, structuredClone(this.lineNameInfo ?? {}));
-
-      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit("merge", [ ["raw", "p111"], {
-        paths: this.paths_,
-        globs: this.globs_,
-        pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
       this.$emit('close');
     },
-
-    ...mapActions(["api"])
-
   },
 
   mounted () {
diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue b/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
index a7a131c..6f6c491 100644
--- a/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
+++ b/lib/www/client/source/src/components/project-settings/input-smartsource-header.vue
@@ -2,6 +2,7 @@
   <dougal-project-settings-file-matching-parameters
     title="Smartsource header data"
     subtitle="Smartsource header data files location and parameters."
+    v-bind="{rootPath: value.rootPath}"
     v-bind.sync="bind"
     :is-valid="isValid"
     :save="save"
@@ -18,8 +19,7 @@
 </style>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -30,57 +30,85 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  props: [ "value", "title", "subtitle" ],
-
-  mixins: [
-    setIfDifferent({
-      globs: "globs_",
-      paths: "paths_",
-      pattern: "pattern_",
-      lineNameInfo: "lineNameInfo_"
-    })
-  ],
-
   props: {
     title: String,
     subtitle: String,
-    rootPath: String,
-    paths: Array,
-    globs: Array,
-    lineNameInfo: Object,
-    pattern: Object
+    value: Object
   },
 
   data () {
     return {
       tab: null,
-      paths_: [],
-      globs_: [],
-      pattern_: {},
-      lineNameInfo_: {}
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.raw?.source?.smsrc?.header) {
+            deepSet(this.value, [ "raw", "source", "smsrc", "header" ], {
+              globs: [ "**/*.hdr", "**/*.HDR" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  }
+                }
+              }
+            });
+          }
+          return this.value.raw.source.smsrc.header;
+        } else {
+          return {
+              globs: [ "**/*.hdr", "**/*.HDR" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                }
+              }
+            };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "raw", "source", "smsrc", "header" ], v);
+        }
+      }
+    },
 
     bind () {
       return {
-        globs: this.globs_,
-        paths: this.paths_,
-        //pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
+        globs: this.cwo?.globs,
+        paths: this.cwo?.paths,
+        pattern: this.cwo?.pattern,
+        lineNameInfo: this.cwo?.lineNameInfo
       };
     },
 
     isValid () {
-      return true;
-      return !!(this.paths.length && this.globs.length && (
-        this.pattern?.regex &&
-          ["direction", "line", "sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
-        this.lineNameInfo &&
-          this.lineNameInfo?.fields &&
+      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
+        this.cwo?.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
+        this.cwo?.lineNameInfo &&
+          this.cwo?.lineNameInfo?.fields &&
             [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
+              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
     }
 
   },
@@ -91,40 +119,14 @@ export default {
   methods: {
 
     reset () {
-
-      this.paths_ = [...this.paths];
-
-      this.globs_ = [...this.globs];
-
-      this.lineNameInfo_ = deepMerge({
-          example: "",
-          fields: {
-            sequence: {
-              length: 3,
-              type: "int"
-            },
-          }
-        }, structuredClone(this.lineNameInfo ?? {}));
-
-      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit("merge", [ ["raw", "source", "smsrc", "header"], {
-        paths: this.paths_,
-        globs: this.globs_,
-        pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
       this.$emit('close');
     },
-
-    ...mapActions(["api"])
-
   },
 
   mounted () {
diff --git a/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue b/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue
index 9711da3..17e12ac 100644
--- a/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue
+++ b/lib/www/client/source/src/components/project-settings/input-smartsource-segy.vue
@@ -2,6 +2,7 @@
   <dougal-project-settings-file-matching-parameters
     title="Smartsource hydrophone data"
     subtitle="Smartsource SEG-Y hydrophone data files location and parameters."
+    v-bind="{rootPath: value.rootPath}"
     v-bind.sync="bind"
     :is-valid="isValid"
     :save="save"
@@ -18,7 +19,7 @@
 </style>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
+import { deepSet } from '@/lib/utils';
 import setIfDifferent from '@/lib/watcher-mixin';
 import DougalProjectSettingsFileMatchingParameters from '@/components/project-settings/file-matching-parameters';
 import { mapActions, mapGetters } from 'vuex';
@@ -30,57 +31,85 @@ export default {
     DougalProjectSettingsFileMatchingParameters
   },
 
-  props: [ "value", "title", "subtitle" ],
-
-  mixins: [
-    setIfDifferent({
-      globs: "globs_",
-      paths: "paths_",
-      pattern: "pattern_",
-      lineNameInfo: "lineNameInfo_"
-    })
-  ],
-
   props: {
     title: String,
     subtitle: String,
-    rootPath: String,
-    paths: Array,
-    globs: Array,
-    lineNameInfo: Object,
-    pattern: Object
+    value: Object
   },
 
   data () {
     return {
       tab: null,
-      paths_: [],
-      globs_: [],
-      pattern_: {},
-      lineNameInfo_: {}
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.raw?.source?.smsrc?.segy) {
+            deepSet(this.value, [ "raw", "source", "smsrc", "segy" ], {
+              globs: [ "**/*.hdr", "**/*.HDR" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  }
+                }
+              }
+            });
+          }
+          return this.value.raw.source.smsrc.segy;
+        } else {
+          return {
+              globs: [ "**/*.hdr", "**/*.HDR" ],
+              paths: [],
+              lineNameInfo: {
+                example: "",
+                fields: {
+                }
+              }
+            };
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "raw", "source", "smsrc", "segy" ], v);
+        }
+      }
+    },
 
     bind () {
       return {
-        globs: this.globs_,
-        paths: this.paths_,
-        //pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
+        globs: this.cwo?.globs,
+        paths: this.cwo?.paths,
+        pattern: this.cwo?.pattern,
+        lineNameInfo: this.cwo?.lineNameInfo
       };
     },
 
     isValid () {
-      return true;
-      return !!(this.paths.length && this.globs.length && (
-        this.pattern?.regex &&
-          ["sequence"].every( i => this.pattern?.captures?.includes(i) )) || (
-        this.lineNameInfo &&
-          this.lineNameInfo?.fields &&
-            [ "sequence" ].every( i =>
-              ["offset", "length"].every( j => j in this.lineNameInfo.fields[i] ))));
+      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
+        this.cwo?.pattern?.regex &&
+          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
+        this.cwo?.lineNameInfo &&
+          this.cwo?.lineNameInfo?.fields &&
+            [ "line", "sequence", "incr" ].every( i =>
+              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
     }
 
   },
@@ -91,40 +120,14 @@ export default {
   methods: {
 
     reset () {
-
-      this.paths_ = [...this.paths];
-
-      this.globs_ = [...this.globs];
-
-      this.lineNameInfo_ = deepMerge({
-          example: "",
-          fields: {
-            sequence: {
-              length: 3,
-              type: "int"
-            },
-          }
-        }, structuredClone(this.lineNameInfo ?? {}));
-
-      this.pattern_ = structuredClone(this.pattern ?? {});
     },
 
     save () {
-      this.$emit("merge", [ ["raw", "source", "smsrc", "segy"], {
-        paths: this.paths_,
-        globs: this.globs_,
-        //pattern: this.pattern_,
-        lineNameInfo: this.lineNameInfo_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
       this.$emit('close');
     },
-
-    ...mapActions(["api"])
-
   },
 
   mounted () {
diff --git a/lib/www/client/source/src/components/project-settings/name-id.vue b/lib/www/client/source/src/components/project-settings/name-id.vue
index d60f27c..554cb45 100644
--- a/lib/www/client/source/src/components/project-settings/name-id.vue
+++ b/lib/www/client/source/src/components/project-settings/name-id.vue
@@ -8,19 +8,20 @@
           label="ID"
           hint="Short survey ID"
           persistent-hint
-          v-model="id_"
+          v-model="cwo.id"
         >
         </v-text-field>
         <v-text-field
           label="Name"
           hint="Survey name"
           persistent-hint
-          v-model="name_"
+          v-model="cwo.name"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -30,6 +31,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -45,40 +47,43 @@ export default {
   name: "DougalProjectSettingsNameId",
 
   props: {
-    id: String,
-    name: String
+    value: Object
   },
 
   data () {
     return {
-      id_: "",
-      name_: ""
     }
   },
 
-  watch: {
-    id () {
-      if (this.id != this.id_) {
-        this.id_ = this.id;
-      }
-    },
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
 
-    name () {
-      if (this.name != this.name_) {
-        this.name_ = this.name;
+      get () {
+        if (this.value) {
+          return this.value;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        this.value = v;
       }
+
     }
   },
 
   methods: {
 
     reset () {
-      this.id_ = this.id;
-      this.name_ = this.name;
     },
 
     save () {
-      this.$emit('input', {id: this.id_, name: this.name_});
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
index 874b701..dfd95ec 100644
--- a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
+++ b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
@@ -1,26 +1,27 @@
 <template>
   <v-card>
-    <v-card-title>Files</v-card-title>
-    <v-card-subtitle>File path configuration for this project.</v-card-subtitle>
+    <v-card-title>Online line name</v-card-title>
+    <v-card-subtitle>Line name decoding configuration for real-time data</v-card-subtitle>
     <v-card-text>
       <v-form>
         <v-text-field
           label="Example file name"
           hint="Enter the name of a representative file to make it easier to visualise your configuration"
           persistent-hint
-          v-model="lineNameInfo_.example"
+          v-model="cwo.lineNameInfo.example"
         ></v-text-field>
 
         <dougal-fixed-string-decoder
           title="Line name format"
           subtitle="Format of line names as configured in the navigation system"
           :multiline="true"
-          :text="lineNameInfo_.example"
-          :fields="lineNameInfo_.fields"
+          :text="cwo.lineNameInfo.example"
+          :fields="cwo.lineNameInfo.fields"
         ></dougal-fixed-string-decoder>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -30,6 +31,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -47,10 +49,8 @@
 </style>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 import DougalFixedStringDecoder from '@/components/decoder/fixed-string-decoder';
-import { mapActions, mapGetters } from 'vuex';
 
 export default {
   name: "DougalProjectSettingsOnlineLineNameFormat",
@@ -59,81 +59,76 @@ export default {
     DougalFixedStringDecoder
   },
 
-  mixins: [
-    setIfDifferent({
-      lineNameInfo: "lineNameInfo_"
-    })
-  ],
-
   props: {
-    lineNameInfo: Object
+    value: Object
   },
 
   data () {
     return {
-      lineNameInfo_: {
-        example: "",
-        fields: {}
-      }
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
 
-    isValid () {
-      return !!(this.lineNameInfo_ &&
-          this.lineNameInfo_?.fields &&
-            [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.lineNameInfo_.fields[i] )));
-    }
+      get () {
+        if (this.value) {
+          if (!this.value?.online?.line) {
+            deepSet(this.value, [ "online", "line" ], {
+              lineNameInfo: {
+                example: "",
+                fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  },
+                  incr: {
+                    length: 1,
+                    type: "bool"
+                  },
+                  attempt: {
+                    length: 1,
+                    type: "int"
+                  }
+                }
+              }
+            });
+          }
+          return this.value.online.line;
+        } else {
+          return {};
+        }
+      },
 
-  },
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "online", "line" ], v);
+        }
+      }
 
-  watch: {
-    value (newValue) {
-      this.reset();
     }
   },
 
   methods: {
 
     reset () {
-
-      this.lineNameInfo_ = deepMerge({
-          example: "",
-          fields: {
-            line: {
-              length: 4,
-              type: "int"
-            },
-            sequence: {
-              length: 3,
-              type: "int"
-            },
-            incr: {
-              length: 1,
-              type: "bool"
-            },
-            attempt: {
-              length: 1,
-              type: "int"
-            },
-          }
-        }, structuredClone(this.lineNameInfo ?? {}));
     },
 
     save () {
-      this.$emit("merge", [ ["online", "line"], {
-        lineNameInfo: this.lineNameInfo_
-      }]);
-      this.$nextTick(this.reset);
     },
 
     back () {
       this.$emit('close');
-    },
-
-    ...mapActions(["api"])
+    }
 
   },
 
diff --git a/lib/www/client/source/src/components/project-settings/planner.vue b/lib/www/client/source/src/components/project-settings/planner.vue
index be5c21b..72393ff 100644
--- a/lib/www/client/source/src/components/project-settings/planner.vue
+++ b/lib/www/client/source/src/components/project-settings/planner.vue
@@ -10,7 +10,7 @@
           type="number"
           hint="Expected line change time in minutes"
           persistent-hint
-          v-model.number="planner_.defaultLineChangeDuration"
+          v-model.number="cwo.defaultLineChangeDuration"
         >
         </v-text-field>
         <v-text-field
@@ -19,7 +19,7 @@
           type="number"
           hint="Expected acquisition speed in knots"
           persistent-hint
-          v-model.number="planner_.defaultAcquisitionSpeed"
+          v-model.number="cwo.defaultAcquisitionSpeed"
         >
         </v-text-field>
         <v-text-field
@@ -27,7 +27,7 @@
           type="number"
           hint="Default number of shots to overlap before the FGSP, for reshoots"
           persistent-hint
-          v-model.number="planner_.overlapBefore"
+          v-model.number="cwo.overlapBefore"
         >
         </v-text-field>
         <v-text-field
@@ -35,12 +35,13 @@
           type="number"
           hint="Default number of shots to overlap after the LGSP, for reshoots"
           persistent-hint
-          v-model.number="planner_.overlapAfter"
+          v-model.number="cwo.overlapAfter"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -50,6 +51,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -60,55 +62,60 @@
 </template>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsPlanner",
 
-  mixins: [
-    setIfDifferent({
-      planner: "planner_"
-    })
-  ],
-
   props: {
-    planner: Object
+    value: Object
   },
 
   data () {
     return {
-      planner_: {
-        defaultLineChangeDuration: null,
-        defaultAcquisitionSpeed: null,
-        overlapBefore: null,
-        overlapAfter: null
-      }
     }
   },
 
-  watch: {
-    planner (newValue) {
-      this.reset();
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.planner) {
+            deepSet(this.value, [ "planner" ], {
+              defaultLineChangeDuration: null,
+              defaultAcquisitionSpeed: null,
+              overlapBefore: null,
+              overlapAfter: null
+            });
+          }
+          return this.value.planner;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "planner" ], v);
+        }
+      }
+
     }
   },
 
+
   methods: {
 
     reset () {
-
-      this.planner_ = deepMerge({
-        defaultLineChangeDuration: null,
-        defaultAcquisitionSpeed: null,
-        overlapBefore: null,
-        overlapAfter: null
-      }, structuredClone(this.planner ?? {}));
-
     },
 
     save () {
-      this.$emit("merge", [ [ ], this.planner_ ]);
-      this.$nextTick(this.reset);
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/preplots.vue b/lib/www/client/source/src/components/project-settings/preplots.vue
index 3893c37..a55ec14 100644
--- a/lib/www/client/source/src/components/project-settings/preplots.vue
+++ b/lib/www/client/source/src/components/project-settings/preplots.vue
@@ -5,14 +5,14 @@
     <v-card-text>
 
       <v-expansion-panels v-model="panel">
-        <v-expansion-panel v-for="(preplot, idx) in preplots_" :key="idx">
+        <v-expansion-panel v-for="(preplot, idx) in cwo" :key="idx">
           <v-expansion-panel-header>
             {{ titleFor(preplot) }}
           </v-expansion-panel-header>
           <v-expansion-panel-content>
             <dougal-project-settings-preplots-preplot
-              v-model="preplots_[idx]"
-              :root-path="rootPath"
+              v-model="cwo[idx]"
+              :root-path="value.rootPath"
             ></dougal-project-settings-preplots-preplot>
 
             <v-btn
@@ -42,6 +42,7 @@
 
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         :disabled="!isValid"
@@ -52,6 +53,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -78,45 +80,53 @@ export default {
     DougalProjectSettingsPreplotsPreplot,
   },
 
-  props: [ "rootPath", "preplots" ],
+  props: {
+    value: Object
+  },
 
   data () {
     return {
-      preplots_: [],
       panel: null
     }
   },
 
   computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.preplots) {
+            deepSet(this.value, [ "preplots" ], []);
+          }
+          return this.value.preplots;
+        } else {
+          return [];
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "preplots" ], v);
+        }
+      }
+
+    },
 
     lastPreplotIsValid () {
-      return this.preplots_.length == 0 || this.validPreplot(this.preplots_[this.preplots_.length-1]);
+      return this.cwo.length == 0 || this.validPreplot(this.cwo[this.cwo.length-1]);
     },
 
     isValid () {
-      return this.preplots_.every(preplot => this.validPreplot(preplot));
+      return this.cwo.every(preplot => this.validPreplot(preplot));
     }
 
   },
 
-  watch: {
-
-    preplots () {
-      if (this.preplots.some( (i, idx) => i != this.preplots_[idx] )) {
-        this.preplots_ = structuredClone(this.preplots);
-      }
-    },
-
-    currentItem: {
-      handler (newValue) {
-        if (newValue) {
-          this.getHead();
-        }
-      },
-      deep: true
-    }
-  },
-
   methods: {
 
     titleFor (preplot) {
@@ -125,7 +135,7 @@ export default {
       if (preplot?.path) {
         str += preplot.path;
       } else {
-        const idx = this.preplots_.findIndex(i => i == preplot);
+        const idx = this.cwo.findIndex(i => i == preplot);
         if (idx != -1) {
           str += `Preplot ${idx}`;
         } else {
@@ -164,9 +174,9 @@ export default {
     },
 
     deletePreplot (preplot) {
-      const idx = this.preplots_.find(i => i == preplot);
+      const idx = this.cwo.find(i => i == preplot);
       if (idx != -1) {
-        this.preplots_.splice(idx, 1);
+        this.cwo.splice(idx, 1);
       }
     },
 
@@ -178,20 +188,16 @@ export default {
           format: "",
           fields: {},
         };
-        this.preplots_.push(preplot);
-        this.panel = this.preplots_.length - 1;
+        this.cwo.push(preplot);
+        this.panel = this.cwo.length - 1;
       }
     },
 
 
     reset () {
-      this.preplots_ = this.preplots;
     },
 
     save () {
-      this.$emit('input', {
-        preplots: this.preplots_
-      });
     },
 
     back () {
diff --git a/lib/www/client/source/src/components/project-settings/production.vue b/lib/www/client/source/src/components/project-settings/production.vue
index e14e724..1ae1a90 100644
--- a/lib/www/client/source/src/components/project-settings/production.vue
+++ b/lib/www/client/source/src/components/project-settings/production.vue
@@ -10,12 +10,13 @@
           persistent-hint
           suffix="min"
           type="number"
-          v-model.number="production_.nominalLineChangeDuration"
+          v-model.number="cwo.nominalLineChangeDuration"
         >
         </v-text-field>
       </v-form>
     </v-card-text>
     <v-card-actions>
+      <!--
       <v-btn
         color="primary"
         @click="save"
@@ -25,6 +26,7 @@
         color="warning"
         @click="reset"
       >Reset</v-btn>
+      -->
       <v-spacer></v-spacer>
       <v-btn
         color="secondary"
@@ -35,48 +37,56 @@
 </template>
 
 <script>
-import { deepCompare, deepMerge } from '@/lib/utils';
-import setIfDifferent from '@/lib/watcher-mixin';
+import { deepSet } from '@/lib/utils';
 
 export default {
   name: "DougalProjectSettingsProduction",
 
-  mixins: [
-    setIfDifferent({
-      production: "production_"
-    })
-  ],
-
   props: {
-    production: Object
+    value: Object
   },
 
   data () {
     return {
-      production_: {
-        nominalLineChangeDuration: null
-      }
     }
   },
 
-  watch: {
-    production (newValue) {
-      this.reset();
+  computed: {
+    // Current working object.
+    // A shortcut so we don't have to specify the full path
+    // on every input control. It also makes it easier to
+    // change that path if necessary. Finally, it ensures that
+    // the properties being modified are always available.
+    cwo: {
+
+      get () {
+        if (this.value) {
+          if (!this.value?.production) {
+            deepSet(this.value, [ "production" ], {
+              nominalLineChangeDuration: null
+            });
+          }
+          return this.value.production;
+        } else {
+          return {};
+        }
+      },
+
+      set (v) {
+        if (this.value) {
+          deepSet(this.value, [ "production" ], v);
+        }
+      }
+
     }
   },
 
   methods: {
 
     reset () {
-
-      this.production_ = deepMerge({
-        nominalLineChangeDuration: null
-      }, structuredClone(this.production ?? {}));
     },
 
     save () {
-      this.$emit("merge", [ [], this.production_ ]);
-      this.$nextTick(this.reset);
     },
 
     back () {
diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index d00dbed..c26175e 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -61,7 +61,7 @@
         <component
           :is="activeComponent"
           v-bind="activeValues"
-          @merge="merge"
+          v-model.sync="configuration"
           @close="deselect"
         ></component>
       </v-col>

From 9785f4541b02345d55621343e700a52c3bff8fd7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 15 Nov 2023 20:04:25 +0100
Subject: [PATCH 065/113] Add dirty configuration flag

---
 .../source/src/views/ProjectSettings.vue      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index c26175e..1b530ee 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -440,6 +440,8 @@ export default {
         }
       ],
 
+      dirty: false,
+
       fileLoadDialog: false,
 
       viewMode: 0,
@@ -451,6 +453,18 @@ export default {
   },
 
   watch: {
+
+    configuration: {
+      handler (cur, prev) {
+        if (cur && prev) {
+          this.dirty = true;
+        } else {
+          this.dirty = false;
+        }
+      },
+      deep: true
+    },
+
     active (cur, prev) {
       if (cur == prev) {
         return;
@@ -548,6 +562,7 @@ export default {
         }
       };
       this.configuration = await this.api([url, init]);
+      this.dirty = false;
     },
 
     makeTree (obj, id=0) {
@@ -605,7 +620,12 @@ export default {
       if (res && res.id == this.configuration.id) {
         // In case the server decided to apply any changes
         this.showSnack(["Configuration uploaded to server", "success"]);
-        this.$nextTick( () => this.configuration = res );
+        this.$nextTick( () => {
+          this.configuration = res;
+          this.$nextTick( () => {
+            this.dirty = false;
+          });
+        });
       }
     },
 

From a9f93cfd17bdb38c7e19dd469fd7ecab797fa6fe Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 15 Nov 2023 20:04:42 +0100
Subject: [PATCH 066/113] Add save / upload controls to configuration toolbar

---
 lib/www/client/source/src/views/ProjectSettings.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 1b530ee..082aca3 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -33,6 +33,11 @@
           <v-toolbar-title>
             Survey configuration
           </v-toolbar-title>
+          <v-spacer/>
+          <template v-if="dirty">
+            <v-icon left color="primary" @click="saveToFile" title="Save changes to file">mdi-content-save-outline</v-icon>
+            <v-icon color="primary" @click="upload" title="Upload changes to server">mdi-cloud-upload</v-icon>
+          </template>
         </v-toolbar>
 
         <v-switch

From 6fa0f8e659d97396dba7b9e72dc92ad0768b4c89 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 15 Nov 2023 20:18:19 +0100
Subject: [PATCH 067/113] Expose Buffer to Webpack configuration

---
 lib/www/client/source/vue.config.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/www/client/source/vue.config.js b/lib/www/client/source/vue.config.js
index 0a24ebd..075e22f 100644
--- a/lib/www/client/source/vue.config.js
+++ b/lib/www/client/source/vue.config.js
@@ -1,3 +1,5 @@
+const webpack = require('webpack');
+
 module.exports = {
   "transpileDependencies": [
     "vuetify",
@@ -41,6 +43,13 @@ module.exports = {
         path: require.resolve("path-browserify")
       }
     },
+    plugins: [
+      // Work around for Buffer is undefined:
+      // https://github.com/webpack/changelog-v5/issues/10
+      new webpack.ProvidePlugin({
+        Buffer: ['buffer', 'Buffer'],
+      })
+    ],
     module: {
       rules: [
         {

From 8ec918bc7c6615bd74d8426ccfd5a97f803f8ed7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 15 Nov 2023 21:36:12 +0100
Subject: [PATCH 068/113] Rename "SPS" preplots import to "legacy fixed width"

---
 bin/{sps.py => legacy_fwr.py} | 25 +++++++++++++++++++++----
 bin/parse_fwr.py              | 21 ---------------------
 bin/preplots.py               |  4 ++--
 3 files changed, 23 insertions(+), 27 deletions(-)
 rename bin/{sps.py => legacy_fwr.py} (66%)
 delete mode 100644 bin/parse_fwr.py

diff --git a/bin/sps.py b/bin/legacy_fwr.py
similarity index 66%
rename from bin/sps.py
rename to bin/legacy_fwr.py
index e0c33e3..c7346ee 100644
--- a/bin/sps.py
+++ b/bin/legacy_fwr.py
@@ -1,13 +1,30 @@
 #!/usr/bin/python3
 
 """
-SPS importing functions.
-
-And by SPS, we mean more or less any line-delimited, fixed-width record format.
+Legacy fixed width record importing functions.
 """
 
 import builtins
-from parse_fwr import parse_fwr
+
+def parse_fwr (string, widths, start=0):
+	"""Parse a fixed-width record.
+
+	string: the string to parse.
+	widths: a list of record widths. A negative width denotes a field to be skipped.
+	start: optional start index.
+
+	Returns a list of strings.
+	"""
+	results = []
+	current_index = start
+	for width in widths:
+		if width > 0:
+			results.append(string[current_index : current_index + width])
+			current_index += width
+		else:
+			current_index -= width
+
+	return results
 
 def int (v):
 	return builtins.int(float(v))
diff --git a/bin/parse_fwr.py b/bin/parse_fwr.py
deleted file mode 100644
index 77d3b4e..0000000
--- a/bin/parse_fwr.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python3
-
-def parse_fwr (string, widths, start=0):
-	"""Parse a fixed-width record.
-
-	string: the string to parse.
-	widths: a list of record widths. A negative width denotes a field to be skipped.
-	start: optional start index.
-
-	Returns a list of strings.
-	"""
-	results = []
-	current_index = start
-	for width in widths:
-		if width > 0:
-			results.append(string[current_index : current_index + width])
-			current_index += width
-		else:
-			current_index -= width
-
-	return results
diff --git a/bin/preplots.py b/bin/preplots.py
index 58be431..6b8bcbd 100644
--- a/bin/preplots.py
+++ b/bin/preplots.py
@@ -1,4 +1,4 @@
-import sps
+import legacy_fwr
 
 """
 Preplot importing functions.
@@ -7,7 +7,7 @@ Preplot importing functions.
 def from_file (file, realpath = None):
 	filepath = realpath or file["path"]
 	if not "type" in file or file["type"] == "sps":
-		records = sps.from_file(filepath, file["format"] if "format" in file else None )
+		records = legacy_fwr.from_file(filepath, file["format"] if "format" in file else None )
 	else:
 		return "Not an SPS file"
 

From c20b3b64c7b74d190be1375729dacdc1689fdbbf Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 29 Apr 2024 14:46:31 +0200
Subject: [PATCH 069/113] Fix symlink target

---
 lib/www/client/source/src/lib/deepMerge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/lib/deepMerge.js b/lib/www/client/source/src/lib/deepMerge.js
index 4df8a54..0efaea4 120000
--- a/lib/www/client/source/src/lib/deepMerge.js
+++ b/lib/www/client/source/src/lib/deepMerge.js
@@ -1 +1 @@
-/home/dberge/Development/projects/dougal/software/lib/www/server/lib/utils/deepMerge.js
\ No newline at end of file
+../../../../server/lib/utils/deepMerge.js
\ No newline at end of file

From 934b921f693390ee0e5e8a2c802756d4e1691a30 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Tue, 30 Apr 2024 13:25:40 +0200
Subject: [PATCH 070/113] Include schema in returned survey configuration
 object

---
 bin/datastore.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/datastore.py b/bin/datastore.py
index 2b787b2..13bcc0f 100644
--- a/bin/datastore.py
+++ b/bin/datastore.py
@@ -627,12 +627,12 @@ class Datastore:
 
 		if include_archived:
 			qry = """
-				SELECT meta
+				SELECT meta, schema
 				FROM public.projects;
 			"""
 		else:
 			qry = """
-				SELECT meta
+				SELECT meta, schema
 				FROM public.projects
 				WHERE NOT (meta->'archived')::boolean IS true
 			"""
@@ -642,7 +642,12 @@ class Datastore:
 
 				cursor.execute(qry)
 				results = cursor.fetchall()
-				return [r[0] for r in results if r[0]]
+				surveys = []
+				for r in results:
+					if r[0]:
+						r[0]['schema'] = r[1]
+						surveys.append(r[0])
+				return surveys
 
 
 	# TODO Does this need tweaking on account of #246?

From be0d7b269ffa5393db96271b62ef23034f6bb545 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Tue, 30 Apr 2024 19:05:54 +0200
Subject: [PATCH 071/113] Support import of various fixed-width formats.

This supports reading: SPSv1, SPSv2.1, P190 and custom
fixed-width formats. Supports skipping lines by startswith()
matching or by complete match (e.g., "EOF").

Closes #300 (SPS v1)
Closes #301 (SPS v2.1)
Closes #302 (P1/90)
---
 bin/fwr.py        | 108 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/legacy_fwr.py |  68 -----------------------------
 bin/preplots.py   |  28 +++++++++---
 3 files changed, 131 insertions(+), 73 deletions(-)
 create mode 100644 bin/fwr.py
 delete mode 100644 bin/legacy_fwr.py

diff --git a/bin/fwr.py b/bin/fwr.py
new file mode 100644
index 0000000..249f510
--- /dev/null
+++ b/bin/fwr.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python3
+
+"""
+Fixed width record importing functions.
+"""
+
+import builtins
+
+transform = {
+	"int": lambda v: builtins.int(float(v)),
+	"float": float,
+	"string": str,
+	"bool": bool
+}
+
+def parse_line (line, fields):
+	data = dict()
+
+	for key in fields:
+		spec = fields[key]
+		transformer = transform[spec["type"]]
+		pos_from = spec["offset"]
+		pos_to = pos_from + spec["length"]
+		text = line[pos_from:pos_to]
+		value = transformer(text)
+		if "enum" in spec:
+			if "default" in spec:
+				value = spec["default"]
+			for enum_key in spec["enum"]:
+				if enum_key == value:
+					enum_value = transformer(spec["enum"][enum_key])
+					value = enum_value
+					break
+
+		data[key] = value
+
+	return data
+
+
+specfields = {
+	"sps1": {
+		"line_name": { "offset": 1, "length": 16, "type": "int" },
+		"point_number": { "offset": 17, "length": 8, "type": "int" },
+		"easting": { "offset": 46, "length": 9, "type": "float" },
+		"northing": { "offset": 55, "length": 10, "type": "float" }
+	},
+	"sps21": {
+		"line_name": { "offset": 1, "length": 7, "type": "int" },
+		"point_number": { "offset": 11, "length": 7, "type": "int" },
+		"easting": { "offset": 46, "length": 9, "type": "float" },
+		"northing": { "offset": 55, "length": 10, "type": "float" }
+	},
+	"p190": {
+		"line_name": { "offset": 1, "length": 12, "type": "int" },
+		"point_number": { "offset": 19, "length": 6, "type": "int" },
+		"easting": { "offset": 46, "length": 9, "type": "float" },
+		"northing": { "offset": 55, "length": 9, "type": "float" }
+	},
+}
+
+def from_file(path, spec):
+
+	# If spec.fields is not present, deduce it from spec.type ("sps1", "sps21", "p190", etc.)
+	if "fields" in spec:
+		fields = spec["fields"]
+	elif "type" in spec and spec["type"] in specfields:
+		fields = specfields[spec["type"]]
+	else:
+		return "Neither 'type' nor 'fields' given. I don't know how to import this fixed-width dataset."
+
+	firstRow = spec.get("firstRow", 0)
+
+	skipStart = [] # Skip lines starting with any of these values
+	skipMatch = [] # Skip lines matching any of these values
+
+	if "type" in spec:
+		if spec["type"] == "sps1" or spec["type"] == "sps21" or spec["type"] == "p190":
+			skipStart = "H"
+			skipMatch = "EOF"
+
+	records = []
+	with open(path, "r", errors="ignore") as fd:
+		row = 0
+		line = fd.readline()
+
+		while line:
+			skip = False
+
+			if row < firstRow:
+				skip = True
+
+			if not skip:
+				for v in skipStart:
+					if line.startswith(v):
+						skip = True
+						break
+				for v in skipMatch:
+					if line == v:
+						skip = True
+						break
+
+			if not skip:
+				records.append(parse_line(line, fields))
+
+			row += 1
+			line = fd.readline()
+
+	return records
diff --git a/bin/legacy_fwr.py b/bin/legacy_fwr.py
deleted file mode 100644
index c7346ee..0000000
--- a/bin/legacy_fwr.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/python3
-
-"""
-Legacy fixed width record importing functions.
-"""
-
-import builtins
-
-def parse_fwr (string, widths, start=0):
-	"""Parse a fixed-width record.
-
-	string: the string to parse.
-	widths: a list of record widths. A negative width denotes a field to be skipped.
-	start: optional start index.
-
-	Returns a list of strings.
-	"""
-	results = []
-	current_index = start
-	for width in widths:
-		if width > 0:
-			results.append(string[current_index : current_index + width])
-			current_index += width
-		else:
-			current_index -= width
-
-	return results
-
-def int (v):
-	return builtins.int(float(v))
-
-def parse_line (string, spec):
-	"""Parse a line from an SPS file."""
-	names = spec["names"]
-	widths = spec["widths"]
-	normalisers = spec["normalisers"]
-	record = [ t[0](t[1]) for t in zip(normalisers, parse_fwr(string, widths)) ]
-	return dict(zip(names, record))
-
-def from_file(path, spec = None):
-	if spec is None:
-		spec = {
-			"names": [ "line_name", "point_number", "easting", "northing" ],
-			"widths": [ -1, 10, 10, -25, 10, 10 ],
-			"normalisers": [ int, int, float, float ]
-		}
-	else:
-		normaliser_tokens = [ "int", "float", "str", "bool" ]
-		spec["normalisers"] = [ eval(t) for t in spec["types"] if t in normaliser_tokens ]
-
-	records = []
-	with open(path) as fd:
-		cnt = 0
-		line = fd.readline()
-		while line:
-			cnt = cnt+1
-
-			if line == "EOF":
-				break
-
-			record = parse_line(line, spec)
-			if record is not None:
-				records.append(record)
-
-			line = fd.readline()
-
-	del spec["normalisers"]
-	return records
diff --git a/bin/preplots.py b/bin/preplots.py
index 6b8bcbd..1dae5e4 100644
--- a/bin/preplots.py
+++ b/bin/preplots.py
@@ -1,15 +1,33 @@
-import legacy_fwr
+import fwr
 
 """
 Preplot importing functions.
 """
 
 def from_file (file, realpath = None):
+	"""
+	Return a list of dicts, where each dict has the structure:
+		{
+			"line_name": <int>,
+			"points": [
+				{
+					"line_name": <int>,
+					"point_number": <int>,
+					"easting": <float>,
+					"northing": <float>
+				},
+				…
+			]
+		}
+	On error, return a string describing the error condition.
+	"""
+
 	filepath = realpath or file["path"]
-	if not "type" in file or file["type"] == "sps":
-		records = legacy_fwr.from_file(filepath, file["format"] if "format" in file else None )
-	else:
-		return "Not an SPS file"
+	records = fwr.from_file(filepath, file)
+
+	if type(records) == str:
+		# This is an error message
+		return records
 
 	lines = []
 	line_names = set([r["line_name"] for r in records])

From bb70cf1a3dc73c0af567650facef9bd8e48a1af3 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:40:21 +0200
Subject: [PATCH 072/113] Check enum keys against text instead of cast value

---
 bin/fwr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fwr.py b/bin/fwr.py
index 249f510..e4362c0 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -27,7 +27,7 @@ def parse_line (line, fields):
 			if "default" in spec:
 				value = spec["default"]
 			for enum_key in spec["enum"]:
-				if enum_key == value:
+				if enum_key == text:
 					enum_value = transformer(spec["enum"][enum_key])
 					value = enum_value
 					break

From 20861331098a30040c95d7a984394f5a9f1ca7e1 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:40:53 +0200
Subject: [PATCH 073/113] Fix bool casting.

A true value is any text that starts with `t` (case insensitive) or
any non-zero integer.
---
 bin/fwr.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/fwr.py b/bin/fwr.py
index e4362c0..57bbb5e 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -6,11 +6,19 @@ Fixed width record importing functions.
 
 import builtins
 
+def to_bool (v):
+	try:
+		return bool(int(v))
+	except ValueError:
+		if type(v) == str:
+			return v.strip().lower().startswith("t")
+		return False
+
 transform = {
 	"int": lambda v: builtins.int(float(v)),
 	"float": float,
 	"string": str,
-	"bool": bool
+	"bool": to_bool
 }
 
 def parse_line (line, fields):

From 41e058ac648af276f23589db39fcdbe0b8e740b1 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:41:50 +0200
Subject: [PATCH 074/113] Add TODO comment

---
 bin/fwr.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/fwr.py b/bin/fwr.py
index 57bbb5e..8062905 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -74,6 +74,7 @@ def from_file(path, spec):
 	elif "type" in spec and spec["type"] in specfields:
 		fields = specfields[spec["type"]]
 	else:
+		# TODO: Should default to looking for spec.format and doing a legacy import on it
 		return "Neither 'type' nor 'fields' given. I don't know how to import this fixed-width dataset."
 
 	firstRow = spec.get("firstRow", 0)

From 7e1023f6e890e85be79f79fe6cec1f0c4e69e729 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:42:20 +0200
Subject: [PATCH 075/113] Support import of delimited formats.

This supports CSV and similar formats, as well as sailline
imports, which is a CSV file with a specific set of column
definitions.

Does not yet support P111 import (for which there is an
implementation already).
---
 bin/delimited.py | 163 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 bin/delimited.py

diff --git a/bin/delimited.py b/bin/delimited.py
new file mode 100644
index 0000000..0a83a242
--- /dev/null
+++ b/bin/delimited.py
@@ -0,0 +1,163 @@
+#!/usr/bin/python3
+
+"""
+Delimited record importing functions.
+"""
+
+import csv
+import builtins
+
+def to_bool (v):
+	try:
+		return bool(int(v))
+	except ValueError:
+		if type(v) == str:
+			return v.strip().lower().startswith("t")
+		return False
+
+transform = {
+	"int": lambda v: builtins.int(float(v)),
+	"float": float,
+	"string": str,
+	"bool": to_bool
+}
+
+def cast_values (row, fields):
+
+	def enum_for (key):
+		field = fields.get(key, {})
+		def enum (val):
+			if "enum" in field:
+				ret_val = field.get("default", val)
+				enums = field.get("enum", [])
+				for enum_key in enums:
+					if enum_key == val:
+						ret_val = enums[enum_key]
+						return ret_val
+			return val
+		return enum
+
+	# Get rid of any unwanted data
+	if None in row:
+		del(row[None])
+
+	for key in row:
+
+		val = row[key]
+		enum = enum_for(key)
+		transformer = transform.get(fields.get(key, {}).get("type"), str)
+
+		if type(val) == list:
+			for i, v in enumerate(val):
+				row[key][i] = transformer(enum(v))
+		elif type(val) == dict:
+			continue
+		else:
+			row[key] = transformer(enum(val))
+	return row
+
+def build_fieldnames (spec): #(arr, key, val):
+	fieldnames = []
+
+	if "fields" in spec:
+		for key in spec["fields"]:
+			index = spec["fields"][key]["column"]
+			try:
+				fieldnames[index] = key
+			except IndexError:
+				assert index >= 0
+				fieldnames.extend(((index + 1) - len(fieldnames)) * [None])
+				fieldnames[index] = key
+
+	return fieldnames
+
+
+def from_file_delimited (path, spec):
+
+	fieldnames = build_fieldnames(spec)
+	fields = spec.get("fields", [])
+	delimiter = spec.get("delimiter", ",")
+	firstRow = spec.get("firstRow", 0)
+	headerRow = spec.get("headerRow", False)
+	if headerRow:
+		firstRow += 1
+
+	records = []
+	with open(path, "r", errors="ignore") as fd:
+
+		if spec.get("type") == "x-sl+csv":
+			fieldnames = None # Pick from header row
+			firstRow = 0
+			reader = csv.DictReader(fd, delimiter=delimiter)
+		else:
+			reader = csv.DictReader(fd, fieldnames=fieldnames, delimiter=delimiter)
+
+		row = 0
+		for line in reader:
+			skip = False
+
+			if row < firstRow:
+				skip = True
+
+			if not skip:
+				records.append(cast_values(dict(line), fields))
+
+			row += 1
+
+	return records
+
+
+def remap (line, headers):
+	row = dict()
+	for i, key in enumerate(headers):
+		if "." in key[1:-1]:
+			# This is an object
+			k, attr = key.split(".")
+			if not k in row:
+				row[k] = dict()
+			row[k][attr] = line[i]
+		elif key in row:
+			if type(row[key]) == list:
+				row[key].append(line[i])
+			else:
+				row[key] = [ row[key], line[i] ]
+		else:
+			row[key] = line[i]
+	return row
+
+def from_file_saillines (path, spec):
+
+	fields = {
+		"sail_line": { "type": "int" },
+		"source_line": { "type": "int" },
+		"incr": { "type": "bool" },
+		"ntba": { "type": "bool" }
+	}
+
+	# fields = spec.get("fields", sl_fields)
+	delimiter = spec.get("delimiter", ",")
+	firstRow = spec.get("firstRow", 0)
+
+	records = []
+	with open(path, "r", errors="ignore") as fd:
+		row = 0
+		reader = csv.reader(fd, delimiter=delimiter)
+		while row < firstRow:
+			next(reader)
+			row += 1
+		headers = [ h.strip() for h in next(reader) if len(h.strip()) ]
+
+		for line in reader:
+			records.append(cast_values(remap(line, headers), fields))
+
+	return records
+
+
+def from_file_p111 (path, spec):
+	pass
+
+def from_file (path, spec):
+	if spec.get("type") == "x-sl+csv":
+		return from_file_saillines(path, spec)
+	else:
+		return from_file_delimited(path, spec)

From 3488c8bf4da63f59486bc9f6a1ad4bd114e45bc6 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:44:32 +0200
Subject: [PATCH 076/113] Support preplot imports in additional formats.

This adds support for SPS v1, SPS v2.1, custom fixed-width,
CSV and custom sailline info preplot imports.
---
 bin/preplots.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/bin/preplots.py b/bin/preplots.py
index 1dae5e4..8f2de1a 100644
--- a/bin/preplots.py
+++ b/bin/preplots.py
@@ -1,9 +1,19 @@
 import fwr
+import delimited
 
 """
 Preplot importing functions.
 """
 
+
+def is_fixed_width (file):
+	fixed_width_types = [ "sps1", "sps21", "p190", "fixed-width" ]
+	return type(file) == dict and "type" in file and file["type"] in fixed_width_types
+
+def is_delimited (file):
+	delimited_types = [ "csv", "p111", "x-sl+csv" ]
+	return type(file) == dict and "type" in file and file["type"] in delimited_types
+
 def from_file (file, realpath = None):
 	"""
 	Return a list of dicts, where each dict has the structure:
@@ -23,12 +33,20 @@ def from_file (file, realpath = None):
 	"""
 
 	filepath = realpath or file["path"]
-	records = fwr.from_file(filepath, file)
+	if is_fixed_width(file):
+		records = fwr.from_file(filepath, file)
+	elif is_delimited(file):
+		records = delimited.from_file(filepath, file)
+	else:
+		return "Unrecognised file format"
 
 	if type(records) == str:
 		# This is an error message
 		return records
 
+	if file.get("type") == "x-sl+csv":
+		return records
+
 	lines = []
 	line_names = set([r["line_name"] for r in records])
 	for line_name in line_names:

From 995e0b9f8187b452e4a2cfb17e16256f249f32cf Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 3 May 2024 11:46:16 +0200
Subject: [PATCH 077/113] Remove unused import

---
 bin/p111.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/p111.py b/bin/p111.py
index cc36575..646fe7d 100644
--- a/bin/p111.py
+++ b/bin/p111.py
@@ -7,7 +7,6 @@ P1/11 parsing functions.
 import math
 import re
 from datetime import datetime, timedelta, timezone
-from parse_fwr import parse_fwr
 
 def _int (string):
 	return int(float(string))

From 4a2bed257dc767af62ceefa5097d57c3d88f6f02 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:15:51 +0200
Subject: [PATCH 078/113] Add database upgrade file 33.

Related to #264.
Closes #303.
---
 ...grade33-v0.5.0-sailline-ancillary-data.sql | 163 ++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql

diff --git a/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql b/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql
new file mode 100644
index 0000000..f6e8a60
--- /dev/null
+++ b/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql
@@ -0,0 +1,163 @@
+-- Sailline ancillary data
+--
+-- New schema version: 0.5.0
+--
+-- ATTENTION:
+--
+-- ENSURE YOU HAVE BACKED UP THE DATABASE BEFORE RUNNING THIS SCRIPT.
+--
+--
+-- NOTE: This upgrade affects all schemas in the database.
+-- NOTE: Each application starts a transaction, which must be committed
+-- or rolled back.
+--
+-- Issue #264 calls for associating sail and acquisition lines as well
+-- as indicating expected acquisition direction, and other data which
+-- cannot be provided via standard import formats such as SPS or P1/90.
+--
+-- We support this via an additional table that holds most of the required
+-- data. This data can simply be inferred from regular preplots, e.g., line
+-- direction can be deduced from preplot point order, and sail / source
+-- line offsets can be taken from P1/90 headers or from a configuration
+-- parameter. Alternatively, and in preference, the data can be provided
+-- explicitly, which is what issue #264 asks for.
+--
+-- In principle, this makes at least some of the attributes of `preplot_lines`
+-- redundant (at least `incr` and `ntba`) but we will leave them there for
+-- the time being as technical debt.
+--
+-- To apply, run as the dougal user:
+--
+-- psql <<EOF
+-- \i $THIS_FILE
+-- COMMIT;
+-- EOF
+--
+-- NOTE: It can be applied multiple times without ill effect.
+--
+
+BEGIN;
+
+CREATE OR REPLACE PROCEDURE pg_temp.show_notice (notice text) AS $$
+BEGIN
+	RAISE NOTICE '%', notice;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade_survey_schema (schema_name text) AS $outer$
+BEGIN
+
+	RAISE NOTICE 'Updating schema %', schema_name;
+	-- We need to set the search path because some of the trigger
+	-- functions reference other tables in survey schemas assuming
+	-- they are in the search path.
+	EXECUTE format('SET search_path TO %I,public', schema_name);
+
+
+	CREATE TABLE IF NOT EXISTS preplot_saillines
+	(
+		sailline integer NOT NULL,
+		line integer NOT NULL,
+		sailline_class character(1) NOT NULL,
+		line_class character(1) NOT NULL,
+		incr boolean NOT NULL DEFAULT true,
+		ntba boolean NOT NULL DEFAULT false,
+		remarks text NOT NULL DEFAULT '',
+		meta jsonb NOT NULL DEFAULT '{}'::jsonb,
+		hash text NULL, -- Theoretically the info in this table could all be inferred.
+		PRIMARY KEY (sailline, sailline_class, line, line_class, incr),
+		CONSTRAINT fk_sailline FOREIGN KEY (sailline, sailline_class)
+			REFERENCES preplot_lines (line, class)
+			ON UPDATE CASCADE
+			ON DELETE CASCADE,
+		CONSTRAINT fk_line FOREIGN KEY (line, line_class)
+			REFERENCES preplot_lines (line, class)
+			ON UPDATE CASCADE
+			ON DELETE CASCADE,
+		CONSTRAINT fk_hash FOREIGN KEY (hash)
+			REFERENCES files (hash) MATCH SIMPLE
+			ON UPDATE CASCADE
+			ON DELETE CASCADE,
+		CHECK (sailline_class = 'V' AND sailline_class != line_class)
+	);
+
+	COMMENT ON TABLE preplot_saillines
+		IS 'We explicitly associate each preplot sailline (aka vessel line) with zero or more source lines. This information can be inferred from preplot files, e.g., via a sailline offset value, or explicitly provided.';
+
+	-- Let us copy whatever information we can from existing tables or views
+
+	INSERT INTO preplot_saillines
+		(sailline, line, sailline_class, line_class, incr, ntba, remarks, meta)
+	SELECT DISTINCT
+		sailline, psp.line, 'V' sailline_class, psp.class line_class, pl.incr, pl.ntba, pl.remarks, pl.meta
+	FROM preplot_saillines_points psp
+	INNER JOIN preplot_lines pl ON psp.sailline = pl.line AND pl.class = 'V'
+	ORDER BY sailline;
+
+	-- We need to recreate the preplot_saillines_points view
+
+	CREATE OR REPLACE VIEW preplot_saillines_points AS
+	SELECT psl.sailline,
+		psl.ntba AS sailline_ntba,
+		psl.line,
+		pps.point,
+		pps.class,
+		pps.ntba,
+		pps.geometry,
+		pps.meta
+	FROM preplot_saillines psl
+	INNER JOIN preplot_points pps
+		ON psl.line = pps.line AND psl.line_class = pps.class;
+
+
+
+END;
+$outer$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade () AS $outer$
+DECLARE
+	row RECORD;
+	current_db_version TEXT;
+BEGIN
+
+	SELECT value->>'db_schema' INTO current_db_version FROM public.info WHERE key = 'version';
+
+	IF current_db_version >= '0.5.0' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Patch already applied';
+	END IF;
+
+	IF current_db_version != '0.4.5' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Invalid database version: ' || current_db_version,
+				HINT='Ensure all previous patches have been applied.';
+	END IF;
+
+	FOR row IN
+		SELECT schema_name FROM information_schema.schemata
+		WHERE schema_name LIKE 'survey_%'
+		ORDER BY schema_name
+	LOOP
+		CALL pg_temp.upgrade_survey_schema(row.schema_name);
+	END LOOP;
+END;
+$outer$ LANGUAGE plpgsql;
+
+CALL pg_temp.upgrade();
+
+CALL pg_temp.show_notice('Cleaning up');
+DROP PROCEDURE pg_temp.upgrade_survey_schema (schema_name text);
+DROP PROCEDURE pg_temp.upgrade ();
+
+CALL pg_temp.show_notice('Updating db_schema version');
+INSERT INTO public.info VALUES ('version', '{"db_schema": "0.5.0"}')
+ON CONFLICT (key) DO UPDATE
+	SET value = public.info.value || '{"db_schema": "0.5.0"}' WHERE public.info.key = 'version';
+
+
+CALL pg_temp.show_notice('All done. You may now run "COMMIT;" to persist the changes');
+DROP PROCEDURE pg_temp.show_notice (notice text);
+
+--
+--NOTE Run `COMMIT;` now if all went well
+--

From d3bdeff8df388acabf8f687e35eeb9478b0da15a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:17:27 +0200
Subject: [PATCH 079/113] Add database upgrade file 34.

Closes #307.
---
 ...ade34-v0.5.1-fix-sequences-detail-view.sql | 119 ++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 etc/db/upgrades/upgrade34-v0.5.1-fix-sequences-detail-view.sql

diff --git a/etc/db/upgrades/upgrade34-v0.5.1-fix-sequences-detail-view.sql b/etc/db/upgrades/upgrade34-v0.5.1-fix-sequences-detail-view.sql
new file mode 100644
index 0000000..7c1966e
--- /dev/null
+++ b/etc/db/upgrades/upgrade34-v0.5.1-fix-sequences-detail-view.sql
@@ -0,0 +1,119 @@
+-- Sailline ancillary data
+--
+-- New schema version: 0.5.1
+--
+-- ATTENTION:
+--
+-- ENSURE YOU HAVE BACKED UP THE DATABASE BEFORE RUNNING THIS SCRIPT.
+--
+--
+-- NOTE: This upgrade affects all schemas in the database.
+-- NOTE: Each application starts a transaction, which must be committed
+-- or rolled back.
+--
+-- The sequences_detail view wrongly associates source lines and shot
+-- points when it should be associating saillines and shot points instead.
+--
+-- This updates fixes that issue (#307).
+--
+-- To apply, run as the dougal user:
+--
+-- psql <<EOF
+-- \i $THIS_FILE
+-- COMMIT;
+-- EOF
+--
+-- NOTE: It can be applied multiple times without ill effect.
+--
+
+BEGIN;
+
+CREATE OR REPLACE PROCEDURE pg_temp.show_notice (notice text) AS $$
+BEGIN
+	RAISE NOTICE '%', notice;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade_survey_schema (schema_name text) AS $outer$
+BEGIN
+
+	RAISE NOTICE 'Updating schema %', schema_name;
+	-- We need to set the search path because some of the trigger
+	-- functions reference other tables in survey schemas assuming
+	-- they are in the search path.
+	EXECUTE format('SET search_path TO %I,public', schema_name);
+
+	CREATE OR REPLACE VIEW sequences_detail
+	AS
+	SELECT rl.sequence,
+		rl.line AS sailline,
+		rs.line,
+		rs.point,
+		rs.tstamp,
+		rs.objref AS objrefraw,
+		fs.objref AS objreffinal,
+		st_transform(pp.geometry, 4326) AS geometrypreplot,
+		st_transform(rs.geometry, 4326) AS geometryraw,
+		st_transform(fs.geometry, 4326) AS geometryfinal,
+		ij_error(rs.line::double precision, rs.point::double precision, rs.geometry) AS errorraw,
+		ij_error(rs.line::double precision, rs.point::double precision, fs.geometry) AS errorfinal,
+		json_build_object('preplot', pp.meta, 'raw', rs.meta, 'final', fs.meta) AS meta
+	FROM raw_lines rl
+		INNER JOIN preplot_saillines psl ON rl.line = psl.sailline
+		INNER JOIN raw_shots rs ON rs.sequence = rl.sequence AND rs.line = psl.line
+		INNER JOIN preplot_points pp ON psl.line = pp.line AND psl.line_class = pp.class AND rs.point = pp.point
+		LEFT JOIN final_shots fs ON rl.sequence = fs.sequence AND rs.point = fs.point;
+
+	ALTER TABLE sequences_detail
+		OWNER TO postgres;
+
+END;
+$outer$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade () AS $outer$
+DECLARE
+	row RECORD;
+	current_db_version TEXT;
+BEGIN
+
+	SELECT value->>'db_schema' INTO current_db_version FROM public.info WHERE key = 'version';
+
+	IF current_db_version >= '0.5.1' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Patch already applied';
+	END IF;
+
+	IF current_db_version != '0.5.0' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Invalid database version: ' || current_db_version,
+				HINT='Ensure all previous patches have been applied.';
+	END IF;
+
+	FOR row IN
+		SELECT schema_name FROM information_schema.schemata
+		WHERE schema_name LIKE 'survey_%'
+		ORDER BY schema_name
+	LOOP
+		CALL pg_temp.upgrade_survey_schema(row.schema_name);
+	END LOOP;
+END;
+$outer$ LANGUAGE plpgsql;
+
+CALL pg_temp.upgrade();
+
+CALL pg_temp.show_notice('Cleaning up');
+DROP PROCEDURE pg_temp.upgrade_survey_schema (schema_name text);
+DROP PROCEDURE pg_temp.upgrade ();
+
+CALL pg_temp.show_notice('Updating db_schema version');
+INSERT INTO public.info VALUES ('version', '{"db_schema": "0.5.1"}')
+ON CONFLICT (key) DO UPDATE
+	SET value = public.info.value || '{"db_schema": "0.5.1"}' WHERE public.info.key = 'version';
+
+
+CALL pg_temp.show_notice('All done. You may now run "COMMIT;" to persist the changes');
+DROP PROCEDURE pg_temp.show_notice (notice text);
+
+--
+--NOTE Run `COMMIT;` now if all went well
+--

From a2a5a783a3cb53654db99e76b5df22b892c0b42c Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:24:52 +0200
Subject: [PATCH 080/113] Add <dougal-fixed-string-text/> component.

It's similar to <dougal-fixed-string-decoder-field/> but it handles
static strings.

Used to match, e.g., file names, where certain parts of the name
are expected to contain a specific string (such as a project prefix
and the like).
---
 .../components/decoder/fixed-string-text.vue  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 lib/www/client/source/src/components/decoder/fixed-string-text.vue

diff --git a/lib/www/client/source/src/components/decoder/fixed-string-text.vue b/lib/www/client/source/src/components/decoder/fixed-string-text.vue
new file mode 100644
index 0000000..dafe495
--- /dev/null
+++ b/lib/www/client/source/src/components/decoder/fixed-string-text.vue
@@ -0,0 +1,122 @@
+<template>
+  <v-row dense no-gutters>
+
+    <v-col cols="1">
+      <slot name="prepend"></slot>
+    </v-col>
+
+    <v-col cols="2">
+      <v-chip outlined label small :color="colour" style="border: 1px dashed">{{value.text}}</v-chip>
+    </v-col>
+
+    <v-col cols="2">
+      <v-text-field
+        class="ml-3"
+        dense
+        label="From"
+        type="number"
+        min="0"
+        v-model.number="value.offset"
+        :readonly="readonly"
+      ></v-text-field>
+    </v-col>
+
+    <v-col cols="2">
+    </v-col>
+
+    <v-col cols="2">
+    </v-col>
+
+    <v-col cols="1">
+      <slot name="append"></slot>
+    </v-col>
+
+  </v-row>
+
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+}
+
+.input >>> .chunk {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+</style>
+
+<script>
+
+export default {
+  name: "DougalFixedStringText",
+
+  components: {
+  },
+
+  props: {
+    value: Object,
+    colour: String,
+    readonly: Boolean,
+  },
+
+  data () {
+    return {
+      name_: "",
+    }
+  },
+
+  computed: {
+  },
+
+  watch: {
+
+    name () {
+      if (this.name != this.name_) {
+        this.name_ = this.name;
+      }
+    },
+  },
+
+  methods: {
+
+    addField () {
+      if (!this.fieldNameErrors) {
+        this.$emit("update:fields", {
+          ...this.fields,
+          [this.fieldName]: { offset: 0, length: 0 }
+        });
+        this.fieldName = "";
+      }
+    },
+
+    reset () {
+      this.text_ = this.text;
+    }
+
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>

From 59971a43fef014310e639cfeccd4d27a62bd23c3 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:27:08 +0200
Subject: [PATCH 081/113] Support fixed text in <dougal-fixed-string-decoder/>

---
 .../decoder/fixed-string-decoder.vue          | 128 +++++++++++++++++-
 1 file changed, 122 insertions(+), 6 deletions(-)

diff --git a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
index 09d2c98..425021f 100644
--- a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
+++ b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
@@ -30,6 +30,12 @@
 
         <v-container>
 
+<!-- Variable fields -->
+
+          <v-row no-gutters class="mb-2">
+            <h4>Variable fields</h4>
+          </v-row>
+
           <dougal-fixed-string-decoder-field v-for="(field, key) in fields" :key="key"
             v-model="fields[key]"
             :name="key"
@@ -73,6 +79,66 @@
             </v-col>
           </v-row>
 
+<!-- Fixed text strings -->
+
+          <v-row no-gutters class="mt-2 mb-2">
+            <h4>Fixed strings</h4>
+          </v-row>
+
+          <dougal-fixed-string-text v-for="(item, idx) in fixed" :key="idx"
+            v-model="fixed[idx]"
+            :colour="getHSLColourFor(item.text+item.offset)"
+            :readonly="readonly"
+          >
+            <template v-slot:append v-if="editableFieldList && !readonly">
+              <v-btn
+                class="ml-3"
+                fab
+                text
+                small
+                title="Remove this property"
+              >
+                <v-icon
+                  color="error"
+                  @click="removeFixed(idx)"
+                >mdi-minus</v-icon>
+              </v-btn>
+            </template>
+          </dougal-fixed-string-text>
+
+          <v-row dense no-gutters v-if="editableFieldList && !readonly">
+            <v-col cols="3">
+              <v-text-field
+                label="Add fixed text"
+                hint="Enter text"
+                :error-messages="fieldNameErrors"
+                v-model="fixedName"
+                @keydown.enter.prevent="addFixed"
+              >
+              </v-text-field>
+            </v-col>
+            <v-col cols="3">
+              <v-text-field
+                class="ml-3"
+                label="From position"
+                hint="Enter offset"
+                type="number"
+                min="0"
+                v-model.number="fixedOffset"
+                :readonly="readonly"
+                append-outer-icon="mdi-plus-circle"
+              >
+                <template v-slot:append-outer>
+                  <v-icon
+                    color="primary"
+                    :disabled="!fixedName"
+                    @click="addFixed"
+                  >mdi-plus</v-icon>
+                </template>
+              </v-text-field>
+            </v-col>
+          </v-row>
+
         </v-container>
 
 
@@ -115,11 +181,16 @@
   top: -1px;
 }
 
-.input, .multiline >>> .chunk {
+.input, .multiline >>> .chunk-field {
   padding-inline: 1px;
   border: 1px solid;
 }
 
+.input, .multiline >>> .chunk-fixed {
+  padding-inline: 1px;
+  border: 1px dashed;
+}
+
 .input, .multiline >>> .chunk-empty {
   padding-inline: 1px;
 }
@@ -129,17 +200,24 @@
   border: 1px solid grey;
   color: grey;
 }
+
+.input, .multiline >>> .chunk-mismatch {
+  padding-inline: 1px;
+  border: 2px solid red !important;
+}
 </style>
 
 <script>
 import { getHSLColourFor } from '@/lib/hsl'
 import DougalFixedStringDecoderField from './fixed-string-decoder-field'
+import DougalFixedStringText from './fixed-string-text'
 
 export default {
   name: "DougalFixedStringDecoder",
 
   components: {
-    DougalFixedStringDecoderField
+    DougalFixedStringDecoderField,
+    DougalFixedStringText
   },
 
   mixins: [
@@ -152,6 +230,7 @@ export default {
 
   props: {
     text: String,
+    fixed: { type: Array, default: () => [] },
     fields: Object,
     multiline: Boolean,
     numberedLines: [ Boolean, Number ],
@@ -169,6 +248,9 @@ export default {
       //< The reason for not using this.text directly is that at some point
       //< we might extend this component to allow editing the sample text.
       text_: "",
+      //< The value of a fixed string that should be always present at a specific position
+      fixedName: "",
+      fixedOffset: 0,
       //< The name of a new field to add.
       fieldName: ""
     }
@@ -185,7 +267,15 @@ export default {
     /* Return the fields as an array sorted by offset
      */
     parts () {
-      return Object.entries(this.fields).sort( (a, b) => a.offset - b.offset );
+      // return Object.entries(this.fields).sort( (a, b) => a[1].offset - b[1].offset );
+      return [
+        ...Object.entries(this.fields),
+        ...this.fixed.map(i => [ i.text + i.offset, {...i, length: i.text?.length} ])
+      ].sort( (a, b) => {
+        const offset_a = a.offset ?? a[1].offset;
+        const offset_b = b.offset ?? b[1].offset;
+        return a - b;
+      })
     },
 
     /* Transform this.parts into {start, end} intervals.
@@ -199,6 +289,8 @@ export default {
         chunk.end = part.offset + part.length - 1;
         //chunk.text = this.text_.slice(chunk.start, chunk.end);
         chunk.colour = this.getHSLColourFor(name)
+        chunk.class = part.text ? "fixed" : "field";
+        chunk.text = part.text;
 
         chunks.push(chunk);
       }
@@ -254,6 +346,19 @@ export default {
 
   methods: {
 
+    addFixed () {
+      if (this.fixedName) {
+        const fixed = [
+          ...this.fixed,
+          { text: this.fixedName, offset: this.fixedOffset }
+        ];
+        fixed.sort( (a, b) => a.offset - b.offset );
+        this.fixedName = null;
+        this.fixedOffset = 0;
+        this.$emit("update:fixed", fixed);
+      }
+    },
+
     addField () {
       if (!this.fieldNameErrors) {
         this.$emit("update:fields", {
@@ -282,6 +387,13 @@ export default {
       this.$emit("update:fields", fields);
     },
 
+    removeFixed (idx) {
+      const fixed = [...this.fixed];
+      fixed.splice(idx, 1);
+      //fixed.sort( (a, b) => a.offset - b.offset );
+      this.$emit("update:fixed", fixed);
+    },
+
     /** Return an HSL colour as a function of an input value
      * `str`.
      */
@@ -323,12 +435,16 @@ export default {
         const chunks = this.chunksFor(pos);
         const isEmpty = chunks.length == 0;
         const isOverlap = chunks.length > 1;
+        const isMismatch = chunks[0]?.text &&
+          (text.substring(chunks[0].start, chunks[0].end+1) != chunks[0].text)
 
         const style = isEmpty
           ? this.style("chunk-empty")
-          : isOverlap
-            ? this.style("chunk-overlap")
-            : this.style("chunk", chunks[0].colour);
+          : isMismatch
+            ? this.style("chunk-mismatch", chunks[0].colour)
+            : isOverlap
+              ? this.style("chunk-overlap")
+              : this.style("chunk-"+chunks[0].class, chunks[0].colour);
 
         if (style != prevStyle) {
           if (prevStyle) {

From 8c6eefed979e4ef4ea533cc512cf9c791c5f2d17 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:27:55 +0200
Subject: [PATCH 082/113] Add support for fixed strings to file parameters
 widget

---
 .../src/components/project-settings/file-matching-parameters.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
index 5b62d80..3377559 100644
--- a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
+++ b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
@@ -167,6 +167,7 @@
                 <dougal-fixed-string-decoder
                   :multiline="true"
                   :text="lineNameInfo.example"
+                  :fixed.sync="lineNameInfo.fixed"
                   :fields.sync="lineNameInfo.fields"
                 ></dougal-fixed-string-decoder>
 

From 40bc1f9293e3f6a25b32f6db85f5d360a127626c Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:29:31 +0200
Subject: [PATCH 083/113] Fix log sequence view

---
 lib/www/client/source/src/views/Log.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/www/client/source/src/views/Log.vue b/lib/www/client/source/src/views/Log.vue
index 7fe91d4..111f5c3 100644
--- a/lib/www/client/source/src/views/Log.vue
+++ b/lib/www/client/source/src/views/Log.vue
@@ -488,6 +488,9 @@ export default {
     rows () {
       const rows = {};
       this.items
+      .filter(i => {
+        return !this.$route.params.sequence || (this.$route.params.sequence == i.sequence)
+      })
       .filter(i => {
         for (const label of this.filterableLabels) {
           if (!this.shownLabels.includes(label) && i.labels.includes(label)) {

From 4368cb8571dc1097f110800a35b0e0606cf6e4c4 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:30:34 +0200
Subject: [PATCH 084/113] Update minimum required database schema to 0.5.0

---
 lib/www/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/server/package.json b/lib/www/server/package.json
index 463e0ac..259699c 100644
--- a/lib/www/server/package.json
+++ b/lib/www/server/package.json
@@ -16,7 +16,7 @@
       "api": "0.4.0"
     },
     "wanted": {
-      "db_schema": "^0.4.5"
+      "db_schema": "^0.5.0"
     }
   },
   "engines": {

From 90782c1b0931a230f033eaf727a7211b2a117b53 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:32:30 +0200
Subject: [PATCH 085/113] Support import of preplot lines ancillary
 information.

Closes #264.
---
 bin/datastore.py       | 56 ++++++++++++++++++++++++++++++++++++++++++
 bin/import_preplots.py | 16 ++++++++++--
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/bin/datastore.py b/bin/datastore.py
index 13bcc0f..56ceb08 100644
--- a/bin/datastore.py
+++ b/bin/datastore.py
@@ -256,6 +256,62 @@ class Datastore:
 
 		self.maybe_commit()
 
+
+	def save_preplot_line_info(self, lines, filepath, filedata = None):
+		"""
+		Save preplot line information
+
+		Arguments:
+
+		lines (iterable): should be a collection of lines returned from
+		one of the line info reading functions (see preplots.py).
+
+		filepath (string): the full path to the preplot file from where the lines
+		have been read. It will be added to the survey's `file` table so that
+		it can be monitored for changes.
+		"""
+
+		with self.conn.cursor() as cursor:
+			cursor.execute("BEGIN;")
+
+			hash = self.add_file(filepath, cursor)
+			count=0
+			for line in lines:
+				count += 1
+				print(f"\u001b[2KSaving line {count} / {len(lines)}", end="\r", flush=True)
+
+				sail_line = line["sail_line"]
+				incr = line.get("incr", True)
+				ntba = line.get("ntba", False)
+				remarks = line.get("remarks", None)
+				meta = json.dumps(line.get("meta", {}))
+				source_lines = line.get("source_line", [])
+
+				for source_line in source_lines:
+					qry = """
+						INSERT INTO preplot_saillines AS ps
+							(sailline, line, sailline_class, line_class, incr, ntba, remarks, meta, hash)
+						VALUES
+							(%s, %s, 'V', 'S', %s, %s, %s, %s, %s)
+						ON CONFLICT (sailline, sailline_class, line, line_class, incr) DO UPDATE
+							SET
+								incr = EXCLUDED.incr,
+								ntba = EXCLUDED.ntba,
+								remarks = COALESCE(EXCLUDED.remarks, ps.remarks),
+								meta = ps.meta || EXCLUDED.meta,
+								hash = EXCLUDED.hash;
+					"""
+
+					# NOTE Consider using cursor.executemany() instead. Then again,
+					# we're only expecting a few hundred lines at most.
+					cursor.execute(qry, (sail_line, source_line, incr, ntba, remarks, meta, hash))
+
+			if filedata is not None:
+				self.save_file_data(filepath, json.dumps(filedata), cursor)
+
+		self.maybe_commit()
+
+
 	def save_raw_p190(self, records, fileinfo, filepath, epsg = 0, filedata = None, ntbp = False):
 		"""
 		Save raw P1 data.
diff --git a/bin/import_preplots.py b/bin/import_preplots.py
index 10c5c1b..697e24e 100755
--- a/bin/import_preplots.py
+++ b/bin/import_preplots.py
@@ -15,6 +15,12 @@ import configuration
 import preplots
 from datastore import Datastore
 
+def preplots_sorter (preplot):
+	rank = {
+		"x-sl+csv": 10
+	}
+	return rank.get(preplot.get("type"), 0)
+
 if __name__ == '__main__':
 
 	print("Connecting to database")
@@ -28,7 +34,10 @@ if __name__ == '__main__':
 	for survey in surveys:
 		print(f'Survey: {survey["id"]} ({survey["schema"]})')
 		db.set_survey(survey["schema"])
-		for file in survey["preplots"]:
+
+		# We sort the preplots so that ancillary line info always comes last,
+		# after the actual line + point data has been imported
+		for file in sorted(survey["preplots"], key=preplots_sorter):
 			realpath = configuration.translate_path(file["path"])
 
 			print(f"Preplot: {file['path']}")
@@ -48,7 +57,10 @@ if __name__ == '__main__':
 
 				if type(preplot) is list:
 					print("Saving to DB")
-					db.save_preplots(preplot, file["path"], file["class"], survey["epsg"], file)
+					if file.get("type") == "x-sl+csv":
+						db.save_preplot_line_info(preplot, file["path"], file)
+					else:
+						db.save_preplots(preplot, file["path"], file["class"], survey["epsg"], file)
 				elif type(preplot) is str:
 					print(preplot)
 			else:

From 5aaad01238129243f39451e4b5166c2986636459 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:33:50 +0200
Subject: [PATCH 086/113] Support `lineNameInfo` in raw P1/11 imports

---
 bin/import_raw_p111.py | 46 +++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/bin/import_raw_p111.py b/bin/import_raw_p111.py
index c6a38ab..4e00dd0 100755
--- a/bin/import_raw_p111.py
+++ b/bin/import_raw_p111.py
@@ -15,6 +15,7 @@ import re
 import time
 import configuration
 import p111
+import fwr
 from datastore import Datastore
 
 if __name__ == '__main__':
@@ -38,8 +39,11 @@ if __name__ == '__main__':
 			print("No raw P1/11 configuration")
 			exit(0)
 
-		pattern = raw_p111["pattern"]
-		rx = re.compile(pattern["regex"])
+		lineNameInfo = raw_p111.get("lineNameInfo")
+		pattern = raw_p111.get("pattern")
+		rx = None
+		if pattern and pattern.get("regex"):
+			rx = re.compile(pattern["regex"])
 
 		if "ntbp" in survey["raw"]:
 			ntbpRx = re.compile(survey["raw"]["ntbp"]["pattern"]["regex"])
@@ -68,16 +72,38 @@ if __name__ == '__main__':
 
 						print("Importing")
 
-						match = rx.match(os.path.basename(logical_filepath))
-						if not match:
-							error_message = f"File path not matching the expected format! ({logical_filepath} ~ {pattern['regex']})"
-							print(error_message, file=sys.stderr)
-							print("This file will be ignored!")
-							continue
+						if rx:
+							match = rx.match(os.path.basename(logical_filepath))
+							if not match:
+								error_message = f"File path not matching the expected format! ({logical_filepath} ~ {pattern['regex']})"
+								print(error_message, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
 
-						file_info = dict(zip(pattern["captures"], match.groups()))
-						file_info["meta"] = {}
+							file_info = dict(zip(pattern["captures"], match.groups()))
+							file_info["meta"] = {}
 
+						if lineNameInfo:
+							basename = os.path.basename(physical_filepath)
+							fields = lineNameInfo.get("fields", {})
+							fixed = lineNameInfo.get("fixed")
+							try:
+								parsed_line = fwr.parse_line(basename, fields, fixed)
+							except ValueError as err:
+								parsed_line = "Line format error: " + str(err)
+							if type(parsed_line) == str:
+								print(parsed_line, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
+
+						file_info = {}
+						file_info["sequence"] = parsed_line["sequence"]
+						file_info["line"] = parsed_line["line"]
+						del(parsed_line["sequence"])
+						del(parsed_line["line"])
+						file_info["meta"] = {
+							"fileInfo": parsed_line
+						}
 						p111_data = p111.from_file(physical_filepath)
 
 						print("Saving")

From e48c734ea947cfc913a8b81257be639b1f9b89cf Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:35:05 +0200
Subject: [PATCH 087/113] Support `lineNameInfo` in final P1/11 imports

---
 bin/import_final_p111.py | 48 +++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/bin/import_final_p111.py b/bin/import_final_p111.py
index bc0c146..3513218 100755
--- a/bin/import_final_p111.py
+++ b/bin/import_final_p111.py
@@ -15,6 +15,7 @@ import re
 import time
 import configuration
 import p111
+import fwr
 from datastore import Datastore
 
 def add_pending_remark(db, sequence):
@@ -69,8 +70,12 @@ if __name__ == '__main__':
 			print("No final P1/11 configuration")
 			exit(0)
 
-		pattern = final_p111["pattern"]
-		rx = re.compile(pattern["regex"])
+
+		lineNameInfo = final_p111.get("lineNameInfo")
+		pattern = final_p111.get("pattern")
+		rx = None
+		if pattern and pattern.get("regex"):
+			rx = re.compile(pattern["regex"])
 
 		if "pending" in survey["final"]:
 			pendingRx = re.compile(survey["final"]["pending"]["pattern"]["regex"])
@@ -98,15 +103,38 @@ if __name__ == '__main__':
 
 						print("Importing")
 
-						match = rx.match(os.path.basename(logical_filepath))
-						if not match:
-							error_message = f"File path not match the expected format! ({logical_filepath} ~ {pattern['regex']})"
-							print(error_message, file=sys.stderr)
-							print("This file will be ignored!")
-							continue
+						if rx:
+							match = rx.match(os.path.basename(logical_filepath))
+							if not match:
+								error_message = f"File path not match the expected format! ({logical_filepath} ~ {pattern['regex']})"
+								print(error_message, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
 
-						file_info = dict(zip(pattern["captures"], match.groups()))
-						file_info["meta"] = {}
+							file_info = dict(zip(pattern["captures"], match.groups()))
+							file_info["meta"] = {}
+
+						if lineNameInfo:
+							basename = os.path.basename(physical_filepath)
+							fields = lineNameInfo.get("fields", {})
+							fixed = lineNameInfo.get("fixed")
+							try:
+								parsed_line = fwr.parse_line(basename, fields, fixed)
+							except ValueError as err:
+								parsed_line = "Line format error: " + str(err)
+							if type(parsed_line) == str:
+								print(parsed_line, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
+
+							file_info = {}
+							file_info["sequence"] = parsed_line["sequence"]
+							file_info["line"] = parsed_line["line"]
+							del(parsed_line["sequence"])
+							del(parsed_line["line"])
+							file_info["meta"] = {
+								"fileInfo": parsed_line
+							}
 
 						if pending:
 							print("Skipping / removing final file because marked as PENDING", logical_filepath)

From 524420d9455a05975685b6ab523cd5071732e456 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 4 May 2024 17:35:41 +0200
Subject: [PATCH 088/113] Support `lineNameInfo` in SmartSource header imports.

Closes #305.
---
 bin/import_smsrc.py | 56 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/bin/import_smsrc.py b/bin/import_smsrc.py
index b3fd4e7..7f91e81 100755
--- a/bin/import_smsrc.py
+++ b/bin/import_smsrc.py
@@ -15,6 +15,7 @@ import re
 import time
 import configuration
 import smsrc
+import fwr
 from datastore import Datastore
 
 if __name__ == '__main__':
@@ -33,17 +34,21 @@ if __name__ == '__main__':
 		db.set_survey(survey["schema"])
 
 		try:
-			raw_smsrc = survey["raw"]["smsrc"]
+			raw_smsrc = survey["raw"]["source"]["smsrc"]["header"]
 		except KeyError:
 			print("No SmartSource data configuration")
 			continue
 
-		flags = 0
-		if "flags" in raw_smsrc:
-			configuration.rxflags(raw_smsrc["flags"])
+		# NOTE I've no idea what this is 🤔
+		# flags = 0
+		# if "flags" in raw_smsrc:
+			# configuration.rxflags(raw_smsrc["flags"])
 
-		pattern = raw_smsrc["pattern"]
-		rx = re.compile(pattern["regex"], flags)
+		lineNameInfo = raw_smsrc.get("lineNameInfo")
+		pattern = raw_smsrc.get("pattern")
+		rx = None
+		if pattern and pattern.get("regex"):
+			rx = re.compile(pattern["regex"])
 
 		for fileprefix in raw_smsrc["paths"]:
 			realprefix = configuration.translate_path(fileprefix)
@@ -64,14 +69,39 @@ if __name__ == '__main__':
 
 						print("Importing")
 
-						match = rx.match(os.path.basename(logical_filepath))
-						if not match:
-							error_message = f"File path not matching the expected format! ({logical_filepath} ~ {pattern['regex']})"
-							print(error_message, file=sys.stderr)
-							print("This file will be ignored!")
-							continue
+						if rx:
+							match = rx.match(os.path.basename(logical_filepath))
+							if not match:
+								error_message = f"File path not matching the expected format! ({logical_filepath} ~ {pattern['regex']})"
+								print(error_message, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
 
-						file_info = dict(zip(pattern["captures"], match.groups()))
+							file_info = dict(zip(pattern["captures"], match.groups()))
+							file_info["meta"] = {}
+
+
+						if lineNameInfo:
+							basename = os.path.basename(physical_filepath)
+							fields = lineNameInfo.get("fields", {})
+							fixed = lineNameInfo.get("fixed")
+							try:
+								parsed_line = fwr.parse_line(basename, fields, fixed)
+							except ValueError as err:
+								parsed_line = "Line format error: " + str(err)
+							if type(parsed_line) == str:
+								print(parsed_line, file=sys.stderr)
+								print("This file will be ignored!")
+								continue
+
+							file_info = {}
+							file_info["sequence"] = parsed_line["sequence"]
+							file_info["line"] = parsed_line["line"]
+							del(parsed_line["sequence"])
+							del(parsed_line["line"])
+							file_info["meta"] = {
+								"fileInfo": parsed_line
+							}
 
 						smsrc_records = smsrc.from_file(physical_filepath)
 

From bc5dfe9c2ae3ace877125055072e392a83c08903 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 5 May 2024 19:34:01 +0200
Subject: [PATCH 089/113] Add fixed strings support to parse_line

---
 bin/fwr.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/fwr.py b/bin/fwr.py
index 8062905..4ae5bf3 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -21,9 +21,17 @@ transform = {
 	"bool": to_bool
 }
 
-def parse_line (line, fields):
+def parse_line (line, fields, fixed = None):
 	data = dict()
 
+	if fixed:
+		for value in fixed:
+			start = value["offset"]
+			end = start + len(value["text"])
+			text = line[start:end]
+			if text != value["text"]:
+				return f"Expected text `{value['text']}` at position {start} but found `{text}` instead."
+
 	for key in fields:
 		spec = fields[key]
 		transformer = transform[spec["type"]]

From 73fb7a50536e6086653e14d41ba64330533ccf32 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sun, 5 May 2024 19:35:19 +0200
Subject: [PATCH 090/113] Make script executable

---
 sbin/upgrade-project-configurations-20231113.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 sbin/upgrade-project-configurations-20231113.js

diff --git a/sbin/upgrade-project-configurations-20231113.js b/sbin/upgrade-project-configurations-20231113.js
old mode 100644
new mode 100755

From fbb4e1efafdbdd437168bb49627aa3a2748bd6c3 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 6 May 2024 11:10:46 +0200
Subject: [PATCH 091/113] Fix insert statement in database upgrade file 33.

This makes it possible to run the script on an already upgraded
schema.
---
 etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql b/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql
index f6e8a60..303d0b4 100644
--- a/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql
+++ b/etc/db/upgrades/upgrade33-v0.5.0-sailline-ancillary-data.sql
@@ -92,7 +92,8 @@ BEGIN
 		sailline, psp.line, 'V' sailline_class, psp.class line_class, pl.incr, pl.ntba, pl.remarks, pl.meta
 	FROM preplot_saillines_points psp
 	INNER JOIN preplot_lines pl ON psp.sailline = pl.line AND pl.class = 'V'
-	ORDER BY sailline;
+	ORDER BY sailline
+	ON CONFLICT DO NOTHING;
 
 	-- We need to recreate the preplot_saillines_points view
 

From 86aaade428d22455d2eb696747f0b71841174845 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 6 May 2024 11:11:55 +0200
Subject: [PATCH 092/113] Add database upgrade file 35.

Fixes #312.
---
 ...-v0.5.2-fix-preplot_lines_summary-view.sql | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 etc/db/upgrades/upgrade35-v0.5.2-fix-preplot_lines_summary-view.sql

diff --git a/etc/db/upgrades/upgrade35-v0.5.2-fix-preplot_lines_summary-view.sql b/etc/db/upgrades/upgrade35-v0.5.2-fix-preplot_lines_summary-view.sql
new file mode 100644
index 0000000..9617e59
--- /dev/null
+++ b/etc/db/upgrades/upgrade35-v0.5.2-fix-preplot_lines_summary-view.sql
@@ -0,0 +1,142 @@
+-- Fix preplot_lines_summary view
+--
+-- New schema version: 0.5.2
+--
+-- ATTENTION:
+--
+-- ENSURE YOU HAVE BACKED UP THE DATABASE BEFORE RUNNING THIS SCRIPT.
+--
+--
+-- NOTE: This upgrade affects all schemas in the database.
+-- NOTE: Each application starts a transaction, which must be committed
+-- or rolled back.
+--
+-- Following introduction of `preplot_saillines` (0.5.0), the incr and
+-- ntba statuses are stored in a separate table, not in `preplot_lines`
+-- (TODO: a future upgrade should remove those columns from `preplot_lines`)
+--
+-- Now any views referencing `incr` and `ntba` must be updated to point to
+-- the new location of those attributes.
+--
+-- This update fixes #312.
+--
+-- To apply, run as the dougal user:
+--
+-- psql <<EOF
+-- \i $THIS_FILE
+-- COMMIT;
+-- EOF
+--
+-- NOTE: It can be applied multiple times without ill effect.
+--
+
+BEGIN;
+
+CREATE OR REPLACE PROCEDURE pg_temp.show_notice (notice text) AS $$
+BEGIN
+	RAISE NOTICE '%', notice;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade_survey_schema (schema_name text) AS $outer$
+BEGIN
+
+	RAISE NOTICE 'Updating schema %', schema_name;
+	-- We need to set the search path because some of the trigger
+	-- functions reference other tables in survey schemas assuming
+	-- they are in the search path.
+	EXECUTE format('SET search_path TO %I,public', schema_name);
+
+	CREATE OR REPLACE VIEW preplot_lines_summary
+	AS
+	WITH summary AS (
+		SELECT DISTINCT pp.line, pp.class,
+			first_value(pp.point) OVER w AS p0,
+			last_value(pp.point) OVER w AS p1,
+			count(pp.point) OVER w AS num_points,
+			st_distance(first_value(pp.geometry) OVER w, last_value(pp.geometry) OVER w) AS length,
+			st_azimuth(first_value(pp.geometry) OVER w, last_value(pp.geometry) OVER w) * 180::double precision / pi() AS azimuth0,
+			st_azimuth(last_value(pp.geometry) OVER w, first_value(pp.geometry) OVER w) * 180::double precision / pi() AS azimuth1
+		FROM preplot_points pp
+		WHERE pp.class = 'V'::bpchar
+		WINDOW w AS (PARTITION BY pp.line ORDER BY pp.point ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
+	)
+	SELECT psl.line,
+		CASE
+			WHEN psl.incr THEN s.p0
+			ELSE s.p1
+		END AS fsp,
+		CASE
+			WHEN psl.incr THEN s.p1
+			ELSE s.p0
+		END AS lsp,
+		s.num_points,
+		s.length,
+		CASE
+			WHEN psl.incr THEN s.azimuth0
+			ELSE s.azimuth1
+		END AS azimuth,
+		psl.incr,
+		psl.remarks
+	FROM summary s
+		JOIN preplot_saillines psl ON psl.sailline_class = s.class AND s.line = psl.line
+	ORDER BY psl.line, incr;
+
+
+	ALTER TABLE preplot_lines_summary
+		OWNER TO postgres;
+	COMMENT ON VIEW preplot_lines_summary
+		IS 'Summarises ''V'' (vessel sailline) preplot lines.';
+
+
+
+END;
+$outer$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade () AS $outer$
+DECLARE
+	row RECORD;
+	current_db_version TEXT;
+BEGIN
+
+	SELECT value->>'db_schema' INTO current_db_version FROM public.info WHERE key = 'version';
+
+	IF current_db_version >= '0.5.2' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Patch already applied';
+	END IF;
+
+	IF current_db_version != '0.5.1' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Invalid database version: ' || current_db_version,
+				HINT='Ensure all previous patches have been applied.';
+	END IF;
+
+	FOR row IN
+		SELECT schema_name FROM information_schema.schemata
+		WHERE schema_name LIKE 'survey_%'
+		ORDER BY schema_name
+	LOOP
+		CALL pg_temp.upgrade_survey_schema(row.schema_name);
+	END LOOP;
+END;
+$outer$ LANGUAGE plpgsql;
+
+CALL pg_temp.upgrade();
+
+CALL pg_temp.show_notice('Cleaning up');
+DROP PROCEDURE pg_temp.upgrade_survey_schema (schema_name text);
+DROP PROCEDURE pg_temp.upgrade ();
+
+CALL pg_temp.show_notice('Updating db_schema version');
+INSERT INTO public.info VALUES ('version', '{"db_schema": "0.5.2"}')
+ON CONFLICT (key) DO UPDATE
+	SET value = public.info.value || '{"db_schema": "0.5.2"}' WHERE public.info.key = 'version';
+
+
+CALL pg_temp.show_notice('All done. You may now run "COMMIT;" to persist the changes');
+DROP PROCEDURE pg_temp.show_notice (notice text);
+
+--
+--NOTE Run `COMMIT;` now if all went well
+--

From 83b3ec5103eda83184266692d89ec0f8b3ab8bf0 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 6 May 2024 12:06:30 +0200
Subject: [PATCH 093/113] Add database upgrade file 36.

Fixes #313.
---
 ...36-v0.5.3-fix-final_lines_summary-view.sql | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 etc/db/upgrades/upgrade36-v0.5.3-fix-final_lines_summary-view.sql

diff --git a/etc/db/upgrades/upgrade36-v0.5.3-fix-final_lines_summary-view.sql b/etc/db/upgrades/upgrade36-v0.5.3-fix-final_lines_summary-view.sql
new file mode 100644
index 0000000..441161a
--- /dev/null
+++ b/etc/db/upgrades/upgrade36-v0.5.3-fix-final_lines_summary-view.sql
@@ -0,0 +1,132 @@
+-- Fix final_lines_summary view
+--
+-- New schema version: 0.5.3
+--
+-- ATTENTION:
+--
+-- ENSURE YOU HAVE BACKED UP THE DATABASE BEFORE RUNNING THIS SCRIPT.
+--
+--
+-- NOTE: This upgrade affects all schemas in the database.
+-- NOTE: Each application starts a transaction, which must be committed
+-- or rolled back.
+--
+-- This fixes a long-standing bug, where if the sail and source lines are
+-- the same, the number of missing shots will be miscounted.
+--
+-- This update fixes #313.
+--
+-- To apply, run as the dougal user:
+--
+-- psql <<EOF
+-- \i $THIS_FILE
+-- COMMIT;
+-- EOF
+--
+-- NOTE: It can be applied multiple times without ill effect.
+--
+
+BEGIN;
+
+CREATE OR REPLACE PROCEDURE pg_temp.show_notice (notice text) AS $$
+BEGIN
+	RAISE NOTICE '%', notice;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade_survey_schema (schema_name text) AS $outer$
+BEGIN
+
+	RAISE NOTICE 'Updating schema %', schema_name;
+	-- We need to set the search path because some of the trigger
+	-- functions reference other tables in survey schemas assuming
+	-- they are in the search path.
+	EXECUTE format('SET search_path TO %I,public', schema_name);
+
+	CREATE OR REPLACE VIEW final_lines_summary
+	AS
+	WITH summary AS (
+		SELECT DISTINCT fs.sequence,
+			first_value(fs.point) OVER w AS fsp,
+			last_value(fs.point) OVER w AS lsp,
+			first_value(fs.tstamp) OVER w AS ts0,
+			last_value(fs.tstamp) OVER w AS ts1,
+			count(fs.point) OVER w AS num_points,
+			count(pp.point) OVER w AS num_preplots,
+			st_distance(first_value(fs.geometry) OVER w, last_value(fs.geometry) OVER w) AS length,
+			st_azimuth(first_value(fs.geometry) OVER w, last_value(fs.geometry) OVER w) * 180::double precision / pi() AS azimuth
+		FROM final_shots fs
+		LEFT JOIN preplot_points pp USING (line, point)
+		WINDOW w AS (PARTITION BY fs.sequence ORDER BY fs.tstamp ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
+	)
+	SELECT fl.sequence,
+		fl.line,
+		s.fsp,
+		s.lsp,
+		s.ts0,
+		s.ts1,
+		s.ts1 - s.ts0 AS duration,
+		s.num_points,
+		(( SELECT count(*) AS count
+			FROM preplot_points
+			WHERE preplot_points.line = fl.line AND (preplot_points.point >= s.fsp AND preplot_points.point <= s.lsp OR preplot_points.point >= s.lsp AND preplot_points.point <= s.fsp))) - s.num_preplots AS missing_shots,
+		s.length,
+		s.azimuth,
+		fl.remarks,
+		fl.meta
+	FROM summary s
+		JOIN final_lines fl USING (sequence);
+
+	ALTER TABLE final_lines_summary
+		OWNER TO postgres;
+
+END;
+$outer$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE pg_temp.upgrade () AS $outer$
+DECLARE
+	row RECORD;
+	current_db_version TEXT;
+BEGIN
+
+	SELECT value->>'db_schema' INTO current_db_version FROM public.info WHERE key = 'version';
+
+	IF current_db_version >= '0.5.3' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Patch already applied';
+	END IF;
+
+	IF current_db_version != '0.5.2' THEN
+		RAISE EXCEPTION
+			USING MESSAGE='Invalid database version: ' || current_db_version,
+				HINT='Ensure all previous patches have been applied.';
+	END IF;
+
+	FOR row IN
+		SELECT schema_name FROM information_schema.schemata
+		WHERE schema_name LIKE 'survey_%'
+		ORDER BY schema_name
+	LOOP
+		CALL pg_temp.upgrade_survey_schema(row.schema_name);
+	END LOOP;
+END;
+$outer$ LANGUAGE plpgsql;
+
+CALL pg_temp.upgrade();
+
+CALL pg_temp.show_notice('Cleaning up');
+DROP PROCEDURE pg_temp.upgrade_survey_schema (schema_name text);
+DROP PROCEDURE pg_temp.upgrade ();
+
+CALL pg_temp.show_notice('Updating db_schema version');
+INSERT INTO public.info VALUES ('version', '{"db_schema": "0.5.3"}')
+ON CONFLICT (key) DO UPDATE
+	SET value = public.info.value || '{"db_schema": "0.5.3"}' WHERE public.info.key = 'version';
+
+
+CALL pg_temp.show_notice('All done. You may now run "COMMIT;" to persist the changes');
+DROP PROCEDURE pg_temp.show_notice (notice text);
+
+--
+--NOTE Run `COMMIT;` now if all went well
+--

From ec26285e538daa09226c83653874727186166eb7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Mon, 6 May 2024 12:13:06 +0200
Subject: [PATCH 094/113] Refresh caniuse's browser statistics.

In other words:

npx update-browserslist-db@latest
---
 lib/www/client/source/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/www/client/source/package-lock.json b/lib/www/client/source/package-lock.json
index 779629e..d3c6b22 100644
--- a/lib/www/client/source/package-lock.json
+++ b/lib/www/client/source/package-lock.json
@@ -3777,9 +3777,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001559",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
-      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true,
       "funding": [
         {
@@ -14189,9 +14189,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001559",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
-      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {

From af0df23cc444d3c6ca7d3e103a6033f03a41144b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 8 May 2024 16:27:32 +0200
Subject: [PATCH 095/113] Add diagnostics API endpoint.

Only available with write access and above.

Reports used and available filesystem sizes and database space
usage.
---
 lib/www/server/api/index.js                   |  3 +
 .../api/middleware/admin/diagnostics/get.js   | 17 ++++
 .../api/middleware/admin/diagnostics/index.js |  4 +
 lib/www/server/api/middleware/admin/index.js  |  3 +
 lib/www/server/api/middleware/index.js        |  3 +-
 lib/www/server/lib/diagnostics.js             | 92 +++++++++++++++++++
 6 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 lib/www/server/api/middleware/admin/diagnostics/get.js
 create mode 100644 lib/www/server/api/middleware/admin/diagnostics/index.js
 create mode 100644 lib/www/server/api/middleware/admin/index.js
 create mode 100644 lib/www/server/lib/diagnostics.js

diff --git a/lib/www/server/api/index.js b/lib/www/server/api/index.js
index fa94437..7da6a1d 100644
--- a/lib/www/server/api/index.js
+++ b/lib/www/server/api/index.js
@@ -312,6 +312,9 @@ app.map({
 			}
 		}
 	},
+	'/diagnostics/': {
+		get: [ mw.auth.access.write, mw.etag.noSave, mw.admin.diagnostics.get ]
+	},
 	'/rss/': {
 		get: [ mw.rss.get ]
 	}
diff --git a/lib/www/server/api/middleware/admin/diagnostics/get.js b/lib/www/server/api/middleware/admin/diagnostics/get.js
new file mode 100644
index 0000000..28d6e1b
--- /dev/null
+++ b/lib/www/server/api/middleware/admin/diagnostics/get.js
@@ -0,0 +1,17 @@
+
+const diagnostics = require('../../../../lib/diagnostics');
+
+module.exports = async function (req, res, next) {
+
+	try {
+		const d = await diagnostics();
+		if (req.user?.role != "admin" && req.user?.role != "user") {
+		}
+		res.status(200).json(d);
+	} catch (err) {
+		next(err);
+		return;
+	}
+	next();
+
+};
diff --git a/lib/www/server/api/middleware/admin/diagnostics/index.js b/lib/www/server/api/middleware/admin/diagnostics/index.js
new file mode 100644
index 0000000..fe5c66b
--- /dev/null
+++ b/lib/www/server/api/middleware/admin/diagnostics/index.js
@@ -0,0 +1,4 @@
+
+module.exports = {
+	get: require('./get')
+}
diff --git a/lib/www/server/api/middleware/admin/index.js b/lib/www/server/api/middleware/admin/index.js
new file mode 100644
index 0000000..622d97a
--- /dev/null
+++ b/lib/www/server/api/middleware/admin/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+	diagnostics: require('./diagnostics')
+};
diff --git a/lib/www/server/api/middleware/index.js b/lib/www/server/api/middleware/index.js
index c765936..6f370d1 100644
--- a/lib/www/server/api/middleware/index.js
+++ b/lib/www/server/api/middleware/index.js
@@ -18,5 +18,6 @@ module.exports = {
 	openapi: require('./openapi'),
 	rss: require('./rss'),
 	etag: require('./etag'),
-	version: require('./version')
+	version: require('./version'),
+	admin: require('./admin')
 };
diff --git a/lib/www/server/lib/diagnostics.js b/lib/www/server/lib/diagnostics.js
new file mode 100644
index 0000000..8230257
--- /dev/null
+++ b/lib/www/server/lib/diagnostics.js
@@ -0,0 +1,92 @@
+const { statfs } = require('fs').promises;
+const { pool } = require('./db/connection');
+const cfg = require('./config');
+const { ALERT, ERROR, WARNING, NOTICE, INFO, DEBUG } = require('DOUGAL_ROOT/debug')(__filename);
+
+
+/** Return filesystem statistics
+ */
+async function df (fs="/") {
+	const s = await statfs(fs);
+
+	if (s) {
+		const total = (s.bsize * s.blocks); // bytes
+		const free = (s.bfree * s.bsize);
+		const available = (s.bavail * s.bsize);
+		const used = total - free;
+		const usedPercent = used/total * 100
+		return {
+			total,
+			free,
+			available,
+			used,
+			usedPercent
+		}
+	}
+}
+
+/** Return the size of the Dougal database
+ */
+async function dbSize () {
+	const client = await pool.connect();
+	let res;
+	try {
+		res = (await client.query("SELECT pg_database_size(current_database()) size;"))?.rows[0];
+	} catch (err) {
+		ERROR(err);
+	} finally {
+		client.release();
+	}
+	return res;
+}
+
+async function dbSchemaSizes () {
+	const text = `
+		SELECT pid,
+			(sum(table_size)::bigint) size,
+			((sum(table_size) / pg_database_size(current_database())) * 100) percent
+		FROM (
+		SELECT pg_catalog.pg_namespace.nspname as schema_name,
+				pg_relation_size(pg_catalog.pg_class.oid) as table_size
+		FROM   pg_catalog.pg_class
+			JOIN pg_catalog.pg_namespace ON relnamespace = pg_catalog.pg_namespace.oid
+		) t
+		JOIN public.projects p ON schema_name = p.schema
+		GROUP BY pid
+		ORDER BY pid
+	`;
+
+	const client = await pool.connect();
+	let res;
+	try {
+		res = (await client.query(text))?.rows;
+	} catch (err) {
+		ERROR(err);
+	} finally {
+		client.release();
+	}
+	return res;
+}
+
+async function diagnostics () {
+	const paths = cfg._("global.imports.paths") ?? {};
+	const data = {};
+	for (path in paths) {
+		data[path] = await df(paths[path]);
+	}
+	const res = {
+		storage: {
+			root: await df("/"),
+			data
+		},
+		database: {
+			...(await dbSize()),
+			projects: Object.fromEntries((await dbSchemaSizes()).map(row => [ row.pid, {size: row.size, percent: row.percent} ]))
+		}
+	};
+
+	return res;
+}
+
+
+module.exports = diagnostics;

From d154e75797e5065ff8db986658457923c66ec833 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 9 May 2024 14:02:18 +0200
Subject: [PATCH 096/113] Add more info to diagnostics endpoint

---
 lib/www/server/lib/diagnostics.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/www/server/lib/diagnostics.js b/lib/www/server/lib/diagnostics.js
index 8230257..1f6f181 100644
--- a/lib/www/server/lib/diagnostics.js
+++ b/lib/www/server/lib/diagnostics.js
@@ -1,3 +1,4 @@
+const os = require('os');
 const { statfs } = require('fs').promises;
 const { pool } = require('./db/connection');
 const cfg = require('./config');
@@ -75,6 +76,15 @@ async function diagnostics () {
 		data[path] = await df(paths[path]);
 	}
 	const res = {
+		hostname: os.hostname(),
+		memory: {
+			total: os.totalmem(),
+			free: os.freemem()
+		},
+		uptime: os.uptime(),
+		loadavg: os.loadavg(),
+		networkInterfaces: os.networkInterfaces(),
+		cpus: os.cpus(),
 		storage: {
 			root: await df("/"),
 			data

From e398f2d3cda25fefc76f5e607e1ad3b8b021e038 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 9 May 2024 14:18:56 +0200
Subject: [PATCH 097/113] Stop attempt at sending a spurious 404.

This was resulting in a bunch of "headers already sent" messages.
---
 lib/www/server/api/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/www/server/api/index.js b/lib/www/server/api/index.js
index 7da6a1d..62e63d9 100644
--- a/lib/www/server/api/index.js
+++ b/lib/www/server/api/index.js
@@ -365,7 +365,9 @@ app.use(function (err, req, res, next) {
 });
 
 app.get("*", (req, res, next) => {
-	res.status(404).send({status: 404, message: "This endpoint does not exist"});
+	if (!res.headersSent) {
+		res.status(404).send({status: 404, message: "This endpoint does not exist"});
+	}
 });
 
 app.disable('x-powered-by');

From d5a10ca27300b3efe354d55c30e83fa154278e01 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 22 Aug 2024 18:43:57 +0200
Subject: [PATCH 098/113] Allow also `str` as a field type specifier

---
 bin/fwr.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/fwr.py b/bin/fwr.py
index 4ae5bf3..f6324c9 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -18,6 +18,7 @@ transform = {
 	"int": lambda v: builtins.int(float(v)),
 	"float": float,
 	"string": str,
+	"str": str,
 	"bool": to_bool
 }
 

From 7a7106e735de4342370953d9dc327c15b7f2d659 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 22 Aug 2024 18:44:24 +0200
Subject: [PATCH 099/113] Default to text if no field type is specified.

---
 bin/fwr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fwr.py b/bin/fwr.py
index f6324c9..fe75d50 100644
--- a/bin/fwr.py
+++ b/bin/fwr.py
@@ -35,7 +35,7 @@ def parse_line (line, fields, fixed = None):
 
 	for key in fields:
 		spec = fields[key]
-		transformer = transform[spec["type"]]
+		transformer = transform[spec.get("type", "str")]
 		pos_from = spec["offset"]
 		pos_to = pos_from + spec["length"]
 		text = line[pos_from:pos_to]

From 96a8d3689a218d517749559bfbc24920a9830a08 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:39:47 +0200
Subject: [PATCH 100/113] Add defaults for lineNameInfo `text` and `fields`

---
 .../source/src/components/decoder/fixed-string-decoder.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
index 425021f..23a2c6c 100644
--- a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
+++ b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
@@ -229,9 +229,9 @@ export default {
   ],
 
   props: {
-    text: String,
+    text: { type: String, default: "" },
     fixed: { type: Array, default: () => [] },
-    fields: Object,
+    fields: { type: Object, default: () => ({}) },
     multiline: Boolean,
     numberedLines: [ Boolean, Number ],
     maxHeight: String,

From fc73fbfb9fe8da8a2ef74473cd54936b32212015 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:40:28 +0200
Subject: [PATCH 101/113] Add GUI for editing lineNameInfo of final P1/111

---
 lib/www/client/source/src/views/ProjectSettings.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 082aca3..627f733 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -400,7 +400,8 @@ export default {
                     rootPath: obj.rootPath,
                     globs: obj.final.p111.globs,
                     paths: obj.final.p111.paths,
-                    pattern: obj.final.p111.pattern
+                    pattern: obj.final.p111.pattern,
+                    lineNameInfo: obj.final?.p111?.lineNameInfo
                   })
                 },
                 {

From 028cab5188f48614f6e129395173bd1b18b70f87 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:41:00 +0200
Subject: [PATCH 102/113] Add default fields for raw P1/11 lineNameInfo

---
 .../src/components/project-settings/input-raw-p111.vue    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
index edc8644..6474684 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
@@ -91,6 +91,14 @@ export default {
               lineNameInfo: {
                 example: "",
                 fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  },
                 }
               }
             };

From f8692afad3c5f475fce68d7587855492458048b2 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:41:51 +0200
Subject: [PATCH 103/113] Add named slots to
 DougalProjectSettingsFileMatchingParameters.

Used to display error or information messages.
---
 .../components/project-settings/file-matching-parameters.vue  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
index 3377559..86b3e4b 100644
--- a/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
+++ b/lib/www/client/source/src/components/project-settings/file-matching-parameters.vue
@@ -18,6 +18,7 @@
               A list of directories which are searched for matching files.
             </v-card-subtitle>
             <v-card-text>
+              <slot name="paths"></slot>
               <v-form>
                 <v-text-field v-for="(item, index) in paths" :key="index"
                   v-model="paths[index]"
@@ -61,6 +62,7 @@
               A list of <a href="https://en.wikipedia.org/wiki/Glob_(programming)" target="_blank">glob patterns</a> expanding to match the files of interest. Note that Linux is case-sensitive.
             </v-card-subtitle>
             <v-card-text>
+              <slot name="globs"></slot>
               <v-form>
                 <v-text-field v-for="(item, index) in globs" :key="index"
                   v-model="globs[index]"
@@ -98,6 +100,7 @@
               <b v-if="lineNameInfo">Note: Use the <a @click.stop="tab=3">line info</a> tab preferentially.</b>
             </v-card-subtitle>
             <v-card-text>
+              <slot name="pattern"></slot>
               <v-form>
                 <v-text-field
                   class="mb-5"
@@ -156,6 +159,7 @@
               Line information that will be extracted from file names
             </v-card-subtitle>
             <v-card-text>
+              <slot name="line-info"></slot>
               <v-form>
                 <v-text-field
                   label="Example file name"

From 7db9155899d7eafcb892f95922b8bd5156ce4016 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:46:49 +0200
Subject: [PATCH 104/113] Add default fields for raw P1/11 lineNameInfo

---
 .../src/components/project-settings/input-final-p111.vue  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/www/client/source/src/components/project-settings/input-final-p111.vue b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
index 2ef9f3c..215000d 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
@@ -91,6 +91,14 @@ export default {
               lineNameInfo: {
                 example: "",
                 fields: {
+                  line: {
+                    length: 4,
+                    type: "int"
+                  },
+                  sequence: {
+                    length: 3,
+                    type: "int"
+                  },
                 }
               }
             };

From 12082b91a3f434a9e8d51d38ebddd52cf0aa4bf2 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:47:38 +0200
Subject: [PATCH 105/113] Add validation messages for raw P1/11 lineNameInfo

---
 .../project-settings/input-raw-p111.vue       | 59 ++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
index 6474684..18ed0e5 100644
--- a/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-raw-p111.vue
@@ -7,6 +7,31 @@
     :is-valid="isValid"
     :save="save"
   >
+    <template v-slot:paths v-if="validationErrors.includes('ERR_PATHS')">
+      <v-alert type="warning">
+        At least one path entry is required.<br/>
+        <ul>
+          <li>If you have final P1/11 files in multiple paths (e.g., each file in its own sequence directory), enter here the parent directory.</li>
+          <li>If files are across multiple paths without a common ancestor, you must add multiple entries here.</li>
+        </ul>
+      </v-alert>
+    </template>
+
+    <template v-slot:globs v-if="validationErrors.includes('ERR_GLOBS')">
+      <v-alert type="warning">
+        At least one glob expression is required.
+      </v-alert>
+    </template>
+
+    <template v-slot:line-info v-if="validationErrors.includes('ERR_LINEINFO')">
+      <v-alert type="warning">
+        At least the following fields are required:
+        <ul>
+          <li><code>line</code> (integer, the preplot line number)</li>
+          <li><code>sequence</code> (integer, the acquisition sequence number)</li>
+        </ul>
+      </v-alert>
+    </template>
   </dougal-project-settings-file-matching-parameters>
 
 </template>
@@ -121,14 +146,34 @@ export default {
       };
     },
 
+    validationErrors () {
+      const errors = [];
+
+      if (!this.cwo?.paths.length || !this.cwo?.paths[0].length) {
+        // "Missing path: we need at least one directory where to search for matching files"
+        errors.push("ERR_PATHS");
+      }
+
+      if (!this.cwo?.globs.length) {
+        // "Missing globs: we need at least one glob to search for matching files"
+        errors.push("ERR_GLOBS");
+      }
+
+      if (this.cwo?.lineNameInfo) {
+        const pass = !this.cwo?.lineNameInfo?.fields || [ "line", "sequence" ].every( i =>
+          ["offset", "length"].every( j => j in (this.cwo?.lineNameInfo?.fields?.[i] ?? {}) ));
+
+        if (!pass) {
+          // "Missing field info: We need at least 'line' and 'sequence' fields"
+          errors.push("ERR_LINEINFO")
+        }
+      }
+
+      return errors;
+    },
+
     isValid () {
-      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
-        this.cwo?.pattern?.regex &&
-          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
-        this.cwo?.lineNameInfo &&
-          this.cwo?.lineNameInfo?.fields &&
-            [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
+      return this.validationErrors.length == 0;
     }
 
   },

From e6669026fa7fe5b7513d617cadc81079d0fad2bf Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:48:35 +0200
Subject: [PATCH 106/113] Add validation messages for final P1/11 lineNameInfo

---
 .../project-settings/input-final-p111.vue     | 62 ++++++++++++++++---
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/lib/www/client/source/src/components/project-settings/input-final-p111.vue b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
index 215000d..bad6553 100644
--- a/lib/www/client/source/src/components/project-settings/input-final-p111.vue
+++ b/lib/www/client/source/src/components/project-settings/input-final-p111.vue
@@ -7,8 +7,32 @@
     :is-valid="isValid"
     :save="save"
   >
-  </dougal-project-settings-file-matching-parameters>
+    <template v-slot:paths v-if="validationErrors.includes('ERR_PATHS')">
+      <v-alert type="warning">
+        At least one path entry is required.<br/>
+        <ul>
+          <li>If you have final P1/11 files in multiple paths (e.g., each file in its own sequence directory), enter here the parent directory.</li>
+          <li>If files are across multiple paths without a common ancestor, you must add multiple entries here.</li>
+        </ul>
+      </v-alert>
+    </template>
 
+    <template v-slot:globs v-if="validationErrors.includes('ERR_GLOBS')">
+      <v-alert type="warning">
+        At least one glob expression is required.
+      </v-alert>
+    </template>
+
+    <template v-slot:line-info v-if="validationErrors.includes('ERR_LINEINFO')">
+      <v-alert type="warning">
+        At least the following fields are required:
+        <ul>
+          <li><code>line</code> (integer, the preplot line number)</li>
+          <li><code>sequence</code> (integer, the acquisition sequence number)</li>
+        </ul>
+      </v-alert>
+    </template>
+  </dougal-project-settings-file-matching-parameters>
 </template>
 
 <style scoped>
@@ -117,18 +141,38 @@ export default {
         globs: this.cwo?.globs,
         paths: this.cwo?.paths,
         pattern: this.cwo?.pattern,
-        lineNameInfo: this.cwo?.lineNameInfo
+        lineNameInfo: this.cwo?.lineNameInfo ?? {}
       };
     },
 
+    validationErrors () {
+      const errors = [];
+
+      if (!this.cwo?.paths.length || !this.cwo?.paths[0].length) {
+        // "Missing path: we need at least one directory where to search for matching files"
+        errors.push("ERR_PATHS");
+      }
+
+      if (!this.cwo?.globs.length) {
+        // "Missing globs: we need at least one glob to search for matching files"
+        errors.push("ERR_GLOBS");
+      }
+
+      if (this.cwo?.lineNameInfo) {
+        const pass = !this.cwo?.lineNameInfo?.fields || [ "line", "sequence" ].every( i =>
+          ["offset", "length"].every( j => j in (this.cwo?.lineNameInfo?.fields?.[i] ?? {}) ));
+
+        if (!pass) {
+          // "Missing field info: We need at least 'line' and 'sequence' fields"
+          errors.push("ERR_LINEINFO")
+        }
+      }
+
+      return errors;
+    },
+
     isValid () {
-      return !!(this.cwo?.paths.length && this.cwo?.globs.length && (
-        this.cwo?.pattern?.regex &&
-          ["direction", "line", "sequence"].every( i => this.cwo?.pattern?.captures?.includes(i) )) || (
-        this.cwo?.lineNameInfo &&
-          this.cwo?.lineNameInfo?.fields &&
-            [ "line", "sequence", "incr" ].every( i =>
-              ["offset", "length"].every( j => j in this.cwo?.lineNameInfo.fields[i] ))));
+      return this.validationErrors.length == 0;
     }
 
   },

From 9ef551db76df4ecda4f2123c5b492266494078d4 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 26 Jun 2025 23:57:19 +0200
Subject: [PATCH 107/113] =?UTF-8?q?Fix=20logical=E2=86=92physical=20path?=
 =?UTF-8?q?=20conversion=20for=20absolute=20paths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/www/server/lib/utils/logicalPath.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/server/lib/utils/logicalPath.js b/lib/www/server/lib/utils/logicalPath.js
index a5adb29..72ffa97 100644
--- a/lib/www/server/lib/utils/logicalPath.js
+++ b/lib/www/server/lib/utils/logicalPath.js
@@ -22,7 +22,7 @@ function translatePath (file) {
 		if (typeof importPaths === "string") {
 			// Substitute the root for the real physical path
 			// NOTE: `root` deals with import_paths not being absolute
-			const prefix = Path.resolve(Path.join(root, importPaths));
+			const prefix = Path.resolve(root, importPaths);
 			const suffix = Path.resolve(file).replace(/^\/+/, "");
 			const physicalPath = Path.resolve(Path.join(prefix, suffix));
 			return validate(physicalPath, prefix);

From 289d50d9c1aed6656c7f399db7487e0b9be7694a Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Fri, 27 Jun 2025 00:23:37 +0200
Subject: [PATCH 108/113] Update caniuse database

---
 lib/www/client/source/package-lock.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/www/client/source/package-lock.json b/lib/www/client/source/package-lock.json
index d3c6b22..7f919b5 100644
--- a/lib/www/client/source/package-lock.json
+++ b/lib/www/client/source/package-lock.json
@@ -3777,9 +3777,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001616",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
-      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
+      "version": "1.0.30001726",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
+      "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==",
       "dev": true,
       "funding": [
         {
@@ -3794,7 +3794,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -14189,9 +14190,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001616",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
-      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
+      "version": "1.0.30001726",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
+      "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {

From 0ef2e60d15fa5bdc25435360e0ee4beea78c7836 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 3 Jul 2025 11:44:52 +0200
Subject: [PATCH 109/113] Do not fail on non-existing property

---
 .../source/src/components/decoder/fixed-string-decoder.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
index 23a2c6c..6386da8 100644
--- a/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
+++ b/lib/www/client/source/src/components/decoder/fixed-string-decoder.vue
@@ -473,7 +473,7 @@ export default {
     },
 
     reset () {
-      this.text_ = this.text.replaceAll("\r", "");
+      this.text_ = this?.text.replaceAll("\r", "");
     }
 
   },

From 8bbe3aee7006e620d9e0f0988fdf446b5cc59bb2 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 9 Jul 2025 16:30:26 +0200
Subject: [PATCH 110/113] Make planned line names configurable.

Line names are made up based on:

* Certain properties defined by the system
* Values assigned to those properties either by the system
  or by the user (line number, sequence, attempt, etc.)
* A line format specification configured by the user for each
  project (`online.line.lineNameBuilder.fields`)

Closes #129.
---
 lib/www/server/lib/db/index.js                |   1 +
 lib/www/server/lib/db/linename/index.js       |   4 +
 lib/www/server/lib/db/linename/post.js        |  39 ++++++
 .../server/lib/db/linename/properties/get.js  |  15 +++
 .../lib/db/linename/properties/index.js       |   3 +
 lib/www/server/lib/db/plan/lib/index.js       | 115 +++++++++++++++++-
 .../lib/db/plan/lib/linename-properties.yaml  |  51 ++++++++
 7 files changed, 224 insertions(+), 4 deletions(-)
 create mode 100644 lib/www/server/lib/db/linename/index.js
 create mode 100644 lib/www/server/lib/db/linename/post.js
 create mode 100644 lib/www/server/lib/db/linename/properties/get.js
 create mode 100644 lib/www/server/lib/db/linename/properties/index.js
 create mode 100644 lib/www/server/lib/db/plan/lib/linename-properties.yaml

diff --git a/lib/www/server/lib/db/index.js b/lib/www/server/lib/db/index.js
index 2748564..ae7c2f0 100644
--- a/lib/www/server/lib/db/index.js
+++ b/lib/www/server/lib/db/index.js
@@ -2,6 +2,7 @@
 module.exports = {
 	project: require('./project'),
 	line: require('./line'),
+	linename: require('./linename'),
 	sequence: require('./sequence'),
 	event: require('./event'),
 	plan: require('./plan'),
diff --git a/lib/www/server/lib/db/linename/index.js b/lib/www/server/lib/db/linename/index.js
new file mode 100644
index 0000000..0f5e59b
--- /dev/null
+++ b/lib/www/server/lib/db/linename/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+	properties: require('./properties'),
+	post: require('./post'),
+};
diff --git a/lib/www/server/lib/db/linename/post.js b/lib/www/server/lib/db/linename/post.js
new file mode 100644
index 0000000..faed019
--- /dev/null
+++ b/lib/www/server/lib/db/linename/post.js
@@ -0,0 +1,39 @@
+const { setSurvey, transaction } = require('../connection');
+const lib = require('../plan/lib');
+
+async function post (projectId, payload, opts = {}) {
+
+	const client = await setSurvey(projectId);
+	try {
+
+		if (!payload.sequence) {
+			payload.sequence = await lib.getSequence(client);
+		}
+		// if (!payload.ts0 || !payload.ts1) {
+		// 	const ts = await lib.getTimestamps(client, projectId, payload);
+		// 	if (!payload.ts0) {
+		// 		payload.ts0 = ts.ts0;
+		// 	}
+		// 	if (!payload.ts1) {
+		// 		payload.ts1 = ts.ts1;
+		// 	}
+		// }
+		const name = await lib.getLineName(client, projectId, payload);
+
+		return name;
+	} catch (err) {
+		if (err.code && Math.trunc(err.code/1000) == 23) {
+			// Class 23 — Integrity Constraint Violation
+			console.error(err);
+			throw { status: 400, message: "Malformed request" };
+		} else {
+			throw err;
+		}
+	} finally {
+		client.release();
+	}
+
+	return;
+}
+
+module.exports = post;
diff --git a/lib/www/server/lib/db/linename/properties/get.js b/lib/www/server/lib/db/linename/properties/get.js
new file mode 100644
index 0000000..661bd61
--- /dev/null
+++ b/lib/www/server/lib/db/linename/properties/get.js
@@ -0,0 +1,15 @@
+const lib = require('../../plan/lib');
+
+async function get (projectId, payload, opts = {}) {
+
+	try {
+
+		return await lib.getLineNameProperties();
+
+	} catch (err) {
+		throw err;
+	}
+
+}
+
+module.exports = get;
diff --git a/lib/www/server/lib/db/linename/properties/index.js b/lib/www/server/lib/db/linename/properties/index.js
new file mode 100644
index 0000000..14c855b
--- /dev/null
+++ b/lib/www/server/lib/db/linename/properties/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+	get: require('./get'),
+};
diff --git a/lib/www/server/lib/db/plan/lib/index.js b/lib/www/server/lib/db/plan/lib/index.js
index abcf369..a78872a 100644
--- a/lib/www/server/lib/db/plan/lib/index.js
+++ b/lib/www/server/lib/db/plan/lib/index.js
@@ -1,6 +1,12 @@
+const YAML = require('yaml');
+const fs = require('fs').promises;
+const path = require('path');
+
 const alert = require("../../../alerts");
 const configuration = require('../../configuration');
 
+let lineNameProperties;
+
 async function getDistance (client, payload) {
 	const text = `
 		SELECT ST_Distance(pp0.geometry, pp1.geometry) distance
@@ -88,8 +94,6 @@ async function getPlanned (client) {
 
 
 async function getLineName (client, projectId, payload) {
-	// FIXME TODO Get line name script from configuration
-	// Ref.: https://gitlab.com/wgp/dougal/software/-/issues/129
 
 	// This is to monitor #165
 	// https://gitlab.com/wgp/dougal/software/-/issues/incident/165
@@ -97,6 +101,36 @@ async function getLineName (client, projectId, payload) {
 		alert({function: "getLineName", client, projectId, payload});
 	}
 
+	const lineNameBuilder = await configuration.get(projectId, "online/line/lineNameBuilder");
+	const fields = lineNameBuilder?.fields;
+
+	if (fields) {
+		const properties = await getLineNameProperties();
+		const values = await getLineNameValues(client, projectId, payload, lineNameBuilder?.values);
+		return buildLineName(properties, fields, values, payload?.name);
+	} else {
+		// TODO send a user notification via WS to let them know
+		// they haven't configured the line name parameters
+	}
+
+	// return undefined
+}
+
+/** Get line properties that go into making a line name.
+ *
+ * The properties are defined in a separate YAML file for
+ * convenience.
+ */
+async function getLineNameProperties () {
+	if (!lineNameProperties) {
+		const buffer = await fs.readFile(path.join(__dirname, 'linename-properties.yaml'));
+		lineNameProperties = YAML.parse(buffer.toString());
+	}
+
+	return lineNameProperties;
+}
+
+async function getLineNameValues (client, projectId, payload, otherValues = {}) {
 	const planned = await getPlanned(client);
 	const previous = await getSequencesForLine(client, payload.line);
 	const attempt = planned.filter(r => r.line == payload.line).concat(previous).length;
@@ -104,9 +138,79 @@ async function getLineName (client, projectId, payload) {
 	const incr = p.lsp > p.fsp;
 	const sequence = p.sequence || 1;
 	const line = p.line;
-	return `${incr?"1":"2"}0${line}${attempt}${sequence.toString().padStart(3, "0")}S00000`;
+
+	return {
+		...structuredClone(otherValues),
+		line_number: payload.line,
+		sequence_number: payload.sequence || 1,
+		original_sequence: payload.meta?.original_sequence,
+		pass_number: attempt,
+		is_prime: attempt == 0,
+		is_reshoot: payload.meta?.is_reshoot ?? (!payload.meta?.is_infill && attempt > 0),
+		is_infill: payload.meta?.is_infill ?? false,
+		direction: null, // TODO
+		is_incrementing: incr
+	};
 }
 
+/** Compute the string representation of a line name field
+ */
+function fieldValue (properties, field, values) {
+	let value;
+
+	if (field.item == "text") {
+		value = field.value;
+	} else if (properties[field.item]?.type == "boolean") {
+		if (values[field.item] === field.when) {
+			value = field.value;
+		}
+	} else {
+		value = values[field.item];
+	}
+
+	if (value != null) {
+
+		if (properties[field.item]?.type == "number") {
+			if (field.scale_multiplier != null) {
+				value *= field.scale_multiplier;
+			}
+			if (field.scale_offset != null) {
+				value += field.scale_offset;
+			}
+
+			if (field.format == "integer") {
+				value = Math.round(value);
+			}
+		}
+
+		value = String(value);
+		if (field.pad_side == "left") {
+			value = value.padStart(field.length, field.pad_string ?? " ");
+		} else if (field.pad_side == "right") {
+			value = value.padEnd(field.length, field.pad_string ?? " ");
+		}
+
+		return value;
+	}
+}
+
+
+/** Build a line name out of its component properties, fields and values.
+ *
+ * NOTE: This is the same function as available client-side on
+ * `fixed-string-encoder.vue`. Consider merging them.
+ */
+function buildLineName (properties, fields, values, str = "") {
+	const length = fields.reduce( (acc, cur) => (cur.offset + cur.length) > acc ? (cur.offset + cur.length) : acc, str.length )
+	str = str.padEnd(length);
+	for (const field of fields) {
+		const value = fieldValue(properties, field, values);
+		if (value != null) {
+			str = str.slice(0, field.offset) + value + str.slice(field.offset + field.length);
+		}
+	}
+	return str;
+}
 
 module.exports = {
 	getDistance,
@@ -114,5 +218,8 @@ module.exports = {
 	getTimestamps,
 	getSequencesForLine,
 	getPlanned,
-	getLineName
+	getLineNameProperties,
+	getLineNameValues,
+	getLineName,
+	buildLineName
 };
diff --git a/lib/www/server/lib/db/plan/lib/linename-properties.yaml b/lib/www/server/lib/db/plan/lib/linename-properties.yaml
new file mode 100644
index 0000000..0c442cb
--- /dev/null
+++ b/lib/www/server/lib/db/plan/lib/linename-properties.yaml
@@ -0,0 +1,51 @@
+#
+# These are the properties that can be used to build
+# line names.
+#
+
+line_number:
+    summary: Line number
+    description: The sailline number that is to be acquired
+    type: number
+    format: integer
+sequence_number:
+    summary: Sequence
+    description: The sequence number that will be assigned to this line
+    type: number
+    format: integer
+original_sequence:
+    summary: Original sequence
+    description: The original sequence number of the line that is being reshot
+    type: number
+    format: integer
+pass_number:
+    summary: Pass number
+    description: The number of times this line, or section of line, has been shot
+    type: number
+    format: integer
+is_prime:
+    summary: Prime line
+    description: Whether this is the first time this line is being acquired
+    type: boolean
+is_reshoot:
+    summary: Reshoot
+    description: Whether this is a reshoot (mutually exclusive with `is_prime` and `is_infill`)
+    type: boolean
+is_infill:
+    summary: Infill line
+    description: Whether this is an infill line (mutually exclusive with `is_prime` and `is_reshoot`)
+    type: boolean
+direction:
+    summary: Line azimuth
+    direction: The line azimuth in the Incrementing shotpoints direction
+    type: number
+    format: float
+is_incrementing:
+    summary: Incrementing
+    description: Whether the line is being shot low to high point numbers or vice versa
+    type: boolean
+text:
+    summary: Fixed text
+    description: Arbitrary user-entered text (line prefix, suffix, etc.)
+    type: text
+

From 712b20c59631c1bfd3579b7800ec7bd792fa91d7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 9 Jul 2025 16:38:41 +0200
Subject: [PATCH 111/113] Add API endpoint to retrieve line name properties.

This will be needed by the configuration GUI.
---
 lib/www/server/api/index.js                   | 11 ++++++++++
 lib/www/server/api/middleware/index.js        |  1 +
 .../server/api/middleware/linename/index.js   |  4 ++++
 .../server/api/middleware/linename/post.js    | 21 +++++++++++++++++++
 .../api/middleware/linename/properties/get.js | 21 +++++++++++++++++++
 .../middleware/linename/properties/index.js   |  3 +++
 6 files changed, 61 insertions(+)
 create mode 100644 lib/www/server/api/middleware/linename/index.js
 create mode 100644 lib/www/server/api/middleware/linename/post.js
 create mode 100644 lib/www/server/api/middleware/linename/properties/get.js
 create mode 100644 lib/www/server/api/middleware/linename/properties/index.js

diff --git a/lib/www/server/api/index.js b/lib/www/server/api/index.js
index 62e63d9..1f86ac3 100644
--- a/lib/www/server/api/index.js
+++ b/lib/www/server/api/index.js
@@ -185,6 +185,17 @@ app.map({
 		delete: [ mw.auth.access.write, mw.plan.delete ]
 	},
 
+	/*
+	 * Line name endpoints
+	 */
+
+	'/project/:project/linename': {
+		post: [ mw.linename.post ], // Get a linename
+	},
+	'/project/:project/linename/properties': {
+		get: [ mw.linename.properties.get ], // Get linename properties
+	},
+
 	/*
 	 * Event log endpoints
 	 */
diff --git a/lib/www/server/api/middleware/index.js b/lib/www/server/api/middleware/index.js
index 6f370d1..645179b 100644
--- a/lib/www/server/api/middleware/index.js
+++ b/lib/www/server/api/middleware/index.js
@@ -3,6 +3,7 @@ module.exports = {
 	files: require('./files'),
 	plan: require('./plan'),
 	line: require('./line'),
+	linename: require('./linename'),
 	project: require('./project'),
 	sequence: require('./sequence'),
 	user: require('./user'),
diff --git a/lib/www/server/api/middleware/linename/index.js b/lib/www/server/api/middleware/linename/index.js
new file mode 100644
index 0000000..0f5e59b
--- /dev/null
+++ b/lib/www/server/api/middleware/linename/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+	properties: require('./properties'),
+	post: require('./post'),
+};
diff --git a/lib/www/server/api/middleware/linename/post.js b/lib/www/server/api/middleware/linename/post.js
new file mode 100644
index 0000000..b95cdae
--- /dev/null
+++ b/lib/www/server/api/middleware/linename/post.js
@@ -0,0 +1,21 @@
+
+const { linename } = require('../../../lib/db/linename');
+
+module.exports = async function (req, res, next) {
+
+	try {
+		const payload = req.body;
+
+		const line = await linename.post(req.params.project, payload);
+		if (line) {
+			res.status(200).type("text/plain").send(line);
+		} else {
+			res.status(404).send();
+		}
+		next();
+	} catch (err) {
+		next(err);
+	}
+
+
+};
diff --git a/lib/www/server/api/middleware/linename/properties/get.js b/lib/www/server/api/middleware/linename/properties/get.js
new file mode 100644
index 0000000..b951bba
--- /dev/null
+++ b/lib/www/server/api/middleware/linename/properties/get.js
@@ -0,0 +1,21 @@
+
+const { linename } = require('../../../../lib/db');
+
+module.exports = async function (req, res, next) {
+
+	try {
+		const payload = req.body;
+
+		const properties = await linename.properties.get(req.params.project, payload);
+		if (properties) {
+			res.status(200).send(properties);
+		} else {
+			res.status(404).send();
+		}
+		next();
+	} catch (err) {
+		next(err);
+	}
+
+
+};
diff --git a/lib/www/server/api/middleware/linename/properties/index.js b/lib/www/server/api/middleware/linename/properties/index.js
new file mode 100644
index 0000000..14c855b
--- /dev/null
+++ b/lib/www/server/api/middleware/linename/properties/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+	get: require('./get'),
+};

From 9cc21ba06aa8091705ee541fa3069a01f6c74ef7 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 9 Jul 2025 16:40:48 +0200
Subject: [PATCH 112/113] Mark planned reshoots as such

---
 lib/www/client/source/src/views/SequenceList.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/www/client/source/src/views/SequenceList.vue b/lib/www/client/source/src/views/SequenceList.vue
index 56163f9..6e0bcbc 100644
--- a/lib/www/client/source/src/views/SequenceList.vue
+++ b/lib/www/client/source/src/views/SequenceList.vue
@@ -712,7 +712,11 @@ export default {
         line: this.contextMenuItem.line,
         fsp: sp0,
         lsp: sp1,
-        remarks: `Reshoot of sequence ${this.contextMenuItem.sequence}.`
+        remarks: `Reshoot of sequence ${this.contextMenuItem.sequence}.`,
+        meta: {
+          is_reshoot: true,
+          original_sequence: this.contextMenuItem.sequence
+        }
       }
       console.log("Plan", payload);
       const url = `/project/${this.$route.params.project}/plan`;

From 071fd7438b75c73846d5401a37772d2d4ab6adfd Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 9 Jul 2025 16:45:35 +0200
Subject: [PATCH 113/113] Reimplement
 <dougal-project-settings-online-line-name-format/>.

Closes #297.
---
 .../encoder/fixed-string-encoder-field.vue    | 269 ++++++++++++++
 .../encoder/fixed-string-encoder-sample.vue   | 351 ++++++++++++++++++
 .../encoder/fixed-string-encoder.vue          | 307 +++++++++++++++
 .../online-line-name-format.vue               |  79 ++--
 .../source/src/views/ProjectSettings.vue      |  66 +++-
 5 files changed, 1017 insertions(+), 55 deletions(-)
 create mode 100644 lib/www/client/source/src/components/encoder/fixed-string-encoder-field.vue
 create mode 100644 lib/www/client/source/src/components/encoder/fixed-string-encoder-sample.vue
 create mode 100644 lib/www/client/source/src/components/encoder/fixed-string-encoder.vue

diff --git a/lib/www/client/source/src/components/encoder/fixed-string-encoder-field.vue b/lib/www/client/source/src/components/encoder/fixed-string-encoder-field.vue
new file mode 100644
index 0000000..8a2b43b
--- /dev/null
+++ b/lib/www/client/source/src/components/encoder/fixed-string-encoder-field.vue
@@ -0,0 +1,269 @@
+<template>
+  <v-row dense no-gutters>
+
+    <v-col>
+      <slot name="prepend"></slot>
+    </v-col>
+
+    <v-col cols="2">
+      <v-chip v-if="value.item && !readonly"
+        outlined
+        label
+        small
+        :color="colour"
+        :title="description"
+      >{{name}}</v-chip>
+      <v-select v-else-if="items.length && !readonly"
+        label="Item"
+        :items=items
+        v-model="value.item"
+        dense
+        title="Select an item to use as a field"
+      ></v-select>
+    </v-col>
+
+    <v-col>
+      <v-select v-if="type == 'boolean'"
+        label="Condition"
+        :items="[true, false]"
+        v-model="value.when"
+        dense
+        title="Use this configuration only when the value of this item matches the selected state. This allows the user to configure different values for true and false conditions."
+      ></v-select>
+    </v-col>
+
+    <v-col>
+      <v-text-field  v-if="type == 'boolean' || type == 'text'"
+        class="ml-3"
+        dense
+        label="Value"
+        v-model="value.value"
+        title="This literal text will be inserted at the designated position"
+      ></v-text-field>
+      <v-menu v-else-if="type == 'number'"
+        max-width="600"
+        :close-on-content-click="false"
+        offset-y
+      >
+        <template v-slot:activator="{ on, attrs }">
+          <v-chip
+            class="ml-3"
+            small
+            :light="$vuetify.theme.isDark"
+            :dark="!$vuetify.theme.isDark"
+            :color="value.scale_offset != null || value.scale_multiplier != null ? 'primary' : ''"
+            :title="`Number scaling${ value.scale_offset != null ? ('\nOffset: ' + value.scale_offset) : '' }${ value.scale_multiplier != null ? ('\nMultiplier: ' + value.scale_multiplier) : ''}`"
+            v-bind="attrs"
+            v-on="on"
+          >
+            <v-icon small>mdi-ruler</v-icon>
+          </v-chip>
+        </template>
+
+        <v-card rounded outlined>
+          <v-card-text>
+            <v-row dense no-gutters>
+              <v-text-field
+                type="number"
+                dense
+                clearable
+                label="Offset"
+                title="Offset the value by this amount (after scaling)"
+                v-model.number="value.scale_offset"
+              ></v-text-field>
+            </v-row>
+            <v-row dense no-gutters>
+              <v-text-field
+                type="number"
+                dense
+                clearable
+                label="Scale"
+                title="Mutiply the value by this amount (before scaling)"
+                v-model.number="value.scale_multiplier"
+              ></v-text-field>
+            </v-row>
+          </v-card-text>
+        </v-card>
+      </v-menu>
+    </v-col>
+
+    <v-col>
+      <v-text-field
+        class="ml-3"
+        dense
+        label="From"
+        type="number"
+        min="0"
+        v-model.number="value.offset"
+        :readonly="readonly"
+      ></v-text-field>
+    </v-col>
+
+    <v-col>
+      <v-text-field
+        class="ml-3"
+        dense
+        label="Length"
+        type="number"
+        min="0"
+        v-model.number="value.length"
+        :readonly="readonly"
+      ></v-text-field>
+    </v-col>
+
+    <v-col>
+      <v-menu v-if="value.length > 1"
+        max-width="600"
+        :close-on-content-click="false"
+        offset-y
+        :disabled="!(value.length>1)"
+      >
+        <template v-slot:activator="{ on, attrs }">
+          <v-chip
+            class="ml-3"
+            small
+            :light="$vuetify.theme.isDark"
+            :dark="!$vuetify.theme.isDark"
+            title="Text alignment"
+            v-bind="attrs"
+            v-on="on"
+            :disabled="!(value.length>1)"
+          >
+            <v-icon small v-if="value.pad_side=='right'">mdi-format-align-left</v-icon>
+            <v-icon small v-else-if="value.pad_side=='left'">mdi-format-align-right</v-icon>
+            <v-icon small v-else>mdi-format-align-justify</v-icon>
+          </v-chip>
+        </template>
+
+        <v-card rounded outlined>
+          <v-card-text>
+            <v-row dense no-gutters>
+              <v-select
+                label="Alignment"
+                clearable
+                :items='[{text:"Left", value:"right"}, {text:"Right", value:"left"}]'
+                v-model="value.pad_side"
+              ></v-select>
+            </v-row>
+            <v-row dense no-gutters v-if="value.pad_side">
+              <v-text-field
+                dense
+                label="Pad character"
+                title="Fill the width of the field on the opposite side by padding with this character"
+                v-model="value.pad_string"
+              ></v-text-field>
+            </v-row>
+          </v-card-text>
+        </v-card>
+      </v-menu>
+    </v-col>
+
+    <v-col>
+      <slot name="append"></slot>
+    </v-col>
+
+  </v-row>
+
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+}
+
+.input >>> .chunk {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+</style>
+
+<script>
+export default {
+  name: "DougalFixedStringEncoderField",
+
+  components: {
+  },
+
+  props: {
+    value: Object,
+    properties: Object,
+    colour: String,
+    readonly: Boolean,
+  },
+
+  data () {
+    return {
+    }
+  },
+
+  watch: {
+    "value.value": function (value, old) {
+      if (value != null && String(value).length > this.value.length) {
+        this.value.length = String(value).length;
+      }
+    }
+  },
+
+  computed: {
+
+    field: {
+      get () {
+        return this.value;
+      },
+      set (v) {
+        console.log("input", v);
+        this.$emit("input", v);
+      }
+    },
+
+    item () {
+      return this.properties?.[this.value?.item] ?? {};
+    },
+
+    items () {
+      return Object.entries(this.properties).map(i => ({text: i[1].summary ?? i[0], value: i[0]}))
+    },
+
+    name () {
+      // TODO Use properties[item].summary or similar
+      return this.item?.summary ?? this.value.item ?? "???";
+    },
+
+    type () {
+      return this.item?.type ?? typeof this.value?.item ?? "undefined";
+    },
+
+    description () {
+      return this.item?.description;
+    }
+  },
+
+  methods: {
+    reset () {
+    }
+  },
+
+  mounted () {
+    this.reset();
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/encoder/fixed-string-encoder-sample.vue b/lib/www/client/source/src/components/encoder/fixed-string-encoder-sample.vue
new file mode 100644
index 0000000..02ac914
--- /dev/null
+++ b/lib/www/client/source/src/components/encoder/fixed-string-encoder-sample.vue
@@ -0,0 +1,351 @@
+<template>
+  <v-input
+    class="v-text-field"
+    :hint="hint"
+    persistent-hint
+    :value="text"
+  >
+    <label
+      class="v-label"
+      :class="[ $vuetify.theme.isDark && 'theme--dark', text && text.length && 'v-label--active' ]"
+      style="left: 0px; right: auto; position: absolute;"
+    >{{ label }}</label>
+    <div class="input" slot="default"
+      v-html="html"
+    >
+    </div>
+    <template slot="append">
+      <v-menu
+        scrollable
+        offset-y
+        :close-on-content-click="false"
+      >
+
+        <template v-slot:activator="{on, attrs}">
+          <v-btn
+            icon
+            v-bind="attrs"
+            v-on="on"
+          >
+            <v-icon title="Configure sample values">mdi-list-box-outline</v-icon>
+          </v-btn>
+        </template>
+
+        <v-card>
+          <v-card-title>Sample values</v-card-title>
+          <v-card-subtitle>Enter sample values to test your configuration</v-card-subtitle>
+
+          <v-divider></v-divider>
+
+          <v-card-text>
+
+            <v-container>
+              <v-row v-for="(prop, key) in properties" :key="key">
+                <template v-if="prop.type == 'boolean'">
+                  <v-col cols="6" align-self="center">
+                    <v-chip
+                      outlined
+                      label
+                      small
+                      :color="getHSLColourFor(key)"
+                      :title="prop.description"
+                    >{{prop.summary || key}}</v-chip>
+                  </v-col>
+                  <v-col cols="6" align-self="center">
+                    <v-simple-checkbox v-model="values[key]"></v-simple-checkbox>
+                  </v-col>
+                </template>
+                <template v-else-if="key != 'text'">
+                  <v-col cols="6" align-self="center">
+                    <v-chip
+                      outlined
+                      label
+                      small
+                      :color="getHSLColourFor(key)"
+                      :title="prop.description"
+                    >{{prop.summary || key}}</v-chip>
+                  </v-col>
+                  <v-col cols="6" align-self="center">
+                    <v-text-field v-if="prop.type == 'number'"
+                      :type="prop.type"
+                      :label="prop.summary || key"
+                      :hint="prop.description"
+                      v-model.number="values[key]"
+                    ></v-text-field>
+                    <v-text-field v-else
+                      :type="prop.type"
+                      :label="prop.summary || key"
+                      :hint="prop.description"
+                      v-model="values[key]"
+                    ></v-text-field>
+                  </v-col>
+                </template>
+              </v-row>
+            </v-container>
+
+          </v-card-text>
+        </v-card>
+
+      </v-menu>
+    </template>
+    <v-icon slot="prepend">mdi-list</v-icon>
+  </v-input>
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+  white-space-collapse: preserve;
+}
+
+.multiline {
+  font-family: mono;
+  white-space: pre;
+  overflow-x: auto;
+  overflow-y: auto;
+}
+
+.multiline >>> .line-number {
+  display: inline-block;
+  font-size: 75%;
+  width: 5ex;
+  margin-inline-end: 1ex;
+  text-align: right;
+  border: none;
+  position: relative;
+  top: -1px;
+}
+
+.input, .multiline >>> .chunk-field {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input, .multiline >>> .chunk-fixed {
+  padding-inline: 1px;
+  border: 1px dashed;
+}
+
+.input, .multiline >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input, .multiline >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+
+.input >>> .chunk-mismatch {
+  padding-inline: 1px;
+  border: 2px solid red !important;
+}
+
+</style>
+
+<script>
+import { getHSLColourFor } from '@/lib/hsl'
+
+export default {
+  name: "DougalFixedStringEncoderSample",
+
+  components: {
+  },
+
+  mixins: [
+    {
+      methods: {
+        getHSLColourFor
+      }
+    }
+  ],
+
+  props: {
+    properties: { type: Object, default: () => ({}) },
+    fields: { type: Array, default: () => [] },
+    values: { type: Object, default: () => ({}) },
+    readonly: Boolean,
+    label: String,
+    hint: String,
+  },
+
+  data () {
+    return {
+    }
+  },
+
+  computed: {
+
+    chunks () {
+      const properties = this.properties;
+      const fields = this.fields;
+      const values = this.values;
+      const str = "";
+      const chunks = [];
+
+      for (const field of fields) {
+        const value = this.fieldValue(properties, field, values);
+
+        if (value != null) {
+          const chunk = {
+            start: field.offset,
+            end: field.offset + field.length - 1,
+            colour: this.getHSLColourFor(field.item),
+            class: field.item == "text" ? "fixed" : "field",
+            text: value
+          }
+          chunks.push(chunk);
+        }
+      }
+
+      return chunks;
+    },
+
+    text () {
+      return this.sample(this.properties, this.fields, this.values);
+    },
+
+    html () {
+      return this.renderTextLine(this.text);
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    fieldValue (properties, field, values) {
+      let value;
+
+      if (field.item == "text") {
+        value = field.value;
+      } else if (properties[field.item]?.type == "boolean") {
+        if (values[field.item] === field.when) {
+          value = field.value;
+        }
+      } else {
+        value = values[field.item];
+      }
+
+      if (value != null) {
+
+        if (properties[field.item]?.type == "number") {
+          if (field.scale_multiplier != null) {
+            value *= field.scale_multiplier;
+          }
+          if (field.scale_offset != null) {
+            value += field.scale_offset;
+          }
+
+          if (field.format == "integer") {
+            value = Math.round(value);
+          }
+        }
+
+        value = String(value);
+        if (field.pad_side == "left") {
+          value = value.padStart(field.length, field.pad_string ?? " ");
+        } else if (field.pad_side == "right") {
+          value = value.padEnd(field.length, field.pad_string ?? " ");
+        }
+
+        return value;
+      }
+    },
+
+    sample (properties, fields, values, str = "") {
+
+      const length = fields.reduce( (acc, cur) => (cur.offset + cur.length) > acc ? (cur.offset + cur.length) : acc, str.length )
+
+      str = str.padEnd(length);
+
+      for (const field of fields) {
+        //console.log("FIELD", field);
+        const value = this.fieldValue(properties, field, values);
+        if (value != null) {
+          str = str.slice(0, field.offset) + value + str.slice(field.offset + field.length);
+        }
+      }
+
+      return str;
+    },
+
+    /** Return a `<span>` opening tag.
+     */
+    style (name, colour) {
+      return colour
+        ? `<span class="${name}" style="color:${colour};border-color:${colour}">`
+        : `<span class="${name}">`;
+    },
+
+    /** Return an array of the intervals that intersect `pos`.
+     * May be empty.
+     */
+    chunksFor (pos) {
+      return this.chunks.filter( chunk =>
+        pos >= chunk.start &&
+        pos <= chunk.end
+      )
+    },
+
+    /*
+     * Algorithm:
+     *
+     * Go through every character of one line of text and determine in which
+     * part(s) it falls in, if any. Collect adjacent same parts into <span/>
+     * elements.
+     */
+    renderTextLine (text) {
+      const parts = [];
+
+      let prevStyle;
+
+      for (const pos in text) {
+        const chunks = this.chunksFor(pos);
+        const isEmpty = chunks.length == 0;
+        const isOverlap = chunks.length > 1;
+        const isMismatch = chunks[0]?.text &&
+          (text.substring(chunks[0].start, chunks[0].end+1) != chunks[0].text);
+
+        const style = isEmpty
+          ? this.style("chunk-empty")
+          : isMismatch
+            ? this.style("chunk-mismatch", chunks[0].colour)
+            : isOverlap
+              ? this.style("chunk-overlap")
+              : this.style("chunk-"+chunks[0].class, chunks[0].colour);
+
+        if (style != prevStyle) {
+          if (prevStyle) {
+            parts.push("</span>");
+          }
+          parts.push(style);
+        }
+        parts.push(text[pos]);
+        prevStyle = style;
+      }
+
+      if (parts.length) {
+        parts.push("</span>");
+      }
+
+      return parts.join("");
+    },
+
+  },
+
+  mounted () {
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/encoder/fixed-string-encoder.vue b/lib/www/client/source/src/components/encoder/fixed-string-encoder.vue
new file mode 100644
index 0000000..f38fd11
--- /dev/null
+++ b/lib/www/client/source/src/components/encoder/fixed-string-encoder.vue
@@ -0,0 +1,307 @@
+<template>
+  <v-card flat elevation="0">
+    <v-card-title v-if="title">{{ title }}</v-card-title>
+    <v-card-subtitle v-if="subtitle">{{ subtitle }}</v-card-subtitle>
+    <v-card-text>
+      <v-form>
+
+<!-- Sample text -->
+
+        <dougal-fixed-string-encoder-sample
+          :label="label"
+          :hint="hint"
+          :properties="properties"
+          :fields="fields"
+          :values.sync="values"
+        ></dougal-fixed-string-encoder-sample>
+
+<!-- Fields -->
+
+        <v-container>
+
+          <v-row no-gutters class="mb-2">
+            <h4>Fields</h4>
+          </v-row>
+
+          <dougal-fixed-string-encoder-field v-for="(field, key) in fields" :key="key"
+            v-model="fields[key]"
+            :properties="properties"
+            :colour="getHSLColourFor(field.item)"
+            :readonly="readonly"
+          >
+            <template v-slot:append v-if="editableFieldList && !readonly">
+              <v-btn
+                class="ml-3"
+                fab
+                text
+                small
+                title="Remove this field"
+              >
+                <v-icon
+                  color="error"
+                  @click="removeField(key)"
+                >mdi-minus</v-icon>
+              </v-btn>
+            </template>
+          </dougal-fixed-string-encoder-field>
+
+          <v-row no-gutters class="mb-2" v-if="editableFieldList && !readonly">
+            <h4>Add new field</h4>
+          </v-row>
+
+          <dougal-fixed-string-encoder-field v-if="editableFieldList && !readonly"
+            v-model="newField"
+            :properties="properties"
+            :colour="getHSLColourFor(newField.item)"
+          >
+            <template v-slot:prepend>
+              <v-btn v-if="isFieldDirty(newField)"
+                top
+                text
+                small
+                title="Reset"
+              >
+                <v-icon
+                  color="warning"
+                  @click="resetField(newField)"
+                >mdi-backspace-reverse-outline</v-icon>
+              </v-btn>
+            </template>
+            <template v-slot:append>
+              <v-btn
+                class="ml-3"
+                fab
+                text
+                small
+                title="Add field"
+                :disabled="isFieldValid(newField) !== true"
+              >
+                <v-icon
+                  color="primary"
+                  @click="addField(newField)"
+                >mdi-plus</v-icon>
+              </v-btn>
+            </template>
+          </dougal-fixed-string-encoder-field>
+
+        </v-container>
+
+
+
+      </v-form>
+    </v-card-text>
+    <v-card-actions>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<style scoped>
+
+.input {
+  flex: 1 1 auto;
+  line-height: 20px;
+  padding: 8px 0 8px;
+  min-height: 32px;
+  max-height: 32px;
+  max-width: 100%;
+  min-width: 0px;
+  width: 100%;
+}
+
+.input, .multiline >>> .chunk-field {
+  padding-inline: 1px;
+  border: 1px solid;
+}
+
+.input, .multiline >>> .chunk-fixed {
+  padding-inline: 1px;
+  border: 1px dashed;
+}
+
+.input, .multiline >>> .chunk-empty {
+  padding-inline: 1px;
+}
+
+.input, .multiline >>> .chunk-overlap {
+  padding-inline: 1px;
+  border: 1px solid grey;
+  color: grey;
+}
+
+.input >>> .chunk-mismatch {
+  padding-inline: 1px;
+  border: 2px solid red !important;
+}
+</style>
+
+<script>
+import { getHSLColourFor } from '@/lib/hsl'
+import DougalFixedStringEncoderField from './fixed-string-encoder-field'
+import DougalFixedStringEncoderSample from './fixed-string-encoder-sample'
+
+export default {
+  name: "DougalFixedStringEncoder",
+
+  components: {
+    DougalFixedStringEncoderField,
+    DougalFixedStringEncoderSample
+  },
+
+  mixins: [
+    {
+      methods: {
+        getHSLColourFor
+      }
+    }
+  ],
+
+  props: {
+    properties: { type: Object },
+    fields: { type: Array },
+    values: { type: Object },
+    editableFieldList: { type: Boolean, default: true },
+    readonly: Boolean,
+    title: String,
+    subtitle: String,
+    label: String,
+    hint: String,
+  },
+
+  data () {
+    return {
+      //< The reason for not using this.text directly is that at some point
+      //< we might extend this component to allow editing the sample text.
+      text_: "",
+      //< The value of a fixed string that should be always present at a specific position
+      fixedName: "",
+      fixedOffset: 0,
+      //< The name of a new field to add.
+      fieldName: "",
+      newField: {
+        item: null,
+        when: null,
+        offset: null,
+        length: null,
+        value: null,
+        pad_side: null,
+        pad_string: null
+      }
+    }
+  },
+
+  computed: {
+
+    chunks () {
+      const properties = this.properties;
+      const fields = this.fields;
+      const values = this.values;
+      const str = "";
+      const chunks = [];
+
+      for (const field of fields) {
+
+        //console.log("FIELD", structuredClone(field));
+        //console.log("VALUES DATA", values[field.item]);
+        let value;
+
+        if (field.item == "text") {
+          value = field.value;
+        } else if (properties[field.item]?.type == "boolean") {
+          if (values[field.item] === field.when) {
+            value = field.value;
+          }
+        } else {
+          value = values[field.item];
+        }
+
+        if (value != null) {
+
+          value = String(value);
+          if (field.pad_side == "left") {
+            value = value.padStart(field.length, field.pad_string);
+          } else {
+            value = value.padEnd(field.length, field.pad_string);
+          }
+
+          const chunk = {
+            start: field.offset,
+            end: field.offset + field.length - 1,
+            colour: this.getHSLColourFor(field.item),
+            class: field.item == "text" ? "fixed" : "field",
+            text: value
+          }
+
+          //console.log("CHUNK", chunk);
+          chunks.push(chunk);
+
+        }
+
+      }
+
+      return chunks;
+    },
+
+    html () {
+      return this.renderTextLine(this.sample(this.properties, this.fields, this.values));
+      //return this.sample(this.properties, this.fields, this.values);
+    }
+
+  },
+
+  watch: {
+  },
+
+  methods: {
+
+    isFieldDirty (field) {
+      return Object.entries(field).reduce( (acc, cur) => cur[1] === null ? acc : true, false );
+    },
+
+    isFieldValid (field) {
+      if (!field.item) return "Missing item";
+      if (typeof field.offset !== "number" || field.offset < 0) return "Missing offset";
+      if (typeof field.length !== "number" || field.length < 1) return "Missing length";
+      if (!this.properties[field.item]) return "Unrecognised property";
+      if (this.properties[field.item].type == "text" && !field.value?.length) return "Missing value";
+      if (this.properties[field.item].type == "boolean" && !field.value?.length) return "Missing value (boolean)";
+      if(!!field.pad_side && !field.pad_string) return "Missing pad string";
+
+      return true;
+    },
+
+    resetField (field) {
+      field.item = null;
+      field.when = null;
+      field.offset = null;
+      field.length = null;
+      field.value = null;
+      field.pad_side = null;
+      field.pad_string = null;
+
+      return field;
+    },
+
+    addField (field) {
+      if (this.isFieldValid(field)) {
+        const fields = structuredClone(this.fields);
+        fields.push({...field});
+        this.resetField(field);
+        console.log("update:fields", fields);
+        this.$emit("update:fields", fields);
+      }
+    },
+
+    removeField (key) {
+      console.log("REMOVE", "update:fields", key, this.fields);
+      const fields = structuredClone(this.fields);
+      fields.splice(key, 1);
+      this.$emit("update:fields", fields);
+    },
+
+  },
+
+  mounted () {
+  }
+
+}
+</script>
diff --git a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
index dfd95ec..03efedc 100644
--- a/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
+++ b/lib/www/client/source/src/components/project-settings/online-line-name-format.vue
@@ -4,20 +4,16 @@
     <v-card-subtitle>Line name decoding configuration for real-time data</v-card-subtitle>
     <v-card-text>
       <v-form>
-        <v-text-field
-          label="Example file name"
-          hint="Enter the name of a representative file to make it easier to visualise your configuration"
-          persistent-hint
-          v-model="cwo.lineNameInfo.example"
-        ></v-text-field>
-
-        <dougal-fixed-string-decoder
+        <dougal-fixed-string-encoder
           title="Line name format"
           subtitle="Format of line names as configured in the navigation system"
+          label="Example line name"
+          hint="Visualise your line name configuration with example values"
           :multiline="true"
-          :text="cwo.lineNameInfo.example"
-          :fields="cwo.lineNameInfo.fields"
-        ></dougal-fixed-string-decoder>
+          :properties="properties"
+          :fields.sync="fields_"
+          :values.sync="values_"
+        ></dougal-fixed-string-encoder>
       </v-form>
     </v-card-text>
     <v-card-actions>
@@ -50,16 +46,19 @@
 
 <script>
 import { deepSet } from '@/lib/utils';
-import DougalFixedStringDecoder from '@/components/decoder/fixed-string-decoder';
+import DougalFixedStringEncoder from '@/components/encoder/fixed-string-encoder';
 
 export default {
   name: "DougalProjectSettingsOnlineLineNameFormat",
 
   components: {
-    DougalFixedStringDecoder
+    DougalFixedStringEncoder
   },
 
   props: {
+    fields: Array,
+    values: Object,
+    properties: Object,
     value: Object
   },
 
@@ -68,53 +67,27 @@ export default {
     }
   },
 
+  watch: {
+  },
+
   computed: {
-    // Current working object.
-    // A shortcut so we don't have to specify the full path
-    // on every input control. It also makes it easier to
-    // change that path if necessary. Finally, it ensures that
-    // the properties being modified are always available.
-    cwo: {
 
+    fields_: {
       get () {
-        if (this.value) {
-          if (!this.value?.online?.line) {
-            deepSet(this.value, [ "online", "line" ], {
-              lineNameInfo: {
-                example: "",
-                fields: {
-                  line: {
-                    length: 4,
-                    type: "int"
-                  },
-                  sequence: {
-                    length: 3,
-                    type: "int"
-                  },
-                  incr: {
-                    length: 1,
-                    type: "bool"
-                  },
-                  attempt: {
-                    length: 1,
-                    type: "int"
-                  }
-                }
-              }
-            });
-          }
-          return this.value.online.line;
-        } else {
-          return {};
-        }
+        return this.fields;
       },
-
       set (v) {
-        if (this.value) {
-          deepSet(this.value, [ "online", "line" ], v);
-        }
+        this.$emit("update", structuredClone({values: this.values, fields: v}));
       }
+    },
 
+    values_: {
+      get () {
+        return this.values;
+      },
+      set (v) {
+        this.$emit("update", structuredClone({values: v, fields: this.fields}));
+      }
     }
   },
 
diff --git a/lib/www/client/source/src/views/ProjectSettings.vue b/lib/www/client/source/src/views/ProjectSettings.vue
index 627f733..6a47384 100644
--- a/lib/www/client/source/src/views/ProjectSettings.vue
+++ b/lib/www/client/source/src/views/ProjectSettings.vue
@@ -67,6 +67,7 @@
           :is="activeComponent"
           v-bind="activeValues"
           v-model.sync="configuration"
+          @update="activeUpdateHandler"
           @close="deselect"
         ></component>
       </v-col>
@@ -279,6 +280,7 @@ export default {
   data () {
     return {
       configuration: null,
+      settings: null,
       active: [],
       open: [],
       files: [],
@@ -420,8 +422,17 @@ export default {
           id: "line_name_format",
           name: "Line name format",
           values: (obj) => ({
-            lineNameInfo: obj?.online?.line?.lineNameInfo
-          })
+            fields: this.makeSection(obj, "online.line.lineNameBuilder.fields", []),
+            values: this.makeSection(obj, "online.line.lineNameBuilder.values",
+              Object.fromEntries(
+                Object.keys(this.settings.lineNameBuilder.properties ?? {}).map( k => [k, undefined] ))),
+            properties: this.settings.lineNameBuilder.properties ?? {}
+          }),
+          update: (obj) => {
+            const configuration = structuredClone(this.configuration);
+            deepSet(configuration, ["online", "line", "lineNameBuilder"], obj);
+            this.configuration = configuration;
+          }
         },
         {
           id: "planner_settings",
@@ -518,6 +529,12 @@ export default {
         this.activeItem.values(this.configuration);
     },
 
+    activeUpdateHandler () {
+      return this.activeItem?.update ?? ((obj) => {
+        console.warn("Unhandled update event on", this.activeItem?.id, obj);
+      })
+    },
+
     surveyState: {
       get () {
         return !this.configuration?.archived;
@@ -559,6 +576,35 @@ export default {
 
   methods: {
 
+    makeSection (obj, path, defaultVaue) {
+
+      function reduced (obj = {}, path = []) {
+        return path.reduce( (acc, cur) =>
+          {
+            if (!(cur in acc)) {
+              acc[cur] = {} ;
+            };
+            return acc[cur]
+          }, obj);
+      }
+
+      if (!obj) {
+        obj = {};
+      }
+
+      if (typeof path == "string") {
+        path = path.split(".");
+      }
+
+      let value = reduced(obj, path);
+
+      const key = path.pop();
+      if (!Object.keys(value ?? {}).length && defaultVaue !== undefined) {
+        reduced(obj, path)[key] = defaultVaue;
+      }
+      return reduced(obj, path)[key];
+    },
+
     async getConfiguration () {
       this.configuration = null;
       const url = `/project/${this.$route.params.project}/configuration`;
@@ -571,6 +617,21 @@ export default {
       this.dirty = false;
     },
 
+    async getSettings () {
+      this.settings = null;
+      let url = `/project/${this.$route.params.project}/linename/properties`;
+      const init = {
+        headers: {
+          "If-None-Match": "" // Ensure we get a fresh response
+        }
+      };
+      this.settings = {
+        lineNameBuilder: {
+          properties: await this.api([url, init])
+        }
+      };
+    },
+
     makeTree (obj, id=0) {
       const isObject = typeof obj === "object" && !Array.isArray(obj) && obj !== null;
       return isObject
@@ -681,6 +742,7 @@ export default {
   },
 
   async mounted () {
+    this.getSettings();
     this.getConfiguration();
   },