@abi-software/flatmap-viewer 2.3.0-a.5 → 2.3.0-a.6

package/README.rst

@@ -38,7 +38,7 @@ The map server endpoint is specified as ``MAP_ENDPOINT`` in ``src/main.js``. It
 Package Installation
 ====================
 
-* ``npm install @abi-software/flatmap-viewer@2.3.0-a.5``
+* ``npm install @abi-software/flatmap-viewer@2.3.0-a.6``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.3.0-a.5",
+  "version": "2.3.0-a.6",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",

package/src/annotation.js

@@ -245,15 +245,17 @@ export class Annotator
         for (const field of ANNOTATION_FIELDS) {
             html.push('<div class="flatmap-annotation-entry">');
             html.push(`  <label for="${field.key}">${field.prompt}:</label>`);
-            const value = field.update ? provenanceData[field.key] || '' : '';
             if (field.kind === 'textbox') {
+                const value = field.update ? provenanceData[field.key] || '' : '';
                 html.push(`  <textarea rows="5" cols="40" id="${field.key}" name="${field.key}">${value.trim()}</textarea>`)
             } else if (!('kind' in field) || field.kind !== 'list') {
+                const value = field.update ? provenanceData[field.key] || '' : '';
                 html.push(`  <input type="text" size="40" id="${field.key}" name="${field.key}" value="${value.trim()}"/>`)
             } else {   // field.kind === 'list'
+                const listValues = field.update ? provenanceData[field.key] || [] : [];
                 html.push('  <div class="multiple">')
                 for (let n = 1; n <= field.size; n++) {
-                    const fieldValue = (n <= value.length) ? value[n-1].trim() : '';
+                    const fieldValue = (n <= listValues.length) ? listValues[n-1].trim() : '';
                     html.push(`    <input type="text" size="40" id="${field.key}_${n}" name="${field.key}" value="${fieldValue}"/>`)
                 }
                 html.push('  </div>')
@@ -290,8 +292,8 @@ export class Annotator
         const newProperties = {};
         let propertiesChanged = false;
         for (const field of ANNOTATION_FIELDS) {
-            const lastValue = field.update ? provenanceData[field.key] || '' : '';
             if (!('kind' in field) || field.kind !== 'list') {
+                const lastValue = field.update ? provenanceData[field.key] || '' : '';
                 const inputField = document.getElementById(field.key);
                 const newValue = inputField.value.trim();
                 if (newValue !== lastValue.trim()) {
@@ -304,6 +306,7 @@ export class Annotator
                     const inputField = document.getElementById(`${field.key}_${n}`);
                     listValues.push(inputField.value.trim());
                 }
+                const lastValue = field.update ? provenanceData[field.key] || [] : [];
                 const oldValues = lastValue.map(v => v.trim()).filter(v => (v !== '')).sort();
                 const newValues = listValues.map(v => v.trim()).filter(v => (v !== '')).sort();
                 if (oldValues.length !== newValues.length