Skip to content

Commit 2231b6d

Browse files
oeni2023daniel-va
oeni2023
authored and
daniel-va
committed
Integrate new voxel layers
1 parent 362f934 commit 2231b6d

File tree

6 files changed

+62
-122
lines changed

6 files changed

+62
-122
lines changed

‎ui/locales/app/app.de.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@
154154
"lyr_top_upper_malm_label": "Top Oberer Malm",
155155
"lyr_top_usm_label": "Top Untere Süsswassermolasse",
156156
"lyr_unconsolidated_rocks_label": "Lockergesteine",
157-
"lyr_voxel_aaretal_litho_label": "Aaretal: Modelliereinheit",
157+
"lyr_voxel_aaretal_mod-units_label": "Aaretal: Modelliereinheit",
158158
"lyr_voxel_aaretal_logk_label": "Aaretal: Hydraulische Leitfähigkeit",
159-
"lyr_voxel_birrfeld_litho_label": "Birrfeld: Modelliereinheit",
159+
"lyr_voxel_birrfeld_mod-units_label": "Birrfeld: Modelliereinheit",
160160
"lyr_voxel_birrfeld_logk_label": "Birrfeld: Hydraulische Leitfähigkeit",
161-
"lyr_voxel_geneva_litho_label": "Genf: Modelliereinheit",
161+
"lyr_voxel_geneva_mod-units_label": "Genf: Modelliereinheit",
162162
"lyr_voxel_geneva_logk_label": "Genf: Hydraulische Leitfähigkeit",
163-
"lyr_voxel_visp_litho_label": "Visp: Modelliereinheit",
163+
"lyr_voxel_visp_mod-units_label": "Visp: Modelliereinheit",
164164
"lyr_voxel_visp_logk_label": "Visp: Hydraulische Leitfähigkeit",
165165
"lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Durchlässigkeit",
166166
"lyr_water_tunnel_label": "Unterirdische Wassertunnel",

‎ui/locales/app/app.en.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@
155155
"lyr_top_upper_malm_label": "Top Upper Malm",
156156
"lyr_top_usm_label": "Top Lower Freshwater Molasse",
157157
"lyr_unconsolidated_rocks_label": "Unconsolidated rocks",
158-
"lyr_voxel_aaretal_litho_label": "Aaretal: Modelling Unit",
158+
"lyr_voxel_aaretal_mod-units_label": "Aaretal: Modelling Unit",
159159
"lyr_voxel_aaretal_logk_label": "Aaretal: Hydraulic conductivity",
160-
"lyr_voxel_birrfeld_litho_label": "Birrfeld: Modelling Unit",
160+
"lyr_voxel_birrfeld_mod-units_label": "Birrfeld: Modelling Unit",
161161
"lyr_voxel_birrfeld_logk_label": "Birrfeld: Hydraulic conductivity",
162-
"lyr_voxel_geneva_litho_label": "Geneva: Modelling Unit",
162+
"lyr_voxel_geneva_mod-units_label": "Geneva: Modelling Unit",
163163
"lyr_voxel_geneva_logk_label": "Geneva: Hydraulic conductivity",
164-
"lyr_voxel_visp_litho_label": "Visp: Modelling Unit",
164+
"lyr_voxel_visp_mod-units_label": "Visp: Modelling Unit",
165165
"lyr_voxel_visp_logk_label": "Visp: Hydraulic conductivity",
166166
"lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Permeability ",
167167
"lyr_water_tunnel_label": "Underground water tunnel",

‎ui/locales/app/app.fr.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@
154154
"lyr_top_upper_malm_label": "Toit du Malm supérieur",
155155
"lyr_top_usm_label": "Toit de la Molasse d'eau douce inférieure",
156156
"lyr_unconsolidated_rocks_label": "Roches non consolidées",
157-
"lyr_voxel_aaretal_litho_label": "Vallée de l'Aar: Lithologie",
157+
"lyr_voxel_aaretal_mod-units_label": "Vallée de l'Aar: Lithologie",
158158
"lyr_voxel_aaretal_logk_label": "Vallée de l'Aar: Conductivité hydraulique",
159-
"lyr_voxel_birrfeld_litho_label": "Birrfeld: Lithologie",
159+
"lyr_voxel_birrfeld_mod-units_label": "Birrfeld: Lithologie",
160160
"lyr_voxel_birrfeld_logk_label": "Birrfeld: Conductivité hydraulique",
161-
"lyr_voxel_geneva_litho_label": "Genève: Lithologie",
161+
"lyr_voxel_geneva_mod-units_label": "Genève: Lithologie",
162162
"lyr_voxel_geneva_logk_label": "Genève: Conductivité hydraulique",
163-
"lyr_voxel_visp_litho_label": "Visp: Lithologie",
163+
"lyr_voxel_visp_mod-units_label": "Visp: Lithologie",
164164
"lyr_voxel_visp_logk_label": "Visp: Conductivité hydraulique",
165165
"lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Perméabilité",
166166
"lyr_water_tunnel_label": "Tunnel d'eau souterrain",

