Skip to content

Commit 2fde26d

Browse files
committed
fix json importer
1 parent 3533b9f commit 2fde26d

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/io/import.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class PolygonImporter extends CaveImporter {
7878
U.parseMyFloat(parts[2]),
7979
U.parseMyFloat(parts[3]),
8080
U.parseMyFloat(parts[4]),
81-
parts[10]
81+
parts[10] === '' ? undefined : parts[10]
8282
)
8383
);
8484
}
@@ -320,7 +320,7 @@ class JsonImporter extends CaveImporter {
320320
this.attributeDefs = attributeDefs;
321321
}
322322

323-
importFile(file, name, onCaveLoad, endcoding = 'iso_8859-2') {
323+
importFile(file, name, onCaveLoad, endcoding = 'utf8') {
324324
super.importFile(file, name, onCaveLoad, endcoding);
325325
}
326326

src/model/survey.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ class Shot {
104104
toExport() {
105105
let newShot = {};
106106
this.export_fields.forEach((fName) => {
107-
newShot[fName] = this[fName];
107+
if (this[fName] !== undefined && this[fName] !== null) {
108+
newShot[fName] = this[fName];
109+
}
108110
});
109111
return newShot;
110112
}

0 commit comments

Comments
 (0)