dt-6044 bike stations ids

app/component/Availability.js

@@ -63,10 +63,15 @@ Availability.displayName = 'Availability';
 Availability.propTypes = {
   available: PropTypes.number.isRequired,
   total: PropTypes.number.isRequired,
-  fewAvailableCount: PropTypes.number.isRequired,
-  fewerAvailableCount: PropTypes.number.isRequired,
+  fewAvailableCount: PropTypes.number,
+  fewerAvailableCount: PropTypes.number,
   text: PropTypes.node.isRequired,
   showStatusBar: PropTypes.bool.isRequired,
 };
 
+Availability.defaultProps = {
+  fewAvailableCount: undefined,
+  fewerAvailableCount: undefined,
+};
+
 export default Availability;

app/component/BicycleLeg.js

@@ -12,13 +12,12 @@ import ItineraryCircleLine from './ItineraryCircleLine';
 import ItineraryCircleLineLong from './ItineraryCircleLineLong';
 import { PREFIX_STOPS } from '../util/path';
 import {
-  getCityBikeNetworkConfig,
-  getCityBikeNetworkId,
+  getVehicleRentalStationNetworkConfig,
   CityBikeNetworkType,
-} from '../util/citybikes';
+} from '../util/vehicleRentalUtils';
 import ItineraryCircleLineWithIcon from './ItineraryCircleLineWithIcon';
 import { splitStringToAddressAndPlace } from '../util/otpStrings';
-import CityBikeLeg from './CityBikeLeg';
+import VehicleRentalLeg from './VehicleRentalLeg';
 import StopCode from './StopCode';
 import PlatformNumber from './PlatformNumber';
 
