Merge branch 'v3' into waltti

HSLdevcom · Nov 12, 2024 · 7a0e048 · 7a0e048
2 parents a29880e + 33a12de
commit 7a0e048
Show file tree

Hide file tree

Showing 160 changed files with 4,793 additions and 41,577 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
     'import/no-extraneous-dependencies': 'off',
     'import/no-named-default': 'off',
     'import/extensions': 'off',
+    'import/prefer-default-export': 'off',
     // react
     'react/button-has-type': 'warn',
     'react/destructuring-assignment': 'off',

diff --git a/app/action/FutureRoutesActions.js b/app/action/FutureRoutesActions.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/prefer-default-export
 export function saveFutureRoute(actionContext, futureRoute) {
   actionContext.dispatch('saveFutureRoute', futureRoute);
 }
diff --git a/app/action/SearchActions.js b/app/action/SearchActions.js
@@ -1,4 +1,3 @@
-// eslint-disable import/prefer-default-export
 export function saveSearch(actionContext, endpoint) {
   actionContext.dispatch('SaveSearch', endpoint);
 }

diff --git a/app/action/SearchSettingsActions.js b/app/action/SearchSettingsActions.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/prefer-default-export
 export function saveRoutingSettings(actionContext, settings) {
   actionContext.dispatch('saveRoutingSettings', settings);
 }
diff --git a/app/action/userPreferencesActions.js b/app/action/userPreferencesActions.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/prefer-default-export */
-
 export function setLanguage(actionContext, language) {
   actionContext.dispatch('SetLanguage', language);
 }
diff --git a/app/client.js b/app/client.js
@@ -159,8 +159,7 @@ async function init() {
       ttl: 60 * 60 * 1000,
     }),
     urlMiddleware({
-      url: () =>
-        Promise.resolve(`${config.URL.OTP}index/graphql${queryParameters}`),
+      url: () => Promise.resolve(`${config.URL.OTP}gtfs/v1${queryParameters}`),
     }),
     errorMiddleware(),
     retryMiddleware({

diff --git a/app/component/EmbeddedSearchGenerator.js b/app/component/EmbeddedSearchGenerator.js
@@ -13,7 +13,12 @@ import { isBrowser } from '../util/browser';
 
 const LocationSearch = withSearchContext(DTAutosuggest, true);
 
-const locationSearchTargets = ['Locations', 'CurrentPosition', 'Stops'];
+const locationSearchTargets = [
+  'Locations',
+  'CurrentPosition',
+  'Stations',
+  'Stops',
+];
 const sources = ['Favourite', 'History', 'Datasource'];
 
 const languages = [

diff --git a/app/component/FavouritesContainer.js b/app/component/FavouritesContainer.js
@@ -325,7 +325,7 @@ class FavouritesContainer extends React.Component {
     const isLoading =
       this.props.favouriteStatus === FavouriteStore.STATUS_FETCHING_OR_UPDATING;
     const { requireLoggedIn, isLoggedIn } = this.props;
-    const targets = ['Locations', 'CurrentPosition', 'MapPosition'];
+    const targets = ['Locations', 'Stations', 'CurrentPosition', 'MapPosition'];
     const { fontWeights } = this.context.config;
     const favouritePlaces = this.props.favourites.filter(
       item => item.type === 'place',

diff --git a/app/component/Icon.js b/app/component/Icon.js
@@ -59,6 +59,7 @@ IconBadge.asString = (badgeFill, badgeText, badgeTextFill) => {
 
 function Icon({
   backgroundShape,
+  backgroundColor,
   badgeFill,
   badgeText,
   badgeTextFill,
@@ -88,7 +89,13 @@ function Icon({
         aria-label={ariaLabel}
       >
         {backgroundShape === 'circle' && (
-          <circle className="icon-circle" cx="20" cy="20" fill="white" r="20" />
+          <circle
+            className="icon-circle"
+            cx="20"
+            cy="20"
+            fill={backgroundColor}
+            r="20"
+          />
         )}
         {!dataURI && <use xlinkHref={`#${img}`} />}
         {dataURI && (
@@ -106,6 +113,7 @@ function Icon({
 
 Icon.propTypes = {
   backgroundShape: PropTypes.oneOf(['circle']),
+  backgroundColor: PropTypes.string,
   badgeFill: PropTypes.string,
   badgeText: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   badgeTextFill: PropTypes.string,
@@ -123,6 +131,7 @@ Icon.propTypes = {
 
 Icon.defaultProps = {
   backgroundShape: undefined,
+  backgroundColor: 'white',
   badgeFill: undefined,
   badgeText: undefined,
   badgeTextFill: undefined,

diff --git a/app/component/IndexPage.js b/app/component/IndexPage.js
@@ -299,21 +299,31 @@ class IndexPage extends React.Component {
     const origin = this.pendingOrigin || this.props.origin;
     const destination = this.pendingDestination || this.props.destination;
     const sources = ['Favourite', 'History', 'Datasource'];
-    const stopAndRouteSearchTargets = ['Stops', 'Routes'];
-    const locationSearchTargets = [
+    const stopAndRouteSearchTargets = ['Stations', 'Stops', 'Routes'];
+    let locationSearchTargets = [
       'Locations',
       'CurrentPosition',
       'FutureRoutes',
-      'Stops',
     ];
 
-    if (useCitybikes(config.vehicleRental?.networks, config)) {
-      stopAndRouteSearchTargets.push('VehicleRentalStations');
-      locationSearchTargets.push('VehicleRentalStations');
-    }
-    if (config.includeParkAndRideSuggestions) {
-      stopAndRouteSearchTargets.push('ParkingAreas');
-      locationSearchTargets.push('ParkingAreas');
+    if (config.locationSearchTargetsFromOTP) {
+      // configurable setup
+      locationSearchTargets = [
+        ...locationSearchTargets,
+        ...config.locationSearchTargetsFromOTP,
+      ];
+    } else {
+      // default setup
+      locationSearchTargets.push('Stations');
+      locationSearchTargets.push('Stops');
+      if (useCitybikes(config.vehicleRental?.networks, config)) {
+        stopAndRouteSearchTargets.push('VehicleRentalStations');
+        locationSearchTargets.push('VehicleRentalStations');
+      }
+      if (config.includeParkAndRideSuggestions) {
+        stopAndRouteSearchTargets.push('ParkingAreas');
+        locationSearchTargets.push('ParkingAreas');
+      }
     }
     const locationSearchTargetsMobile = [
       ...locationSearchTargets,