From cf1bca273800f36a6ab9f779b72ba107a6e3bb66 Mon Sep 17 00:00:00 2001
From: Ian Rees <ian@ianrees.net>
Date: Thu, 11 Jul 2024 20:48:44 -0700
Subject: [PATCH 1/4] [EXP] Route departure tables

---
 src/runtime/components/nw.ts                |  90 ++++++
 src/runtime/components/pages/route.vue      |   2 +
 src/runtime/components/route-departures.vue | 318 ++++++++++++++++++++
 3 files changed, 410 insertions(+)
 create mode 100644 src/runtime/components/nw.ts
 create mode 100644 src/runtime/components/route-departures.vue

diff --git a/src/runtime/components/nw.ts b/src/runtime/components/nw.ts
new file mode 100644
index 0000000..be2ed24
--- /dev/null
+++ b/src/runtime/components/nw.ts
@@ -0,0 +1,90 @@
+// adapted from https://gist.github.com/shinout/f19da7720d130f3925ac
+const UP = '1'
+const LEFT = '2'
+const UL = '4'
+
+interface Options {
+  G: number,
+  P: number,
+  M: number
+}
+
+interface Matrix {
+  [key: number]: {[key: number]: number}
+}
+
+interface Direc {
+  [key: number]: {[key: number]: Array<string>}
+}
+
+export function NeedlemanWunsch(s1: Array<string>, s2: Array<string>, op: Options): {a: Array<string>, b: Array<string>} {
+  op = op || {}
+  const G = op.G || 2
+  const P = op.P || 1
+  const M = op.M || -100
+  const mat: Matrix = {}
+  const direc: Direc = {}
+
+  // initialization
+  for (let i = 0; i < s1.length + 1; i++) {
+    mat[i] = { 0: 0 }
+    direc[i] = { 0: [] }
+    for (let j = 1; j < s2.length + 1; j++) {
+      mat[i][j] = (i === 0)
+        ? 0
+        : (s1[i - 1] === s2[j - 1]) ? P : M
+      direc[i][j] = []
+    }
+  }
+
+  // calculate each value
+  for (let i = 0; i < s1.length + 1; i++) {
+    for (let j = 0; j < s2.length + 1; j++) {
+      const newval = (i === 0 || j === 0)
+        ? -G * (i + j)
+        : Math.max(mat[i - 1][j] - G, mat[i - 1][j - 1] + mat[i][j], mat[i][j - 1] - G)
+
+      if (i > 0 && j > 0) {
+        if (newval === mat[i - 1][j] - G) { direc[i][j].push(UP) }
+        if (newval === mat[i][j - 1] - G) { direc[i][j].push(LEFT) }
+        if (newval === mat[i - 1][j - 1] + mat[i][j]) { direc[i][j].push(UL) }
+      } else {
+        direc[i][j].push((j === 0) ? UP : LEFT)
+      }
+      mat[i][j] = newval
+    }
+  }
+
+  // get result
+  const chars = [new Array<string>(), new Array<string>()]
+  let I = s1.length
+  let J = s2.length
+  while (I > 0 || J > 0) {
+    switch (direc[I][J][0]) {
+      case UP:
+        I--
+        chars[0].push(s1[I])
+        chars[1].push('-')
+        break
+      case LEFT:
+        J--
+        chars[0].push('-')
+        chars[1].push(s2[J])
+        break
+      case UL:
+        I--
+        J--
+        chars[0].push(s1[I])
+        chars[1].push(s2[J])
+        break
+      default: break
+    }
+  }
+  return {
+    a: chars[0].reverse(),
+    b: chars[1].reverse()
+  }
+  // return chars.map(function(v) {
+  //   return v.reverse()
+  // })
+}
diff --git a/src/runtime/components/pages/route.vue b/src/runtime/components/pages/route.vue
index b62cb29..602d282 100644
--- a/src/runtime/components/pages/route.vue
+++ b/src/runtime/components/pages/route.vue
@@ -30,6 +30,8 @@
 
       <slot name="contentBeforeTable" :entity="entity" />
 
+      <tl-route-departures :route-id="entity.id" />
+
       <!-- Main content -->
       <div class="columns">
         <div class="column is-two-thirds">
