Merge branch 'prerel' into v3

HSLdevcom · May 14, 2024 · 589fe55 · 589fe55
2 parents def218c + b56d0dc
commit 589fe55
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22,639 deletions.
diff --git a/.github/workflows/dev-pipeline.yml b/.github/workflows/dev-pipeline.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - v3
+      - prerel
   pull_request:
     branches:
       - v3

diff --git a/app/configurations/config.jyvaskyla.js b/app/configurations/config.jyvaskyla.js
@@ -139,7 +139,7 @@ export default configMerger(walttiConfig, {
           sv: 'Zoner',
           en: 'Zones',
         },
-        url: '/assets/geojson/jkl_zone_lines_20240403.geojson',
+        url: '/assets/geojson/jkl_zone_lines_20210222.geojson',
       },
       {
         name: {
@@ -158,12 +158,13 @@ export default configMerger(walttiConfig, {
     1: 'A',
     2: 'B',
     3: 'C',
+    4: 'D',
   },
 
-  showTicketInformation: true,
+  showTicketInformation: false,
   useTicketIcons: true,
   ticketLink: 'https://linkki.jyvaskyla.fi/liput-ja-hinnat',
-  showTicketPrice: true,
+  showTicketPrice: false,
 
   ticketPurchaseLink: function purchaseTicketLink(fare) {
     const fareId = fare.fareProducts[0].product.id;
@@ -216,5 +217,5 @@ export default configMerger(walttiConfig, {
     itinerary: true,
   },
   // Notice! Turning on this setting forces the search for car routes (for the CO2 comparison only).
-  showCO2InItinerarySummary: true,
+  showCO2InItinerarySummary: false,
 });
diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js
@@ -269,7 +269,6 @@ export default configMerger(walttiConfig, {
     },
   },
 
-  // enable train routing for Tampere
   transportModes: {
     rail: {
       availableForSelection: true,
@@ -283,11 +282,11 @@ export default configMerger(walttiConfig, {
       availableForSelection: true,
     },
   },
-
+  /*
   bikeBoardingModes: {
     RAIL: { showNotification: true },
     TRAM: { showNotification: true },
   },
-
+  */
   showTenWeeksOnRouteSchedule: true,
 });