From 5be99841ff20864d66a5203daf534e35d2396a09 Mon Sep 17 00:00:00 2001 From: Robin Hawkes Date: Mon, 5 Sep 2016 16:35:54 +0100 Subject: [PATCH] Add missing reject statements --- src/layer/GeoJSONWorkerLayer.js | 12 ++++++------ src/layer/geometry/PolygonLayer.js | 2 +- src/util/WorkerPool.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/layer/GeoJSONWorkerLayer.js b/src/layer/GeoJSONWorkerLayer.js index c34e5c6..85abd4a 100644 --- a/src/layer/GeoJSONWorkerLayer.js +++ b/src/layer/GeoJSONWorkerLayer.js @@ -63,7 +63,7 @@ class GeoJSONWorkerLayer extends Layer { transferrables.push(geojson.buffer); this._execWorker(geojson, this._options.topojson, this._world._originPoint, style, this._options.interactive, transferrables).then(() => { resolve(); - }); + }).catch(reject); } else if (typeof this._options.onEachFeature === 'function') { GeoJSONWorkerLayer.RequestGeoJSON(geojson).then((res) => { var fc = GeoJSON.collectFeatures(res, this._options.topojson); @@ -80,12 +80,12 @@ class GeoJSONWorkerLayer extends Layer { this._execWorker(geojson, false, this._options.headers, this._world._originPoint, style, this._options.interactive, transferrables).then(() => { resolve(); - }); + }).catch(reject); }); } else { this._execWorker(geojson, this._options.topojson, this._options.headers, this._world._originPoint, style, this._options.interactive, transferrables).then(() => { resolve(); - }); + }).catch(reject); } }); } @@ -291,9 +291,9 @@ class GeoJSONWorkerLayer extends Layer { }); var point; - var projected = converted.map(_coordinates => { - return _coordinates.map(ring => { - return ring.map(latlon => { + var projected = converted.map((_coordinates) => { + return _coordinates.map((ring) => { + return ring.map((latlon) => { point = Geo.latLonToPoint(latlon)._subtract(originPoint); if (!pointScale) { diff --git a/src/layer/geometry/PolygonLayer.js b/src/layer/geometry/PolygonLayer.js index b6a52c1..de732d7 100644 --- a/src/layer/geometry/PolygonLayer.js +++ b/src/layer/geometry/PolygonLayer.js @@ -234,7 +234,7 @@ class PolygonLayer extends Layer { // TODO: Ensure that this has feature parity with the non-static method static SetBufferAttributes(coordinates, options) { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { var height = 0; // Convert height into world units diff --git a/src/util/WorkerPool.js b/src/util/WorkerPool.js index ee52fc1..600ee0e 100644 --- a/src/util/WorkerPool.js +++ b/src/util/WorkerPool.js @@ -22,7 +22,7 @@ class WorkerPool { Promise.all(workerPromises).then(() => { if (DEBUG) { console.log('All workers ready', performance.now()); } resolve(); - }); + }).catch(reject); }); } @@ -41,7 +41,7 @@ class WorkerPool { this.workers.push(worker); resolve(); - }); + }).catch(reject); }); }