Merge branch 'v3' into waltti

Author: vesameskanen

app/action/PositionActions.js

@@ -3,6 +3,7 @@ import { getJson } from '../util/xhrPromise';
 import geolocationMessages from '../util/geolocationMessages';
 import { addAnalyticsEvent } from '../util/analyticsUtils';
 
+const MOCKPOS = false;
 let geoWatchId;
 
 function reverseGeocodeAddress(actionContext, coords) {
@@ -87,6 +88,20 @@ function dispatchGeolocationError(actionContext, error) {
   }
 }
 
+function mockPositionChange(actionContext) {
+  const pos = actionContext.getStore('PositionStore').getLocationState();
+  if (pos.hasLocation) {
+    const newPos = {
+      coords: {
+        latitude: pos.lat + (Math.random() - 0.5) * 0.001,
+        longitude: pos.lon + (Math.random() - 0.5) * 0.001,
+        heading: 0,
+      },
+    };
+    geoCallback(actionContext, newPos);
+  }
+}
+
 // set watcher for geolocation
 function watchPosition(actionContext) {
   const quietTimeoutSeconds = 20;
@@ -96,6 +111,9 @@ function watchPosition(actionContext) {
     updateGeolocationMessage(actionContext, 'timeout');
   }, quietTimeoutSeconds * 1000);
   try {
+    if (MOCKPOS) {
+      setInterval(mockPositionChange, 5000, actionContext);
+    }
     geoWatchId = navigator.geolocation.watchPosition(
       position => {
         updateGeolocationMessage(actionContext);
@@ -200,10 +218,20 @@ export function startLocationWatch(actionContext) {
           watchPosition(actionContext);
           break;
       }
+      watchPending = false;
     });
   }
 }
 
+/* stops location watch */
+export function stopLocationWatch() {
+  if (typeof geoWatchId !== 'undefined') {
+    navigator.geolocation.clearWatch(geoWatchId);
+    geoWatchId = undefined;
+  }
+  watchPending = false;
+}
+
 export function showGeolocationDeniedMessage(actionContext) {
   actionContext.dispatch('GeolocationDenied');
   updateGeolocationMessage(actionContext, 'denied');

app/component/DepartureListContainer.js

@@ -80,15 +80,15 @@ class DepartureListContainer extends Component {
     infiniteScroll: PropTypes.bool,
     className: PropTypes.string,
     isTerminal: PropTypes.bool,
-    isStopPage: PropTypes.bool,
+    showVehicles: PropTypes.bool,
   };
 
   static defaultProps = {
     limit: undefined,
     infiniteScroll: false,
     className: undefined,
     isTerminal: false,
-    isStopPage: false,
+    showVehicles: false,
     mode: 'BUS',
   };
 
@@ -114,27 +114,27 @@ class DepartureListContainer extends Component {
         }
       }, 100);
     }
