Unverified Commit 04388729 authored by Sparkf's avatar Sparkf 🏙️
Browse files

fix timetable for L2

parent 1c8bc584

docs/.vuepress/components/BusTable.vue

+10 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ export default { 
      now: new Date(),

      timer: null,

      showUpcomingOnly: true,

      defaultTripDuration: 20 // Default duration in minutes for "en-route" calculation

      defaultminuteOnRoad: 20 // Default duration in minutes for "en-route" calculation

    }

  },

  computed: {
@@ -249,13 +249,15 @@ export default { 
               const results = await Promise.all(promises)

               results.forEach(res => {

                 const times = res.data.times || []

                 const duration = res.data.minuteOnRoad

                 // Tag them

                 times.forEach(t => {

                   mergedTimes.push({

                     text: t,

                     val: this.timeToMinutes(t),

                     type: res.type || 'bus', // 'bus' or 'shuttle'

                     status: 'future'

                     status: 'future',

                     duration: duration

                   })

                 })

               })
@@ -267,12 +269,14 @@ export default { 
            try {

              const res = await axios.get(routeConfig.timesUrl)

              const times = res.data.times || []

              const duration = res.data.minuteOnRoad

              times.forEach(t => {

                mergedTimes.push({

                  text: t,

                  val: this.timeToMinutes(t),

                  type: 'bus',

                  status: 'future'

                  status: 'future',

                  duration: duration

                })

              })

            } catch (err) { console.error(err) }
@@ -312,9 +316,10 @@ export default { 
          let nextFound = false

          r.times.forEach(t => {

            // Status logic

            if (t.val < now - this.defaultTripDuration) {

            const duration = t.duration || this.defaultminuteOnRoad

            if (t.val < now - duration) {

              t.status = 'past'

            } else if (t.val <= now && t.val >= now - this.defaultTripDuration) {

            } else if (t.val <= now && t.val >= now - duration) {

              t.status = 'en-route'

            } else {

              // Future

docs/.vuepress/public/bus_times/one_shuttle_down.json

+25 −4
Original line number Diff line number Diff line 
{

  "times": [

    "07:00", "07:10", "10:20",

    "10:30", "10:40", "10:50", "11:00", "11:10", "11:20","14:00", "14:10", "14:20", "14:30", "14:40",

    "14:50", "14:55", "15:00", "15:10", "15:20", "15:30", "15:40", "15:45", "15:50", "15:55"

    "07:00",

    "07:10",

    "10:20",

    "10:30",

    "10:40",

    "10:50",

    "11:00",

    "11:10",

    "11:20",

    "14:00",

    "14:10",

    "14:20",

    "14:30",

    "14:40",

    "14:50",

    "14:55",

    "15:00",

    "15:10",

    "15:20",

    "15:30",

    "15:40",

    "15:45",

    "15:50",

    "15:55"

  ],

  "stations": [

    [
@@ -62,5 +83,5 @@ 
      1

    ]

  ],

  "minuteOnRoad": 20

  "minuteOnRoad": 23

}
 
 No newline at end of file

docs/.vuepress/public/bus_times/one_shuttle_down_holiday.json

+34 −4
Original line number Diff line number Diff line 
{

  "times": [

    "07:00", "07:20", "07:40", "08:00", "08:20", "08:30", "08:40", "08:50", "09:00", "09:10","13:10", "13:20", "13:30",

    "13:40", "13:50", "14:00", "14:10", "14:20", "14:30", "14:40", "14:50", "15:00", "15:10",

    "15:20", "15:40", "15:50", "16:00", "16:10", "16:20", "16:40", "16:50", "17:00", "17:10",

    "07:00",

    "07:20",

    "07:40",

    "08:00",

    "08:20",

    "08:30",

    "08:40",

    "08:50",

    "09:00",

    "09:10",

    "13:10",

    "13:20",

    "13:30",

    "13:40",

    "13:50",

    "14:00",

    "14:10",

    "14:20",

    "14:30",

    "14:40",

    "14:50",

    "15:00",

    "15:10",

    "15:20",

    "15:40",

    "15:50",

    "16:00",

    "16:10",

    "16:20",

    "16:40",

    "16:50",

    "17:00",

    "17:10",

    "17:20"

  ],

  "stations": [
@@ -63,5 +93,5 @@ 
      1

    ]

  ],

  "minuteOnRoad": 20

  "minuteOnRoad": 23

}
 
 No newline at end of file

docs/.vuepress/public/bus_times/two_down.json

+8 −2
Original line number Diff line number Diff line 
{

  "times": [

    "07:32", "07:35", "09:50", "10:00", "13:30", "13:40", "16:00"

    "07:32",

    "07:35",

    "09:50",

    "10:00",

    "13:30",

    "13:40",

    "16:00"

  ],

  "stations": [

    [
@@ -32,5 +38,5 @@ 
      1

    ]

  ],

  "minuteOnRoad": 10

  "minuteOnRoad": 23

}
 
 No newline at end of file

docs/.vuepress/public/bus_times/two_down_holiday.json

+2 −3
Original line number Diff line number Diff line 
{

  "times": [

  ],

  "times": [],

  "stations": [

    [

      "欣园",
@@ -31,5 +30,5 @@ 
      1

    ]

  ],

  "minuteOnRoad": 10

  "minuteOnRoad": 23

}
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE