DT-6955 Viapoint by coordinates

app/component/itinerary/Itinerary.js

@@ -426,7 +426,7 @@ const Itinerary = (
     // don't want to add it twice in the same place with the same key, so we
     // record whether we added it here at the first place.
     let viaAdded = false;
-    if (leg.intermediatePlace) {
+    if (leg.intermediatePlace || leg.from.name?.indexOf('Via') > -1) {
       onlyIconLegs += 1;
       legs.push(<ViaLeg key={`via_${leg.mode}_${startMs}`} />);
       viaAdded = true;

app/component/itinerary/WalkLeg.js

@@ -125,6 +125,7 @@ function WalkLeg(
         appendClass={appendClass}
         index={index}
         modeClassName={modeClassName}
+        isVia={!!leg.viaAddress}
       />
       <div
         className={`small-9 columns itinerary-instruction-column ${leg.mode.toLowerCase()}`}
@@ -219,7 +220,9 @@ function WalkLeg(
                       />
                     </div>
                   )}
-                  {!returnNotice && !alightNotice && leg[toOrFrom].name}
+                  {!returnNotice &&
+                    !alightNotice &&
+                    (leg.viaAddress || leg[toOrFrom].name)}
                   {leg[toOrFrom].stop && !alightNotice && (
                     <Icon
                       img="icon-icon_arrow-collapse--right"

app/component/map/ItineraryPageMap.js

@@ -128,9 +128,9 @@ const ItineraryPageMap = (
   let onSelectLocation;
 
   if (isLocationPopupEnabled) {
-    // max 5 viapoints
     locationPopup =
-      config.viaPointsEnabled && viaPoints.length < 5
+      config.viaPointsEnabled &&
+      (!config.viaPointsMax || viaPoints.length < config.viaPointsMax)
         ? 'all'
         : 'origindestination';
     onSelectLocation = (item, id) =>

app/component/map/tile-layer/TileLayerContainer.js

@@ -45,7 +45,6 @@ class TileLayerContainer extends GridLayer {
     tileSize: PropTypes.number.isRequired,
     zoomOffset: PropTypes.number.isRequired,
     locationPopup: PropTypes.string, // all, none, reversegeocoding, origindestination
-    allowViaPoint: PropTypes.bool, // temporary, until OTP2 handles arbitrary via points
     onSelectLocation: PropTypes.func,
     mergeStops: PropTypes.bool,
     mapLayers: mapLayerShape.isRequired,
@@ -71,7 +70,6 @@ class TileLayerContainer extends GridLayer {
   static defaultProps = {
     onSelectLocation: undefined,
     locationPopup: undefined,
-    allowViaPoint: false,
     objectsToHide: { vehicleRentalStations: [] },
     highlightedStops: undefined,
     stopsToShow: undefined,
@@ -355,10 +353,7 @@ class TileLayerContainer extends GridLayer {
     let contents;
     const breakpoint = getClientBreakpoint();
     let showPopup = true;
-    const locationPopup =
-      this.props.allowViaPoint || this.props.locationPopup !== 'all'
-        ? this.props.locationPopup
-        : 'origindestination';
+    const { locationPopup } = this.props;
 
     if (typeof this.state.selectableTargets !== 'undefined') {
       if (this.state.selectableTargets.length === 1) {

app/configurations/config.default.js

@@ -780,6 +780,7 @@ export default {
   },
 
   viaPointsEnabled: true,
+  viaPointsMax: 1,
 
   // Toggling this off shows the alert bodytext instead of the header
   showAlertHeader: true,

app/util/legUtils.js

@@ -238,6 +238,17 @@ function isViaPointMatch(stop, viaPoints) {
   );
 }
 
+function getViaPointAddress(from, viaPoints) {
+  if (!from || !from.lat || !from.lon || from.name?.indexOf('Via') < 0) {
+    return null;
+  }
+  return viaPoints.find(
+    p =>
+      p.lat.toFixed(5) === from.lat.toFixed(5) &&
+      p.lon.toFixed(5) === from.lon.toFixed(5),
+  );
+}
+
 /**
  * Adds intermediate: true to legs if their start point should have a via point
  * marker, possibly splitting legs in case the via point belongs in the middle.
@@ -309,7 +320,8 @@ export function markViaPoints(originalLegs, viaPlaces) {
   const legs = [];
   const viaPoints = viaPlaces.map(p => p.gtfsId);
   originalLegs.forEach(leg => {
-    const isViaPoint = isViaPointMatch(leg.from.stop, viaPoints);
+    const viaAddress = getViaPointAddress(leg.from, viaPlaces)?.address;
+    const isViaPoint = isViaPointMatch(leg.from.stop, viaPoints) || viaAddress;
     if (leg.intermediatePlaces) {
       const intermediatePlaces = [];
       leg.intermediatePlaces.forEach(place => {
@@ -327,6 +339,7 @@ export function markViaPoints(originalLegs, viaPlaces) {
       legs.push({
         ...leg,
         isViaPoint,
+        viaAddress,
       });
     }
   });

app/util/planParamUtil.js

@@ -313,11 +313,29 @@ export function getPlanParams(
   const intermediateLocations = getIntermediatePlaces({
     intermediatePlaces,
   });
-  const via = intermediateLocations.map(loc => ({
-    passThrough: {
-      stopLocationIds: [loc.gtfsId],
-    },
-  }));
+  const via = intermediateLocations
+    .map(loc => {
+      if (loc.gtfsId) {
+        return {
+          passThrough: {
+            stopLocationIds: [loc.gtfsId],
+          },
+        };
+      }
+      if (loc.lat && loc.lon) {
+        return {
+          visit: {
+            coordinate: {
+              latitude: loc.lat,
+              longitude: loc.lon,
+            },
+          },
+        };
+      }
+      return null;
+    })
+    .filter(Boolean);
+
   const distance = estimateItineraryDistance(
     fromLocation,
     toLocation,