Skip to content

Commit 6b8ff0c

Browse files
vesameskanenvesameskanen
committed
Merge branch 'v3' into next
2 parents d114a26 + 259eee7 commit 6b8ff0c

File tree

14 files changed

+92
-69
lines changed

14 files changed

+92
-69
lines changed

‎app/component/DepartureRow.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,10 @@ export default function DepartureRow(
8888
);
8989
}
9090
const { shortName } = departure.trip.route;
91+
const lowerCaseShortName = shortName?.toLowerCase();
9192
const nameOrIcon =
9293
shortName?.length > 6 || !shortName?.length ? (
93-
<Icon
94-
className={mode.toLowerCase()}
95-
img={`icon-icon_${mode.toLowerCase()}`}
96-
/>
94+
<Icon className={mode} img={`icon-icon_${mode}`} />
9795
) : (
9896
shortName
9997
);
@@ -121,7 +119,7 @@ export default function DepartureRow(
121119
id: 'departure-page-sr',
122120
},
123121
{
124-
shortName: shortName?.toLowerCase(),
122+
shortName: lowerCaseShortName,
125123
destination: headsign,
126124
time,
127125
},
@@ -159,7 +157,7 @@ export default function DepartureRow(
159157
<div aria-hidden="true" className="route-number">
160158
{nameOrIcon}
161159
</div>
162-
<span className="sr-only">{shortName?.toLowerCase()}</span>
160+
<span className="sr-only">{lowerCaseShortName}</span>
163161
{icon && (
164162
<>
165163
<Icon

‎app/component/itinerary/IntermediateLeg.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function IntermediateLeg(
117117
</div>
118118
<div style={{ color }} className={`leg-before-line ${modeClassName}`} />
119119
{isLastPlace && (
120-
<div className={`leg-before-circle circle ${mode.toLowerCase()}`}>
120+
<div className={`leg-before-circle circle ${modeClassName}`}>
121121
<svg
122122
xmlns="http://www.w3.org/2000/svg"
123123
width={28}

‎app/component/itinerary/LegInfo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ export default function LegInfo(
6363
// TODO: Create a helper function for generating links
6464
}
6565
aria-label={`${intl.formatMessage({
66-
id: mode.toLowerCase(),
66+
id: mode,
6767
defaultMessage: 'Vehicle',
6868
})} ${leg.route && leg.route.shortName?.toLowerCase()}`}
6969
>
7070
<span aria-hidden="true">
7171
<RouteNumber
72-
mode={mode.toLowerCase()}
72+
mode={mode}
7373
alertSeverityLevel={alertSeverityLevel}
7474
color={leg.route ? `#${leg.route.color}` : 'currentColor'}
7575
text={leg.route && leg.route.shortName}

‎app/component/itinerary/TaxiLeg.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export default function TaxiLeg(props, { config, intl }) {
3838
);
3939
const duration = durationToString(props.leg.duration * 1000);
4040
const firstLegClassName = props.index === 0 ? 'first' : '';
41+
const lowerCaseLegMode = props.leg.mode.toLowerCase();
4142
const modeClassName = 'taxi-external';
4243

4344
const legDescription = (
@@ -69,7 +70,7 @@ export default function TaxiLeg(props, { config, intl }) {
6970
appendClass="taxi"
7071
/>
7172
<div
72-
className={`small-9 columns itinerary-instruction-column ${firstLegClassName} ${props.leg.mode.toLowerCase()}`}
73+
className={`small-9 columns itinerary-instruction-column ${firstLegClassName} ${lowerCaseLegMode}`}
7374
>
7475
<div className={cx('itinerary-leg-first-row', 'walk', 'first')}>
7576
<div className="address-container">
@@ -121,7 +122,7 @@ export default function TaxiLeg(props, { config, intl }) {
121122
isNotFirstLeg
122123
/>
123124
<div
124-
className={`small-9 columns itinerary-instruction-column ${firstLegClassName} ${props.leg.mode.toLowerCase()}`}
125+
className={`small-9 columns itinerary-instruction-column ${firstLegClassName} ${lowerCaseLegMode}`}
125126
>
126127
<div className={`itinerary-leg-first-row ${firstLegClassName}`}>
127128
<div className="itinerary-leg-row-with-link">{legDescription}</div>

‎app/component/itinerary/customizesearch/TransportModesSection.js

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,50 +29,53 @@ const TransportModesSection = ({ config }, { executeAction }) => {
2929
/>
3030
</legend>
3131
<div className="transport-modes-container">
32-
{transitModes.map(mode => (
33-
<div
34-
className="mode-option-container"
35-
key={`mode-option-${mode.toLowerCase()}`}
36-
>
37-
<label
38-
htmlFor={`settings-toggle-${mode}`}
39-
className={cx(
40-
[`mode-option-block`, 'toggle-label'],
41-
mode.toLowerCase(),
42-
{
43-
disabled: !selectedModes.includes(mode),
44-
},
45-
)}
32+
{transitModes.map(mode => {
33+
const lowerCaseMode = mode.toLowerCase();
34+
return (
35+
<div
36+
className="mode-option-container"
37+
key={`mode-option-${lowerCaseMode}`}
4638
>
47-
<div className="mode-icon">
48-
<Icon
49-
className={`${mode}-icon`}
50-
img={`icon-icon_${mode.toLowerCase()}`}
51-
color={getModeIconColor(config, mode)}
52-
/>
53-
</div>
54-
<div className="mode-name">
55-
<FormattedMessage
56-
id={
57-
alternativeNames.includes(mode.toLowerCase())
58-
? `settings-alternative-name-${mode.toLowerCase()}`
59-
: mode.toLowerCase()
39+
<label
40+
htmlFor={`settings-toggle-${mode}`}
41+
className={cx(
42+
[`mode-option-block`, 'toggle-label'],
43+
lowerCaseMode,
44+
{
45+
disabled: !selectedModes.includes(mode),
46+
},
47+
)}
48+
>
49+
<div className="mode-icon">
50+
<Icon
51+
className={`${mode}-icon`}
52+
img={`icon-icon_${lowerCaseMode}`}
53+
color={getModeIconColor(config, mode)}
54+
/>
55+
</div>
56+
<div className="mode-name">
57+
<FormattedMessage
58+
id={
59+
alternativeNames.includes(lowerCaseMode)
60+
? `settings-alternative-name-${lowerCaseMode}`
61+
: lowerCaseMode
62+
}
63+
defaultMessage={lowerCaseMode}
64+
/>
65+
</div>
66+
<Toggle
67+
id={`settings-toggle-${mode}`}
68+
toggled={selectedModes.includes(mode)}
69+
onToggle={() =>
70+
executeAction(saveRoutingSettings, {
71+
modes: toggleTransportMode(mode, config),
72+
})
6073
}
61-
defaultMessage={mode.toLowerCase()}
6274
/>
63-
</div>
64-
<Toggle
65-
id={`settings-toggle-${mode}`}
66-
toggled={selectedModes.includes(mode)}
67-
onToggle={() =>
68-
executeAction(saveRoutingSettings, {
69-
modes: toggleTransportMode(mode, config),
70-
})
71-
}
72-
/>
73-
</label>
74-
</div>
75-
))}
75+
</label>
76+
</div>
77+
);
78+
})}
7679
</div>
7780
</fieldset>
7881
);

‎app/component/routepage/RouteAlertsContainer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const getCancelations = (
3939
const first = trip.stoptimes[0];
4040
const departureTime = first.serviceDay + first.scheduledDeparture;
4141
const mode = intl.formatMessage({
42-
id: getRouteMode(route).toLowerCase(),
42+
id: getRouteMode(route),
4343
});
4444
return {
4545
alertDescriptionText: intl.formatMessage(

‎app/component/routepage/RoutePage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class RoutePage extends React.Component {
127127
>
128128
<span className="sr-only" style={{ whiteSpace: 'pre' }}>
129129
{this.context.intl.formatMessage({
130-
id: mode.toLowerCase(),
130+
id: mode,
131131
})}{' '}
132132
{label?.toLowerCase()}
133133
</span>

‎app/component/routepage/RoutePatternSelect.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ function renderPatternSelectSuggestion(item, currentPattern) {
8585
}
8686
if (item.shortName && item.longName && item.mode) {
8787
const routePath = `/${PREFIX_ROUTES}/${item.gtfsId}`;
88+
const lowerCaseItemMode = item.mode.toLowerCase();
8889
return (
8990
<Link
9091
to={routePath}
@@ -94,8 +95,8 @@ function renderPatternSelectSuggestion(item, currentPattern) {
9495
>
9596
<div className="similar-route">
9697
<Icon
97-
className={item.mode.toLowerCase()}
98-
img={`icon-icon_${item.mode.toLowerCase()}`}
98+
className={lowerCaseItemMode}
99+
img={`icon-icon_${lowerCaseItemMode}`}
99100
color={item.color ? `#${item.color}` : null}
100101
/>
101102
<div className="similar-route-text">

‎app/component/stop/FilterTimeTableModal.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class FilterTimeTableModal extends React.Component {
101101
},
102102
{
103103
mode: this.context.intl.formatMessage({
104-
id: mode.toLowerCase(),
104+
id: mode,
105105
}),
106106
shortName: o.shortName,
107107
headsign: o.headsign,
@@ -138,13 +138,10 @@ class FilterTimeTableModal extends React.Component {
138138
{/* eslint-enable jsx-a11y/label-has-associated-control */}
139139
</div>
140140
<div className="route-mode">
141-
<Icon
142-
className={mode.toLowerCase()}
143-
img={`icon-icon_${mode.toLowerCase()}`}
144-
/>
141+
<Icon className={mode} img={`icon-icon_${mode}`} />
145142
</div>
146143
<div
147-
className={`route-number ${mode.toLowerCase()} ${cx({
144+
className={`route-number ${mode} ${cx({
148145
'overflow-fade':
149146
(o.shortName ? o.shortName : o.agency) &&
150147
(o.shortName ? o.shortName : o.agency).length > LONG_LINE_NAME,

‎app/component/stop/StopAlerts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export const getCancelations = (stop, intl, config) => {
6767
};
6868
const departureTime = stoptime.serviceDay + stoptime.scheduledDeparture;
6969
const translatedMode = intl.formatMessage({
70-
id: getRouteMode(stoptime.trip.route).toLowerCase(),
70+
id: getRouteMode(stoptime.trip.route),
7171
});
7272
return {
7373
alertDescriptionText: intl.formatMessage(

‎app/configurations/config.default.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/finland/`;
1313
const HSL_TIMETABLES_URL =
1414
process.env.HSL_TIMETABLES_URL || 'https://dev.kartat.hsl.fi';
1515
const APP_PATH = process.env.APP_CONTEXT || '';
16+
const API_SUBSCRIPTION_QUERY_PARAMETER_NAME =
17+
process.env.API_SUBSCRIPTION_QUERY_PARAMETER_NAME ||
18+
'digitransit-subscription-key';
19+
const API_SUBSCRIPTION_HEADER_NAME =
20+
process.env.API_SUBSCRIPTION_HEADER_NAME || 'digitransit-subscription-key';
21+
const API_SUBSCRIPTION_TOKEN =
22+
process.env.API_SUBSCRIPTION_TOKEN || 'c65af0cd2d0a401a9599894970a2b29c';
23+
1624
const {
1725
// AXE,
1826
NODE_ENV,
19-
API_SUBSCRIPTION_QUERY_PARAMETER_NAME,
20-
API_SUBSCRIPTION_HEADER_NAME,
21-
API_SUBSCRIPTION_TOKEN,
2227
RUN_ENV,
2328
} = process.env;
24-
const hasAPISubscriptionQueryParameter =
25-
API_SUBSCRIPTION_QUERY_PARAMETER_NAME && API_SUBSCRIPTION_TOKEN;
29+
const hasAPISubscriptionQueryParameter = true;
2630
const PORT = process.env.PORT || 8080;
2731
const APP_DESCRIPTION = 'Digitransit journey planning UI';
2832
const OTP_TIMEOUT = process.env.OTP_TIMEOUT || 12000;

‎app/configurations/config.matka.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,4 +459,20 @@ export default {
459459
allowFlexJourneys: IS_DEV,
460460
allowDirectFlexJourneys: IS_DEV,
461461
},
462+
463+
devAnalytics: true,
464+
analyticsScript: function createAnalyticsScript() {
465+
return `<script>
466+
var _paq = window._paq = window._paq || [];
467+
_paq.push(['trackPageView']);
468+
_paq.push(['enableLinkTracking']);
469+
(function() {
470+
var u=https://fintraffic.matomo.cloud/;
471+
_paq.push(['setTrackerUrl', u+'matomo.php']);
472+
_paq.push(['setSiteId', '9']);
473+
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
474+
g.async=true; g.src='https://cdn.matomo.cloud/fintraffic.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
475+
})();
476+
<\/script>\n`; // eslint-disable-line no-useless-escape
477+
},
462478
};

‎app/util/modeUtils.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ export function getTransportModes(config) {
114114
};
115115
}
116116

117+
/**
118+
* @returns mode always in lower case
119+
*/
117120
export function getRouteMode(route, config) {
118121
switch (route.type) {
119122
case ExtendedRouteTypes.BusExpress:

‎app/util/vehicleRentalUtils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const getRentalNetworkId = networks => {
4747
};
4848

4949
export const getRentalNetworkConfig = (networkId, config) => {
50-
if (!networkId || !networkId.toLowerCase) {
50+
if (!networkId) {
5151
return defaultNetworkConfig;
5252
}
5353
const id = networkId.toLowerCase();

0 commit comments

Comments
 (0)