-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2361 from HSLdevcom/DT-1869
Dt 1869
- Loading branch information
Showing
10 changed files
with
1,260 additions
and
18 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import PropTypes from 'prop-types'; | ||
| import React from 'react'; | ||
| import AdminForm from './AdminForm'; | ||
|
|
||
| class AdminPage extends React.Component { | ||
| static contextTypes = { | ||
| config: PropTypes.object.isRequired, | ||
| }; | ||
|
|
||
| state = { loading: true, dataConDefaults: {} }; | ||
|
|
||
| componentDidMount() { | ||
| const OTPURLSplit = this.context.config.URL.OTP.split('/'); | ||
| const dataContainerURL = `${ | ||
| this.context.config.URL.API_URL | ||
| }/routing-data/v2/${ | ||
| OTPURLSplit[OTPURLSplit.length - 2] | ||
| }/router-config.json`; | ||
| fetch(dataContainerURL) | ||
| .then(res => res.json()) | ||
| .then( | ||
| result => { | ||
| this.setState({ | ||
| loading: false, | ||
| dataConDefaults: result.routingDefaults, | ||
| }); | ||
| }, | ||
| err => { | ||
| console.log(err); | ||
| this.setState({ loading: false }); | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return <AdminForm {...this.state} />; | ||
| } | ||
| } | ||
|
|
||
| export default AdminPage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| import React from 'react'; | ||
| import Snackbar from 'material-ui/Snackbar'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import { FormattedMessage } from 'react-intl'; | ||
| import { locationShape } from 'react-router'; | ||
| import { setRoutingSettings } from '../store/localStorage'; | ||
|
|
||
| class RoutingSettingsButtons extends React.Component { | ||
| static contextTypes = { | ||
| location: locationShape.isRequired, | ||
| }; | ||
|
|
||
| static propTypes = { | ||
| onReset: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| autoHideDuration: 940, | ||
| open: false, | ||
| message: '', | ||
| }; | ||
| } | ||
|
|
||
| setSettingsData = () => { | ||
| const settings = { | ||
| maxWalkDistance: this.context.location.query.maxWalkDistance | ||
| ? this.context.location.query.maxWalkDistance | ||
| : undefined, | ||
| maxBikingDistance: this.context.location.query.maxBikingDistance | ||
| ? this.context.location.query.maxBikingDistance | ||
| : undefined, | ||
| ignoreRealtimeUpdates: this.context.location.query.ignoreRealtimeUpdates | ||
| ? this.context.location.query.ignoreRealtimeUpdates | ||
| : undefined, | ||
| maxPreTransitTime: this.context.location.query.maxPreTransitTime | ||
| ? this.context.location.query.maxPreTransitTime | ||
| : undefined, | ||
| walkOnStreetReluctance: this.context.location.query.walkOnStreetReluctance | ||
| ? this.context.location.query.walkOnStreetReluctance | ||
| : undefined, | ||
| waitReluctance: this.context.location.query.waitReluctance | ||
| ? this.context.location.query.waitReluctance | ||
| : undefined, | ||
| bikeSpeed: this.context.location.query.bikeSpeed | ||
| ? this.context.location.query.bikeSpeed | ||
| : undefined, | ||
| bikeSwitchTime: this.context.location.query.bikeSwitchTime | ||
| ? this.context.location.query.bikeSwitchTime | ||
| : undefined, | ||
| bikeSwitchCost: this.context.location.query.bikeSwitchCost | ||
| ? this.context.location.query.bikeSwitchCost | ||
| : undefined, | ||
| bikeBoardCost: this.context.location.query.bikeBoardCost | ||
| ? this.context.location.query.bikeBoardCost | ||
| : undefined, | ||
| optimize: this.context.location.query.optimize | ||
| ? this.context.location.query.optimize | ||
| : undefined, | ||
| safetyFactor: this.context.location.query.safetyFactor | ||
| ? this.context.location.query.safetyFactor | ||
| : undefined, | ||
| slopeFactor: this.context.location.query.slopeFactor | ||
| ? this.context.location.query.slopeFactor | ||
| : undefined, | ||
| timeFactor: this.context.location.query.timeFactor | ||
| ? this.context.location.query.timeFactor | ||
| : undefined, | ||
| carParkCarLegWeight: this.context.location.query.carParkCarLegWeight | ||
| ? this.context.location.query.carParkCarLegWeight | ||
| : undefined, | ||
| maxTransfers: this.context.location.query.maxTransfers | ||
| ? this.context.location.query.maxTransfers | ||
| : undefined, | ||
| waitAtBeginningFactor: this.context.location.query.waitAtBeginningFactor | ||
| ? this.context.location.query.waitAtBeginningFactor | ||
| : undefined, | ||
| heuristicStepsPerMainStep: this.context.location.query | ||
| .heuristicStepsPerMainStep | ||
| ? this.context.location.query.heuristicStepsPerMainStep | ||
| : undefined, | ||
| compactLegsByReversedSearch: this.context.location.query | ||
| .compactLegsByReversedSearch | ||
| ? this.context.location.query.compactLegsByReversedSearch | ||
| : undefined, | ||
| disableRemainingWeightHeuristic: this.context.location.query | ||
| .disableRemainingWeightHeuristic | ||
| ? this.context.location.query.disableRemainingWeightHeuristic | ||
| : undefined, | ||
| itineraryFiltering: this.context.location.query.itineraryFiltering | ||
| ? this.context.location.query.itineraryFiltering | ||
| : undefined, | ||
| }; | ||
|
|
||
| if ( | ||
| settings.optimize === 'TRIANGLE' && | ||
| Number(settings.safetyFactor) + | ||
| Number(settings.slopeFactor) + | ||
| Number(settings.timeFactor) !== | ||
| 1.0 | ||
| ) { | ||
| alert('Cycling safety, slope, and time factors should equal to 1.0'); | ||
| } else { | ||
| setRoutingSettings(settings); | ||
| this.setState({ | ||
| open: true, | ||
| message: ( | ||
| <FormattedMessage | ||
| tagName="span" | ||
| defaultMessage="Tallenna asetukset" | ||
| id="settings-saved" | ||
| /> | ||
| ), | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| resetSettings = () => { | ||
| this.props.onReset(); | ||
| this.setState({ | ||
| open: true, | ||
| message: 'Reseted settings!', | ||
| }); | ||
| }; | ||
|
|
||
| handleRequestClose = () => { | ||
| this.setState({ | ||
| open: false, | ||
| }); | ||
| }; | ||
|
|
||
| render() { | ||
| return ( | ||
| <div className="save-settings"> | ||
| <hr /> | ||
| <button | ||
| onClick={this.setSettingsData} | ||
| style={{ | ||
| margin: '0 10px 0 0', | ||
| }} | ||
| > | ||
| <FormattedMessage | ||
| defaultMessage="Tallenna asetukset" | ||
| id="settings-savebutton" | ||
| /> | ||
| </button> | ||
| <button onClick={this.resetSettings}> | ||
| <FormattedMessage | ||
| defaultMessage="Palauta oletusasetukset" | ||
| id="settings-reset" | ||
| /> | ||
| </button> | ||
| <Snackbar | ||
| open={this.state.open} | ||
| message={this.state.message} | ||
| autoHideDuration={this.state.autoHideDuration} | ||
| onRequestClose={this.handleRequestClose} | ||
| bodyStyle={{ | ||
| backgroundColor: '#585a5b', | ||
| color: '#fff', | ||
| textAlign: 'center', | ||
| width: 'auto', | ||
| fontSize: '0.8rem', | ||
| fontFamily: | ||
| '"Gotham Rounded SSm A", "Gotham Rounded SSm B", Arial, Georgia, Serif', | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default RoutingSettingsButtons; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.