‎ui/locales/app/app.it.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@
154154
"lyr_top_upper_malm_label": "Tetto del Malm superiore",
155155
"lyr_top_usm_label": "Tetto della Molassa d'acqua dolce inferiore",
156156
"lyr_unconsolidated_rocks_label": "Rocce non consolidate",
157-
"lyr_voxel_aaretal_litho_label": "Valle dell'Aare: Litologia",
157+
"lyr_voxel_aaretal_mod-units_label": "Valle dell'Aare: Litologia",
158158
"lyr_voxel_aaretal_logk_label": "Valle dell'Aare: Conducibilità idraulica",
159-
"lyr_voxel_birrfeld_litho_label": "Birrfeld: Litologia",
159+
"lyr_voxel_birrfeld_mod-units_label": "Birrfeld: Litologia",
160160
"lyr_voxel_birrfeld_logk_label": "Birrfeld: Conducibilità idraulica",
161-
"lyr_voxel_geneva_litho_label": "Ginevra: Litologia",
161+
"lyr_voxel_geneva_mod-units_label": "Ginevra: Litologia",
162162
"lyr_voxel_geneva_logk_label": "Ginevra: Conducibilità idraulica",
163-
"lyr_voxel_visp_litho_label": "Visp: Litologia",
163+
"lyr_voxel_visp_mod-units_label": "Visp: Litologia",
164164
"lyr_voxel_visp_logk_label": "Visp: Conducibilità idraulica",
165165
"lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Permeabilità",
166166
"lyr_water_tunnel_label": "Condotta idrica sotterranea",

‎ui/package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/src/layertree.ts‎

