Skip to content

Commit 1bf40f1

Browse files
authored
Merge pull request #36 from proj4js/eslint-es2015
Use eslint to enforce ES2015 features
2 parents 88fdd94 + e0fcf7f commit 1bf40f1

13 files changed

+2168
-195
lines changed

.eslintrc

Lines changed: 0 additions & 21 deletions
This file was deleted.

PROJJSONBuilder2015.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class PROJJSONBuilder2015 extends PROJJSONBuilderBase {
55
super.convert(node, result);
66

77
// Skip `CS` and `USAGE` nodes for WKT2-2015
8-
if (result.coordinate_system?.subtype === "Cartesian") {
8+
if (result.coordinate_system && result.coordinate_system.subtype === 'Cartesian') {
99
delete result.coordinate_system;
1010
}
1111
if (result.usage) {

PROJJSONBuilder2019.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class PROJJSONBuilder2019 extends PROJJSONBuilderBase {
55
super.convert(node, result);
66

77
// Handle `CS` node for WKT2-2019
8-
const csNode = node.find((child) => Array.isArray(child) && child[0] === "CS");
8+
const csNode = node.find((child) => Array.isArray(child) && child[0] === 'CS');
99
if (csNode) {
1010
result.coordinate_system = {
1111
subtype: csNode[1],
@@ -14,13 +14,21 @@ class PROJJSONBuilder2019 extends PROJJSONBuilderBase {
1414
}
1515

1616
// Handle `USAGE` node for WKT2-2019
17-
const usageNode = node.find((child) => Array.isArray(child) && child[0] === "USAGE");
17+
const usageNode = node.find((child) => Array.isArray(child) && child[0] === 'USAGE');
1818
if (usageNode) {
19-
result.usage = {
20-
scope: usageNode.find((child) => Array.isArray(child) && child[0] === "SCOPE")?.[1],
21-
area: usageNode.find((child) => Array.isArray(child) && child[0] === "AREA")?.[1],
22-
bbox: usageNode.find((child) => Array.isArray(child) && child[0] === "BBOX")?.slice(1),
23-
};
19+
const scope = usageNode.find((child) => Array.isArray(child) && child[0] === 'SCOPE');
20+
const area = usageNode.find((child) => Array.isArray(child) && child[0] === 'AREA');
21+
const bbox = usageNode.find((child) => Array.isArray(child) && child[0] === 'BBOX');
22+
result.usage = {};
23+
if (scope) {
24+
result.usage.scope = scope[1];
25+
}
26+
if (area) {
27+
result.usage.area = area[1];
28+
}
29+
if (bbox) {
30+
result.usage.bbox = bbox.slice(1);
31+
}
2432
}
2533

2634
return result;

0 commit comments

Comments
 (0)