-    if (this.context.config.showVehiclesOnStopPage && this.props.isStopPage) {
+    if (this.context.config.showVehiclesOnStopPage && this.props.showVehicles) {
       const departures = asDepartures(this.props.stoptimes)
         .filter(departure => !(this.props.isTerminal && departure.isArrival))
-        .filter(departure => this.props.currentTime < departure.stoptime);
+        .filter(departure => this.props.currentTime < departure.time);
       this.startClient(departures);
     }
   }
 
   componentDidUpdate() {
-    if (this.context.config.showVehiclesOnStopPage && this.props.isStopPage) {
+    if (this.context.config.showVehiclesOnStopPage && this.props.showVehicles) {
       const departures = asDepartures(this.props.stoptimes)
         .filter(departure => !(this.props.isTerminal && departure.isArrival))
-        .filter(departure => this.props.currentTime < departure.stoptime)
+        .filter(departure => this.props.currentTime < departure.time)
         .filter(departure => departure.realtime);
 
       this.updateClient(departures);
     }
   }
 
   componentWillUnmount() {
-    if (this.context.config.showVehiclesOnStopPage && this.props.isStopPage) {
+    if (this.context.config.showVehiclesOnStopPage && this.props.showVehicles) {
       const { client } = this.context.getStore('RealTimeInformationStore');
       if (client) {
         this.context.executeAction(stopRealTimeClient, client);

app/component/IndexPage.js

@@ -115,9 +115,6 @@ class IndexPage extends React.Component {
 
     if (this.context.config.startSearchFromUserLocation && !origin.lat) {
       checkPositioningPermission().then(permission => {
-        if (this.context.match.location?.query?.debug !== undefined) {
-          alert(permission.state);
-        }
         if (
           permission.state === 'granted' &&
           this.props.locationState.status === 'no-location'

app/component/itinerary/BicycleLeg.js

@@ -276,6 +276,12 @@ export default function BicycleLeg(
                     to={`/${PREFIX_STOPS}/${fromStop.gtfsId}`}
                   >
                     {origin}
+                    {leg.isViaPoint && (
+                      <Icon
+                        img="icon-icon_mapMarker-via"
+                        className="itinerary-mapmarker-icon"
+                      />
+                    )}
                     <Icon
                       img="icon-icon_arrow-collapse--right"
                       className="itinerary-arrow-icon"

app/component/itinerary/BikeParkLeg.js

@@ -8,6 +8,7 @@ import { displayDistance } from '../../util/geo-utils';
 import { durationToString } from '../../util/timeUtils';
 import ItineraryCircleLineWithIcon from './ItineraryCircleLineWithIcon';
 import ItineraryMapAction from './ItineraryMapAction';
+import Icon from '../Icon';
 
 const BikeParkLeg = (
   { leg, index, focusAction, bikePark },
@@ -55,6 +56,12 @@ const BikeParkLeg = (
                 > */}
             <div className="address">
               <FormattedMessage id="bike-park" />
+              {leg.isViaPoint && (
+                <Icon
+                  img="icon-icon_mapMarker-via"
+                  className="itinerary-mapmarker-icon"
+                />
+              )}
               {/* TODO */}
               {/* {bikePark && (
                   <Icon

app/component/itinerary/CarLeg.js

@@ -66,6 +66,12 @@ export default function CarLeg(props, { config, intl }) {
           <div className="address-container">
             <div className="address">
               {address}
+              {props.leg.isViaPoint && (
+                <Icon
+                  img="icon-icon_mapMarker-via"
+                  className="itinerary-mapmarker-icon"
+                />
+              )}
               {props.leg.from.stop && (
                 <Icon
                   img="icon-icon_arrow-collapse--right"

app/component/itinerary/CarParkLeg.js

@@ -72,6 +72,12 @@ function CarParkLeg(props, { config, intl }) {
             >
               <div className="address">
                 <FormattedMessage id="car_park" defaultMessage="Park & Ride" />
+                {props.leg.isViaPoint && (
+                  <Icon
+                    img="icon-icon_mapMarker-via"
+                    className="itinerary-mapmarker-icon"
+                  />
+                )}
                 {props.carPark && (
                   <Icon
                     img="icon-icon_arrow-collapse--right"

app/component/itinerary/IntermediateLeg.js

@@ -23,6 +23,7 @@ function IntermediateLeg(
     previousZoneId,
     currentZoneId,
     nextZoneId,
+    isViaPoint,
     isCanceled,
     isLastPlace,
   },
@@ -151,6 +152,12 @@ function IntermediateLeg(
               </span>
               {` ${name}`}
             </div>
+            {isViaPoint && (
+              <Icon
+                img="icon-icon_mapMarker-via"
+                className="itinerary-mapmarker-icon"
+              />
+            )}
             <Icon
               img="icon-icon_arrow-collapse--right"
               className="itinerary-arrow-icon"
@@ -176,6 +183,7 @@ IntermediateLeg.propTypes = {
   previousZoneId: PropTypes.string,
   currentZoneId: PropTypes.string,
   nextZoneId: PropTypes.string,
+  isViaPoint: PropTypes.bool,
   isLastPlace: PropTypes.bool,
   gtfsId: PropTypes.string,
   isCanceled: PropTypes.bool,
@@ -191,6 +199,7 @@ IntermediateLeg.defaultProps = {
   isCanceled: false,
   realTime: false,
   isLastPlace: false,
+  isViaPoint: false,
   gtfsId: undefined,
   color: undefined,
 };

app/component/itinerary/Itinerary.js

@@ -21,6 +21,7 @@ import {
   getLegBadgeProps,
   isCallAgencyLeg,
   getInterliningLegs,
+  isFirstInterliningLeg,
   getTotalDistance,
   getRouteText,
   legTime,
@@ -318,8 +319,8 @@ const Itinerary = (
     }
     nameLengthSum += 10; // every leg requires some minimum space
     if (
-      leg.intermediatePlace ||
-      connectsFromViaPoint(leg, intermediatePlaces)
+      i > 0 &&
+      (leg.intermediatePlace || connectsFromViaPoint(leg, intermediatePlaces))
     ) {
       intermediateSlack +=
         legTime(leg.start) - legTime(compressedLegs[i - 1].end); // calculate time spent at each intermediate place
@@ -361,11 +362,9 @@ const Itinerary = (
     let waitLength;
     const startMs = legTime(leg.start);
     const endMs = legTime(leg.end);
-    const isNextLegLast = i + 1 === compressedLegs.length - 1;
-    const shouldRenderLastLeg =
-      isNextLegLast && lastLegLength < renderBarThreshold;
-    const previousLeg = compressedLegs[i - 1];
-    const nextLeg = compressedLegs[i + 1];
+    const previousLeg = i > 0 ? compressedLegs[i - 1] : null;
+    const nextLeg =
+      i < compressedLegs.length - 1 ? compressedLegs[i + 1] : null;
     let legLength = relativeLength(endMs - startMs);
     const longName = !leg?.route?.shortName || leg?.route?.shortName.length > 5;
 
@@ -386,24 +385,37 @@ const Itinerary = (
       }
     }
 
-    const [interliningLines, interliningLegs] = getInterliningLegs(
-      compressedLegs,
-      i,
-    );
-
-    const lastLegWithInterline = interliningLegs[interliningLegs.length - 1];
-    if (lastLegWithInterline) {
+    if (isFirstInterliningLeg(compressedLegs, i)) {
+      const [interliningLines, interliningLegs] = getInterliningLegs(
+        compressedLegs,
+        i,
+      );
       interliningWithRoute = interliningLines.join(' / ');
-      legLength =
-        ((legTime(lastLegWithInterline.end) - startMs) / durationWithoutSlack) *
-        100;
+      const lastLegWithInterline = interliningLegs[interliningLegs.length - 1];
+      legLength = relativeLength(legTime(lastLegWithInterline.end) - startMs);
+      if (
+        compressedLegs.length - 2 === i + interliningLegs.length &&
+        lastLegLength < renderBarThreshold
+      ) {
+        // If the last interlining leg is the next to last leg and
+        // if the last leg is too short add its length to the interlining leg.
+        legLength += lastLegLength;
+      }
+    } else if (leg.interlineWithPreviousLeg) {
+      // Interlining legs after the first one should be skipped, this skips to the next index.
+      return;
+    } else if (
+      compressedLegs.length - 2 === i &&
+      lastLegLength < renderBarThreshold
+    ) {
+      // Interlining legs handle this addition differently.
+      // If this leg is the next to last leg and
+      // if the last leg is too short add its length to the leg before it.
+      legLength += lastLegLength;
     }
+
     legLength += addition;
     addition = 0;
-
-    if (shouldRenderLastLeg) {
-      legLength += lastLegLength; // if the last leg is too short add its length to the leg before it
-    }
     if (legLength < renderBarThreshold && isLegOnFoot(leg)) {
       // don't render short legs that are on foot at all
       renderBar = false;
@@ -592,25 +604,23 @@ const Itinerary = (
         legLength > renderRouteNumberThreshold &&
         !longName &&
         transitLegCount < 7;
-      if (!leg.interlineWithPreviousLeg) {
-        legs.push(
-          <RouteLeg
-            key={`${leg.mode}_${startMs}`}
-            leg={leg}
-            fitRouteNumber={
-              (fitAllRouteNumbers && !longName) || renderRouteNumberForALongLeg
-            }
-            interliningWithRoute={interliningWithRoute}
-            intl={intl}
-            legLength={legLength}
-            large={breakpoint === 'large'}
-            withBicycle={withBicycle}
-            withCar={withCar}
-            hasOneTransitLeg={hasOneTransitLeg(itinerary)}
-            shortenLabels={shortenLabels}
-          />,
-        );
-      }
+      legs.push(
+        <RouteLeg
+          key={`${leg.mode}_${startMs}`}
+          leg={leg}
+          fitRouteNumber={
+            (fitAllRouteNumbers && !longName) || renderRouteNumberForALongLeg
+          }
+          interliningWithRoute={interliningWithRoute}
+          intl={intl}
+          legLength={legLength}
+          large={breakpoint === 'large'}
+          withBicycle={withBicycle}
+          withCar={withCar}
+          hasOneTransitLeg={hasOneTransitLeg(itinerary)}
+          shortenLabels={shortenLabels}
+        />,
+      );
       vehicleNames.push(
         formatMessage(
           {

app/component/itinerary/ItineraryPageUtils.js

@@ -472,15 +472,7 @@ export function mergeBikeTransitPlans(bikeParkPlan, bikeTransitPlan) {
  */
 export function mergeCarDirectAndTransitPlans(carDirectPlan, carTransitPlan) {
   const carDirectPlanEdges = carDirectPlan?.edges || [];
-  let carPublicEdges = carTransitPlan?.edges || [];
-
-  // If the car direct plan has a shorter duration than a transit plan, the transit plan is filtered out.
-  if (carDirectPlanEdges.length === 1) {
-    carPublicEdges = carPublicEdges.filter(
-      itinerary =>
-        itinerary.node.duration <= carDirectPlanEdges[0].node.duration,
-    );
-  }
+  const carPublicEdges = carTransitPlan?.edges || [];
 
   return {
     searchDateTime: carTransitPlan.searchDateTime,