Merge pull request #14 from thefeli73/we-new-users

Add: new locations
This commit is contained in:
William Eriksson 2020-12-11 10:08:31 +01:00 committed by GitHub
commit b56e334d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 332 additions and 308 deletions

View File

@ -1,51 +1,51 @@
{ {
"DepartureBoard": { "DepartureBoard": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
"servertime": "10:09", "servertime": "09:38",
"serverdate": "2020-12-10", "serverdate": "2020-12-11",
"Departures": [ "Departures": [
{ {
"name": "Buss MEXP", "name": "Buss MEXP",
"sname": "MEXP", "sname": "MEXP",
"journeyNumber": "24", "journeyNumber": "22",
"type": "BUS", "type": "BUS",
"stopid": "9022014014754002", "stopid": "9022014014751002",
"stop": "Bollestadsvägen, Kungälv", "stop": "Guddeby, Kungälv",
"time": "10:09", "time": "09:40",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014621000024", "journeyid": "9015014621000022",
"direction": "Marstrand", "direction": "Marstrand",
"track": "B", "track": "B",
"rtTime": "10:11", "rtTime": "09:44",
"rtDate": "2020-12-10", "rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=347217%2F124275%2F19874%2F105802%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=715722%2F247121%2F629948%2F76401%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26"
} }
}, },
{ {
"name": "Buss 920", "name": "Buss 927",
"sname": "920", "sname": "927",
"journeyNumber": "2", "journeyNumber": "2",
"type": "BUS", "type": "BUS",
"stopid": "9022014014754002", "stopid": "9022014014751002",
"stop": "Bollestadsvägen, Kungälv", "stop": "Guddeby, Kungälv",
"time": "12:26", "time": "12:29",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014692000002", "journeyid": "9015014692700002",
"direction": "Bredsten", "direction": "Tjuvkil",
"track": "B", "track": "B",
"rtTime": "12:26", "rtTime": "12:30",
"rtDate": "2020-12-10", "rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=210630%2F70533%2F834318%2F346949%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=286581%2F125303%2F109682%2F40686%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26"
} }
} }
] ]

View File

@ -1,51 +1,51 @@
{ {
"DepartureBoard": { "DepartureBoard": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
"servertime": "10:10", "servertime": "09:41",
"serverdate": "2020-12-10", "serverdate": "2020-12-11",
"Departures": [ "Departures": [
{ {
"name": "Buss MEXP", "name": "Buss MEXP",
"sname": "MEXP", "sname": "MEXP",
"journeyNumber": "24", "journeyNumber": "22",
"type": "BUS", "type": "BUS",
"stopid": "9022014014020002", "stopid": "9022014014010002",
"stop": "Ekelöv västra, Kungälv", "stop": "Hålta kyrka, Kungälv",
"time": "10:10", "time": "09:47",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014621000024", "journeyid": "9015014621000022",
"direction": "Marstrand", "direction": "Marstrand",
"track": "B", "track": "B",
"rtTime": "10:13", "rtTime": "09:50",
"rtDate": "2020-12-10", "rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=740262%2F255290%2F59460%2F217024%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14020002%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=514476%2F180039%2F54148%2F144419%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14010002%26station_type%3Ddep%26format%3Djson%26"
} }
}, },
{ {
"name": "Buss 920", "name": "Buss 927",
"sname": "920", "sname": "927",
"journeyNumber": "2", "journeyNumber": "2",
"type": "BUS", "type": "BUS",
"stopid": "9022014014754002", "stopid": "9022014014010002",
"stop": "Bollestadsvägen, Kungälv", "stop": "Hålta kyrka, Kungälv",
"time": "12:28", "time": "12:38",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014692000002", "journeyid": "9015014692700002",
"direction": "Bredsten", "direction": "Tjuvkil",
"track": "B", "track": "B",
"rtTime": "12:26", "rtTime": "12:38",
"rtDate": "2020-12-10", "rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=210630%2F70533%2F834318%2F346949%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=667647%2F252325%2F917844%2F236373%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14010002%26station_type%3Ddep%26format%3Djson%26"
} }
} }
] ]

View File

