diff --git a/src/components/Project/Detail/ProjectFeatureTypes.vue b/src/components/Project/Detail/ProjectFeatureTypes.vue index 7cb7968533a7c1f3a17d9d919486a52e05b3075b..fa88de3e66e19b648fc845c0f5258eff69964bc2 100644 --- a/src/components/Project/Detail/ProjectFeatureTypes.vue +++ b/src/components/Project/Detail/ProjectFeatureTypes.vue @@ -633,7 +633,6 @@ export default { try { fr.readAsText(this.csvFileToImport); fr.onloadend = () => { - // Find csv delimiter const commaDelimited = fr.result.split('\n')[0].includes(','); const semicolonDelimited = fr.result.split('\n')[0].includes(';'); @@ -644,19 +643,16 @@ export default { this.featureTypeImporting = false; return; } - // Check if file contains 'lat' and 'long' fields - const headersLine = - fr.result - .split('\n')[0] - .split(delimiter) - .map(el => { - return el.replace('\r', ''); - }) - .filter(el => { - return el === 'lat' || el === 'lon'; - }); - + const headers = fr.result + .split('\n')[0] + .split(delimiter) + .map(el => { + return el.replace('\r', ''); + }); + const headersCoord = headers.filter(el => { + return el === 'lat' || el === 'lon'; + }); // Look for 2 decimal fields in first line of csv // corresponding to lon and lat const sampleLine = @@ -667,7 +663,7 @@ export default { return !isNaN(el) && el.indexOf('.') !== -1; }) .filter(Boolean); - if (sampleLine.length > 1 && headersLine.length === 2) { + if (sampleLine.length > 1 && headersCoord.length === 2) { this.csvError = null; this.csvImport = csvToJson(fr.result, delimiter); this.featureTypeImporting = false; diff --git a/src/views/Feature/FeatureDetail.vue b/src/views/Feature/FeatureDetail.vue index 196ac2ae3474cf84656e5994d6af97224e5018cb..3437f276d40cbf54b14131cb9980064cef30084f 100644 --- a/src/views/Feature/FeatureDetail.vue +++ b/src/views/Feature/FeatureDetail.vue @@ -250,12 +250,14 @@ export default { ]), ...mapState('feature-type', [ 'feature_types', - 'feature_type', ]), ...mapState('feature', [ 'currentFeature', 'form', ]), + ...mapGetters('feature-type', [ + 'feature_type', + ]), ...mapGetters([ 'permissions', ]), diff --git a/src/views/FeatureType/FeatureTypeEdit.vue b/src/views/FeatureType/FeatureTypeEdit.vue index 5682366fa74a2f7e5540ddcefbd9f87884d11fda..315acba70feeaf31c5d1beb13cbc259fbb08a0a3 100644 --- a/src/views/FeatureType/FeatureTypeEdit.vue +++ b/src/views/FeatureType/FeatureTypeEdit.vue @@ -247,6 +247,7 @@ export default { 'archived_on', 'deletion_on', 'feature_type', + 'feature_id', 'display_creator', 'display_last_editor', 'project',