diff --git a/deploy/bkwdCompat/urlState.js b/deploy/bkwdCompat/urlState.js index e63fcd2355ad260a61c3e21048c1688b78ed2020..f902a8a9f32a10dd843a0d0e4e561db18f28c7e3 100644 --- a/deploy/bkwdCompat/urlState.js +++ b/deploy/bkwdCompat/urlState.js @@ -57,7 +57,7 @@ const templateMap = { id: 'minds/core/referencespace/v1.0.0/dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2', parc: { 'Cytoarchitectonic Maps - v2.5.1': { - id: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25' + id: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26' }, 'Short Fiber Bundles - HCP': { id: 'juelich/iav/atlas/v1.0.0/79cbeaa4ee96d5d3dfe2876e9f74b3dc3d3ffb84304fb9b965b1776563a1069c' @@ -92,9 +92,6 @@ const templateMap = { aId: 'juelich/iav/atlas/v1.0.0/1', id: 'minds/core/referencespace/v1.0.0/7f39f7be-445b-47c0-9791-e971c0b6d992', parc: { - 'Cytoarchitectonic Maps - v2.5.1': { - id: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25' - }, 'Cytoarchitectonic Maps - v1.18': { id: 'juelich/iav/atlas/v1.0.0/8' } diff --git a/deploy/datasets/testData/bigbrain.js b/deploy/datasets/testData/bigbrain.js index ca8e64871a35dcdc8685f64faf14c1a982c23868..6e5c5ad6fee360e1d8b2770e3a4c3cda98782cf1 100644 --- a/deploy/datasets/testData/bigbrain.js +++ b/deploy/datasets/testData/bigbrain.js @@ -75,7 +75,7 @@ module.exports = [ "parcellationAtlas": [ { "name": "Jülich Cytoarchitechtonic Brain Atlas (human)", - "fullId": "https://nexus.humanbrainproject.org/v0/data/minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "fullId": "https://nexus.humanbrainproject.org/v0/data/minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "id": [ "deec923ec31a82f89a9c7c76a6fefd6b", "e2d45e028b6da0f6d9fdb9491a4de80a" diff --git a/deploy/datasets/testData/colin27.js b/deploy/datasets/testData/colin27.js index 44957a98138564316f0cfd01be4cd58d4e12c4ae..43389fe15164959058e4faace389da3113c51cdd 100644 --- a/deploy/datasets/testData/colin27.js +++ b/deploy/datasets/testData/colin27.js @@ -61,7 +61,7 @@ module.exports = [ "parcellationAtlas": [ { "name": "Jülich Cytoarchitechtonic Brain Atlas (human)", - "fullId": "https://nexus.humanbrainproject.org/v0/data/minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "fullId": "https://nexus.humanbrainproject.org/v0/data/minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "id": [ "deec923ec31a82f89a9c7c76a6fefd6b", "e2d45e028b6da0f6d9fdb9491a4de80a" diff --git a/deploy/datasets/util.js b/deploy/datasets/util.js index 229b03891d1c0b498d734d017655d6a7127ad892..48620a093e4ddc666e29be7f811930354f839e5d 100644 --- a/deploy/datasets/util.js +++ b/deploy/datasets/util.js @@ -12,7 +12,7 @@ const KG_IDS = { LONG_BUNDLE: 'juelich/iav/atlas/v1.0.0/5', SHORT_BUNDLE: 'juelich/iav/atlas/v1.0.0/6', JULICH_BRAIN: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579', - JULICH_BRAIN_V25: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25', + JULICH_BRAIN_V25: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26', JULICH_BRAIN_V24_BIGBRAIN: 'juelich/iav/atlas/v1.0.0/7' } } diff --git a/src/res/ext/MNI152.json b/src/res/ext/MNI152.json index c47348065055770a66277a9b384fdc05962200c0..967ff0c943444f348219fa9509f3ec30d3ffdf65 100644 --- a/src/res/ext/MNI152.json +++ b/src/res/ext/MNI152.json @@ -27,8 +27,8 @@ "nehubaConfigURL": "nehubaConfig/MNI152NehubaConfig", "parcellations": [ { - "fullId": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "fullId": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", + "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "name": "Cytoarchitectonic Maps - v2.5.1", "displayName": "Cytoarchitectonic Maps", "hasAdditionalViewMode": [ diff --git a/src/res/ext/atlas/atlas_multiLevelHuman.json b/src/res/ext/atlas/atlas_multiLevelHuman.json index 8bff76f3ec6d19cd1c975824bad57841f8bae5d4..d249b0fc87ded3b44b4db65559c688d6f5fef8a0 100644 --- a/src/res/ext/atlas/atlas_multiLevelHuman.json +++ b/src/res/ext/atlas/atlas_multiLevelHuman.json @@ -9,7 +9,7 @@ "displayName": "ICBM 152 2009c Nonlinear Asymmetric", "availableIn": [ { - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "name": "Cytoarchitectonic maps - v2.5" }, { @@ -85,7 +85,7 @@ "name": "Cytoarchitectonic Maps - v1.18", "baseLayer": true, "@version": { - "@next": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "@next": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "@this": "juelich/iav/atlas/v1.0.0/8", "name": "v1.18", "@previous": null @@ -118,12 +118,12 @@ ] }, { - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "name": "Cytoarchitectonic maps", "baseLayer": true, "@version": { "@next": null, - "@this": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "@this": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "name": "v2.6", "@previous": "juelich/iav/atlas/v1.0.0/8" }, diff --git a/src/res/ext/colin.json b/src/res/ext/colin.json index 2c1d0cd2639a41c661fb6e45c8f695e84299ee33..372a589b763d8141dd444b752b833a8814227c87 100644 --- a/src/res/ext/colin.json +++ b/src/res/ext/colin.json @@ -9,8 +9,8 @@ "nehubaConfigURL": "nehubaConfig/colinNehubaConfig", "parcellations": [ { - "fullId": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", - "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25", + "fullId": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", + "@id": "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26", "name": "Cytoarchitectonic Maps - v2.5.1", "displayName": "Cytoarchitectonic Maps", "auxillaryMeshIndices": [ diff --git a/src/routerModule/parseRouteToTmplParcReg.spec.ts b/src/routerModule/parseRouteToTmplParcReg.spec.ts index aea1764afe001414d13690c19c30b7b14181c4d3..d81c9491c540006a068f13ad7b8e573f645d0345 100644 --- a/src/routerModule/parseRouteToTmplParcReg.spec.ts +++ b/src/routerModule/parseRouteToTmplParcReg.spec.ts @@ -1,6 +1,6 @@ import { parseSearchParamForTemplateParcellationRegion } from './parseRouteToTmplParcReg' -const url = `/a:juelich:iav:atlas:v1.0.0:1/t:minds:core:referencespace:v1.0.0:dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2/p:minds:core:parcellationatlas:v1.0.0:94c1125b-b87e-45e4-901c-00daee7f2579-25/@:0.0.0.-W000..2_ZG29.-ASCS.2-8jM2._aAY3..BSR0..0.1w4W0~.0..1jtG` +const url = `/a:juelich:iav:atlas:v1.0.0:1/t:minds:core:referencespace:v1.0.0:dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2/p:minds:core:parcellationatlas:v1.0.0:94c1125b-b87e-45e4-901c-00daee7f2579-26/@:0.0.0.-W000..2_ZG29.-ASCS.2-8jM2._aAY3..BSR0..0.1w4W0~.0..1jtG` const fakeState = { } diff --git a/src/util/fn.spec.ts b/src/util/fn.spec.ts index be7d8b7dd660ec877b5fc640883eaae03712d2f5..1fe2e6469c7b85da4772d135d2701cb77b799079 100644 --- a/src/util/fn.spec.ts +++ b/src/util/fn.spec.ts @@ -11,7 +11,7 @@ describe(`> util/fn.ts`, () => { const colinsJson = require('!json-loader!../res/ext/colin.json') const COLIN_JULICHBRAIN_LAYER_NAME = `COLIN_V25_LEFT_NG_SPLIT_HEMISPHERE` - const COLIN_V25_ID = 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25' + const COLIN_V25_ID = 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26' it('translateds hoc1 from labelIndex to region', () => { diff --git a/src/util/fn.ts b/src/util/fn.ts index f476b461db8ab009afbf38bc59aaa78777034091..6322303e11020211f35aa5cba5d0b864590afda6 100644 --- a/src/util/fn.ts +++ b/src/util/fn.ts @@ -150,7 +150,7 @@ const BACKCOMAP_KEY_DICT = { // icbm152 'minds/core/referencespace/v1.0.0/dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2': { // julich brain v2.6 - 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25': { + 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26': { 'left hemisphere': 'MNI152_V25_LEFT_NG_SPLIT_HEMISPHERE', 'right hemisphere': 'MNI152_V25_RIGHT_NG_SPLIT_HEMISPHERE' }, @@ -190,7 +190,7 @@ const BACKCOMAP_KEY_DICT = { }, // colin 27 "minds/core/referencespace/v1.0.0/7f39f7be-445b-47c0-9791-e971c0b6d992": { - "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25": { + "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26": { "left hemisphere": "COLIN_V25_LEFT_NG_SPLIT_HEMISPHERE", "right hemisphere": "COLIN_V25_RIGHT_NG_SPLIT_HEMISPHERE", }, @@ -201,7 +201,7 @@ const BACKCOMAP_KEY_DICT = { }, // big brain "minds/core/referencespace/v1.0.0/a1655b99-82f1-420f-a3c2-fe80fd4c8588": { - "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25": { + "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26": { }, // isocortex diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts index f72a05d619e943936bd60a70f8146b9786d7ff0b..82941cbbc7fef21921798fcf8d516a1e3807dac8 100644 --- a/src/util/pureConstant.service.ts +++ b/src/util/pureConstant.service.ts @@ -431,7 +431,7 @@ Raise/track issues at github repo: <a target = "_blank" href = "${this.repoUrl}" */ if ( tmpl.id !== 'minds/core/referencespace/v1.0.0/a1655b99-82f1-420f-a3c2-fe80fd4c8588' - && parc.id === 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-25' + && parc.id === 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26' && hemisphereKey === 'whole brain' ) { region.labelIndex = null