Skip to content

Commit 0f18f8e

Browse files
author
William Reis Fernandes
committed
feat: upgrade packages and change function xml2str
1 parent bdb1d6a commit 0f18f8e

File tree

3 files changed

+42
-41
lines changed

3 files changed

+42
-41
lines changed

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"rules": {
33
"indent": [2, 4],
4-
"quotes": [2, "single"],
4+
"quotes": [1, "single"],
55
"linebreak-style": [2, "unix"],
66
"semi": [2, "always"]
77
},

test/index.js

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
var test = require('tape').test,
2-
assert = require('assert'),
3-
glob = require('glob'),
4-
fs = require('fs'),
5-
tj = require('../');
2+
assert = require('assert'),
3+
glob = require('glob'),
4+
fs = require('fs'),
5+
tj = require('../');
66

77
if (!process.browser) {
8-
var xmldom = require('@xmldom/xmldom');
8+
var xmldom = require('@xmldom/xmldom');
99
}
1010

1111
function kmlFixtureEqual(t, file) {
12-
if (process.env.UPDATE) {
13-
var output = tj.kml(toDOM(fs.readFileSync(file)));
14-
fs.writeFileSync(file + '.geojson', JSON.stringify(output, null, 4));
15-
}
16-
t.equal(
17-
JSON.stringify(tj.kml(toDOM(fs.readFileSync(file))), null, 4),
18-
fs.readFileSync(file + '.geojson', 'utf8'),
19-
file
20-
);
12+
if (process.env.UPDATE) {
13+
var output = tj.kml(toDOM(fs.readFileSync(file)));
14+
fs.writeFileSync(file + '.geojson', JSON.stringify(output, null, 4));
15+
}
16+
t.equal(
17+
JSON.stringify(tj.kml(toDOM(fs.readFileSync(file))), null, 4),
18+
fs.readFileSync(file + '.geojson', 'utf8'),
19+
file
20+
);
2121
}
2222

2323
function gpxFixtureEqual(t, file) {
24-
if (process.env.UPDATE) {
25-
var output = tj.gpx(toDOM(fs.readFileSync(file)));
26-
fs.writeFileSync(file + '.geojson', JSON.stringify(output, null, 4));
27-
}
24+
if (process.env.UPDATE) {
25+
var output = tj.gpx(toDOM(fs.readFileSync(file)));
26+
fs.writeFileSync(file + '.geojson', JSON.stringify(output, null, 4));
27+
}
2828

29-
t.deepEqual(
30-
tj.gpx(toDOM(fs.readFileSync(file, 'utf8'))),
31-
JSON.parse(fs.readFileSync(file + '.geojson', 'utf8')),
32-
file
33-
);
29+
t.deepEqual(
30+
tj.gpx(toDOM(fs.readFileSync(file, 'utf8'))),
31+
JSON.parse(fs.readFileSync(file + '.geojson', 'utf8')),
32+
file
33+
);
3434
}
3535

3636
test('KML', function (t) {
37-
glob.sync('test/data/*.kml').forEach(function (file) {
38-
kmlFixtureEqual(t, file);
39-
});
40-
t.end();
37+
glob.sync('test/data/*.kml').forEach(function (file) {
38+
kmlFixtureEqual(t, file);
39+
});
40+
t.end();
4141
});
4242

4343
test('GPX', function (t) {
44-
glob.sync('test/data/*.gpx').forEach(function (file) {
45-
gpxFixtureEqual(t, file);
46-
});
47-
t.end();
44+
glob.sync('test/data/*.gpx').forEach(function (file) {
45+
gpxFixtureEqual(t, file);
46+
});
47+
t.end();
4848
});
4949

5050
function toDOM(_) {
51-
try {
52-
if (typeof DOMParser === 'undefined') {
53-
return new xmldom.DOMParser().parseFromString(_.toString());
54-
} else {
55-
return new DOMParser().parseFromString(_, 'text/xml');
51+
try {
52+
if (typeof DOMParser === 'undefined') {
53+
return new xmldom.DOMParser().parseFromString(_.toString());
54+
} else {
55+
return new DOMParser().parseFromString(_, 'text/xml');
56+
}
57+
} catch (error) {
58+
throw new error;
5659
}
57-
} catch (error) {
58-
throw new Error(`toDOM() - Error: ${error.message}`);
59-
}
6060
}

togeojson.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ var toGeoJSON = (function () {
121121
return serializer.serializeToString(xmlNode);
122122
} catch (er) {
123123
//Other browsers without XML Serializer
124-
throw new Error('xml2str - Error: ${e.message} - ${er.message}');
124+
console.error(e);
125+
throw new er;
125126
}
126127
}
127128
}

0 commit comments

Comments
 (0)