Skip to content

Commit 11361a9

Browse files
committed
change indentation to 2 spaces
1 parent 7e1c01d commit 11361a9

12 files changed

+1335
-1322
lines changed

.eslintrc

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
],
66
"rules": {
77
"space-before-function-paren": 0,
8-
"object-curly-spacing": 0
8+
"object-curly-spacing": 0,
9+
"indent": [2, 2]
910
},
1011
"env": {
1112
"browser": true,
@@ -20,4 +21,4 @@
2021
"ignore": [
2122
"dist",
2223
]
23-
}
24+
}

lib/config.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export const config = {
2-
overpassBase: '//overpass-cfn-production.tilestream.net/api/interpreter',
3-
osmBase: '//www.openstreetmap.org/api/0.6/',
4-
mapboxAccessToken: 'pk.eyJ1IjoicmFzYWd5IiwiYSI6ImNpejVrMjc4eTAwNGczM2thNWozYnJ1OHkifQ.yFRr3Sd39TJiwEguQpIkWQ',
5-
S3_URL: '//s3.amazonaws.com/mapbox/real-changesets/production/'
2+
overpassBase: '//overpass-cfn-production.tilestream.net/api/interpreter',
3+
osmBase: '//www.openstreetmap.org/api/0.6/',
4+
mapboxAccessToken:
5+
'pk.eyJ1IjoicmFzYWd5IiwiYSI6ImNpejVrMjc4eTAwNGczM2thNWozYnJ1OHkifQ.yFRr3Sd39TJiwEguQpIkWQ',
6+
S3_URL: '//s3.amazonaws.com/mapbox/real-changesets/production/'
67
};

lib/getChangeset.js

+52-52
Original file line numberDiff line numberDiff line change
@@ -4,91 +4,91 @@ import { query } from './query';
44
import { config } from './config';
55

66
export function getChangeset(changesetID, overpassBase = config.overpassBase) {
7-
return query(changesetID).then(changeset => {
8-
var url = config.S3_URL + changesetID + '.json';
9-
return fetch(url)
7+
return query(changesetID).then(changeset => {
8+
var url = config.S3_URL + changesetID + '.json';
9+
return fetch(url)
1010
.then(r => {
11-
if (r.ok) return r.json();
11+
if (r.ok) return r.json();
1212
// Fallback to overpass
13-
return Promise.reject();
13+
return Promise.reject();
1414
})
1515
.then(r => {
16-
var geojson = jsonParser(r);
17-
var featureMap = getFeatureMap(geojson);
18-
var ret = {
19-
geojson: geojson,
20-
featureMap: featureMap,
21-
changeset: changeset
22-
};
23-
return ret;
16+
var geojson = jsonParser(r);
17+
var featureMap = getFeatureMap(geojson);
18+
var ret = {
19+
geojson: geojson,
20+
featureMap: featureMap,
21+
changeset: changeset
22+
};
23+
return ret;
2424
})
2525
.catch(() => fetchFromOverPass(changesetID, changeset, overpassBase));
26-
});
26+
});
2727
}
2828

