Wellington Line Stops & Routes

Author: consindo

js/views/lines.jsx

@@ -190,7 +190,7 @@ class Lines extends React.Component {
           }
           return (
             <li key={key}>
-              <a className="line-item" href={'/l/nz-akl/'+item} onClick={this.disable} onTouchTap={this.hijack('/l/nz-akl/'+item)}>
+              <a className="line-item" href={`/l/${this.props.match.params.region}/${item}`} onClick={this.disable} onTouchTap={this.hijack(`/l/${this.props.match.params.region}/${item}`)}>
                 <span className="line-pill-wrapper">
                   <span className={roundelStyle} style={{backgroundColor: this.state.colors[item] || '#000'}}>{code}</span>
                 </span>

js/views/vehicle_loc.jsx

@@ -72,10 +72,10 @@ class vehicle_location extends React.Component {
   }
   getShapeData = (newProps = this.props) => {
     let showIcons = true
-    let url = `${local.endpoint}/nz-akl/stops/trip/${newProps.params.trip_id}`
+    let url = `${local.endpoint}/${newProps.params.region}/stops/trip/${newProps.params.trip_id}`
     if ('line_id' in newProps.params) {
       if (typeof(newProps.tripInfo.shape_id) !== 'undefined') {
-        url = `${local.endpoint}/nz-akl/stops/shape/${newProps.tripInfo.shape_id}`
+        url = `${local.endpoint}/${newProps.params.region}/stops/shape/${encodeURIComponent(newProps.tripInfo.shape_id)}`
       } else {
         return
       }
@@ -105,8 +105,19 @@ class vehicle_location extends React.Component {
   getWKB = (newProps = this.props, force = false) => {
     if (typeof(this.state.line) === 'undefined' || force === true) {
       if (typeof(newProps.tripInfo.shape_id) !== 'undefined') {
-        fetch(`${local.endpoint}/nz-akl/shape/${newProps.tripInfo.shape_id}`).then((response) => {
-          response.text().then(this.convert)
+        fetch(`${local.endpoint}/${newProps.params.region}/shapejson/${encodeURIComponent(newProps.tripInfo.shape_id)}`).then((response) => {
+          response.json().then((geoJson) => {
+            let newState = {
+              line: geoJson
+            }
+            // this centers the line if we're looking at the line
+            if ('line_id' in this.props.params) {
+              // it's opposite for some reason, also we shouldn't mutate it
+              let center = geoJson.coordinates[Math.round(geoJson.coordinates.length/2)]
+              newState.position = center.slice().reverse()
+            }
+            this.setState(newState)
+          })
         })
       }
     }
@@ -125,22 +136,6 @@ class vehicle_location extends React.Component {
       CurrentLocation.stopWatch()
     }
   }
-
-  convert  = (data) => {
-    let wkb = new Buffer(data, 'hex')
-    let geoJson = wkx.Geometry.parse(wkb).toGeoJSON()
-
-    let newState = {
-      line: geoJson
-    }
-    // this centers the line if we're looking at the line
-    if ('line_id' in this.props.params) {
-      // it's opposite for some reason, also we shouldn't mutate it
-      let center = geoJson.coordinates[Math.round(geoJson.coordinates.length/2)]
-      newState.position = center.slice().reverse()
-    }
-    this.setState(newState)
-  }
 
   componentDidMount() {
     CurrentLocation.bind('pinmove', this.pinmove)
@@ -235,14 +230,14 @@ class vehicle_location extends React.Component {
 
   viewServices = (stop) => {
     return () => {
-      this.props.history.push(`/s/nz-akl/${stop}`)
+      this.props.history.push(`/s/${this.props.params.region}/${stop}`)
     }
   }
 
   viewTimetable = (stop) => {
     return () => {
       const line_id = this.props.params.line_id || this.props.tripInfo.route_short_name
-      this.props.history.push(`/s/nz-akl/${stop}/timetable/${line_id}-2`)
+      this.props.history.push(`/s/${this.props.params.region}/${stop}/timetable/${line_id}-2`)
     }
   }
 

js/views/vehicle_loc_bootstrap.jsx

@@ -70,7 +70,7 @@ class VehicleLocationBootstrap extends React.Component {
     })
   }
   lineMountCb = (newProps) => {
-    StationStore.getLines().then((data) => {
+    StationStore.getLines(newProps.match.params.region).then((data) => {
       this.setState({
         tripInfo: {
           route_short_name: newProps.match.params.line_id,
@@ -80,7 +80,7 @@ class VehicleLocationBootstrap extends React.Component {
     })
   }
   getLineData = () => {
-    fetch(`${local.endpoint}/nz-akl/line/${this.props.match.params.line_id}`).then((response) => {
+    fetch(`${local.endpoint}/${this.props.match.params.region}/line/${this.props.match.params.line_id}`).then((response) => {
       response.json().then((data) => {
         let tripInfo = JSON.parse(JSON.stringify(this.state.tripInfo))
         tripInfo.route_long_name = data[0].route_long_name

server/lines/index.js

@@ -256,8 +256,9 @@ var line = {
 
   getStopsFromTrip: function(req, res){
     const sqlRequest = connection.get().request()
-    sqlRequest.input('prefix', sql.VarChar(50), req.params.prefix || 'nz-akl')
-    sqlRequest.input('version', sql.VarChar(50), cache.currentVersion())
+    const prefix = req.params.prefix || 'nz-akl'
+    sqlRequest.input('prefix', sql.VarChar(50), prefix)
+    sqlRequest.input('version', sql.VarChar(50), cache.currentVersion(prefix))
     sqlRequest.input('trip_id', sql.VarChar(100), req.params.trip_id)
     sqlRequest.query(`
       SELECT 
@@ -286,8 +287,9 @@ var line = {
   },
   getStopsFromShape: function(req, res) {
     const sqlRequest = connection.get().request()
-    sqlRequest.input('prefix', sql.VarChar(50), req.params.prefix || 'nz-akl')
-    sqlRequest.input('version', sql.VarChar(50), cache.currentVersion())
+    const prefix = req.params.prefix || 'nz-akl'
+    sqlRequest.input('prefix', sql.VarChar(50), prefix)
+    sqlRequest.input('version', sql.VarChar(50), cache.currentVersion(prefix))
     sqlRequest.input('shape_id', sql.VarChar(100), req.params.shape_id)
     sqlRequest.query(`SELECT TOP(1) trip_id FROM trips WHERE trips.prefix = @prefix and trips.version = @version and trips.shape_id = @shape_id`).then((result) => {
       let trip_id = result.recordset[0].trip_id