@transportme/vline-nsp-reader 1.0.5 → 1.0.7

package/lib/pass/pass-pdf-reader.mjs

@@ -28,20 +28,26 @@ export default class PassPDFReader {
       const body = this.getBody(table)
 
       for (let columnIndex = 0; columnIndex < body[0].length; columnIndex++) {
+        let operationDay = body[0][columnIndex]
         let currentRun = {
           type: '',
-          stops: []
+          stops: [],
+          operationDay,
+          flags: ''
         }
 
         let lastStation
-        for (let stationIndex = 0; stationIndex < stations.length; stationIndex++) {
+        for (let stationIndex = 1; stationIndex < stations.length; stationIndex++) {
           const stationName = stations[stationIndex]
           const stopData = (body[stationIndex][columnIndex] || '').replace('.', ':')
           if (stationName === 'Service') {
             currentRun.type = stopData[0] + stopData.slice(1).toLowerCase()
             continue
           }
-          if (stationName === 'Service Information') continue
+          if (stationName === 'Service Information') {
+            currentRun.flags = stopData || ''
+            continue
+          }
           if (!stopData || stopData.length === 1) continue
           if (stationName === 'Change Service' && !currentRun.stops.length) continue
           if (stationName === 'Change Service' && stopData.length) {
@@ -50,7 +56,9 @@ export default class PassPDFReader {
             lastStation = null
             currentRun = {
               type: stopData[0] + stopData.slice(1).toLowerCase(),
-              stops: []
+              stops: [],
+              operationDay,
+              flags: ''
             }
 
             continue

package/lib/pass/pass-table-reader.mjs

@@ -56,12 +56,12 @@ export default class PassTableReader {
         const tableData = []
 
         page.Texts.forEach(text => {
-          if (text.y < tableStart - commonHeight || text.y > tableEnd + commonHeight * 1.5) return
+          if (text.y < tableStart - commonHeight * 2 || text.y > tableEnd + commonHeight * 1.5) return
 
           let textContent = decodeURIComponent(text.R[0].T)
 
-          let currentRow = rowStarts.findIndex(r => r > text.y + 0.3) - 1
-          if (currentRow < 0) currentRow = rowStarts.length - 1
+          let currentRow = text.y < tableStart - commonHeight ? 0 : rowStarts.findIndex(r => r > text.y + 0.3)
+          if (currentRow < 0) currentRow = rowStarts.length
 
           let currentCol = colStarts.findLastIndex(c => c < text.x + 0.4)
 
@@ -78,29 +78,22 @@ export default class PassTableReader {
           }
         }
 
-        return tableData
-      })
-
-      console.log(tables)
-
-      console.log(heightFrequency)
-      console.log(VLines)
-      console.log(rowStarts)
+        const colCount = tableData[1].length
+        for (let x = colCount - 1; x > 0; x--) {
+          let text = tableData[0][x] || ''
+          if (text.startsWith(' ') || text.startsWith('to')) {
+            tableData[0][x - 1] = (tableData[0][x - 1] + ' ' + text.trim()).replace('continued', '').trim()
+            tableData[0][x] = ''
+          }
+        }
 
-      let pageData = []
-      let smallTable = rowStarts.length === 2
+        for (let x = 1; x < colCount; x++) {
+          if (!tableData[0][x]) tableData[0][x] = tableData[0][x - 1]
+        }
 
-      return pageData
+        return tableData
+      })
     })
-
-    return pages[0]
-
-    // return pages.map(page => {
-    //   let maxSize = Math.max(...page.map(row => row.length))
-    //   let blankCells = Array(maxSize).fill('')
-
-    //   return page.map(row => row.map(g => g.replace(/  +/g, ' ').trim()).concat(blankCells).slice(0, maxSize))
-    // })
   }
 
   read() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transportme/vline-nsp-reader",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "lib.mjs",
   "scripts": {
     "test": "mocha './{,!(node_modules)/**}/*.test.mjs'"