fixes

Author: fhennig

website/src/components/Submission/FileUpload/ColumnMapping.spec.ts

@@ -18,6 +18,23 @@ describe('ColumnMapping', () => {
         ]);
     });
 
+    it('should create a mapping from columns with sensible column mapping', () => {
+        const sourceColumns = ['state', 'geoLocAdmin2'];
+        const inputFields = [
+            { name: 'date' },
+            { name: 'geoLocAdmin1', displayName: 'Collection subdivision level 1' },
+            { name: 'geoLocAdmin2', displayName: 'Collection subdivision level 2' }
+        ];
+
+        const mapping = ColumnMapping.fromColumns(sourceColumns, inputFields);
+        const entries = mapping.entries();
+
+        expect(entries).toEqual([
+            ['state', null],
+            ['geoLocAdmin2', 'geoLocAdmin2']
+        ]);
+    });
+
     it('should create a mapping from columns without duplicates', () => {
         const sourceColumns = ['date', 'Date'];
         const inputFields = [{ name: 'date', displayName: 'Date' }, { name: 'location' }, { name: 'foo' }];

website/src/components/Submission/FileUpload/ColumnMapping.ts

@@ -19,7 +19,7 @@ export class ColumnMapping {
                 return [field.name, score];
             })
             .reduce((maxItem, currentItem) => (currentItem[1] > maxItem[1] ? currentItem : maxItem));
-        return score > 0.5 ? bestMatch : null;
+        return score > 0.8 ? bestMatch : null;
     }
 
     /* Create a new mapping with the given columns, doing a best-effort to pre-match columns. */

website/src/utils/stringSimilarity.ts

@@ -38,13 +38,13 @@ export const stringSimilarity = (
 
     const map = new Map<string, number>();
     for (let i = 0; i < str1.length - (substringLength - 1); i++) {
-        const substr1 = str1.substring(i, substringLength);
+        const substr1 = str1.substring(i, i + substringLength);
         map.set(substr1, (map.get(substr1) ?? 0) + 1);
     }
 
     let match = 0;
     for (let j = 0; j < str2.length - (substringLength - 1); j++) {
-        const substr2 = str2.substring(j, substringLength);
+        const substr2 = str2.substring(j, j + substringLength);
         const count = map.get(substr2) ?? 0;
         if (count > 0) {
             map.set(substr2, count - 1);