From 919d48667f513cd206dea272fa3370e191039fd2 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Tue, 13 Nov 2018 10:21:47 +0100
Subject: [PATCH] feat: waxholm quicknii planes
---
src/atlasViewer/atlasViewer.dataService.service.ts | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/atlasViewer/atlasViewer.dataService.service.ts b/src/atlasViewer/atlasViewer.dataService.service.ts
index 6a15513be..c402f2e72 100644
--- a/src/atlasViewer/atlasViewer.dataService.service.ts
+++ b/src/atlasViewer/atlasViewer.dataService.service.ts
@@ -127,8 +127,11 @@ export class AtlasViewerDataService implements OnDestroy{
})
.catch(console.error)
}else if (templateSpace === 'Waxholm Rat V2.0'){
- return fetch('res/json/camillaWaxholmPointsAggregatedData.json')
- .then(res => res.json())
+ return Promise.all([
+ fetch('res/json/waxholmPlaneAggregatedData.json').then(res => res.json()),
+ fetch('res/json/camillaWaxholmPointsAggregatedData.json').then(res => res.json())
+ ])
+ .then(arr => arr.reduce((acc,curr) => acc.concat(curr) ,[]))
.then(arr => {
this.store.dispatch({
type : FETCHED_SPATIAL_DATA,
--
GitLab