diff --git a/src/runtime/components/route-departures.vue b/src/runtime/components/route-departures.vue
new file mode 100644
index 0000000..5db5a70
--- /dev/null
+++ b/src/runtime/components/route-departures.vue
@@ -0,0 +1,318 @@
+<template>
+  <div>
+    <div v-for="route of routes" :key="route.id">
+      <div v-for="[k,mergedPattern] of Object.entries(directionTables(route.trips))" :key="k">
+        <div class="title is-3">
+          {{ $filters.capitalize(k) }}
+        </div>
+        <table class="table is-striped">
+          <thead>
+            <th v-for="sp of mergedPattern.timepointStops" :key="sp.id+sp.visit">
+              <nuxt-link :to="{name:'stops-stopKey', params: {stopKey: sp.stop?.onestop_id}}">
+                {{ sp.stop?.stop_name }}
+              </nuxt-link>
+            </th>
+          </thead>
+          <tbody>
+            <tr v-for="trip of mergedPattern.trips" :key="trip.id">
+              <td v-for="pst of pluckStopTimes(mergedPattern.timepointStops, trip.stop_times)" :key="pst.sequence">
+                <span v-if="pst.st">
+                  <template v-if="pst.st.departure.estimated">
+                    {{ $filters.reformatHMS(pst.st.departure.estimated) }} &nbsp;<o-icon variant="success" size="small" icon="wifi" />
+                  </template><template v-else>
+                    {{ $filters.reformatHMS(pst.st.departure.scheduled) }} &nbsp;<o-icon variant="success" size="small" icon="blank" />
+                  </template>
+                </span>
+                <span v-else>-</span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { gql } from 'graphql-tag'
+import { NeedlemanWunsch } from './nw'
+
+const q = gql`
+query($ids: [Int!], $service_date: Date!) {
+    routes(ids: $ids) {
+        id
+        onestop_id
+        trips(limit: 1000, where: { service_date: $service_date}) {
+            id
+            trip_id
+            trip_headsign
+            direction_id
+            stop_pattern_id
+            stop_times(limit: 1000) {
+                stop_sequence
+                stop_headsign
+                timepoint
+                departure {
+                  scheduled
+                  estimated
+                }
+                stop {
+                    id
+                    stop_name
+                    onestop_id
+                }
+            }
+        }
+    }
+}
+`
+
+interface Stop {
+  id: number;
+  stop_name: string;
+  onestop_id: string;
+}
+
+interface StopTimeEvent {
+  scheduled: string;
+  estimated: string;
+}
+
+interface StopTime {
+  departure: StopTimeEvent;
+  timepoint: number;
+  stop_sequence: number;
+  stop: Stop;
+}
+
+interface PluckedStopTime {
+  sequence: number;
+  st?: StopTime;
+}
+
+interface Trip {
+  id: number;
+  stop_pattern_id: number;
+  direction_id: number;
+  stop_times: Array<StopTime>;
+  timepoints: Array<StopTime>;
+}
+
+interface StopPosition {
+  id: number;
+  visit: number;
+  stop?: Stop;
+}
+
+interface Route {
+  id: number;
+  trips: Array<Trip>;
+}
+
+interface MergedPattern {
+  timepointStops: Array<StopPosition>;
+  trips: Array<Trip>;
+}
+
+function pluckStopTimes(stopPositionPattern: Array<StopPosition>, sts: Array<StopTime>): Array<PluckedStopTime> {
+  const ret = new Array<PluckedStopTime>()
+  let j = 0
+  for (let i = 0; i < stopPositionPattern.length; i++) {
+    const sp = stopPositionPattern[i]
+    let found = false
+    for (let jj = j; jj < sts.length; jj++) {
+      const st = sts[jj]
+      if (st.stop.id === sp.id) {
+        ret.push({
+          sequence: i,
+          st
+        })
+        j = j + 1
+        found = true
+        break
+      }
+    }
+    if (!found) {
+      ret.push({ sequence: i })
+    }
+  }
+  return ret
+}
+
+function parseHMS(value: string): number {
+  const a = (value || '').split(':').map((s) => {
+    return parseInt(s)
+  })
+  if (a.length !== 3) {
+    return 0
+  }
+  return a[0] * 3600 + a[1] * 60 + a[2]
+}
+
+function firstStopDeparture(sts: Array<StopTime>): number {
+  if (sts.length === 0) {
+    return 0
+  }
+  return parseHMS(sts[0].departure.scheduled)
+}
+
+function timepointTables(trips: Array<Trip>): MergedPattern {
+  // Check visits to all timepoints across all trips
+  const seenAllPatterns = new Map<number, number>()
+  for (const t of trips) {
+    const seen = new Map<number, number>()
+    for (const st of t.stop_times) {
+      if (!st.timepoint) {
+        continue
+      }
+      // Only count first visit to this stop as a hit
+      const visit = seen.get(st.stop.id) ?? 0
+      if (visit === 0) {
+        const allVisits = seenAllPatterns.get(st.stop.id) ?? 0
+        seenAllPatterns.set(st.stop.id, allVisits + 1)
+      }
+      seen.set(st.stop.id, visit + 1)
+    }
+  }
+
+  // Sort by departure from most common stop, falling back to first stop departure
+  const tripSortStop = new Map<number, number>()
+  const seenAllPatternsKeys = [...seenAllPatterns.entries()].sort((a, b) => b[1] - a[1])
+  if (seenAllPatternsKeys.length > 0) {
+    const sortStop = seenAllPatternsKeys[0][0]
+    for (const t of trips) {
+      for (const st of t.stop_times) {
+        // Only consider first visit to common stop
+        if (st.stop.id === sortStop) {
+          tripSortStop.set(t.id, parseHMS(st.departure.scheduled))
+          break
+        }
+      }
+    }
+  }
+  const tripDir = trips.sort((a, b) => {
+    const at = tripSortStop.get(a.id) || firstStopDeparture(a.stop_times)
+    const bt = tripSortStop.get(b.id) || firstStopDeparture(b.stop_times)
+    return at - bt
+  })
+
+  // Convert stop patterns to StopPositions
+  // This is so the alignment is not confused by multiple visits to the same stop
+  const stopPositionPatterns = new Map<number, Array<StopPosition>>()
+  const stopLookup = new Map<number, Stop>()
+  for (const t of tripDir) {
+    if (stopPositionPatterns.has(t.stop_pattern_id)) {
+      continue
+    }
+    for (const st of t.stop_times) {
+      stopLookup.set(st.stop.id, st.stop)
+    }
+    const stopPositionPattern = new Array<StopPosition>()
+    const seen = new Map<number, number>()
+    for (const st of t.stop_times) {
+      if (!st.timepoint) {
+        continue
+      }
+      const visit = seen.get(st.stop.id) ?? 0
+      stopPositionPattern.push({ id: st.stop.id, visit })
+      seen.set(st.stop.id, visit + 1)
+    }
+    stopPositionPatterns.set(t.stop_pattern_id, stopPositionPattern)
+  }
+
+  // Sort patterns by length desc
+  const sortedPatterns = Array.from(stopPositionPatterns.values())
+  sortedPatterns.sort((a, b) => { return b.length - a.length })
+
+  // Merge stop patterns using Needleman-Wunsch algorithm
+  let commonCount = 0
+  let mergedStops = new Array<string>()
+  for (const stopPositionPattern of sortedPatterns) {
+    // convert to `<id>:<visit>`
+    const spString = stopPositionPattern.map((s) => { return s.id + ':' + s.visit })
+    console.log('pattern:', stopPositionPattern)
+    console.log('  spString:', spString)
+    const alignment = NeedlemanWunsch(mergedStops, spString)
+    const alignA = alignment.a
+    const alignB = alignment.b
+    console.log('  alignA:', alignA)
+    console.log('  alignB:', alignB)
+
+    // TODO: Exclude stop pattern if there are no common stops??
+    for (let i = 0; i < alignA.length; i++) {
+      if (alignA[i] === alignB[i]) {
+        commonCount += 1
+      }
+    }
+    console.log('  common count:', commonCount)
+
+    // Merge alignA and alignB together
+    const mergedAlignment = Array<string>()
+    for (let i = 0; i < alignA.length; i++) {
+      const a = alignA[i]
+      const b = alignB[i]
+      if (a === b) {
+        commonCount += 1
+      }
+      if (a !== '-') {
+        mergedAlignment.push(a)
+      } else if (b !== '-') {
+        mergedAlignment.push(b)
+      }
+    }
+    console.log('  mergedAlignment: ', mergedAlignment)
+    mergedStops = mergedAlignment
+  }
+  console.log('mergedStops:', mergedStops)
+
+  // Convert `<id>:<visit>` back to StopPositions
+  const mergedStopPositions = new Array<StopPosition>()
+  for (const s of mergedStops) {
+    const ss = s.split(':')
+    const sid = Number(ss[0])
+    const svisit = Number(ss[1])
+    console.log(ss, sid, svisit)
+    mergedStopPositions.push({
+      id: sid,
+      visit: svisit,
+      stop: stopLookup.get(sid)!
+    })
+  }
+  return {
+    timepointStops: mergedStopPositions,
+    trips: tripDir
+  }
+}
+
+export default {
+  props: {
+    routeId: { type: Number, default: 0 }
+  },
+  data () {
+    return { routes: new Array<Route>() }
+  },
+  apollo: {
+    routes: {
+      query: q,
+      variables () {
+        return {
+          ids: [this.routeId],
+          service_date: '2024-07-11'
+        }
+      }
+    }
+  },
+  methods: {
+    pluckStopTimes,
+    directionTables(trips: Array<Trip>): {inbound: MergedPattern, outbound: MergedPattern} {
+      const inbound = timepointTables(trips.filter((t) => { return t.direction_id === 0 }))
+      const outbound = timepointTables(trips.filter((t) => { return t.direction_id === 1 }))
+      return {
+        inbound,
+        outbound
+      }
+    }
+  }
+
+}
+</script>

