diff --git a/src/res/ext/atlas/atlas_multiLevelHuman.json b/src/res/ext/atlas/atlas_multiLevelHuman.json index 3148c1b8531835698ce630690d24791a8a979beb..b9f7135647d222df921cda7f2dd8c7bc0850989c 100644 --- a/src/res/ext/atlas/atlas_multiLevelHuman.json +++ b/src/res/ext/atlas/atlas_multiLevelHuman.json @@ -58,7 +58,7 @@ "name": "Big Brain (Histology)", "availableIn": [ { - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", + "@id": "juelich/iav/atlas/v1.0.0/7", "name": "Cytoarchitectonic maps" }, { @@ -74,14 +74,33 @@ ], "parcellations": [ { - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", + "@id": "juelich/iav/atlas/v1.0.0/7", "name": "Cytoarchitectonic maps", "baseLayer": true, + "@version": { + "@next": null, + "this": "juelich/iav/atlas/v1.0.0/7", + "name": "v2.4", + "@previous": null + }, "availableIn": [ { "@id": "minds/core/referencespace/v1.0.0/a1655b99-82f1-420f-a3c2-fe80fd4c8588", "name": "Big Brain (Histology)" - }, + } + ] + }, + { + "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", + "name": "Cytoarchitectonic maps", + "baseLayer": true, + "@version": { + "@next": null, + "this": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", + "name": "v2.4", + "@previous": null + }, + "availableIn": [ { "@id": "minds/core/referencespace/v1.0.0/dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2", "name": "MNI 152 ICBM 2009c Nonlinear Asymmetric", diff --git a/src/res/ext/bigbrain.json b/src/res/ext/bigbrain.json index 105159a4e81158f3fbf5ca71c3e669c39beee574..065b9eac9bbbc013fd3a3881a0f4b762d32601fb 100644 --- a/src/res/ext/bigbrain.json +++ b/src/res/ext/bigbrain.json @@ -15,8 +15,8 @@ "nehubaConfigURL": "nehubaConfig/bigbrainNehubaConfig", "parcellations": [ { - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", - "fullId": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579", + "@id": "juelich/iav/atlas/v1.0.0/7", + "fullId": "juelich/iav/atlas/v1.0.0/7", "name": "Cytoarchitectonic Maps", "properties": { "name": "Cytoarchitectonic Maps", diff --git a/src/services/state/viewerState/selectors.spec.ts b/src/services/state/viewerState/selectors.spec.ts index 9faae82c648c8943a6071552267404664c66d50b..724d3a76b56cbe43c531a1dbbfd059a1dfd11d53 100644 --- a/src/services/state/viewerState/selectors.spec.ts +++ b/src/services/state/viewerState/selectors.spec.ts @@ -52,14 +52,15 @@ describe('viewerState/selector.ts', () => { it('> if atlas has basic layer, should return non empty array, if non basic layer is selected', () => { + const parc = humanAtlasJson.parcellations.find(p => !p['baseLayer']) const multihumanParcs = viewerStateGetOverlayingAdditionalParcellations.projector({ fetchedAtlases, selectedAtlasId: humanAtlasJson['@id'] }, { - parcellationSelected: humanAtlasJson.parcellations[1] + parcellationSelected: parc }) expect(multihumanParcs.length).toEqual(1) - expect(multihumanParcs[0]['@id']).toEqual(humanAtlasJson.parcellations[1]['@id']) + expect(multihumanParcs[0]['@id']).toEqual(parc['@id']) }) it('> if atlas has basic layer, but has basic layer selected, should return empty array', () => { diff --git a/src/services/state/viewerState/selectors.ts b/src/services/state/viewerState/selectors.ts index 66a4b835620566c248ddaac7fc88c720976ad2ec..3148ed164d4a99b9170e1de1c92a9377502e852c 100644 --- a/src/services/state/viewerState/selectors.ts +++ b/src/services/state/viewerState/selectors.ts @@ -119,7 +119,7 @@ export const viewerStateAtlasParcellationSelector = createSelector( const allParcellations = fetchedTemplates.reduce(flattenFetchedTemplatesIntoParcellationsReducer, []) const selectedAtlas = selectedAtlasId && fetchedAtlases.find(a => a['@id'] === selectedAtlasId) - const atlasLayers = selectedAtlas?.parcellations + const atlasLayers = selectedAtlas?.parcellations .map(p => { const otherHalfOfParc = allParcellations.find(parc => parc['@id'] === p['@id']) || {} return {