2929
function fetchFromOverPass(changesetID, changeset, overpassBase) {
30-
var data = getDataParam(changeset);
31-
var bbox = getBboxParam(changeset.bbox);
32-
var url = overpassBase + '?data=' + data + '&bbox=' + bbox;
30+
var data = getDataParam(changeset);
31+
var bbox = getBboxParam(changeset.bbox);
32+
var url = overpassBase + '?data=' + data + '&bbox=' + bbox;
3333

34-
return fetch(url, {
35-
'Response-Type': 'application/osm3s+xml'
36-
})
34+
return fetch(url, {
35+
'Response-Type': 'application/osm3s+xml'
36+
})
3737
.then(r => r.text())
3838
.then(response => {
39-
return new Promise((res, rej) => {
40-
adiffParser(response, null, (err, json) => {
41-
if (err) {
42-
return rej({
43-
msg: 'Failed to parser adiff xml.',
44-
error: err
45-
});
46-
}
47-
var geojson = jsonParser({
48-
elements: json[changesetID]
49-
});
50-
var featureMap = getFeatureMap(geojson);
51-
52-
var ret = {
53-
geojson: geojson,
54-
featureMap: featureMap,
55-
changeset: changeset
56-
};
57-
return res(ret);
39+
return new Promise((res, rej) => {
40+
adiffParser(response, null, (err, json) => {
41+
if (err) {
42+
return rej({
43+
msg: 'Failed to parser adiff xml.',
44+
error: err
5845
});
46+
}
47+
var geojson = jsonParser({
48+
elements: json[changesetID]
49+
});
50+
var featureMap = getFeatureMap(geojson);
51+
52+
var ret = {
53+
geojson: geojson,
54+
featureMap: featureMap,
55+
changeset: changeset
56+
};
57+
return res(ret);
5958
});
59+
});
6060
})
6161
.catch(err =>
6262
Promise.reject({
63-
msg: 'Overpass query failed.',
64-
error: err
63+
msg: 'Overpass query failed.',
64+
error: err
6565
})
6666
);
6767
}
6868

6969
function getDataParam(c) {
70-
return (
70+
return (
7171
'[out:xml][adiff:%22' +
7272
c.from.toString() +
7373
',%22,%22' +
7474
c.to.toString() +
7575
'%22];(node(bbox)(changed);way(bbox)(changed);relation(bbox)(changed));out%20meta%20geom(bbox);'
76-
);
76+
);
7777
}
7878

7979
function getBboxParam(bbox) {
80-
return [bbox.left, bbox.bottom, bbox.right, bbox.top].join(',');
80+
return [bbox.left, bbox.bottom, bbox.right, bbox.top].join(',');
8181
}
8282

8383
function getFeatureMap(geojson) {
84-
var features = geojson.features;
85-
var featureMap = {};
84+
var features = geojson.features;
85+
var featureMap = {};
8686

87-
for (var i = 0, len = features.length; i < len; i++) {
88-
var id = features[i].properties.id;
89-
featureMap[id] = featureMap[id] || [];
90-
featureMap[id].push(features[i]);
91-
}
87+
for (var i = 0, len = features.length; i < len; i++) {
88+
var id = features[i].properties.id;
89+
featureMap[id] = featureMap[id] || [];
90+
featureMap[id].push(features[i]);
91+
}
9292

93-
return featureMap;
93+
return featureMap;
9494
}

lib/helpers.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ import turfBboxPolygon from '@turf/bbox-polygon';
55
const featureCollection = turfHelpers.featureCollection;
66

77
export function getBounds(bbox) {
8-
var left = +bbox.left,
9-
right = +bbox.right,
10-
top = +bbox.top,
11-
bottom = +bbox.bottom;
8+
var left = +bbox.left,
9+
right = +bbox.right,
10+
top = +bbox.top,
11+
bottom = +bbox.bottom;
1212

13-
return new mapboxgl.LngLatBounds(
13+
return new mapboxgl.LngLatBounds(
1414
new mapboxgl.LngLat(left, bottom),
1515
new mapboxgl.LngLat(right, top)
1616
);
1717
}
1818

1919
export function getBoundingBox(bounds) {
20-
var left = bounds.getWest(),
21-
right = bounds.getEast(),
22-
top = bounds.getNorth(),
23-
bottom = bounds.getSouth();
20+
var left = bounds.getWest(),
21+
right = bounds.getEast(),
22+
top = bounds.getNorth(),
23+
bottom = bounds.getSouth();
2424

25-
var padX = 0;
26-
var padY = 0;
27-
if (!(left === -180 && right === 180 && top === 90 && bottom === -90)) {
28-
padX = Math.max((right - left) / 5, 0.0001);
29-
padY = Math.max((top - bottom) / 5, 0.0001);
30-
}
25+
var padX = 0;
26+
var padY = 0;
27+
if (!(left === -180 && right === 180 && top === 90 && bottom === -90)) {
28+
padX = Math.max((right - left) / 5, 0.0001);
29+
padY = Math.max((top - bottom) / 5, 0.0001);
30+
}
3131

32-
var bboxPolygon = turfBboxPolygon([
33-
left - padX,
34-
bottom - padY,
35-
right + padX,
36-
top + padY
37-
]);
32+
var bboxPolygon = turfBboxPolygon([
33+
left - padX,
34+
bottom - padY,
35+
right + padX,
36+
top + padY
37+
]);
3838

39-
return featureCollection([bboxPolygon]);
39+
return featureCollection([bboxPolygon]);
4040
}

0 commit comments

Comments
 (0)