From 95b6c4790534c4e1d68491dcec414b955898d41f Mon Sep 17 00:00:00 2001
From: Ian Rees <ian@ianrees.net>
Date: Fri, 12 Jul 2024 22:14:35 -0700
Subject: [PATCH 2/4] WIP

---
 src/runtime/components/modal.vue              |   4 +-
 src/runtime/components/nw.ts                  |   2 +-
 src/runtime/components/pages/route.vue        |   5 +-
 .../components/route-departures-outer.vue     | 213 ++++++++++++++++
 .../components/route-departures-table.vue     | 126 ++++++++++
 ...ute-departures.vue => route-departures.ts} | 235 +++++++-----------
 src/runtime/plugins/filters-fn.ts             |   4 +
 src/runtime/plugins/filters.ts                |   4 +
 8 files changed, 440 insertions(+), 153 deletions(-)
 create mode 100644 src/runtime/components/route-departures-outer.vue
 create mode 100644 src/runtime/components/route-departures-table.vue
 rename src/runtime/components/{route-departures.vue => route-departures.ts} (51%)

diff --git a/src/runtime/components/modal.vue b/src/runtime/components/modal.vue
index c3a838f..c327326 100644
--- a/src/runtime/components/modal.vue
+++ b/src/runtime/components/modal.vue
@@ -4,6 +4,7 @@
       :active="modelValue"
       has-modal-card
       can-cancel
+      :fullscreen="fullscreen"
       @update:model-value="$emit('update:modelValue', $event)"
       @close="close"
     >