@ -1,27 +1,53 @@
{ {
"DepartureBoard": { "DepartureBoard": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
"servertime": "10:10", "servertime": "09:44",
"serverdate": "2020-12-10", "serverdate": "2020-12-11",
"Departures": [{ "Departures": [
{
"name": "Buss MEXP", "name": "Buss MEXP",
"sname": "MEXP", "sname": "MEXP",
"journeyNumber": "24", "journeyNumber": "22",
"type": "BUS", "type": "BUS",
"stopid": "9022014014751002", "stopid": "9022014014614002",
"stop": "Guddeby, Kungälv", "stop": "Stenskärsvägen, Kungälv",
"time": "10:07", "time": "09:52",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014621000024", "journeyid": "9015014621000022",
"direction": "Marstrand", "direction": "Marstrand",
"track": "B", "track": "B",
"rtTime": "09:57",
"rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=473190%2F166266%2F666560%2F175550%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=341064%2F122235%2F154456%2F36461%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14614002%26station_type%3Ddep%26format%3Djson%26"
} }
}] },
{
"name": "Buss 320",
"sname": "320",
"journeyNumber": "10",
"type": "BUS",
"stopid": "9022014014614002",
"stop": "Stenskärsvägen, Kungälv",
"time": "10:44",
"date": "2020-12-11",
"journeyid": "9015014632000010",
"direction": "Tjuvkil",
"track": "B",
"rtTime": "10:44",
"rtDate": "2020-12-11",
"fgColor": "#006C93",
"bgColor": "#FFFFFF",
"stroke": "Solid",
"accessibility": "wheelChair",
"JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=931884%2F318653%2F795430%2F87087%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14614002%26station_type%3Ddep%26format%3Djson%26"
}
}
]
} }
} }

View File

@ -1,10 +1,9 @@
{ {
"DepartureBoard": { "DepartureBoard": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
"servertime": "10:11", "servertime": "09:45",
"serverdate": "2020-12-10", "serverdate": "2020-12-11",
"Departures": "Departures": [{
[{
"name": "Buss 928", "name": "Buss 928",
"sname": "928", "sname": "928",
"journeyNumber": "10", "journeyNumber": "10",
@ -12,18 +11,18 @@
"stopid": "9022014014225001", "stopid": "9022014014225001",
"stop": "Skrämmenborg, Kungälv", "stop": "Skrämmenborg, Kungälv",
"time": "15:19", "time": "15:19",
"date": "2020-12-10", "date": "2020-12-11",
"journeyid": "9015014692800010", "journeyid": "9015014692800010",
"direction": "Kärna", "direction": "Kärna",
"track": "A", "track": "A",
"rtTime": "15:19", "rtTime": "15:19",
"rtDate": "2020-12-10", "rtDate": "2020-12-11",
"fgColor": "#006C93", "fgColor": "#006C93",
"bgColor": "#FFFFFF", "bgColor": "#FFFFFF",
"stroke": "Solid", "stroke": "Solid",
"accessibility": "wheelChair", "accessibility": "wheelChair",
"JourneyDetailRef": { "JourneyDetailRef": {
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=261732%2F87569%2F149176%2F12656%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14225001%26station_type%3Ddep%26format%3Djson%26" "ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=110424%2F37130%2F997492%2F461938%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14225001%26station_type%3Ddep%26format%3Djson%26"
} }
}] }]
} }

View File

@ -2,15 +2,15 @@
"situationNumber": "RT1", "situationNumber": "RT1",
"severity":"normal", "severity":"normal",
"title":"Nabbensbergsvägen närmast Edsvägen helt avstängd och trafiken hänvisas istället via Korsebergsvägen. Samtidigt tas den tillfälliga förbifarten bort på Edsvägen och trafiken kommer att ledas förbi den nya cirkulationsplatsen i de två västra körfälten tills arbetet på Nabbensbergsvägen är klart Hastighet: 50km/h", "title":"Nabbensbergsvägen närmast Edsvägen helt avstängd och trafiken hänvisas istället via Korsebergsvägen. Samtidigt tas den tillfälliga förbifarten bort på Edsvägen och trafiken kommer att ledas förbi den nya cirkulationsplatsen i de två västra körfälten tills arbetet på Nabbensbergsvägen är klart Hastighet: 50km/h",
"time":"00:01", "time":"00:07",
"affectedStopPoints":[ "affectedStopPoints":[
{ {
"gid": "9022014014020001", "gid": "9022014014010001",
"name": "Ekelöv västra, Kungälv" "name": "Hålta kyrka, Kungälv"
}, },
{ {
"gid": "9022014014751001", "gid": "9022014014614001",
"name": "Guddeby, Kungälv" "name": "Stenskärsvägen, Kungälv"
} }
] ]
} }

