Merge pull request #2004 from HSLdevcom/navigation-fix-for-addresses-…

…with-special-chars

Navigation fix for addresses with special chars

app/component/FavouriteLocationsContainer.js

@@ -6,7 +6,7 @@ import connectToStores from 'fluxible-addons-react/connectToStores';
 import SwipeableViews from 'react-swipeable-views';
 import { bindKeyboard } from 'react-swipeable-views-utils';
 import range from 'lodash/range';
-import { getPathWithEndpointObjects } from '../util/path';
+import { navigateTo } from '../util/path';
 import Icon from './Icon';
 import FavouriteLocationContainer from './FavouriteLocationContainer';
 import FavouriteLocation from './FavouriteLocation';
@@ -105,10 +105,15 @@ class FavouriteLocationsContainer extends React.Component {
       lat,
       lon,
       address: locationName,
+      ready: true,
     };
 
-    const url = getPathWithEndpointObjects(this.props.origin, location);
-    this.context.router.push(url);
+    navigateTo({
+      origin: this.props.origin,
+      destination: location,
+      context: '/',
+      router: this.context.router,
+    });
   };
 
   slideRenderer = ({ key, index }) => {

app/util/otpStrings.js

@@ -17,7 +17,9 @@ export const addressToItinerarySearch = location => {
   if (location.set === false) {
     return '-';
   }
-  return `${location.address}::${location.lat},${location.lon}`;
+  return `${encodeURIComponent(
+    location.address,
+  )}::${location.lat},${location.lon}`;
 };
 
 export const locationToOTP = location => {

app/util/path.js

@@ -15,7 +15,11 @@ export const PREFIX_ITINERARY_SUMMARY = 'reitti';
 export const stopUrl = id => id;
 
 export const getRoutePath = (origin, destination) =>
-  [`/${PREFIX_ITINERARY_SUMMARY}`, origin, destination].join('/');
+  [
+    `/${PREFIX_ITINERARY_SUMMARY}`,
+    encodeURIComponent(decodeURIComponent(origin)),
+    encodeURIComponent(decodeURIComponent(destination)),
+  ].join('/');
 
 export const getItineraryPath = (from, to, idx) =>
   [getRoutePath(from, to), idx].join('/');