Merge branch 'main' into live
This commit is contained in:
williameriksson126
commit
25977e6600
@ -1,53 +1,53 @@
|
|||||||
{
|
{
|
||||||
"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",
|
|
||||||
"sname": "920",
|
|
||||||
"journeyNumber": "2",
|
|
||||||
"type": "BUS",
|
|
||||||
"stopid": "9022014014754002",
|
|
||||||
"stop": "Bollestadsvägen, Kungälv",
|
|
||||||
"time": "12:26",
|
|
||||||
"date": "2020-12-10",
|
|
||||||
"journeyid": "9015014692000002",
|
|
||||||
"direction": "Bredsten",
|
|
||||||
"track": "B",
|
|
||||||
"rtTime": "12:26",
|
|
||||||
"rtDate": "2020-12-10",
|
|
||||||
"fgColor": "#006C93",
|
|
||||||
"bgColor": "#FFFFFF",
|
|
||||||
"stroke": "Solid",
|
|
||||||
"accessibility": "wheelChair",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
},
|
||||||
}
|
{
|
||||||
}
|
"name": "Buss 927",
|
||||||
|
"sname": "927",
|
||||||
|
"journeyNumber": "2",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014751002",
|
||||||
|
"stop": "Guddeby, Kungälv",
|
||||||
|
"time": "12:29",
|
||||||
|
"date": "2020-12-11",
|
||||||
|
"journeyid": "9015014692700002",
|
||||||
|
"direction": "Tjuvkil",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "12:30",
|
||||||
|
"rtDate": "2020-12-11",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,53 +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: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",
|
|
||||||
"sname": "920",
|
|
||||||
"journeyNumber": "2",
|
|
||||||
"type": "BUS",
|
|
||||||
"stopid": "9022014014754002",
|
|
||||||
"stop": "Bollestadsvägen, Kungälv",
|
|
||||||
"time": "12:28",
|
|
||||||
"date": "2020-12-10",
|
|
||||||
"journeyid": "9015014692000002",
|
|
||||||
"direction": "Bredsten",
|
|
||||||
"track": "B",
|
|
||||||
"rtTime": "12:26",
|
|
||||||
"rtDate": "2020-12-10",
|
|
||||||
"fgColor": "#006C93",
|
|
||||||
"bgColor": "#FFFFFF",
|
|
||||||
"stroke": "Solid",
|
|
||||||
"accessibility": "wheelChair",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
},
|
||||||
}
|
{
|
||||||
|
"name": "Buss 927",
|
||||||
|
"sname": "927",
|
||||||
|
"journeyNumber": "2",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014010002",
|
||||||
|
"stop": "Hålta kyrka, Kungälv",
|
||||||
|
"time": "12:38",
|
||||||
|
"date": "2020-12-11",
|
||||||
|
"journeyid": "9015014692700002",
|
||||||
|
"direction": "Tjuvkil",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "12:38",
|
||||||
|
"rtDate": "2020-12-11",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,30 +1,29 @@
|
|||||||
{
|
{
|
||||||
"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",
|
"type": "BUS",
|
||||||
"type": "BUS",
|
"stopid": "9022014014225001",
|
||||||
"stopid": "9022014014225001",
|
"stop": "Skrämmenborg, Kungälv",
|
||||||
"stop": "Skrämmenborg, Kungälv",
|
"time": "15:19",
|
||||||
"time": "15:19",
|
"date": "2020-12-11",
|
||||||
"date": "2020-12-10",
|
"journeyid": "9015014692800010",
|
||||||
"journeyid": "9015014692800010",
|
"direction": "Kärna",
|
||||||
"direction": "Kärna",
|
"track": "A",
|
||||||
"track": "A",
|
"rtTime": "15:19",
|
||||||
"rtTime": "15:19",
|
"rtDate": "2020-12-11",
|
||||||
"rtDate": "2020-12-10",
|
"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=110424%2F37130%2F997492%2F461938%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14225001%26station_type%3Ddep%26format%3Djson%26"
|
||||||
"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"
|
}
|
||||||
}
|
}]
|
||||||
}]
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@ -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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -1,36 +1,36 @@
|
|||||||
{
|
{
|
||||||
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,36 +1,36 @@
|
|||||||
{
|
{
|
||||||
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,36 +1,36 @@
|
|||||||
{
|
{
|
||||||
"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",
|
||||||
},
|
"track": "B"
|
||||||
{
|
},
|
||||||
"name": "Guddeby, Kungälv",
|
{
|
||||||
"id": "9022014014751002",
|
"name": "Stenskärsvägen, Kungälv",
|
||||||
"lat": "57.874746",
|
"id": "9021014014614000",
|
||||||
"lon": "11.903965",
|
"lat": "57.894738",
|
||||||
"track": "B"
|
"lon": "11.739858"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Stället, Kungälv",
|
"name": "Tjuvkilsboden, Kungälv",
|
||||||
"id": "9022014014744001",
|
"id": "9022014014615002",
|
||||||
"lat": "57.869784",
|
"lat": "57.892743",
|
||||||
"lon": "11.904172",
|
"lon": "11.743490",
|
||||||
"track": "A"
|
"track": "B"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,35 +1,35 @@
|
|||||||
{
|
{
|
||||||
"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",
|
{
|
||||||
"id": "9022014014225001",
|
"name": "Kuröd, Kungälv",
|
||||||
"lat": "57.863528",
|
"id": "9021014014762000",
|
||||||
"lon": "11.867406",
|
"lat": "57.856831",
|
||||||
"track": "A"
|
"lon": "11.864260"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Kuröd, Kungälv",
|
"name": "Kuröd, Kungälv",
|
||||||
"id": "9022014014762002",
|
"id": "9022014014762002",
|
||||||
"lat": "57.856966",
|
"lat": "57.856966",
|
||||||
"lon": "11.863774",
|
"lon": "11.863774",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "Användare 1",
|
"name": "Användare 1",
|
||||||
"deviceId": "1",
|
"deviceId": "1",
|
||||||
"stoppointgid": "9022014014754001"
|
"stoppointgid": "9022014014751001"
|
||||||
}
|
}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "Användare 2",
|
"name": "Användare 2",
|
||||||
"deviceId": "2",
|
"deviceId": "2",
|
||||||
"stoppointgid": "9022014014020001"
|
"stoppointgid": "9022014014010001"
|
||||||
}
|
}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "Användare 3",
|
"name": "Användare 3",
|
||||||
"deviceId": "3",
|
"deviceId": "3",
|
||||||
"stoppointgid": "9022014014751001"
|
"stoppointgid": "9022014014614001"
|
||||||
}
|
}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "Användare 4",
|
"name": "Användare 4",
|
||||||
"deviceId": "4",
|
"deviceId": "4",
|
||||||
"stoppointgid": "9021014014225000"
|
"stoppointgid": "9022014014762001"
|
||||||
}
|
}
|
||||||
@ -1,4 +1,7 @@
|
|||||||
import globData from '../GlobalData.js';
|
import moment from "moment";
|
||||||
|
|
||||||
|
import globalData from '../GlobalData.js';
|
||||||
|
import Button from './Button.js';
|
||||||
|
|
||||||
import user1 from '../APIexamples/user1.json'
|
import user1 from '../APIexamples/user1.json'
|
||||||
import user2 from '../APIexamples/user2.json'
|
import user2 from '../APIexamples/user2.json'
|
||||||
@ -18,11 +21,6 @@ import departureuser4 from '../APIexamples/departureuser4.json'
|
|||||||
import ex1 from '../APIexamples/disruption1.json'
|
import ex1 from '../APIexamples/disruption1.json'
|
||||||
import ex2 from '../APIexamples/disruption2.json'
|
import ex2 from '../APIexamples/disruption2.json'
|
||||||
|
|
||||||
import Button from './Button.js';
|
|
||||||
import disruptIcon from '../img/flash.svg';
|
|
||||||
|
|
||||||
import globalData from '../GlobalData.js'
|
|
||||||
import moment from "moment";
|
|
||||||
|
|
||||||
class DisruptionButton extends Button {
|
class DisruptionButton extends Button {
|
||||||
state = {
|
state = {
|
||||||
@ -39,12 +37,11 @@ class DisruptionButton extends Button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showMomentTime = (time) => {
|
showMomentTime = (time) => {
|
||||||
//return(time.hours().toString()+ ":"+time.minutes().toString())
|
|
||||||
return(time.format("HH:mm"))
|
return(time.format("HH:mm"))
|
||||||
}
|
}
|
||||||
|
|
||||||
genUsers = () => {
|
genUsers = () => {
|
||||||
if(globData.users.length < 2){
|
if(globalData.users.length < 2){
|
||||||
this.state.first = true;
|
this.state.first = true;
|
||||||
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
||||||
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
||||||
@ -54,7 +51,7 @@ class DisruptionButton extends Button {
|
|||||||
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
||||||
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
||||||
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
||||||
globData.users = [
|
globalData.users = [
|
||||||
this.state.u1,
|
this.state.u1,
|
||||||
this.state.u2,
|
this.state.u2,
|
||||||
this.state.u3,
|
this.state.u3,
|
||||||
@ -69,7 +66,7 @@ class DisruptionButton extends Button {
|
|||||||
this.state.disruption = undefined
|
this.state.disruption = undefined
|
||||||
if(this.state.jsonLocation === "ex1"){
|
if(this.state.jsonLocation === "ex1"){
|
||||||
for (let stopPoint of ex1.affectedStopPoints) {
|
for (let stopPoint of ex1.affectedStopPoints) {
|
||||||
for (let user of globData.users){
|
for (let user of globalData.users){
|
||||||
if(stopPoint.gid === user.stoppointgid){
|
if(stopPoint.gid === user.stoppointgid){
|
||||||
this.state.disruption = ex1;
|
this.state.disruption = ex1;
|
||||||
var old1t = moment(user.stop.departures[0].time,"HH:mm");
|
var old1t = moment(user.stop.departures[0].time,"HH:mm");
|
||||||
@ -78,17 +75,17 @@ class DisruptionButton extends Button {
|
|||||||
user.stop.departures[0].trafficInfo = ex1.title;
|
user.stop.departures[0].trafficInfo = ex1.title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(stopPoint.gid === globData.user.stoppointgid){
|
if(stopPoint.gid === globalData.user.stoppointgid){
|
||||||
this.state.disruption = ex1;
|
this.state.disruption = ex1;
|
||||||
var old2t = moment(globData.stop.departures[0].time,"HH:mm");
|
var old2t = moment(globalData.stop.departures[0].time,"HH:mm");
|
||||||
old2t.add(ex1.time, "HH:mm");
|
old2t.add(ex1.time, "HH:mm");
|
||||||
globData.stop.departures[0].newTime = this.showMomentTime(old2t);
|
globalData.stop.departures[0].newTime = this.showMomentTime(old2t);
|
||||||
globData.stop.departures[0].trafficInfo = ex1.title;
|
globalData.stop.departures[0].trafficInfo = ex1.title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (this.state.jsonLocation === "ex2"){
|
} else if (this.state.jsonLocation === "ex2"){
|
||||||
for (let stopPoint of ex2.affectedStopPoints) {
|
for (let stopPoint of ex2.affectedStopPoints) {
|
||||||
for (let user of globData.users){
|
for (let user of globalData.users){
|
||||||
if(stopPoint.gid === user.stoppointgid){
|
if(stopPoint.gid === user.stoppointgid){
|
||||||
this.state.disruption = ex2;
|
this.state.disruption = ex2;
|
||||||
var old3t = moment(user.stop.departures[0].time,"HH:mm");
|
var old3t = moment(user.stop.departures[0].time,"HH:mm");
|
||||||
@ -97,24 +94,23 @@ class DisruptionButton extends Button {
|
|||||||
user.stop.departures[0].trafficInfo = ex2.title;
|
user.stop.departures[0].trafficInfo = ex2.title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(stopPoint.gid === globData.user.stoppointgid){
|
if(stopPoint.gid === globalData.user.stoppointgid){
|
||||||
this.state.disruption = ex2;
|
this.state.disruption = ex2;
|
||||||
var old4t = moment(globData.stop.departures[0].time,"HH:mm");
|
var old4t = moment(globalData.stop.departures[0].time,"HH:mm");
|
||||||
old4t.add(ex2.time, "HH:mm");
|
old4t.add(ex2.time, "HH:mm");
|
||||||
globData.stop.departures[0].newTime = this.showMomentTime(old4t);
|
globalData.stop.departures[0].newTime = this.showMomentTime(old4t);
|
||||||
globData.stop.departures[0].trafficInfo = ex2.title;
|
globalData.stop.departures[0].trafficInfo = ex2.title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
globData.disruption = this.state.disruption
|
globalData.disruption = this.state.disruption
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Button onClick={this.props.onClick.concat([this.genDisrupt,this.updatePage])} className="disruptBtn">
|
<Button onClick={this.props.onClick.concat([this.genDisrupt,this.updatePage])} className="disruptBtn">
|
||||||
<img src={disruptIcon} alt="" />
|
{this.props.children}
|
||||||
<span>Generera Störning</span>
|
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
import globData from '../GlobalData.js';
|
import globalData from '../GlobalData.js';
|
||||||
|
|
||||||
import locationuser1 from '../APIexamples/locationuser1.json'
|
import locationuser1 from '../APIexamples/locationuser1.json'
|
||||||
import locationuser2 from '../APIexamples/locationuser2.json'
|
import locationuser2 from '../APIexamples/locationuser2.json'
|
||||||
@ -15,13 +15,13 @@ class FindStops extends Button {
|
|||||||
locations : []
|
locations : []
|
||||||
}
|
}
|
||||||
findStops = () => {
|
findStops = () => {
|
||||||
if(globData.user.deviceId === "1"){
|
if(globalData.user.deviceId === "1"){
|
||||||
this.state.locations = locationuser1.LocationList.StopLocation
|
this.state.locations = locationuser1.LocationList.StopLocation
|
||||||
}else if (globData.user.deviceId === "2"){
|
}else if (globalData.user.deviceId === "2"){
|
||||||
this.state.locations = locationuser2.LocationList.StopLocation
|
this.state.locations = locationuser2.LocationList.StopLocation
|
||||||
}else if (globData.user.deviceId === "3"){
|
}else if (globalData.user.deviceId === "3"){
|
||||||
this.state.locations = locationuser3.LocationList.StopLocation
|
this.state.locations = locationuser3.LocationList.StopLocation
|
||||||
}else if (globData.user.deviceId === "4"){
|
}else if (globalData.user.deviceId === "4"){
|
||||||
this.state.locations = locationuser4.LocationList.StopLocation
|
this.state.locations = locationuser4.LocationList.StopLocation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,14 +5,14 @@ class MenuButton extends Button {
|
|||||||
render() {
|
render() {
|
||||||
if (this.props.childOrderReverse) {
|
if (this.props.childOrderReverse) {
|
||||||
return (
|
return (
|
||||||
<Button>
|
<Button className="menuButton">
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
<img src={this.props.icon} alt="" />
|
<img src={this.props.icon} alt="" />
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<Button>
|
<Button className="menuButton">
|
||||||
<img src={this.props.icon} alt="" />
|
<img src={this.props.icon} alt="" />
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import Button from './Button.js';
|
|||||||
import './css/NavigationDrawer.css';
|
import './css/NavigationDrawer.css';
|
||||||
|
|
||||||
import userIcon from '../img/user.svg';
|
import userIcon from '../img/user.svg';
|
||||||
|
import disruptIcon from '../img/flash.svg';
|
||||||
|
|
||||||
|
|
||||||
class NavigationDrawer extends Component {
|
class NavigationDrawer extends Component {
|
||||||
@ -53,11 +54,10 @@ class NavigationDrawer extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup ref={this.popupElem}>
|
<Popup ref={this.popupElem}>
|
||||||
<h3>Välj hållplats:</h3>
|
<h3>Välj scenario:</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störningsscenario 1</DisruptionButton></li>
|
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störningsscenario 1</DisruptionButton></li>
|
||||||
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störningsscenario 2</DisruptionButton></li>
|
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störningsscenario 2</DisruptionButton></li>
|
||||||
@ -75,7 +75,7 @@ class NavigationDrawer extends Component {
|
|||||||
<SelectUserButton path={"user2"} username="Användare 2"/>
|
<SelectUserButton path={"user2"} username="Användare 2"/>
|
||||||
<SelectUserButton path={"user3"} username="Användare 3"/>
|
<SelectUserButton path={"user3"} username="Användare 3"/>
|
||||||
<SelectUserButton path={"user4"} username="Användare 4"/>
|
<SelectUserButton path={"user4"} username="Användare 4"/>
|
||||||
<Button onClick={[this.showPopup, this.close]}><span>Generera Störning</span></Button>
|
<Button onClick={[this.showPopup, this.close]} className="disruptBtn"><img src={disruptIcon} alt="" />Generera Störning</Button>
|
||||||
</div>
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import globData from '../GlobalData.js';
|
import globalData from '../GlobalData.js';
|
||||||
|
|
||||||
import user1 from '../APIexamples/user1.json'
|
import user1 from '../APIexamples/user1.json'
|
||||||
import user2 from '../APIexamples/user2.json'
|
import user2 from '../APIexamples/user2.json'
|
||||||
@ -17,20 +17,19 @@ import departureuser4 from '../APIexamples/departureuser4.json'
|
|||||||
|
|
||||||
import Button from './Button.js';
|
import Button from './Button.js';
|
||||||
import userIcon from '../img/userDark.svg';
|
import userIcon from '../img/userDark.svg';
|
||||||
import globalData from '../GlobalData.js';
|
|
||||||
|
|
||||||
|
|
||||||
class SelectUserButton extends Button {
|
class SelectUserButton extends Button {
|
||||||
state = {
|
state = {
|
||||||
first : false,
|
first: false,
|
||||||
u1 : user1,
|
u1: user1,
|
||||||
u2 : user2,
|
u2: user2,
|
||||||
u3 : user3,
|
u3: user3,
|
||||||
u4 : user4,
|
u4: user4,
|
||||||
}
|
}
|
||||||
|
|
||||||
genUsers = () => {
|
genUsers = () => {
|
||||||
if(globData.users.length < 2){
|
if (globalData.users.length < 2) {
|
||||||
this.state.first = true;
|
this.state.first = true;
|
||||||
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
||||||
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
||||||
@ -40,7 +39,7 @@ class SelectUserButton extends Button {
|
|||||||
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
||||||
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
||||||
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
||||||
globData.users = [
|
globalData.users = [
|
||||||
this.state.u1,
|
this.state.u1,
|
||||||
this.state.u2,
|
this.state.u2,
|
||||||
this.state.u3,
|
this.state.u3,
|
||||||
@ -51,33 +50,32 @@ class SelectUserButton extends Button {
|
|||||||
|
|
||||||
selectUser = () => {
|
selectUser = () => {
|
||||||
this.genUsers()
|
this.genUsers()
|
||||||
|
|
||||||
if(this.props.path === "user1"){
|
if(this.props.path === "user1"){
|
||||||
globData.user = user1
|
globalData.user = user1
|
||||||
globData.user.track = locationuser1.LocationList.StopLocation[0].track
|
globalData.user.track = locationuser1.LocationList.StopLocation[0].track
|
||||||
globData.stop = locationuser1.LocationList.StopLocation[0]
|
globalData.stop = locationuser1.LocationList.StopLocation[0]
|
||||||
globData.stop.departures = departureuser1.DepartureBoard.Departures
|
globalData.stop.departures = departureuser1.DepartureBoard.Departures
|
||||||
}else if (this.props.path === "user2"){
|
}else if (this.props.path === "user2"){
|
||||||
globData.user = user2
|
globalData.user = user2
|
||||||
globData.user.track = locationuser2.LocationList.StopLocation[0].track
|
globalData.user.track = locationuser2.LocationList.StopLocation[0].track
|
||||||
globData.stop = locationuser2.LocationList.StopLocation[0]
|
globalData.stop = locationuser2.LocationList.StopLocation[0]
|
||||||
globData.stop.departures = departureuser2.DepartureBoard.Departures
|
globalData.stop.departures = departureuser2.DepartureBoard.Departures
|
||||||
}else if (this.props.path === "user3"){
|
}else if (this.props.path === "user3"){
|
||||||
globData.user = user3
|
globalData.user = user3
|
||||||
globData.user.track = locationuser3.LocationList.StopLocation[0].track
|
globalData.user.track = locationuser3.LocationList.StopLocation[0].track
|
||||||
globData.stop = locationuser3.LocationList.StopLocation[0]
|
globalData.stop = locationuser3.LocationList.StopLocation[0]
|
||||||
globData.stop.departures = departureuser3.DepartureBoard.Departures
|
globalData.stop.departures = departureuser3.DepartureBoard.Departures
|
||||||
}else if (this.props.path === "user4"){
|
}else if (this.props.path === "user4"){
|
||||||
globData.user = user4
|
globalData.user = user4
|
||||||
globData.user.track = locationuser4.LocationList.StopLocation[0].track
|
globalData.user.track = locationuser4.LocationList.StopLocation[0].track
|
||||||
globData.stop = locationuser4.LocationList.StopLocation[0]
|
globalData.stop = locationuser4.LocationList.StopLocation[0]
|
||||||
globData.stop.departures = departureuser4.DepartureBoard.Departures
|
globalData.stop.departures = departureuser4.DepartureBoard.Departures
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
updatePage = () => {
|
updatePage = () => {
|
||||||
globalData.currentPage.forceUpdate();
|
globalData.currentPage.forceUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import React, { Component } from 'react';
|
|||||||
|
|
||||||
import Button from './Button.js';
|
import Button from './Button.js';
|
||||||
import Popup from './Popup.js';
|
import Popup from './Popup.js';
|
||||||
|
import globalData from '../GlobalData.js';
|
||||||
|
|
||||||
import './css/StopTitle.css';
|
import './css/StopTitle.css';
|
||||||
|
|
||||||
@ -20,6 +21,18 @@ class StopTitle extends Component {
|
|||||||
this.popupElem.current.hide();
|
this.popupElem.current.hide();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
setTrackA = () => {
|
||||||
|
globalData.user.track = "A";
|
||||||
|
};
|
||||||
|
|
||||||
|
setTrackB = () => {
|
||||||
|
globalData.user.track = "B";
|
||||||
|
};
|
||||||
|
|
||||||
|
updatePage = () => {
|
||||||
|
globalData.currentPage.forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div id="stopTitle">
|
<div id="stopTitle">
|
||||||
@ -27,8 +40,8 @@ class StopTitle extends Component {
|
|||||||
<h3>Välj läge:</h3>
|
<h3>Välj läge:</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<>
|
<>
|
||||||
<li><Button onClick={[this.hidePopup]}>{"Läge A"}</Button></li>
|
<li><Button onClick={[this.setTrackA, this.updatePage, this.hidePopup]}>{"Läge A"}</Button></li>
|
||||||
<li><Button onClick={[this.hidePopup]}>{"Läge B"}</Button></li>
|
<li><Button onClick={[this.setTrackB, this.updatePage, this.hidePopup]}>{"Läge B"}</Button></li>
|
||||||
</>
|
</>
|
||||||
</ul>
|
</ul>
|
||||||
</Popup>
|
</Popup>
|
||||||
@ -41,9 +54,9 @@ class StopTitle extends Component {
|
|||||||
{this.props.stop.name !== undefined && this.props.stop.track !== undefined ?
|
{this.props.stop.name !== undefined && this.props.stop.track !== undefined ?
|
||||||
<div>
|
<div>
|
||||||
<h3>
|
<h3>
|
||||||
<span>{"Läge " + this.props.stop.track}</span>
|
<span>{"Läge " + globalData.user.track}</span>
|
||||||
</h3>
|
</h3>
|
||||||
<Button onclick={this.showPopup}>Byt Läge</Button>
|
<Button className="changeTrackBtn" onClick={[this.showPopup]}>Byt Läge</Button>
|
||||||
</div>
|
</div>
|
||||||
:
|
:
|
||||||
(this.props.stop.name !== undefined ?
|
(this.props.stop.name !== undefined ?
|
||||||
|
|||||||
@ -5,6 +5,8 @@
|
|||||||
transform: translate(-50%, -50%) scale(0);
|
transform: translate(-50%, -50%) scale(0);
|
||||||
transform-origin: center;
|
transform-origin: center;
|
||||||
background: white;
|
background: white;
|
||||||
|
display: flex !important;
|
||||||
|
flex-direction: column !important;
|
||||||
width: 55vw;
|
width: 55vw;
|
||||||
height: 39vh;
|
height: 39vh;
|
||||||
padding: 3vh 5vw;
|
padding: 3vh 5vw;
|
||||||
@ -21,16 +23,26 @@
|
|||||||
|
|
||||||
.popup h3 {
|
.popup h3 {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
display: block;
|
||||||
|
font-size: 1.17em;
|
||||||
|
font-weight: bold !important;
|
||||||
|
text-align: center;
|
||||||
|
color: black !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup ul {
|
.popup ul {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup li button {
|
.popup li button {
|
||||||
width: 100%;
|
width: 100% !important;
|
||||||
padding: 8% 0;
|
height: 50px;
|
||||||
font-size: 16px;
|
padding: 8% 0 !important;
|
||||||
|
font-size: 16px !important;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popupClose {
|
.popupClose {
|
||||||
|
|||||||
@ -38,9 +38,10 @@
|
|||||||
#stopTitle div {
|
#stopTitle div {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle button {
|
.changeTrackBtn {
|
||||||
width: auto;
|
width: auto;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
@ -52,6 +53,6 @@
|
|||||||
border-radius: calc(var(--topMenuHeight) / 15);
|
border-radius: calc(var(--topMenuHeight) / 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle button:active {
|
.changeTrackBtn:active {
|
||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
@ -6,7 +6,7 @@
|
|||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
}
|
}
|
||||||
|
|
||||||
#topMenu button {
|
#topMenu .menuButton {
|
||||||
width: var(--topMenuHeight);
|
width: var(--topMenuHeight);
|
||||||
height: calc(var(--topMenuHeight) / 1.3);
|
height: calc(var(--topMenuHeight) / 1.3);
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -17,7 +17,7 @@
|
|||||||
box-shadow: var(--boxShadow);
|
box-shadow: var(--boxShadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
#topMenu button:active {
|
#topMenu .menuButton:active {
|
||||||
background: rgb(235, 235, 235);
|
background: rgb(235, 235, 235);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -89,7 +89,7 @@
|
|||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
display: block;
|
display: block;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
max-height: 3.5vw;
|
max-height: 4.5vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.infoWrapper span {
|
.infoWrapper span {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user