Skip to content

Commit

Permalink
Merge pull request #2099 from HSLdevcom/DT-2412
Browse files Browse the repository at this point in the history
DT-2412
  • Loading branch information
vesameskanen authored Jan 12, 2018
2 parents fb33b25 + 919930f commit db05122
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
3 changes: 1 addition & 2 deletions app/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import ErrorBoundary from './component/ErrorBoundary';

import { getGeocodingResult } from './util/searchUtils';
import { locationToOTP } from './util/otpStrings';
import { PREFIX_ITINERARY_SUMMARY } from './util/path';
import { kkj2ToWgs84 } from './util/geo-utils';

const plugContext = f => () => ({
Expand Down Expand Up @@ -236,7 +235,7 @@ const callback = () =>
parseLocation(query.to, query.to_in, config),
]).then(([from, to]) => {
window.location.replace(
`/${PREFIX_ITINERARY_SUMMARY}/${from}/${to}?${timeStr}arriveBy=${arriveBy}`,
`/${from}/${to}?${timeStr}arriveBy=${arriveBy}`,
);
});
} else if (['/fi/', '/en/', '/sv/', '/ru/', '/slangi/'].includes(path)) {
Expand Down
5 changes: 1 addition & 4 deletions server/reittiopasParameterMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import moment from 'moment-timezone';
import { locationToOTP } from '../app/util/otpStrings';
import { getGeocodingResult } from '../app/util/searchUtils';
import { getConfiguration } from '../app/config';
import { PREFIX_ITINERARY_SUMMARY } from '../app/util/path';

const kkj2 =
'+proj=tmerc +lat_0=0 +lon_0=24 +k=1 +x_0=2500000 +y_0=0 +ellps=intl +towgs84=-96.0617,-82.4278,-121.7535,4.80107,0.34543,-1.37646,1.4964 +units=m +no_defs';
Expand Down Expand Up @@ -131,9 +130,7 @@ export default function reittiopasParameterMiddleware(req, res, next) {
parseLocation(req.query.from, req.query.from_in, config, next),
parseLocation(req.query.to, req.query.to_in, config, next),
]).then(([from, to]) =>
res.redirect(
`/${PREFIX_ITINERARY_SUMMARY}/${from}/${to}?${timeStr}arriveBy=${arriveBy}`,
),
res.redirect(`/${from}/${to}?${timeStr}arriveBy=${arriveBy}`),
);
} else if (
['/fi/', '/en/', '/sv/', '/ru/', '/slangi/'].includes(req.path)
Expand Down

0 comments on commit db05122

Please sign in to comment.