View File

@ -1,12 +1,12 @@
{ {
"situationNumber": "RT2", "situationNumber": "RT2",
"severity":"normal", "severity":"normal",
"title":"Försening", "title":"På grund av renovation av Nordreälvsbron i Kungälv från 10 november, 2019 till sommaren 2022 är det risk för förseningar på vissa Västtrafik bussar.",
"time":"00:02", "time":"00:09",
"affectedStopPoints":[ "affectedStopPoints":[
{ {
"gid": "9021014014225000", "gid": "9022014014762001",
"name": "Skrämmenborg, Kungälv" "name": "Kuröd, Kungälv"
} }
] ]
} }

View File

@ -1,35 +1,35 @@
{ {
"LocationList": { "LocationList": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
"servertime": "16:48", "servertime": "09:34",
"serverdate": "2020-12-09", "serverdate": "2020-12-11",
"StopLocation": [ "StopLocation": [
{ {
"name": "Bollestadsvägen, Kungälv", "name": "Guddeby, Kungälv",
"id": "9022014014754001", "id": "9022014014751001",
"lat": "57.888940", "lat": "57.874665",
"lon": "11.885663", "lon": "11.903884",
"track": "A" "track": "A"
}, },
{ {
"name": "Bollestadsvägen, Kungälv", "name": "Guddeby, Kungälv",
"id": "9021014014754000", "id": "9021014014751000",
"lat": "57.889030", "lat": "57.874710",
"lon": "11.885708" "lon": "11.903929"
}, },
{ {
"name": "Bollestadsvägen, Kungälv", "name": "Guddeby, Kungälv",
"id": "9022014014754002", "id": "9022014014751002",
"lat": "57.889111", "lat": "57.874746",
"lon": "11.885753", "lon": "11.903965",
"track": "B" "track": "B"
}, },
{ {
"name": "Bredsten, Kungälv", "name": "Stället, Kungälv",
"id": "9022014014753002", "id": "9022014014744001",
"lat": "57.886450", "lat": "57.869784",
"lon": "11.889529", "lon": "11.904172",
"track": "B" "track": "A"
} }
] ]
} }

View File

@ -1,35 +1,35 @@
{ {
"LocationList": { "LocationList": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
"servertime": "16:47", "servertime": "09:35",
"serverdate": "2020-12-09", "serverdate": "2020-12-11",
"StopLocation": [ "StopLocation": [
{ {
"name": "Ekelöv västra, Kungälv", "name": "Hålta kyrka, Kungälv",
"id": "9022014014020001", "id": "9022014014010001",
"lat": "57.892527", "lat": "57.895125",
"lon": "11.865321", "lon": "11.827854",
"track": "A" "track": "A"
}, },
{ {
"name": "Ekelöv västra, Kungälv", "name": "Hålta kyrka, Kungälv",
"id": "9021014014020000", "id": "9021014014010000",
"lat": "57.892608", "lat": "57.895206",
"lon": "11.865312" "lon": "11.827647"
}, },
{ {
"name": "Ekelöv västra, Kungälv", "name": "Hålta kyrka, Kungälv",
"id": "9022014014020002", "id": "9022014014010002",
"lat": "57.892689", "lat": "57.895278",
"lon": "11.865285", "lon": "11.827440",
"track": "B" "track": "B"
}, },
{ {
"name": "Ekelöv östra, Kungälv", "name": "Hålta skola, Kungälv",
"id": "9022014014021002", "id": "9022014014015001",
"lat": "57.892994", "lat": "57.896015",
"lon": "11.873923", "lon": "11.824555",
"track": "B" "track": "A"
} }
] ]
} }

View File

@ -1,35 +1,35 @@
{ {
"LocationList": { "LocationList": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
"servertime": "16:45", "servertime": "09:36",
"serverdate": "2020-12-09", "serverdate": "2020-12-11",
"StopLocation": [ "StopLocation": [
{ {
"name": "Guddeby, Kungälv", "name": "Stenskärsvägen, Kungälv",
"id": "9022014014751001", "id": "9022014014614001",
"lat": "57.874665", "lat": "57.894594",
"lon": "11.903884", "lon": "11.740128",
"track": "A" "track": "A"
}, },
{ {
"name": "Guddeby, Kungälv", "name": "Stenskärsvägen, Kungälv",
"id": "9021014014751000", "id": "9022014014614002",
"lat": "57.874710", "lat": "57.894729",
"lon": "11.903929" "lon": "11.739984",
},
{
"name": "Guddeby, Kungälv",
"id": "9022014014751002",
"lat": "57.874746",
"lon": "11.903965",
"track": "B" "track": "B"
}, },
{ {
"name": "Stället, Kungälv", "name": "Stenskärsvägen, Kungälv",
"id": "9022014014744001", "id": "9021014014614000",
"lat": "57.869784", "lat": "57.894738",
"lon": "11.904172", "lon": "11.739858"
"track": "A" },
{
"name": "Tjuvkilsboden, Kungälv",
"id": "9022014014615002",
"lat": "57.892743",
"lon": "11.743490",
"track": "B"
} }
] ]
} }

View File

@ -1,21 +1,21 @@
{ {
"LocationList": { "LocationList": {
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
"servertime": "16:44", "servertime": "09:37",
"serverdate": "2020-12-09", "serverdate": "2020-12-11",
"StopLocation": [ "StopLocation": [
{ {
"name": "Skrämmenborg, Kungälv", "name": "Kuröd, Kungälv",
"id": "9021014014225000", "id": "9022014014762001",
"lat": "57.863528", "lat": "57.856687",
"lon": "11.867406" "lon": "11.864727",
"track": "A"
}, },
{ {
"name": "Skrämmenborg, Kungälv", "name": "Kuröd, Kungälv",
"id": "9022014014225001", "id": "9021014014762000",
"lat": "57.863528", "lat": "57.856831",
"lon": "11.867406", "lon": "11.864260"
"track": "A"
}, },
{ {
"name": "Kuröd, Kungälv", "name": "Kuröd, Kungälv",
@ -25,10 +25,10 @@
"track": "B" "track": "B"
}, },
{ {
"name": "Kuröd, Kungälv", "name": "Skrämmenborg, Kungälv",
"id": "9021014014762000", "id": "9021014014225000",
"lat": "57.856831", "lat": "57.863528",
"lon": "11.864260" "lon": "11.867406"
} }
] ]
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Användare 1", "name": "Användare 1",
"deviceId": "1", "deviceId": "1",
"stoppointgid": "9022014014754001" "stoppointgid": "9022014014751001"
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Användare 2", "name": "Användare 2",
"deviceId": "2", "deviceId": "2",
"stoppointgid": "9022014014020001" "stoppointgid": "9022014014010001"
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Användare 3", "name": "Användare 3",
"deviceId": "3", "deviceId": "3",
"stoppointgid": "9022014014751001" "stoppointgid": "9022014014614001"
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Användare 4", "name": "Användare 4",
"deviceId": "4", "deviceId": "4",
"stoppointgid": "9021014014225000" "stoppointgid": "9022014014762001"
} }

View File

@ -50,7 +50,6 @@ class SelectUserButton extends Button {
selectUser = () => { selectUser = () => {
this.genUsers() this.genUsers()
if(this.props.path === "user1"){ if(this.props.path === "user1"){
globalData.user = user1 globalData.user = user1
globalData.user.track = locationuser1.LocationList.StopLocation[0].track globalData.user.track = locationuser1.LocationList.StopLocation[0].track