From ff8a87c961bcc7ba5b19e83f66bd188b9010d50c Mon Sep 17 00:00:00 2001 From: williameriksson126 Date: Fri, 4 Dec 2020 10:45:22 +0100 Subject: [PATCH] Hack: Nothing is done just commiting to swap branch --- src/APIexamples/Disruption.json | 0 src/App.js | 6 ++- src/classes/Stop.js | 11 +++++ src/components/NearbyStation.js | 2 +- src/components/StationDisruption.js | 64 +++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 src/APIexamples/Disruption.json create mode 100644 src/components/StationDisruption.js diff --git a/src/APIexamples/Disruption.json b/src/APIexamples/Disruption.json new file mode 100644 index 0000000..e69de29 diff --git a/src/App.js b/src/App.js index 9df211d..74bfe0c 100644 --- a/src/App.js +++ b/src/App.js @@ -5,8 +5,9 @@ import React, { Component } from "react"; import { BrowserRouter as Router, Route } from "react-router-dom"; import BottomMenu from "./components/BottomMenu.js"; -//import AccessToken from "./components/AccessToken.js"; -import NearbyStation from "./components/NearbyStation"; +import NearbyStation from "./components/NearbyStation.js"; +import Disruption from "./components/Disruption.js"; +import StationDisruption from "./components/StationDisruption.js"; import Tickets from "./components/pages/Tickets.js"; import TicketsBuy from "./components/pages/TicketsBuy.js"; @@ -20,6 +21,7 @@ class App extends Component { return (
+ diff --git a/src/classes/Stop.js b/src/classes/Stop.js index 408729b..0798738 100644 --- a/src/classes/Stop.js +++ b/src/classes/Stop.js @@ -14,4 +14,15 @@ class Stop { } } +/* +Från västtrafiks api ett element i listan av hållplatser ser ut som följande + "id": "string", + "lon": "string", + "idx": "string", + "weight": "string", + "name": "string", + "track": "string", + "lat": "string" +*/ + export default Stop; \ No newline at end of file diff --git a/src/components/NearbyStation.js b/src/components/NearbyStation.js index a0c7b3d..efb4132 100644 --- a/src/components/NearbyStation.js +++ b/src/components/NearbyStation.js @@ -28,7 +28,7 @@ class NearbyStation extends React.Component { console.log('Attempted connection') - axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=20&format=json', { headers }) + axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers }) .then(response => { console.log(response.data.LocationList.StopLocation) this.setState({ diff --git a/src/components/StationDisruption.js b/src/components/StationDisruption.js new file mode 100644 index 0000000..fb76620 --- /dev/null +++ b/src/components/StationDisruption.js @@ -0,0 +1,64 @@ +import React from 'react'; +import axios from 'axios'; +import AccessToken from '../classes/AccessToken' + +class StationDisruption extends React.Component { + state = { + gid: '9022014005700002', + lat: '57.7', + long: '12.0', + disruptions: [], + token: undefined, + tokenClass: new AccessToken() + } + + handleChangeGid = event => { + this.setState({ lat: event.target.value}); + } + + handleSubmit = event => { + event.preventDefault(); + + const headers = { + 'Authorization': 'Bearer ' + this.state.tokenClass.token + }; + + console.log('Attempted connection') + axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers }) + .then(response => { + console.log(response.data.LocationList.StopLocation) + }) + axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers }) + .then(response => { + console.log(response) + this.setState({ + disruptions: response.data + }) + }) + } + + render() { + return ( +
+
+ + +
+

+ {this.state.gid} +

+ {this.state.disruptions.map((item) => +
+

+ {item.description} +

+
+ )} +
+ ) + } +} +export default StationDisruption