Skip to content

Commit 589fe55

Browse files
committed
Merge branch 'prerel' into v3
2 parents def218c + b56d0dc commit 589fe55

File tree

5 files changed

+9
-22639
lines changed

5 files changed

+9
-22639
lines changed

.github/workflows/dev-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- v3
7+
- prerel
78
pull_request:
89
branches:
910
- v3

app/configurations/config.jyvaskyla.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export default configMerger(walttiConfig, {
139139
sv: 'Zoner',
140140
en: 'Zones',
141141
},
142-
url: '/assets/geojson/jkl_zone_lines_20240403.geojson',
142+
url: '/assets/geojson/jkl_zone_lines_20210222.geojson',
143143
},
144144
{
145145
name: {
@@ -158,12 +158,13 @@ export default configMerger(walttiConfig, {
158158
1: 'A',
159159
2: 'B',
160160
3: 'C',
161+
4: 'D',
161162
},
162163

163-
showTicketInformation: true,
164+
showTicketInformation: false,
164165
useTicketIcons: true,
165166
ticketLink: 'https://linkki.jyvaskyla.fi/liput-ja-hinnat',
166-
showTicketPrice: true,
167+
showTicketPrice: false,
167168

168169
ticketPurchaseLink: function purchaseTicketLink(fare) {
169170
const fareId = fare.fareProducts[0].product.id;
@@ -216,5 +217,5 @@ export default configMerger(walttiConfig, {
216217
itinerary: true,
217218
},
218219
// Notice! Turning on this setting forces the search for car routes (for the CO2 comparison only).
219-
showCO2InItinerarySummary: true,
220+
showCO2InItinerarySummary: false,
220221
});

app/configurations/config.tampere.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ export default configMerger(walttiConfig, {
269269
},
270270
},
271271

272-
// enable train routing for Tampere
273272
transportModes: {
274273
rail: {
275274
availableForSelection: true,
@@ -283,11 +282,11 @@ export default configMerger(walttiConfig, {
283282
availableForSelection: true,
284283
},
285284
},
286-
285+
/*
287286
bikeBoardingModes: {
288287
RAIL: { showNotification: true },
289288
TRAM: { showNotification: true },
290289
},
291-
290+
*/
292291
showTenWeeksOnRouteSchedule: true,
293292
});

0 commit comments

Comments
 (0)