diff --git a/src/APIexamples/departureuser1.json b/src/APIexamples/departureuser1.json index c1214b0..6b56110 100644 --- a/src/APIexamples/departureuser1.json +++ b/src/APIexamples/departureuser1.json @@ -1,53 +1,53 @@ { - "DepartureBoard": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", - "servertime": "10:09", - "serverdate": "2020-12-10", - "Departures": [ - { - "name": "Buss MEXP", - "sname": "MEXP", - "journeyNumber": "24", - "type": "BUS", - "stopid": "9022014014754002", - "stop": "Bollestadsvägen, Kungälv", - "time": "10:09", - "date": "2020-12-10", - "journeyid": "9015014621000024", - "direction": "Marstrand", - "track": "B", - "rtTime": "10:11", - "rtDate": "2020-12-10", - "fgColor": "#006C93", - "bgColor": "#FFFFFF", - "stroke": "Solid", - "accessibility": "wheelChair", - "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" - } - }, - { - "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" - } + "DepartureBoard": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", + "servertime": "09:38", + "serverdate": "2020-12-11", + "Departures": [ + { + "name": "Buss MEXP", + "sname": "MEXP", + "journeyNumber": "22", + "type": "BUS", + "stopid": "9022014014751002", + "stop": "Guddeby, Kungälv", + "time": "09:40", + "date": "2020-12-11", + "journeyid": "9015014621000022", + "direction": "Marstrand", + "track": "B", + "rtTime": "09: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=715722%2F247121%2F629948%2F76401%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26" } - ] - } - } \ No newline at end of file + }, + { + "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" + } + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/departureuser2.json b/src/APIexamples/departureuser2.json index 20cb88c..3d9f6a0 100644 --- a/src/APIexamples/departureuser2.json +++ b/src/APIexamples/departureuser2.json @@ -1,53 +1,53 @@ { - "DepartureBoard": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", - "servertime": "10:10", - "serverdate": "2020-12-10", - "Departures": [ - { - "name": "Buss MEXP", - "sname": "MEXP", - "journeyNumber": "24", - "type": "BUS", - "stopid": "9022014014020002", - "stop": "Ekelöv västra, Kungälv", - "time": "10:10", - "date": "2020-12-10", - "journeyid": "9015014621000024", - "direction": "Marstrand", - "track": "B", - "rtTime": "10:13", - "rtDate": "2020-12-10", - "fgColor": "#006C93", - "bgColor": "#FFFFFF", - "stroke": "Solid", - "accessibility": "wheelChair", - "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" - } - }, - { - "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" - } + "DepartureBoard": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", + "servertime": "09:41", + "serverdate": "2020-12-11", + "Departures": [ + { + "name": "Buss MEXP", + "sname": "MEXP", + "journeyNumber": "22", + "type": "BUS", + "stopid": "9022014014010002", + "stop": "Hålta kyrka, Kungälv", + "time": "09:47", + "date": "2020-12-11", + "journeyid": "9015014621000022", + "direction": "Marstrand", + "track": "B", + "rtTime": "09:50", + "rtDate": "2020-12-11", + "fgColor": "#006C93", + "bgColor": "#FFFFFF", + "stroke": "Solid", + "accessibility": "wheelChair", + "JourneyDetailRef": { + "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 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" + } + } + ] + } } \ No newline at end of file diff --git a/src/APIexamples/departureuser3.json b/src/APIexamples/departureuser3.json index 96194d8..fe689cf 100644 --- a/src/APIexamples/departureuser3.json +++ b/src/APIexamples/departureuser3.json @@ -1,27 +1,53 @@ { - "DepartureBoard": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", - "servertime": "10:10", - "serverdate": "2020-12-10", - "Departures": [{ + "DepartureBoard": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", + "servertime": "09:44", + "serverdate": "2020-12-11", + "Departures": [ + { "name": "Buss MEXP", "sname": "MEXP", - "journeyNumber": "24", + "journeyNumber": "22", "type": "BUS", - "stopid": "9022014014751002", - "stop": "Guddeby, Kungälv", - "time": "10:07", - "date": "2020-12-10", - "journeyid": "9015014621000024", + "stopid": "9022014014614002", + "stop": "Stenskärsvägen, Kungälv", + "time": "09:52", + "date": "2020-12-11", + "journeyid": "9015014621000022", "direction": "Marstrand", "track": "B", + "rtTime": "09:57", + "rtDate": "2020-12-11", "fgColor": "#006C93", "bgColor": "#FFFFFF", "stroke": "Solid", "accessibility": "wheelChair", "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" } - }] - } - } \ No newline at end of file + }, + { + "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" + } + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/departureuser4.json b/src/APIexamples/departureuser4.json index bb9fab3..d8ad285 100644 --- a/src/APIexamples/departureuser4.json +++ b/src/APIexamples/departureuser4.json @@ -1,30 +1,29 @@ { - "DepartureBoard": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", - "servertime": "10:11", - "serverdate": "2020-12-10", - "Departures": - [{ - "name": "Buss 928", - "sname": "928", - "journeyNumber": "10", - "type": "BUS", - "stopid": "9022014014225001", - "stop": "Skrämmenborg, Kungälv", - "time": "15:19", - "date": "2020-12-10", - "journeyid": "9015014692800010", - "direction": "Kärna", - "track": "A", - "rtTime": "15:19", - "rtDate": "2020-12-10", - "fgColor": "#006C93", - "bgColor": "#FFFFFF", - "stroke": "Solid", - "accessibility": "wheelChair", - "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" - } - }] - } - } \ No newline at end of file + "DepartureBoard": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd", + "servertime": "09:45", + "serverdate": "2020-12-11", + "Departures": [{ + "name": "Buss 928", + "sname": "928", + "journeyNumber": "10", + "type": "BUS", + "stopid": "9022014014225001", + "stop": "Skrämmenborg, Kungälv", + "time": "15:19", + "date": "2020-12-11", + "journeyid": "9015014692800010", + "direction": "Kärna", + "track": "A", + "rtTime": "15:19", + "rtDate": "2020-12-11", + "fgColor": "#006C93", + "bgColor": "#FFFFFF", + "stroke": "Solid", + "accessibility": "wheelChair", + "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" + } + }] + } +} \ No newline at end of file diff --git a/src/APIexamples/disruption1.json b/src/APIexamples/disruption1.json index 0a97099..fe948d3 100644 --- a/src/APIexamples/disruption1.json +++ b/src/APIexamples/disruption1.json @@ -2,15 +2,15 @@ "situationNumber": "RT1", "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", - "time":"00:01", + "time":"00:07", "affectedStopPoints":[ { - "gid": "9022014014020001", - "name": "Ekelöv västra, Kungälv" + "gid": "9022014014010001", + "name": "Hålta kyrka, Kungälv" }, { - "gid": "9022014014751001", - "name": "Guddeby, Kungälv" + "gid": "9022014014614001", + "name": "Stenskärsvägen, Kungälv" } ] } \ No newline at end of file diff --git a/src/APIexamples/disruption2.json b/src/APIexamples/disruption2.json index 5cdea81..e66a95a 100644 --- a/src/APIexamples/disruption2.json +++ b/src/APIexamples/disruption2.json @@ -1,12 +1,12 @@ { "situationNumber": "RT2", "severity":"normal", - "title":"Försening", - "time":"00:02", + "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:09", "affectedStopPoints":[ { - "gid": "9021014014225000", - "name": "Skrämmenborg, Kungälv" + "gid": "9022014014762001", + "name": "Kuröd, Kungälv" } ] } \ No newline at end of file diff --git a/src/APIexamples/locationuser1.json b/src/APIexamples/locationuser1.json index 8288ff8..f8b13db 100644 --- a/src/APIexamples/locationuser1.json +++ b/src/APIexamples/locationuser1.json @@ -1,36 +1,36 @@ { - "LocationList": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", - "servertime": "16:48", - "serverdate": "2020-12-09", - "StopLocation": [ - { - "name": "Bollestadsvägen, Kungälv", - "id": "9022014014754001", - "lat": "57.888940", - "lon": "11.885663", - "track": "A" - }, - { - "name": "Bollestadsvägen, Kungälv", - "id": "9021014014754000", - "lat": "57.889030", - "lon": "11.885708" - }, - { - "name": "Bollestadsvägen, Kungälv", - "id": "9022014014754002", - "lat": "57.889111", - "lon": "11.885753", - "track": "B" - }, - { - "name": "Bredsten, Kungälv", - "id": "9022014014753002", - "lat": "57.886450", - "lon": "11.889529", - "track": "B" - } - ] - } - } \ No newline at end of file + "LocationList": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", + "servertime": "09:34", + "serverdate": "2020-12-11", + "StopLocation": [ + { + "name": "Guddeby, Kungälv", + "id": "9022014014751001", + "lat": "57.874665", + "lon": "11.903884", + "track": "A" + }, + { + "name": "Guddeby, Kungälv", + "id": "9021014014751000", + "lat": "57.874710", + "lon": "11.903929" + }, + { + "name": "Guddeby, Kungälv", + "id": "9022014014751002", + "lat": "57.874746", + "lon": "11.903965", + "track": "B" + }, + { + "name": "Stället, Kungälv", + "id": "9022014014744001", + "lat": "57.869784", + "lon": "11.904172", + "track": "A" + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/locationuser2.json b/src/APIexamples/locationuser2.json index decace7..7fdd235 100644 --- a/src/APIexamples/locationuser2.json +++ b/src/APIexamples/locationuser2.json @@ -1,36 +1,36 @@ { - "LocationList": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", - "servertime": "16:47", - "serverdate": "2020-12-09", - "StopLocation": [ - { - "name": "Ekelöv västra, Kungälv", - "id": "9022014014020001", - "lat": "57.892527", - "lon": "11.865321", - "track": "A" - }, - { - "name": "Ekelöv västra, Kungälv", - "id": "9021014014020000", - "lat": "57.892608", - "lon": "11.865312" - }, - { - "name": "Ekelöv västra, Kungälv", - "id": "9022014014020002", - "lat": "57.892689", - "lon": "11.865285", - "track": "B" - }, - { - "name": "Ekelöv östra, Kungälv", - "id": "9022014014021002", - "lat": "57.892994", - "lon": "11.873923", - "track": "B" - } - ] - } - } \ No newline at end of file + "LocationList": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", + "servertime": "09:35", + "serverdate": "2020-12-11", + "StopLocation": [ + { + "name": "Hålta kyrka, Kungälv", + "id": "9022014014010001", + "lat": "57.895125", + "lon": "11.827854", + "track": "A" + }, + { + "name": "Hålta kyrka, Kungälv", + "id": "9021014014010000", + "lat": "57.895206", + "lon": "11.827647" + }, + { + "name": "Hålta kyrka, Kungälv", + "id": "9022014014010002", + "lat": "57.895278", + "lon": "11.827440", + "track": "B" + }, + { + "name": "Hålta skola, Kungälv", + "id": "9022014014015001", + "lat": "57.896015", + "lon": "11.824555", + "track": "A" + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/locationuser3.json b/src/APIexamples/locationuser3.json index 450cfe7..cb4906f 100644 --- a/src/APIexamples/locationuser3.json +++ b/src/APIexamples/locationuser3.json @@ -1,36 +1,36 @@ { - "LocationList": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", - "servertime": "16:45", - "serverdate": "2020-12-09", - "StopLocation": [ - { - "name": "Guddeby, Kungälv", - "id": "9022014014751001", - "lat": "57.874665", - "lon": "11.903884", - "track": "A" - }, - { - "name": "Guddeby, Kungälv", - "id": "9021014014751000", - "lat": "57.874710", - "lon": "11.903929" - }, - { - "name": "Guddeby, Kungälv", - "id": "9022014014751002", - "lat": "57.874746", - "lon": "11.903965", - "track": "B" - }, - { - "name": "Stället, Kungälv", - "id": "9022014014744001", - "lat": "57.869784", - "lon": "11.904172", - "track": "A" - } - ] - } - } \ No newline at end of file + "LocationList": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", + "servertime": "09:36", + "serverdate": "2020-12-11", + "StopLocation": [ + { + "name": "Stenskärsvägen, Kungälv", + "id": "9022014014614001", + "lat": "57.894594", + "lon": "11.740128", + "track": "A" + }, + { + "name": "Stenskärsvägen, Kungälv", + "id": "9022014014614002", + "lat": "57.894729", + "lon": "11.739984", + "track": "B" + }, + { + "name": "Stenskärsvägen, Kungälv", + "id": "9021014014614000", + "lat": "57.894738", + "lon": "11.739858" + }, + { + "name": "Tjuvkilsboden, Kungälv", + "id": "9022014014615002", + "lat": "57.892743", + "lon": "11.743490", + "track": "B" + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/locationuser4.json b/src/APIexamples/locationuser4.json index d8f2fc4..38f7289 100644 --- a/src/APIexamples/locationuser4.json +++ b/src/APIexamples/locationuser4.json @@ -1,35 +1,35 @@ { - "LocationList": { - "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", - "servertime": "16:44", - "serverdate": "2020-12-09", - "StopLocation": [ - { - "name": "Skrämmenborg, Kungälv", - "id": "9021014014225000", - "lat": "57.863528", - "lon": "11.867406" - }, - { - "name": "Skrämmenborg, Kungälv", - "id": "9022014014225001", - "lat": "57.863528", - "lon": "11.867406", - "track": "A" - }, - { - "name": "Kuröd, Kungälv", - "id": "9022014014762002", - "lat": "57.856966", - "lon": "11.863774", - "track": "B" - }, - { - "name": "Kuröd, Kungälv", - "id": "9021014014762000", - "lat": "57.856831", - "lon": "11.864260" - } - ] - } - } \ No newline at end of file + "LocationList": { + "noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd", + "servertime": "09:37", + "serverdate": "2020-12-11", + "StopLocation": [ + { + "name": "Kuröd, Kungälv", + "id": "9022014014762001", + "lat": "57.856687", + "lon": "11.864727", + "track": "A" + }, + { + "name": "Kuröd, Kungälv", + "id": "9021014014762000", + "lat": "57.856831", + "lon": "11.864260" + }, + { + "name": "Kuröd, Kungälv", + "id": "9022014014762002", + "lat": "57.856966", + "lon": "11.863774", + "track": "B" + }, + { + "name": "Skrämmenborg, Kungälv", + "id": "9021014014225000", + "lat": "57.863528", + "lon": "11.867406" + } + ] + } +} \ No newline at end of file diff --git a/src/APIexamples/user1.json b/src/APIexamples/user1.json index 6f3b2f2..da40428 100644 --- a/src/APIexamples/user1.json +++ b/src/APIexamples/user1.json @@ -1,5 +1,5 @@ { "name": "Användare 1", "deviceId": "1", - "stoppointgid": "9022014014754001" + "stoppointgid": "9022014014751001" } \ No newline at end of file diff --git a/src/APIexamples/user2.json b/src/APIexamples/user2.json index 06eef29..ad09031 100644 --- a/src/APIexamples/user2.json +++ b/src/APIexamples/user2.json @@ -1,5 +1,5 @@ { "name": "Användare 2", "deviceId": "2", - "stoppointgid": "9022014014020001" + "stoppointgid": "9022014014010001" } \ No newline at end of file diff --git a/src/APIexamples/user3.json b/src/APIexamples/user3.json index 6ee5f34..8eb3611 100644 --- a/src/APIexamples/user3.json +++ b/src/APIexamples/user3.json @@ -1,5 +1,5 @@ { "name": "Användare 3", "deviceId": "3", - "stoppointgid": "9022014014751001" + "stoppointgid": "9022014014614001" } \ No newline at end of file diff --git a/src/APIexamples/user4.json b/src/APIexamples/user4.json index 3a81c81..9d6541b 100644 --- a/src/APIexamples/user4.json +++ b/src/APIexamples/user4.json @@ -1,5 +1,5 @@ { "name": "Användare 4", "deviceId": "4", - "stoppointgid": "9021014014225000" + "stoppointgid": "9022014014762001" } \ No newline at end of file diff --git a/src/components/DisruptionButton.js b/src/components/DisruptionButton.js index 08f0dc3..af5ddcf 100644 --- a/src/components/DisruptionButton.js +++ b/src/components/DisruptionButton.js @@ -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 user2 from '../APIexamples/user2.json' @@ -18,11 +21,6 @@ import departureuser4 from '../APIexamples/departureuser4.json' import ex1 from '../APIexamples/disruption1.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 { state = { @@ -39,12 +37,11 @@ class DisruptionButton extends Button { } showMomentTime = (time) => { - //return(time.hours().toString()+ ":"+time.minutes().toString()) return(time.format("HH:mm")) } genUsers = () => { - if(globData.users.length < 2){ + if(globalData.users.length < 2){ this.state.first = true; this.state.u1.stop = locationuser1.LocationList.StopLocation[0]; 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.u4.stop = locationuser4.LocationList.StopLocation[0]; this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures; - globData.users = [ + globalData.users = [ this.state.u1, this.state.u2, this.state.u3, @@ -69,7 +66,7 @@ class DisruptionButton extends Button { this.state.disruption = undefined if(this.state.jsonLocation === "ex1"){ for (let stopPoint of ex1.affectedStopPoints) { - for (let user of globData.users){ + for (let user of globalData.users){ if(stopPoint.gid === user.stoppointgid){ this.state.disruption = ex1; 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; } } - if(stopPoint.gid === globData.user.stoppointgid){ + if(stopPoint.gid === globalData.user.stoppointgid){ 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"); - globData.stop.departures[0].newTime = this.showMomentTime(old2t); - globData.stop.departures[0].trafficInfo = ex1.title; + globalData.stop.departures[0].newTime = this.showMomentTime(old2t); + globalData.stop.departures[0].trafficInfo = ex1.title; } } } else if (this.state.jsonLocation === "ex2"){ for (let stopPoint of ex2.affectedStopPoints) { - for (let user of globData.users){ + for (let user of globalData.users){ if(stopPoint.gid === user.stoppointgid){ this.state.disruption = ex2; 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; } } - if(stopPoint.gid === globData.user.stoppointgid){ + if(stopPoint.gid === globalData.user.stoppointgid){ 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"); - globData.stop.departures[0].newTime = this.showMomentTime(old4t); - globData.stop.departures[0].trafficInfo = ex2.title; + globalData.stop.departures[0].newTime = this.showMomentTime(old4t); + globalData.stop.departures[0].trafficInfo = ex2.title; } } } - globData.disruption = this.state.disruption + globalData.disruption = this.state.disruption } render() { return ( ); } diff --git a/src/components/FindStops.js b/src/components/FindStops.js index 46a7d0d..9c8cfd1 100644 --- a/src/components/FindStops.js +++ b/src/components/FindStops.js @@ -1,5 +1,5 @@ -import globData from '../GlobalData.js'; +import globalData from '../GlobalData.js'; import locationuser1 from '../APIexamples/locationuser1.json' import locationuser2 from '../APIexamples/locationuser2.json' @@ -15,13 +15,13 @@ class FindStops extends Button { locations : [] } findStops = () => { - if(globData.user.deviceId === "1"){ + if(globalData.user.deviceId === "1"){ this.state.locations = locationuser1.LocationList.StopLocation - }else if (globData.user.deviceId === "2"){ + }else if (globalData.user.deviceId === "2"){ this.state.locations = locationuser2.LocationList.StopLocation - }else if (globData.user.deviceId === "3"){ + }else if (globalData.user.deviceId === "3"){ this.state.locations = locationuser3.LocationList.StopLocation - }else if (globData.user.deviceId === "4"){ + }else if (globalData.user.deviceId === "4"){ this.state.locations = locationuser4.LocationList.StopLocation } } diff --git a/src/components/MenuButton.js b/src/components/MenuButton.js index 0ab96d0..090dbd5 100644 --- a/src/components/MenuButton.js +++ b/src/components/MenuButton.js @@ -5,14 +5,14 @@ class MenuButton extends Button { render() { if (this.props.childOrderReverse) { return ( - ); } else { return ( - diff --git a/src/components/NavigationDrawer.js b/src/components/NavigationDrawer.js index 48a40d7..c4bd993 100644 --- a/src/components/NavigationDrawer.js +++ b/src/components/NavigationDrawer.js @@ -9,6 +9,7 @@ import Button from './Button.js'; import './css/NavigationDrawer.css'; import userIcon from '../img/user.svg'; +import disruptIcon from '../img/flash.svg'; class NavigationDrawer extends Component { @@ -53,11 +54,10 @@ class NavigationDrawer extends Component { } render() { - return ( <> -

Välj hållplats:

+

Välj scenario: