Skip to content

Commit

Permalink
added matkahuolto feed ids to matka config, fixed issue where matkahu…
Browse files Browse the repository at this point in the history
…olto data didn't work correctly
  • Loading branch information
joonasrissanen committed Jul 16, 2019
1 parent eaa0893 commit 3502de5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 13 deletions.
25 changes: 13 additions & 12 deletions app/component/map/ItineraryLine.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class ItineraryLine extends React.Component {
}

const objs = [];

this.props.legs.forEach((leg, i) => {
if (leg.mode === 'WAIT') {
return;
Expand Down Expand Up @@ -82,17 +81,19 @@ class ItineraryLine extends React.Component {
this.props.showIntermediateStops &&
leg.intermediatePlaces != null
) {
leg.intermediatePlaces.forEach(place =>
objs.push(
<StopMarker
disableModeIcons
stop={place.stop}
key={`intermediate-${place.stop.gtfsId}`}
mode={modePlusClass}
thin
/>,
),
);
leg.intermediatePlaces
.filter(place => place.stop)
.forEach(place =>
objs.push(
<StopMarker
disableModeIcons
stop={place.stop}
key={`intermediate-${place.stop.gtfsId}`}
mode={modePlusClass}
thin
/>,
),
);
}

if (leg.from.vertexType === 'BIKESHARE') {
Expand Down
21 changes: 20 additions & 1 deletion app/configurations/config.matka.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,26 @@ export default {

favicon: './app/configurations/images/hsl/icon_favicon-matkafi.svg',

feedIds: ['MATKA', 'HSL', 'tampere', 'LINKKI', 'lautta', 'OULU'],
feedIds: [
'MATKA',
'HSL',
'tampere',
'LINKKI',
'lautta',
'OULU',
'MatkahuoltoKainuu',
'MatkahuoltoSavo',
'MatkahuoltoKanta',
'MatkahuoltoKarjala',
'MatkahuoltoKeski',
'MatkahuoltoKyme',
'MatkahuoltoLappi',
'MatkahuoltoPohjanmaa',
'MatkahuoltoSatakunta',
'MatkahuoltoVakka',
'MatkahuoltoVantaa',
'MatkahuoltoVarsinais',
],

meta: {
description: APP_DESCRIPTION,
Expand Down

0 comments on commit 3502de5

Please sign in to comment.