diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js index 05a20057e776787f9d9ff3e9afc70a0013698c2b..4b01c67ef07d0bf803528976e6708657894fa821 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -18,7 +18,9 @@ export function csvToJson(csv, delimiter) { const result = []; const allLines = csv.split('\n'); - const headers = allLines[0].split(delimiter); + const headers = allLines[0].split(delimiter).map(el => { + return el.replace('\r', ''); + }); const [, ...lines] = allLines; for (const line of lines) { diff --git a/src/components/Project/Detail/ProjectFeatureTypes.vue b/src/components/Project/Detail/ProjectFeatureTypes.vue index 744b1640ffc15f1ba79bb1a23bfc609ee0672ecd..f6401e629b3f49990a64c70280fa7d132f66eaa9 100644 --- a/src/components/Project/Detail/ProjectFeatureTypes.vue +++ b/src/components/Project/Detail/ProjectFeatureTypes.vue @@ -607,6 +607,9 @@ export default { fr.result .split('\n')[0] .split(delimiter) + .map(el => { + return el.replace('\r', ''); + }) .filter(el => { return el === 'lat' || el === 'lon'; }); @@ -621,7 +624,6 @@ export default { return !isNaN(el) && el.indexOf('.') != -1; }) .filter(Boolean); - if (sampleLine.length > 1 && headersLine.length === 2) { this.csvError = null; this.csvImport = csvToJson(fr.result, delimiter);