flexibility with codes

README.md

@@ -1,4 +1,5 @@
 # trainspy 2.0 🔍
+[![Downloads](https://img.shields.io/npm/dt/trainspy?logo=npm&style=flat-square)](https://npmjs.com/package/trainspy) [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/3bnnkvrZwc)
 
 Get fast & free departures at any UK train station & recieve instant real-time updates on trains throughout their journey. Version 2.0 brings exact location tracking with precise latitude & longitude co-ordinates!
 
@@ -15,13 +16,16 @@ npm i trainspy
 `findTrains(stationNameOrCode)` _-> Promise\<typeof Object>_
 
 ```js
-const trains = await findTrains("WLF")
-const moreTrains await findTrains("Solihull")
-```
+import { findTrains } from "trainspy";
 
-_🌻 NOTE: Location co-ordinates are unavailable with use of a station name._
+(async()=> {
+  const trains = await findTrains("WLF")
+  const moreTrains = await findTrains("Solihull")
+  console.log(trains);
+})();
+```
 
-example response:
+this yields a response:
 
 ```js
 {
@@ -63,6 +67,8 @@ Emit live updates on a train until it's journey is complete. You first need the
 E.g. ServiceID `P70052` departing on 18/08/2023:
 
 ```js
+import { trackTrain } from "trainspy";
+
 trackTrain("P70052", "2023-08-18").then((emitter) => {
   emitter.on("journey", (update) => {
     //your code for journey updates!
@@ -122,7 +128,7 @@ Journey updates
 | ------------- | -----------------------|
 | status        | string                 |
 | station       | { `name`: string, `code`: string \| null, `location`: { `longitude`: number \| null, `latitude`: number \| null }`stopsHere`: boolean, `delay`: number \| null, `arrival`: { `actual`: string \| null, `scheduled`: string \| null }, `departure`: -same as arrival- } |
-| callingPoints | Array\<Station> |
+| callingPoints | Array\<station> |
 
 Information updates
 | Property | Type |

dist/src/findTrains.js

@@ -15,6 +15,7 @@ const getCurrentDayTime = require("./getDayTime");
 const util = require("util");
 const types_1 = require("./types/types");
 var stationLocations = require("./map/stationLocations.json");
+var stationCodes = require("./map/stationCodes.json");
 const trackTrain_1 = require("./trackTrain");
 //method: present stations
 const findStationNameAndCode = (stationNameOrCode) => {
@@ -27,14 +28,21 @@ const findStationNameAndCode = (stationNameOrCode) => {
     const match = stationNameOrCode.match(/^[A-Z]{3}$/);
     if (match) {
         // console.log(`match: ${match}`);
-        stationName = stationLocations[match[0]].station_name || null;
+        const jsonMatch = stationLocations[match[0]];
+        if (jsonMatch) {
+            stationName = stationLocations[match[0]].station_name;
+            stationCode = match[0];
+        }
+        else {
+            stationName = null;
+            stationCode = null;
+        }
         // console.log(`stationName: ${stationName}`);
-        stationCode = match[0];
         // console.log(`stationCode: ${stationCode}`);
     }
     else {
         stationName = stationNameOrCode;
-        stationCode = null;
+        stationCode = stationCodes["stations"].find(station => station["Station Name"] == stationNameOrCode)["CRS Code"];
     }
     return { stationName, stationCode };
 };
@@ -48,19 +56,18 @@ exports.findStationNameAndCode = findStationNameAndCode;
 function findTrains(stationNameOrCode, dateOfDeparture = getCurrentDayTime("YYYY-MM-DD"), timeOfDeparture = getCurrentDayTime("HHmm")) {
     return __awaiter(this, void 0, void 0, function* () {
         //if stationName is 3 letters, destructure from map
-        const callOutAndInfoValue = yield fetch(`https://www.realtimetrains.co.uk/search/handler?location=${stationNameOrCode}`).then((res) => res.text().then((data) => {
+        const { stationName, stationCode } = (0, exports.findStationNameAndCode)(stationNameOrCode);
+        // console.log(`stationName: ${stationName}, stationCode: ${stationCode}`)
+        const callOutAndInfoValue = yield fetch(`https://www.realtimetrains.co.uk/search/handler?location=${stationCode}`).then((res) => res.text().then((data) => {
             const $ = cheerio.load(data);
             return { callout: $(".callout"), info: $(".info") };
         }));
         if (callOutAndInfoValue.callout.find("h3").text() ==
             "Cannot find primary location" ||
-            callOutAndInfoValue.callout.find("p").text() ==
-                "Sorry, no services were found in the next two hours." ||
             callOutAndInfoValue.info.find("h3").text() == "Bad request" ||
             !stationNameOrCode) {
             return (0, types_1.createInformationBodyResponse)("Error", "Please enter a valid station code or the date and time entered.");
         }
-        const { stationName, stationCode } = (0, exports.findStationNameAndCode)(stationNameOrCode);
         const location = {
             latitude: stationCode ? stationLocations[stationCode].latitude : null,
             longitude: stationCode ? stationLocations[stationCode].longitude : null,

dist/src/getInfo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInfo = exports.getLocationObject = exports.parseStationNameAndCode = exports.getDelay = void 0;
 var stationLocations = require("./map/stationLocations.json");
+var stationCodes = require("./map/stationCodes.json");
 //UNIT TESTS
 function getDelay(record) {
     if (record.find(".delay.nil").length != 0) {
@@ -31,8 +32,18 @@ function parseStationNameAndCode(stationString) {
     };
 }
 exports.parseStationNameAndCode = parseStationNameAndCode;
-function getLocationObject(code) {
-    if (stationLocations[code]) {
+function getLocationObject(nameOrCode) {
+    //if it's a code
+    if (stationLocations[nameOrCode]) {
+        return {
+            latitude: stationLocations[nameOrCode].latitude,
+            longitude: stationLocations[nameOrCode].longitude,
+        };
+    }
+    //else find it's code
+    const stationObj = stationCodes["stations"].find((station) => station["Station Name"] == nameOrCode);
+    if (stationObj) {
+        const code = stationObj["CRS Code"];
         return {
             latitude: stationLocations[code].latitude,
             longitude: stationLocations[code].longitude,

dist/src/index.js

@@ -1,17 +1,30 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const findTrains_1 = require("./findTrains");
 const trackTrain_1 = require("./trackTrain");
-// const util = require("util");
+const util = require("util");
 module.exports = {
     findTrains: findTrains_1.default,
     trackTrain: trackTrain_1.trackTrain,
 };
-// trackTrain("P71987", "2023-08-19").then((emitter) => {
+// trackTrain("Smethwick Rolfe Street", "2023-08-19").then((emitter) => {
 //   emitter.on("journey", (data) => {
 //     console.log(util.inspect(data, false, null, true));
 //   });
 //   emitter.on("information", (data) => {
 //     console.log(util.inspect(data, false, null, true));
 //   });
 // });
+(() => __awaiter(void 0, void 0, void 0, function* () {
+    const data = yield (0, findTrains_1.default)("ABC", "2023-08-19");
+    console.log(util.inspect(data, false, null, true));
+}))();