Lines changed: 39 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,86 +1028,26 @@ const group_01: LayerTreeNode =
10281028
// Sub-Group II "Unconsolidated rocks"
10291029
label: t('lyr_unconsolidated_rocks_label'),
10301030
children: [
1031-
{
1032-
type: LayerType.voxels3dtiles,
1033-
assetId: 3882543,
1034-
voxelDataName: 'Index',
1035-
voxelColors: aaretalIndexVoxelColors,
1036-
voxelFilter: aaretalVoxelFilter,
1037-
label: t('2025-10-08--ion--new'),
1038-
layer: '2025-10-08--ion--new',
1039-
opacityDisabled: true,
1040-
pickable: true,
1041-
downloadUrl:
1042-
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
1043-
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
1044-
},
1031+
// Layer "NEW Voxel-Aaretal - Modelling units"
10451032
{
10461033
type: LayerType.voxels3dtiles,
10471034
assetId: 3882886,
10481035
voxelDataName: 'Index',
10491036
voxelColors: aaretalIndexVoxelColors,
10501037
voxelFilter: aaretalVoxelFilter,
1051-
label: t('2025-10-08_04--ion--new'),
1052-
layer: '2025-10-08_04--ion--new',
1038+
label: t('lyr_voxel_aaretal_mod-units_label'),
1039+
layer: 'voxel_aaretal_mod-units',
10531040
opacityDisabled: true,
10541041
pickable: true,
10551042
downloadUrl:
10561043
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
10571044
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
10581045
},
10591046

1060-
{
1061-
// Layer "Voxel-Aaretal"
1062-
type: LayerType.voxels3dtiles,
1063-
// url: 'http://localhost:8000/aaretal/tileset.json',
1064-
url: 'http://localhost:3002/layers/2025-10-08/output/tileset.json',
1065-
voxelDataName: 'Index',
1066-
voxelColors: aaretalIndexVoxelColors,
1067-
voxelFilter: aaretalVoxelFilter,
1068-
label: t('lyr_voxel_aaretal_litho_label--1'),
1069-
layer: 'voxel_aaretal_litho--new1',
1070-
opacityDisabled: true,
1071-
pickable: true,
1072-
downloadUrl:
1073-
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
1074-
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
1075-
},
1076-
{
1077-
// Layer "Voxel-Aaretal"
1078-
type: LayerType.voxels3dtiles,
1079-
// url: 'http://localhost:8000/aaretal/tileset.json',
1080-
url: 'http://localhost:3002/layers/2025-10-08_04/2025-10-08/output/tileset.json',
1081-
voxelDataName: 'Index',
1082-
voxelColors: aaretalIndexVoxelColors,
1083-
voxelFilter: aaretalVoxelFilter,
1084-
label: t('lyr_voxel_aaretal_litho_label--2'),
1085-
layer: 'voxel_aaretal_litho--new2',
1086-
opacityDisabled: true,
1087-
pickable: true,
1088-
downloadUrl:
1089-
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
1090-
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
1091-
},
1092-
1093-
{
1094-
// Layer "Voxel-Aaretal"
1095-
type: LayerType.voxels3dtiles,
1096-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-Aaretal-Combined/tileset.json',
1097-
voxelDataName: 'Index',
1098-
voxelColors: aaretalIndexVoxelColors,
1099-
voxelFilter: aaretalVoxelFilter,
1100-
label: t('lyr_voxel_aaretal_litho_label'),
1101-
layer: 'voxel_aaretal_litho',
1102-
opacityDisabled: true,
1103-
pickable: true,
1104-
downloadUrl:
1105-
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
1106-
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
1107-
},
1047+
// Layer "NEW Voxel-Aaretal - LogK"
11081048
{
11091049
type: LayerType.voxels3dtiles,
1110-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-Aaretal-Combined/tileset.json',
1050+
assetId: 3882886,
11111051
voxelDataName: 'logk',
11121052
voxelColors: logkVoxelColors,
11131053
voxelFilter: aaretalVoxelFilter,
@@ -1117,41 +1057,29 @@ const group_01: LayerTreeNode =
11171057
pickable: true,
11181058
downloadUrl:
11191059
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Aaretal-Legende.pdf',
1120-
geocatId: '9471ee1b-5811-489d-b050-612c011f9d57',
1060+
geocatId: 'b1a36f66-638a-4cfb-88d3-b0df6c7a7502',
11211061
},
11221062

1063+
// Layer "NEW Voxel-Birr - Modelling units"
11231064
{
11241065
type: LayerType.voxels3dtiles,
1125-
url: 'http://localhost:8000/birr/tileset.json',
1066+
assetId: 3922953,
11261067
voxelDataName: 'Index',
11271068
voxelColors: birrIndexVoxelColors,
11281069
voxelFilter: birrIndexVoxelFilter,
1129-
label: t('lyr_voxel_birrfeld_litho_label--new'),
1130-
layer: 'voxel_birrfeld_litho--new',
1070+
label: t('lyr_voxel_birrfeld_mod-units_label'),
1071+
layer: 'voxel_aaretal_mod-units',
11311072
opacityDisabled: true,
11321073
pickable: true,
11331074
downloadUrl:
11341075
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Birrfeld-Legende.pdf',
11351076
geocatId: 'f56c9c6c-ff59-463d-ba66-477fd2d92f39',
11361077
},
11371078

1079+
// Layer "NEW Voxel-Birr - LogK"
11381080
{
11391081
type: LayerType.voxels3dtiles,
1140-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-BIRR-Combined/tileset.json',
1141-
voxelDataName: 'Index',
1142-
voxelColors: birrIndexVoxelColors,
1143-
voxelFilter: birrIndexVoxelFilter,
1144-
label: t('lyr_voxel_birrfeld_litho_label'),
1145-
layer: 'voxel_birrfeld_litho',
1146-
opacityDisabled: true,
1147-
pickable: true,
1148-
downloadUrl:
1149-
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Birrfeld-Legende.pdf',
1150-
geocatId: 'f56c9c6c-ff59-463d-ba66-477fd2d92f39',
1151-
},
1152-
{
1153-
type: LayerType.voxels3dtiles,
1154-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-BIRR-Combined/tileset.json',
1082+
assetId: 3922953,
11551083
voxelDataName: 'logk',
11561084
voxelColors: logkVoxelColors,
11571085
voxelFilter: birrIndexVoxelFilter,
@@ -1161,27 +1089,31 @@ const group_01: LayerTreeNode =
11611089
pickable: true,
11621090
downloadUrl:
11631091
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Birrfeld-Legende.pdf',
1164-
geocatId: '96f923d6-a747-481b-a0d8-2cfec321170e',
1092+
geocatId: 'f56c9c6c-ff59-463d-ba66-477fd2d92f39',
11651093
},
1094+
1095+
// Layer "NEW Voxel-Genf - Modelling units"
11661096
{
11671097
type: LayerType.voxels3dtiles,
1168-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-GENF-Combined/tileset.json',
1098+
assetId: 3920957,
11691099
voxelDataName: 'Index',
11701100
voxelColors: genevaIndexVoxelColors,
11711101
voxelFilter: genevaIndexVoxelFilter,
1172-
label: t('lyr_voxel_geneva_litho_label'),
1173-
layer: 'voxel_geneva_litho',
1102+
label: t('lyr_voxel_geneva_mod-units_label'),
1103+
layer: 'voxel_geneva_mod-units',
11741104
opacityDisabled: true,
11751105
pickable: true,
11761106
downloadUrl:
11771107
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-GVA-Legende.pdf',
1178-
geocatId: '697f4c99-ed1b-4901-bc87-3710fcce1352',
1108+
geocatId: '4a4a530f-6a2a-423d-834e-2831d70fde20',
11791109
},
1110+
1111+
// Layer "NEW Voxel-Genf - LogK"
11801112
{
11811113
type: LayerType.voxels3dtiles,
1182-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-GENF-Combined/tileset.json',
1114+
assetId: 3920957,
11831115
voxelDataName: 'logk',
1184-
voxelColors: logkVoxelColors,
1116+
voxelColors: genevaIndexVoxelColors,
11851117
voxelFilter: genevaIndexVoxelFilter,
11861118
label: t('lyr_voxel_geneva_logk_label'),
11871119
layer: 'voxel_geneva_logk',
@@ -1191,37 +1123,45 @@ const group_01: LayerTreeNode =
11911123
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-GVA-Legende.pdf',
11921124
geocatId: '4a4a530f-6a2a-423d-834e-2831d70fde20',
11931125
},
1126+
1127+
// Layer "NEW Voxel-St.Galler-Rheintal"
11941128
{
11951129
type: LayerType.voxels3dtiles,
1196-
url: 'https://download.swissgeol.ch/testvoxel/test20250113_KTSGRhein/2025-03-21/output/tileset.json',
1130+
assetId: 3939135,
11971131
voxelDataName: 'Klasse',
11981132
voxelColors: rheintalVoxelColors,
11991133
voxelFilter: rheintalVoxelFilter,
12001134
label: t('lyr_voxel_rheintal_klasse_label'),
1201-
layer: 'voxel_rheintal_klasse',
1135+
layer: 'voxel_rheintal',
12021136
opacityDisabled: true,
12031137
pickable: true,
1138+
// downloadUrl:
1139+
// DOWNLOAD_ROOT_VOXEL + 'legends/Vox-GVA-Legende.pdf',
12041140
geocatId: 'c12c8e4e-4c06-41c9-b705-f1dadb0654ae-8371',
12051141
},
1142+
1143+
// Layer "NEW Voxel-Visp - Modelling units"
12061144
{
12071145
type: LayerType.voxels3dtiles,
1208-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-VISP-Combined/tileset.json',
1146+
assetId: 3920961,
12091147
voxelDataName: 'Index',
12101148
voxelColors: vispIndexVoxelColors,
12111149
voxelFilter: vispIndexVoxelFilter,
1212-
label: t('lyr_voxel_visp_litho_label'),
1213-
layer: 'voxel_visp_litho',
1150+
label: t('lyr_voxel_visp_mod-units_label'),
1151+
layer: 'voxel_visp_mod-units',
12141152
opacityDisabled: true,
12151153
pickable: true,
12161154
downloadUrl:
12171155
DOWNLOAD_ROOT_VOXEL + 'legends/Vox-Visp-Legende.pdf',
1218-
geocatId: 'b621de46-2553-4fb2-88b4-f770e0243299',
1156+
geocatId: 'f7847c2c-bd3a-4dda-99c7-d50453b24c3d',
12191157
},
1158+
1159+
// Layer "NEW Voxel-Visp - LogK"
12201160
{
12211161
type: LayerType.voxels3dtiles,
1222-
url: 'https://download.swissgeol.ch/testvoxel/20240415/Voxel-VISP-Combined/tileset.json',
1162+
assetId: 3920961,
12231163
voxelDataName: 'logk',
1224-
voxelColors: logkVoxelColors,
1164+
voxelColors: vispIndexVoxelColors,
12251165
voxelFilter: vispIndexVoxelFilter,
12261166
label: t('lyr_voxel_visp_logk_label'),
12271167
layer: 'voxel_visp_logk',

0 commit comments

Comments
 (0)