@@ -34,7 +35,8 @@ export default {
   props: {
     text: { type: String, default: '+' },
     title: { type: String, default: '' },
-    modelValue: { type: Boolean }
+    modelValue: { type: Boolean },
+    fullscreen: { type: Boolean }
   },
   emits: ['input', 'update:modelValue'],
   data () {
diff --git a/src/runtime/components/nw.ts b/src/runtime/components/nw.ts
index be2ed24..e0501a0 100644
--- a/src/runtime/components/nw.ts
+++ b/src/runtime/components/nw.ts
@@ -21,7 +21,7 @@ export function NeedlemanWunsch(s1: Array<string>, s2: Array<string>, op: Option
   op = op || {}
   const G = op.G || 2
   const P = op.P || 1
-  const M = op.M || -100
+  const M = op.M || 0.5
   const mat: Matrix = {}
   const direc: Direc = {}
 
diff --git a/src/runtime/components/pages/route.vue b/src/runtime/components/pages/route.vue
index 602d282..caab8a6 100644
--- a/src/runtime/components/pages/route.vue
+++ b/src/runtime/components/pages/route.vue
@@ -30,8 +30,6 @@
 
       <slot name="contentBeforeTable" :entity="entity" />
 
-      <tl-route-departures :route-id="entity.id" />
-
       <!-- Main content -->
       <div class="columns">
         <div class="column is-two-thirds">
@@ -135,6 +133,9 @@
             :animated="false"
             @update:model-value="setTab"
           >
+            <o-tab-item id="schedule" label="Schedule">
+              <tl-route-departures-outer :route-id="entity.id" />
+            </o-tab-item>
             <o-tab-item id="summary" label="Connections">
               <client-only placeholder="Service patterns">
                 <tl-rsp-viewer v-if="activeTab === 1" :route-ids="entityIds" :link-version="linkVersion" />
diff --git a/src/runtime/components/route-departures-outer.vue b/src/runtime/components/route-departures-outer.vue
new file mode 100644
index 0000000..1a86361
--- /dev/null
+++ b/src/runtime/components/route-departures-outer.vue
@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <o-field grouped>
+      <o-button>
+        <o-icon icon="fullscreen" @click="showModal=true" />
+      </o-button>
+      <o-select v-model="showKey">
+        <option v-for="[k,mergedPattern] of Object.entries(directionTables)" :key="k" :value="k">
+          To: {{ mergedPattern.title }}
+        </option>
+      </o-select>
+
+      <o-datepicker
+        v-model="displayServiceDate"
+        placeholder="Click to select..."
+        icon="calendar-today"
+        trap-focus
+      />
+
+      <o-field>
+        <o-dropdown position="bottom-left" append-to-body aria-role="menu" trap-focus menu-class="tl-feeds-table">
+          <template #trigger="{ active }">
+            <o-button label="Options" :icon-left="active ? 'menu-up' : 'menu-down'" />
+          </template>
+
+          <div aria-role="menu-item" style="padding:20px">
+            <o-field label="Group by">
+              <o-checkbox v-model="groupByRoute">
+                Route
+              </o-checkbox>
+            </o-field>
+            <o-field>
+              <o-checkbox v-model="groupByHeadsign">
+                Headsign
+              </o-checkbox>
+            </o-field>
+            <o-field>
+              <o-checkbox v-model="groupByStopPattern">
+                Stop Pattern
+              </o-checkbox>
+            </o-field>
+          </div>
+        </o-dropdown>
+      </o-field>
+    </o-field>
+
+    <tl-loading v-if="$apollo.loading" />
+    <tl-msg-error v-else-if="error">
+      {{ error }}
+    </tl-msg-error>
+    <div v-else-if="routes.length > 0">
+      <div
+        v-if="activeTable"
+        class="tl-timepoint-overflow"
+      >
+        <tl-route-departures-table
+          :merged-pattern="activeTable"
+          :timepoint-limit="6"
+        />
+      </div>
+
+      <tl-modal
+        v-model="showModal"
+        title="Route Schedule"
+      >
+        <tl-route-departures-table :merged-pattern="activeTable" :timepoint-limit="100" />
+      </tl-modal>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { gql } from 'graphql-tag'
+import { parseISO, format, add, isBefore } from 'date-fns'
+import { MergedPattern, Route, Trip, timepointTables } from './route-departures'
+
+const q = gql`
+query($ids: [Int!], $service_date: Date!) {
+    routes(ids: $ids) {
+        id
+        onestop_id
+        trips(limit: 1000, where: { service_date: $service_date}) {
+            id
+            trip_id
+            trip_headsign
+            direction_id
+            stop_pattern_id
+            stop_times(limit: 1000) {
+                stop_sequence
+                stop_headsign
+                timepoint
+                departure {
+                  scheduled
+                  estimated
+                }
+                stop {
+                    id
+                    stop_name
+                    onestop_id
+                }
+            }
+        }
+    }
+}
+`
+
+interface DirectionTables {[key: string]: MergedPattern}
+
+export default {
+  props: {
+    routeId: { type: Number, default: 0 }
+  },
+  data () {
+    const serviceDate: Date = new Date()
+    return {
+      showModalMergedPattern: {},
+      showKey: 'inbound',
+      routes: new Array<Route>(),
+      showModal: false,
+      groupByRoute: true,
+      groupByDirection: true,
+      groupByHeadsign: false,
+      groupByStopPattern: false,
+      error: '',
+      serviceDate
+    }
+  },
+  apollo: {
+    routes: {
+      query: q,
+      error (e) { this.error = String(e) },
+      variables () {
+        return {
+          ids: [this.routeId],
+          service_date: format(this.serviceDate, 'yyyy-MM-dd')
+        }
+      }
+    }
+  },
+  computed: {
+    displayServiceDate: {
+      get () {
+        if (this.serviceDate) {
+          return this.serviceDate
+        }
+        // Get default date
+        // const days = this.fvsls.map((s) => { return s.start_date }).sort()
+        // if (days.length > 0) {
+        //   return serviceDate(days[0].substr(0, 10))
+        // }
+        // return serviceDate('2020-01-01')
+        return parseISO('2020-01-01')
+      },
+      set (v: Date) {
+        this.serviceDate = v
+      }
+    },
+    activeTable() {
+      return this.directionTables[this.showKey]
+    },
+    directionTables(): DirectionTables {
+      if (this.routes.length === 0) {
+        return {}
+      }
+      const groupedTrips = new Map<string, Array<Trip>>()
+      for (const route of this.routes) {
+        for (const trip of route.trips) {
+          const key = []
+          if (this.groupByRoute) {
+            key.push(route.id)
+          }
+          if (this.groupByDirection) {
+            key.push(trip.direction_id)
+          }
+          if (this.groupByHeadsign) {
+            key.push(trip.trip_headsign)
+          }
+          if (this.groupByStopPattern) {
+            key.push(trip.stop_pattern_id)
+          }
+          const ks = key.join('|')
+          const a = groupedTrips.get(ks) || []
+          a.push(trip)
+          groupedTrips.set(ks, a)
+        }
+      }
+      const ret: DirectionTables = {}
+      for (const [k, v] of groupedTrips.entries()) {
+        ret[k] = timepointTables(v)
+      }
+      return ret
+    }
+  },
+  watch: {
+    directionTables () {
+      const keys = Object.keys(this.directionTables)
+      keys.sort()
+      this.showKey = keys.length > 0 ? keys[0] : ''
+    }
+  }
+}
+</script>
+
+<style>
+.tl-stop-column {
+  min-width:120px;
+}
+.tl-timepoint-overflow {
+  width:100% !important;
+  overflow-x:scroll;
+}
+
+</style>
diff --git a/src/runtime/components/route-departures-table.vue b/src/runtime/components/route-departures-table.vue
new file mode 100644
index 0000000..3542deb
--- /dev/null
+++ b/src/runtime/components/route-departures-table.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <table class="table is-striped">
+      <thead>
+        <th
+          v-for="sp of timepointStops"
+          :key="sp.id + sp.visit"
+          class="tl-stop-column"
+        >
+          <nuxt-link v-if="sp.stop" :to="{ name: 'stops-stopKey', params: { stopKey: sp.stop?.onestop_id } }">
+            {{ sp.stop?.stop_name }}
+          </nuxt-link>
+          <div v-else class="skipstop-header">
+            ← … →<br>
+            {{ sp.skipStops?.length }} time points
+          </div>
+        </th>
+      </thead>
+      <tbody>
+        <tr
+          v-for="row of rows"
+          :key="row.trip.id"
+        >
+          <td
+            v-for="pst of row.psts"
+            :key="pst.sequence"
+          >
+            <div v-if="pst.sp?.skipStops?.length ?? 0 > 0" class="skipstop-row">
+              …
+            </div>
+            <div v-else-if="pst.st">
+              <template v-if="pst.st.departure.estimated">
+                {{ $filters.reformatHM(pst.st.departure.estimated) }} &nbsp;<o-icon
+                  variant="success"
+                  size="small"
+                  icon="wifi"
+                />
+              </template><template v-else>
+                {{ $filters.reformatHM(pst.st.departure.scheduled) }} &nbsp;<o-icon
+                  variant="success"
+                  size="small"
+                  icon="blank"
+                />
+              </template>
+            </div>
+            <div v-else>
+              -
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script lang="ts">
+import {
+  pluckStopTimes,
+  MergedPattern
+} from './route-departures'
+
+export default {
+  props: {
+    timepointLimit: {
+      type: Number,
+      default: 100
+    },
+    mergedPattern: {
+      type:
+        Object as PropType<MergedPattern>,
+      default () { return null }
+    }
+  },
+  computed: {
+    timepointStops() {
+      const tps = this.mergedPattern.timepointStops
+      if (tps.length > this.timepointLimit) {
+        const limitTps = []
+        const split = Math.floor(this.timepointLimit / 2.0)
+        console.log('tp length:', tps.length, 'limit:', this.timepointLimit, 'split:', split)
+        for (let i = 0; i < split; i++) {
+          limitTps.push(tps[i])
+        }
+        const skipStops = new Array<string>()
+        for (let i = split; i < (tps.length - split); i++) {
+          skipStops.push(tps[i]?.stop?.stop_name ?? '')
+        }
+        limitTps.push({
+          id: 0,
+          visit: split,
+          skipStops
+        })
+        for (let i = tps.length - split; i < tps.length; i++) {
+          limitTps.push(tps[i])
+        }
+        return limitTps
+      }
+
+      return tps
+    },
+    rows() {
+      const rows = []
+      for (const trip of this.mergedPattern.trips) {
+        const psts = pluckStopTimes(this.timepointStops, trip.stop_times)
+        rows.push({ trip, psts })
+      }
+      return rows
+    }
+  },
+  methods: {
+    pluckStopTimes
+  }
+}
+</script>
+
+<style>
+.tl-stop-column {
+    min-width: 120px;
+}
+.skipstop-header {
+  text-align:center;
+}
+.skipstop-row {
+  text-align:center;
+}
+</style>
diff --git a/src/runtime/components/route-departures.vue b/src/runtime/components/route-departures.ts
similarity index 51%
rename from src/runtime/components/route-departures.vue
rename to src/runtime/components/route-departures.ts
index 5db5a70..7163e81 100644
--- a/src/runtime/components/route-departures.vue
+++ b/src/runtime/components/route-departures.ts
@@ -1,139 +1,82 @@
-<template>
-  <div>
-    <div v-for="route of routes" :key="route.id">
-      <div v-for="[k,mergedPattern] of Object.entries(directionTables(route.trips))" :key="k">
-        <div class="title is-3">
-          {{ $filters.capitalize(k) }}
-        </div>
-        <table class="table is-striped">
-          <thead>
-            <th v-for="sp of mergedPattern.timepointStops" :key="sp.id+sp.visit">
-              <nuxt-link :to="{name:'stops-stopKey', params: {stopKey: sp.stop?.onestop_id}}">
-                {{ sp.stop?.stop_name }}
-              </nuxt-link>
-            </th>
-          </thead>
-          <tbody>
-            <tr v-for="trip of mergedPattern.trips" :key="trip.id">
-              <td v-for="pst of pluckStopTimes(mergedPattern.timepointStops, trip.stop_times)" :key="pst.sequence">
-                <span v-if="pst.st">
-                  <template v-if="pst.st.departure.estimated">
-                    {{ $filters.reformatHMS(pst.st.departure.estimated) }} &nbsp;<o-icon variant="success" size="small" icon="wifi" />
-                  </template><template v-else>
-                    {{ $filters.reformatHMS(pst.st.departure.scheduled) }} &nbsp;<o-icon variant="success" size="small" icon="blank" />
-                  </template>
-                </span>
-                <span v-else>-</span>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { gql } from 'graphql-tag'
 import { NeedlemanWunsch } from './nw'
 
-const q = gql`
-query($ids: [Int!], $service_date: Date!) {
-    routes(ids: $ids) {
-        id
-        onestop_id
-        trips(limit: 1000, where: { service_date: $service_date}) {
-            id
-            trip_id
-            trip_headsign
-            direction_id
-            stop_pattern_id
-            stop_times(limit: 1000) {
-                stop_sequence
-                stop_headsign
-                timepoint
-                departure {
-                  scheduled
-                  estimated
-                }
-                stop {
-                    id
-                    stop_name
-                    onestop_id
-                }
-            }
-        }
-    }
-}
-`
-
-interface Stop {
+export interface Stop {
   id: number;
   stop_name: string;
   onestop_id: string;
 }
 
-interface StopTimeEvent {
+export interface StopTimeEvent {
   scheduled: string;
   estimated: string;
 }
 
-interface StopTime {
+export interface StopTime {
   departure: StopTimeEvent;
   timepoint: number;
   stop_sequence: number;
   stop: Stop;
 }
 
-interface PluckedStopTime {
-  sequence: number;
-  st?: StopTime;
-}
-
-interface Trip {
+export interface Trip {
   id: number;
+  trip_headsign: string;
   stop_pattern_id: number;
   direction_id: number;
   stop_times: Array<StopTime>;
   timepoints: Array<StopTime>;
 }
 
-interface StopPosition {
+export interface StopPosition {
   id: number;
   visit: number;
   stop?: Stop;
+  skipStops?: Array<string>;
 }
 
-interface Route {
+export interface Route {
   id: number;
   trips: Array<Trip>;
 }
 
-interface MergedPattern {
+export interface MergedPattern {
+  title: string;
   timepointStops: Array<StopPosition>;
   trips: Array<Trip>;
 }
 
-function pluckStopTimes(stopPositionPattern: Array<StopPosition>, sts: Array<StopTime>): Array<PluckedStopTime> {
+export interface PluckedStopTime {
+  sequence: number;
+  st?: StopTime;
+  sp: StopPosition;
+}
+
+export function pluckStopTimes(stopPositionPattern: Array<StopPosition>, sts: Array<StopTime>): Array<PluckedStopTime> {
   const ret = new Array<PluckedStopTime>()
   let j = 0
   for (let i = 0; i < stopPositionPattern.length; i++) {
     const sp = stopPositionPattern[i]
     let found = false
-    for (let jj = j; jj < sts.length; jj++) {
-      const st = sts[jj]
-      if (st.stop.id === sp.id) {
-        ret.push({
-          sequence: i,
-          st
-        })
-        j = j + 1
-        found = true
-        break
+    if (sp.id > 0) {
+      for (let jj = j; jj < sts.length; jj++) {
+        const st = sts[jj]
+        if (st.stop.id === sp.id) {
+          ret.push({
+            sequence: i,
+            st,
+            sp
+          })
+          j = j + 1
+          found = true
+          break
+        }
       }
     }
     if (!found) {
-      ret.push({ sequence: i })
+      ret.push({
+        sequence: i,
+        sp
+      })
     }
   }
   return ret
@@ -156,13 +99,26 @@ function firstStopDeparture(sts: Array<StopTime>): number {
   return parseHMS(sts[0].departure.scheduled)
 }
 
-function timepointTables(trips: Array<Trip>): MergedPattern {
+function hasTimepoints(sts: Array<StopTime>): boolean {
+  for (const st of sts) {
+    if (st.timepoint > 0) {
+      return true
+    }
+  }
+  return false
+}
+
+export function timepointTables(trips: Array<Trip>): MergedPattern {
+  // Filter out trips with no stop times
+  const filteredTrips = trips.filter((t) => { return t.stop_times.length > 0 })
+
   // Check visits to all timepoints across all trips
   const seenAllPatterns = new Map<number, number>()
   for (const t of trips) {
     const seen = new Map<number, number>()
+    const hastp = hasTimepoints(t.stop_times)
     for (const st of t.stop_times) {
-      if (!st.timepoint) {
+      if (!st.timepoint && hastp) {
         continue
       }
       // Only count first visit to this stop as a hit
@@ -180,7 +136,7 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
   const seenAllPatternsKeys = [...seenAllPatterns.entries()].sort((a, b) => b[1] - a[1])
   if (seenAllPatternsKeys.length > 0) {
     const sortStop = seenAllPatternsKeys[0][0]
-    for (const t of trips) {
+    for (const t of filteredTrips) {
       for (const st of t.stop_times) {
         // Only consider first visit to common stop
         if (st.stop.id === sortStop) {
@@ -190,7 +146,7 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
       }
     }
   }
-  const tripDir = trips.sort((a, b) => {
+  const sortedTrips = filteredTrips.sort((a, b) => {
     const at = tripSortStop.get(a.id) || firstStopDeparture(a.stop_times)
     const bt = tripSortStop.get(b.id) || firstStopDeparture(b.stop_times)
     return at - bt
@@ -200,7 +156,7 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
   // This is so the alignment is not confused by multiple visits to the same stop
   const stopPositionPatterns = new Map<number, Array<StopPosition>>()
   const stopLookup = new Map<number, Stop>()
-  for (const t of tripDir) {
+  for (const t of sortedTrips) {
     if (stopPositionPatterns.has(t.stop_pattern_id)) {
       continue
     }
@@ -209,8 +165,9 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
     }
     const stopPositionPattern = new Array<StopPosition>()
     const seen = new Map<number, number>()
+    const hastp = hasTimepoints(t.stop_times)
     for (const st of t.stop_times) {
-      if (!st.timepoint) {
+      if (!st.timepoint && hastp) {
         continue
       }
       const visit = seen.get(st.stop.id) ?? 0
@@ -225,45 +182,42 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
   sortedPatterns.sort((a, b) => { return b.length - a.length })
 
   // Merge stop patterns using Needleman-Wunsch algorithm
-  let commonCount = 0
   let mergedStops = new Array<string>()
   for (const stopPositionPattern of sortedPatterns) {
     // convert to `<id>:<visit>`
     const spString = stopPositionPattern.map((s) => { return s.id + ':' + s.visit })
-    console.log('pattern:', stopPositionPattern)
-    console.log('  spString:', spString)
-    const alignment = NeedlemanWunsch(mergedStops, spString)
+    // console.log('pattern:', stopPositionPattern)
+    // console.log('  spString:', spString)
+    const alignment = NeedlemanWunsch(mergedStops, spString, { G: 2, P: 1, M: -100 })
     const alignA = alignment.a
     const alignB = alignment.b
-    console.log('  alignA:', alignA)
-    console.log('  alignB:', alignB)
+    // console.log('  alignA:', alignA)
+    // console.log('  alignB:', alignB)
 
     // TODO: Exclude stop pattern if there are no common stops??
-    for (let i = 0; i < alignA.length; i++) {
-      if (alignA[i] === alignB[i]) {
-        commonCount += 1
-      }
-    }
-    console.log('  common count:', commonCount)
+    // const commonCount = 0
+    // for (let i = 0; i < alignA.length; i++) {
+    //   if (alignA[i] === alignB[i]) {
+    //     commonCount += 1
+    //   }
+    // }
+    // console.log('  common count:', commonCount)
 
     // Merge alignA and alignB together
     const mergedAlignment = Array<string>()
     for (let i = 0; i < alignA.length; i++) {
       const a = alignA[i]
       const b = alignB[i]
-      if (a === b) {
-        commonCount += 1
-      }
       if (a !== '-') {
         mergedAlignment.push(a)
       } else if (b !== '-') {
         mergedAlignment.push(b)
       }
     }
-    console.log('  mergedAlignment: ', mergedAlignment)
+    // console.log('  mergedAlignment: ', mergedAlignment)
     mergedStops = mergedAlignment
   }
-  console.log('mergedStops:', mergedStops)
+  // console.log('mergedStops:', mergedStops)
 
   // Convert `<id>:<visit>` back to StopPositions
   const mergedStopPositions = new Array<StopPosition>()
@@ -271,48 +225,31 @@ function timepointTables(trips: Array<Trip>): MergedPattern {
     const ss = s.split(':')
     const sid = Number(ss[0])
     const svisit = Number(ss[1])
-    console.log(ss, sid, svisit)
+    // console.log(ss, sid, svisit)
     mergedStopPositions.push({
       id: sid,
       visit: svisit,
       stop: stopLookup.get(sid)!
     })
   }
-  return {
-    timepointStops: mergedStopPositions,
-    trips: tripDir
-  }
-}
 
-export default {
-  props: {
-    routeId: { type: Number, default: 0 }
-  },
-  data () {
-    return { routes: new Array<Route>() }
-  },
-  apollo: {
-    routes: {
-      query: q,
-      variables () {
-        return {
-          ids: [this.routeId],
-          service_date: '2024-07-11'
-        }
-      }
-    }
-  },
-  methods: {
-    pluckStopTimes,
-    directionTables(trips: Array<Trip>): {inbound: MergedPattern, outbound: MergedPattern} {
-      const inbound = timepointTables(trips.filter((t) => { return t.direction_id === 0 }))
-      const outbound = timepointTables(trips.filter((t) => { return t.direction_id === 1 }))
-      return {
-        inbound,
-        outbound
-      }
-    }
+  // Sort headsigns by frequency
+  const headsignCount = new Map<string, number>()
+  for (const trip of sortedTrips) {
+    const a = headsignCount.get(trip.trip_headsign) ?? 0
+    headsignCount.set(trip.trip_headsign, a + 1)
   }
+  const headsignUniqueKeys = [...headsignCount.keys()].sort((a, b) => {
+    const at = headsignCount.get(a) ?? 0
+    const bt = headsignCount.get(b) ?? 0
+    return at - bt
+  })
+  const title = headsignUniqueKeys.join(', ')
 
+  // OK
+  return {
+    title,
+    timepointStops: mergedStopPositions,
+    trips: sortedTrips
+  }
 }
-</script>
diff --git a/src/runtime/plugins/filters-fn.ts b/src/runtime/plugins/filters-fn.ts
index aa6056b..e8747c7 100644
--- a/src/runtime/plugins/filters-fn.ts
+++ b/src/runtime/plugins/filters-fn.ts
@@ -158,6 +158,10 @@ export function reformatHMS(value: string): string {
   return formatHMS(parseHMS(value))
 }
 
+export function reformatHM(value: string): string {
+  return formatHM(parseHMS(value))
+}
+
 export function round(value: number): string {
   return value.toFixed(2)
 }
diff --git a/src/runtime/plugins/filters.ts b/src/runtime/plugins/filters.ts
index 360e168..8207dc2 100644
--- a/src/runtime/plugins/filters.ts
+++ b/src/runtime/plugins/filters.ts
@@ -2,8 +2,10 @@ import {
   nameSort,
   fromNowDate,
   fromNow,
+  reformatHM,
   reformatHMS,
   parseHMS,
+  formatHM,
   formatHMS,
   shortenName,
   formatDate,
@@ -29,8 +31,10 @@ export default defineNuxtPlugin((nuxtApp) => {
     sanitizeFilename,
     fromNowDate,
     fromNow,
+    reformatHM,
     reformatHMS,
     parseHMS,
+    formatHM,
     formatHMS,
     shortenName,
     formatDate,

From 621d6f6f8f66c4943bd6e2e10d46ef09c32e08e7 Mon Sep 17 00:00:00 2001
From: Ian Rees <ian@ianrees.net>
Date: Fri, 12 Jul 2024 22:25:18 -0700
Subject: [PATCH 3/4] showRt

---
 src/runtime/components/route-departures-outer.vue | 7 +++++++
 src/runtime/components/route-departures-table.vue | 9 +++------
 src/runtime/components/route-departures.ts        | 2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/runtime/components/route-departures-outer.vue b/src/runtime/components/route-departures-outer.vue
index 1a86361..d11bcaa 100644
--- a/src/runtime/components/route-departures-outer.vue
+++ b/src/runtime/components/route-departures-outer.vue
@@ -39,6 +39,12 @@
                 Stop Pattern
               </o-checkbox>
             </o-field>
+
+            <o-field label="Debug">
+              <o-checkbox v-model="showRt">
+                Show GTFS-RT
+              </o-checkbox>
+            </o-field>
           </div>
         </o-dropdown>
       </o-field>
@@ -121,6 +127,7 @@ export default {
       groupByDirection: true,
       groupByHeadsign: false,
       groupByStopPattern: false,
+      showRt: true,
       error: '',
       serviceDate
     }
diff --git a/src/runtime/components/route-departures-table.vue b/src/runtime/components/route-departures-table.vue
index 3542deb..d075df0 100644
--- a/src/runtime/components/route-departures-table.vue
+++ b/src/runtime/components/route-departures-table.vue
@@ -29,18 +29,14 @@
               …
             </div>
             <div v-else-if="pst.st">
-              <template v-if="pst.st.departure.estimated">
+              <template v-if="pst.st.departure.estimated && showRt">
                 {{ $filters.reformatHM(pst.st.departure.estimated) }} &nbsp;<o-icon
                   variant="success"
                   size="small"
                   icon="wifi"
                 />
               </template><template v-else>
-                {{ $filters.reformatHM(pst.st.departure.scheduled) }} &nbsp;<o-icon
-                  variant="success"
-                  size="small"
-                  icon="blank"
-                />
+                {{ $filters.reformatHM(pst.st.departure.scheduled) }}
               </template>
             </div>
             <div v-else>
@@ -65,6 +61,7 @@ export default {
       type: Number,
       default: 100
     },
+    showRt: { type: Boolean, default: false },
     mergedPattern: {
       type:
         Object as PropType<MergedPattern>,
diff --git a/src/runtime/components/route-departures.ts b/src/runtime/components/route-departures.ts
index 7163e81..55a5afa 100644
--- a/src/runtime/components/route-departures.ts
+++ b/src/runtime/components/route-departures.ts
@@ -242,7 +242,7 @@ export function timepointTables(trips: Array<Trip>): MergedPattern {
   const headsignUniqueKeys = [...headsignCount.keys()].sort((a, b) => {
     const at = headsignCount.get(a) ?? 0
     const bt = headsignCount.get(b) ?? 0
-    return at - bt
+    return bt - at
   })
   const title = headsignUniqueKeys.join(', ')
 

From bce29dfef471e88ba4e3a6b57d41e5023164de50 Mon Sep 17 00:00:00 2001
From: Ian Rees <ian@ianrees.net>
Date: Fri, 12 Jul 2024 22:39:04 -0700
Subject: [PATCH 4/4] Cleanup

---
 .../components/route-departures-outer.vue     | 20 +++++++++----------
 .../components/route-departures-table.vue     | 19 +++++++++---------
 src/runtime/components/route-departures.ts    |  1 +
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/runtime/components/route-departures-outer.vue b/src/runtime/components/route-departures-outer.vue
index d11bcaa..6af70e5 100644
--- a/src/runtime/components/route-departures-outer.vue
+++ b/src/runtime/components/route-departures-outer.vue
@@ -62,6 +62,7 @@
         <tl-route-departures-table
           :merged-pattern="activeTable"
           :timepoint-limit="6"
+          :show-rt="showRt"
         />
       </div>
 
@@ -69,7 +70,11 @@
         v-model="showModal"
         title="Route Schedule"
       >
-        <tl-route-departures-table :merged-pattern="activeTable" :timepoint-limit="100" />
+        <tl-route-departures-table
+          :merged-pattern="activeTable"
+          :timepoint-limit="100"
+          :show-rt="showRt"
+        />
       </tl-modal>
     </div>
   </div>
@@ -77,7 +82,7 @@
 
 <script lang="ts">
 import { gql } from 'graphql-tag'
-import { parseISO, format, add, isBefore } from 'date-fns'
+import { parseISO, format } from 'date-fns'
 import { MergedPattern, Route, Trip, timepointTables } from './route-departures'
 
 const q = gql`
@@ -127,7 +132,7 @@ export default {
       groupByDirection: true,
       groupByHeadsign: false,
       groupByStopPattern: false,
-      showRt: true,
+      showRt: false,
       error: '',
       serviceDate
     }
@@ -150,13 +155,8 @@ export default {
         if (this.serviceDate) {
           return this.serviceDate
         }
-        // Get default date
-        // const days = this.fvsls.map((s) => { return s.start_date }).sort()
-        // if (days.length > 0) {
-        //   return serviceDate(days[0].substr(0, 10))
-        // }
-        // return serviceDate('2020-01-01')
-        return parseISO('2020-01-01')
+        // TODO: GET DATE
+        return parseISO('2024-07-11')
       },
       set (v: Date) {
         this.serviceDate = v
diff --git a/src/runtime/components/route-departures-table.vue b/src/runtime/components/route-departures-table.vue
index d075df0..64ac520 100644
--- a/src/runtime/components/route-departures-table.vue
+++ b/src/runtime/components/route-departures-table.vue
@@ -28,16 +28,15 @@
             <div v-if="pst.sp?.skipStops?.length ?? 0 > 0" class="skipstop-row">
               …
             </div>
-            <div v-else-if="pst.st">
-              <template v-if="pst.st.departure.estimated && showRt">
-                {{ $filters.reformatHM(pst.st.departure.estimated) }} &nbsp;<o-icon
-                  variant="success"
-                  size="small"
-                  icon="wifi"
-                />
-              </template><template v-else>
-                {{ $filters.reformatHM(pst.st.departure.scheduled) }}
-              </template>
+            <div v-else-if="pst.st && pst.st.departure.estimated && showRt" :title="'trip: '+row.trip.trip_id">
+              {{ $filters.reformatHM(pst.st.departure.estimated) }} &nbsp;<o-icon
+                variant="success"
+                size="small"
+                icon="wifi"
+                :title="'scheduled: '+pst.st.departure.scheduled"
+              />
+            </div><div v-else-if="pst.st" :title="row.trip.trip_id">
+              {{ $filters.reformatHM(pst.st.departure.scheduled) }}
             </div>
             <div v-else>
               -
diff --git a/src/runtime/components/route-departures.ts b/src/runtime/components/route-departures.ts
index 55a5afa..eea2f5c 100644
--- a/src/runtime/components/route-departures.ts
+++ b/src/runtime/components/route-departures.ts
@@ -20,6 +20,7 @@ export interface StopTime {
 
 export interface Trip {
   id: number;
+  trip_id: string;
   trip_headsign: string;
   stop_pattern_id: number;
   direction_id: number;