fix: use nearyou consistently (no more nearbys)

Author: vesameskanen

app/component/IndexPage.js

@@ -252,7 +252,7 @@ class IndexPage extends React.Component {
       ? { modeSet: config.iconModeSet }
       : {
           buttonStyle: config.nearYouButton,
-          modeSet: config.nearbyModeSet,
+          modeSet: config.nearYouModeSet,
           horizontal: false,
         };
 

app/component/map/NearYouMap.js

@@ -17,8 +17,8 @@ import {
   changeRealTimeClientTopics,
 } from '../../action/realTimeClientAction';
 import {
-  sortNearbyRentalStations,
-  sortNearbyStops,
+  sortNearYouRentalStations,
+  sortNearYouStops,
 } from '../../util/sortUtils';
 import ItineraryLine from './ItineraryLine';
 import {
@@ -274,11 +274,11 @@ function NearYouMap(
         });
         sortedEdges = filteredCityBikeEdges
           .slice()
-          .sort(sortNearbyRentalStations(favouriteIds));
+          .sort(sortNearYouRentalStations(favouriteIds));
       } else {
         sortedEdges = stops.nearest.edges
           .slice()
-          .sort(sortNearbyStops(favouriteIds, walkRoutingThreshold));
+          .sort(sortNearYouStops(favouriteIds, walkRoutingThreshold));
       }
 
       sortedEdges.unshift(

app/component/nearyou/NearYouContainer.js

@@ -6,8 +6,8 @@ import { configShape, relayShape } from '../../util/shapes';
 import StopNearYouContainer from './StopNearYouContainer';
 import withBreakpoint from '../../util/withBreakpoint';
 import {
-  sortNearbyRentalStations,
-  sortNearbyStops,
+  sortNearYouRentalStations,
+  sortNearYouStops,
 } from '../../util/sortUtils';
 import VehicleRentalStationNearYou from './VehicleRentalStationNearYou';
 import Loading from '../Loading';
@@ -76,7 +76,7 @@ function NearYouContainer(
     const fetchMore =
       edges.filter(
         stop => !(stop.node.place.stoptimesWithoutPatterns?.length === 0),
-      ).length < 5 && refetches.current < config.maxNearbyStopRefetches;
+      ).length < 5 && refetches.current < config.maxNearYouStopRefetches;
     if (fetchMore) {
       showMore(true);
     }
@@ -95,7 +95,7 @@ function NearYouContainer(
     loadingDone();
   }, []);
 
-  const createNearbyStops = () => {
+  const createNearYouStops = () => {
     if (!places?.nearest) {
       return [];
     }
@@ -114,12 +114,12 @@ function NearYouContainer(
       });
       sorted = filteredCityBikeStopEdges
         .slice(0, 5)
-        .sort(sortNearbyRentalStations(favouriteIds));
+        .sort(sortNearYouRentalStations(favouriteIds));
       sorted.push(...filteredCityBikeStopEdges.slice(5));
     } else {
       sorted = edges
         .slice(0, 5)
-        .sort(sortNearbyStops(favouriteIds, walkRoutingThreshold));
+        .sort(sortNearYouStops(favouriteIds, walkRoutingThreshold));
       sorted.push(...edges.slice(5));
     }
 
@@ -158,13 +158,13 @@ function NearYouContainer(
     return stops;
   };
 
-  const stops = createNearbyStops();
+  const stops = createNearYouStops();
   const alerts = stops
     .flatMap(stop => stop?.props?.stop?.routes || [])
     .flatMap(route => route?.alerts || [])
     .filter(alert => alert.alertSeverityLevel === 'SEVERE');
   const noStopsFound =
-    !stops.length && refetches >= config.maxNearbyStopRefetches && !loading;
+    !stops.length && refetches >= config.maxNearYouStopRefetches && !loading;
   return (
     <>
       {renderDisruptionBanner && (

app/component/nearyou/NearYouPage.js

@@ -193,8 +193,8 @@ function NearYouPage(
       lat: searchPosition.lat,
       lon: searchPosition.lon,
       maxResults: 10,
-      first: config.maxNearbyStopAmount,
-      maxDistance: config.maxNearbyStopDistance[queryMode.toLowerCase()],
+      first: config.maxNearYouStopAmount,
+      maxDistance: config.maxNearYouStopDistance[queryMode.toLowerCase()],
       filterByModes: qModes,
       filterByPlaceTypes: placeTypes,
       omitNonPickups: config.omitNonPickups,

app/configurations/config.default.js

@@ -163,15 +163,15 @@ export default {
     minimalRegexp: /.{2,}/,
   },
 
-  nearbyRoutes: {
+  nearYouRoutes: {
     radius: 10000,
     bucketSize: 1000,
   },
 
   omitNonPickups: true,
-  maxNearbyStopAmount: 5,
-  maxNearbyStopRefetches: 5,
-  maxNearbyStopDistance: {
+  maxNearYouStopAmount: 5,
+  maxNearYouStopRefetches: 5,
+  maxNearYouStopDistance: {
     favorite: 20000,
     bus: 50000,
     tram: 20000,
@@ -344,7 +344,7 @@ export default {
       sv: 'Köp ett abonnemang för en dag, en vecka eller för en hel säsong',
       en: 'Buy a daily, weekly or season pass',
     },
-    maxNearbyRentalVehicleAmount: 5,
+    maxNearYouRentalVehicleAmount: 5,
     maxDistanceToRentalVehiclesInMeters: 100,
     maxMinutesToRentalJourneyStart: 60,
     maxMinutesToRentalJourneyEnd: 720,

app/configurations/config.hsl.js

@@ -108,7 +108,7 @@ export default {
   loginAnalyticsEventName: 'user-hsl-id',
   loginAnalyticsKey: 'hsl-id',
 
-  nearbyRoutes: {
+  nearYouRoutes: {
     radius: 500,
     bucketSize: 100,
   },
@@ -335,7 +335,7 @@ export default {
     en: 'HSL',
   },
 
-  maxNearbyStopDistance: {
+  maxNearYouStopDistance: {
     favorite: 20000,
     bus: 20000,
     tram: 20000,

app/configurations/config.waltti.js

@@ -123,8 +123,8 @@ export default {
     en: 'Timetables and routes',
   },
   nearYouModes: ['bus'],
-  nearbyModeSet: 'waltti',
-  maxNearbyStopDistance: {
+  nearYouModeSet: 'waltti',
+  maxNearYouStopDistance: {
     bus: 30000,
     tram: 30000,
     rail: 50000,

app/util/sortUtils.js

@@ -3,7 +3,7 @@
  *
  * @param {Set} favouriteRentalStationsIds stationIds of favourite bike rental stations.
  */
-export const sortNearbyRentalStations = favouriteRentalStationsIds => {
+export const sortNearYouRentalStations = favouriteRentalStationsIds => {
   return (first, second) => {
     const firstIsClose = first.node.distance < 1500;
     const secondIsClose = second.node.distance < 1500;
@@ -29,7 +29,7 @@ export const sortNearbyRentalStations = favouriteRentalStationsIds => {
  * @param {Set} favouriteStopIds gtfsIds of favourite stops and stations.
  * @param distanceThreshold maximum distance with which the stops are priorized
  */
-export const sortNearbyStops = (favouriteStopIds, distanceThreshold) => {
+export const sortNearYouStops = (favouriteStopIds, distanceThreshold) => {
   return (first, second) => {
     const firstStopOrStationId = first.node.place.gtfsId;
     const firstStopOrStationIsClose = first.node.distance < distanceThreshold;