@@ -41,9 +40,9 @@ function BicycleLeg(
   const [address, place] = splitStringToAddressAndPlace(leg.from.name);
   const networkConfig =
     leg.rentedBike &&
-    leg.from.bikeRentalStation &&
-    getCityBikeNetworkConfig(
-      getCityBikeNetworkId(leg.from.bikeRentalStation.networks),
+    leg.from.vehicleRentalStation &&
+    getVehicleRentalStationNetworkConfig(
+      leg.from.vehicleRentalStation.network,
       config,
     );
   const isFirstLeg = i => i === 0;
@@ -200,10 +199,10 @@ function BicycleLeg(
             />
           </div>
         ) : (
-          <CityBikeLeg
+          <VehicleRentalLeg
             stationName={leg.from.name}
             isScooter={isScooter}
-            bikeRentalStation={leg.from.bikeRentalStation}
+            vehicleRentalStation={leg.from.vehicleRentalStation}
           />
         )}
         {bicycleWalkLeg?.from.stop && (
@@ -311,9 +310,9 @@ BicycleLeg.propTypes = {
     distance: PropTypes.number.isRequired,
     from: PropTypes.shape({
       name: PropTypes.string.isRequired,
-      bikeRentalStation: PropTypes.shape({
-        bikesAvailable: PropTypes.number.isRequired,
-        networks: PropTypes.array.isRequired,
+      vehicleRentalStation: PropTypes.shape({
+        vehiclesAvailable: PropTypes.number.isRequired,
+        network: PropTypes.string.isRequired,
       }),
       stop: PropTypes.object,
     }).isRequired,
@@ -332,12 +331,12 @@ BicycleLeg.propTypes = {
     startTime: PropTypes.number.isRequired,
     from: PropTypes.shape({
       name: PropTypes.string.isRequired,
-      bikeRentalStation: PropTypes.shape({
-        bikesAvailable: PropTypes.number.isRequired,
-        networks: PropTypes.array.isRequired,
+      vehicleRentalStation: PropTypes.shape({
+        vehiclesAvailable: PropTypes.number.isRequired,
+        network: PropTypes.string.isRequired,
       }),
       stop: PropTypes.object,
-    }).isRequired,
+    }),
     to: PropTypes.shape({
       name: PropTypes.string.isRequired,
       stop: PropTypes.object,

app/component/BikeParkLeg.js

@@ -102,17 +102,17 @@ BikeParkLeg.contextTypes = {
 BikeParkLeg.propTypes = {
   index: PropTypes.number.isRequired,
   focusAction: PropTypes.func.isRequired,
-  bikePark: PropTypes.object,
+  bikePark: PropTypes.object.isRequired,
   leg: PropTypes.shape({
     endTime: PropTypes.number.isRequired,
     duration: PropTypes.number.isRequired,
     startTime: PropTypes.number.isRequired,
     distance: PropTypes.number.isRequired,
     from: PropTypes.shape({
       name: PropTypes.string.isRequired,
-      bikeRentalStation: PropTypes.shape({
-        bikesAvailable: PropTypes.number.isRequired,
-        networks: PropTypes.array.isRequired,
+      vehicleRentalStation: PropTypes.shape({
+        vehiclesAvailable: PropTypes.number.isRequired,
+        network: PropTypes.string.isRequired,
       }),
       stop: PropTypes.object,
     }).isRequired,

app/component/CustomizeSearchNew.js

@@ -10,11 +10,11 @@ import TransportModesSection from './customizesearch/TransportModesSection';
 import WalkingOptionsSection from './customizesearch/WalkingOptionsSection';
 import AccessibilityOptionSection from './customizesearch/AccessibilityOptionSection';
 import TransferOptionsSection from './customizesearch/TransferOptionsSection';
-import CityBikeNetworkSelector from './customizesearch/CityBikeNetworkSelector';
+import VehicleRentalStationNetworkSelector from './customizesearch/VehicleRentalStationNetworkSelector';
 import { showModeSettings, useCitybikes } from '../util/modeUtils';
 import ScrollableWrapper from './ScrollableWrapper';
 import { getDefaultSettings } from '../util/planParamUtil';
-import { getCitybikeNetworks } from '../util/citybikes';
+import { getVehicleRentalStationNetworks } from '../util/vehicleRentalUtils';
 
 class CustomizeSearch extends React.Component {
   static contextTypes = {
@@ -126,8 +126,8 @@ class CustomizeSearch extends React.Component {
                     />
                   </legend>
                   <div className="transport-modes-container">
-                    <CityBikeNetworkSelector
-                      currentOptions={getCitybikeNetworks(config)}
+                    <VehicleRentalStationNetworkSelector
+                      currentOptions={getVehicleRentalStationNetworks(config)}
                     />
                   </div>
                 </fieldset>

app/component/DepartureRow.js

@@ -263,7 +263,8 @@ DepartureRow.propTypes = {
   showPlatformCode: PropTypes.bool,
   canceled: PropTypes.bool,
   className: PropTypes.string,
-  onCapacityClick: PropTypes.func.isRequired,
+  // eslint-disable-next-line react/require-default-props
+  onCapacityClick: PropTypes.func,
 };
 
 DepartureRow.contextTypes = {

app/component/FavouriteBikeRentalStationContainer.js → app/component/FavouriteVehicleRentalStationContainer.js

@@ -4,53 +4,53 @@ import Favourite from './Favourite';
 import { saveFavourite, deleteFavourite } from '../action/FavouriteActions';
 import { addAnalyticsEvent } from '../util/analyticsUtils';
 
-const FavouriteBikeRentalStationContainer = connectToStores(
+const FavouriteVehicleRentalStationContainer = connectToStores(
   Favourite,
   ['FavouriteStore', 'UserStore', 'PreferencesStore'],
-  (context, { bikeRentalStation }) => ({
+  (context, { vehicleRentalStation }) => ({
     favourite: context
       .getStore('FavouriteStore')
-      .isFavouriteBikeRentalStation(
-        bikeRentalStation.stationId,
-        bikeRentalStation.networks,
+      .isFavouriteVehicleRentalStation(
+        vehicleRentalStation.stationId,
+        vehicleRentalStation.network,
       ),
     isFetching: context.getStore('FavouriteStore').getStatus() === 'fetching',
     addFavourite: () => {
       context.executeAction(saveFavourite, {
-        lat: bikeRentalStation.lat,
-        lon: bikeRentalStation.lon,
-        networks: bikeRentalStation.networks,
-        name: bikeRentalStation.name,
-        stationId: bikeRentalStation.stationId,
+        lat: vehicleRentalStation.lat,
+        lon: vehicleRentalStation.lon,
+        network: vehicleRentalStation.network,
+        name: vehicleRentalStation.name,
+        stationId: vehicleRentalStation.stationId,
         type: 'bikeStation',
       });
       addAnalyticsEvent({
         category: 'BikeRentalStation',
         action: 'MarkBikeRentalStationAsFavourite',
         name: !context
           .getStore('FavouriteStore')
-          .isFavouriteBikeRentalStation(
-            bikeRentalStation.stationId,
-            bikeRentalStation.networks,
+          .isFavouriteVehicleRentalStation(
+            vehicleRentalStation.stationId,
+            vehicleRentalStation.network,
           ),
       });
     },
     deleteFavourite: () => {
-      const bikeRentalStationToDelete = context
+      const vehicleRentalStationToDelete = context
         .getStore('FavouriteStore')
         .getByStationIdAndNetworks(
-          bikeRentalStation.stationId,
-          bikeRentalStation.networks,
+          vehicleRentalStation.stationId,
+          vehicleRentalStation.network,
         );
-      context.executeAction(deleteFavourite, bikeRentalStationToDelete);
+      context.executeAction(deleteFavourite, vehicleRentalStationToDelete);
       addAnalyticsEvent({
         category: 'BikeRentalStation',
         action: 'MarkBikeRentalStationAsFavourite',
         name: !context
           .getStore('FavouriteStore')
-          .isFavouriteBikeRentalStation(
-            bikeRentalStation.stationId,
-            bikeRentalStation.networks,
+          .isFavouriteVehicleRentalStation(
+            vehicleRentalStation.stationId,
+            vehicleRentalStation.network,
           ),
       });
     },
@@ -62,10 +62,10 @@ const FavouriteBikeRentalStationContainer = connectToStores(
   }),
 );
 
-FavouriteBikeRentalStationContainer.contextTypes = {
+FavouriteVehicleRentalStationContainer.contextTypes = {
   getStore: PropTypes.func.isRequired,
   executeAction: PropTypes.func.isRequired,
   config: PropTypes.object.isRequired,
 };
 
-export default FavouriteBikeRentalStationContainer;
+export default FavouriteVehicleRentalStationContainer;

app/component/FavouritesContainer.js

@@ -331,7 +331,7 @@ class FavouritesContainer extends React.Component {
     if (
       useCitybikes(this.context.config.cityBike?.networks, this.context.config)
     ) {
-      targets.push('BikeRentalStations');
+      targets.push('VehicleRentalStations');
     }
     if (this.context.config.includeParkAndRideSuggestions) {
       targets.push('ParkingAreas');

app/component/IndexPage.js

@@ -224,8 +224,8 @@ class IndexPage extends React.Component {
     ];
 
     if (useCitybikes(config.cityBike?.networks, config)) {
-      stopAndRouteSearchTargets.push('BikeRentalStations');
-      locationSearchTargets.push('BikeRentalStations');
+      stopAndRouteSearchTargets.push('VehicleRentalStations');
+      locationSearchTargets.push('VehicleRentalStations');
     }
     if (config.includeParkAndRideSuggestions) {
       stopAndRouteSearchTargets.push('ParkingAreas');

app/component/ItinerarySummaryListContainer/ItinerarySummaryListContainer.js

@@ -405,9 +405,9 @@ const containerComponent = createFragmentContainer(
                 effectiveStartDate
               }
             }
-            bikeRentalStation {
-              bikesAvailable
-              networks
+            vehicleRentalStation {
+              vehiclesAvailable
+              network
             }
           }
           to {