Drop Unused WKX Dep

Author: consindo

js/stores/settingsStore.js

@@ -12,7 +12,7 @@ export class settingsStore {
         this.state[attrname] = preState[attrname]
       }
     }
-    localStorage.setItem('AppVersion', '1.6.0')
+    localStorage.setItem('AppVersion', '1.6.1')
   }
   getState() {
     return this.state

js/views/vehicle_loc.jsx

@@ -18,8 +18,6 @@ const iconMap = {
 }
 
 let leaflet = require('react-leaflet')
-let wkx = require('wkx')
-let Buffer = require('buffer').Buffer
 let Map = leaflet.Map
 let Marker = leaflet.Marker
 let Popup = leaflet.Popup

js/views/vehicle_loc_bootstrap.jsx

@@ -99,7 +99,7 @@ class VehicleLocationBootstrap extends React.Component {
     const tripNodeMatches = (item) => {
       return item.trip_id === newProps.match.params.trip_id
     }
-    StationStore.getData(this.props.match.params.station).then((data) => {
+    StationStore.getData(this.props.match.params.station, this.props.match.params.region).then((data) => {
       this.setState({
         tripInfo: StationStore.tripData.find(tripNodeMatches) || this.state.tripInfo,
         stopInfo: data

package-lock.json

@@ -81,7 +81,6 @@
     "sendgrid": "^4.3.0",
     "stream-transform": "^0.1.2",
     "style-loader": "^0.18.2",
-    "wkx": "^0.4.0",
     "zenscroll": "^4.0.0"
   }
 }

package.json

@@ -38,4 +38,20 @@ async function doShit() {
   await metlinkShapes.create('../cache/metlink.zipunarchived/shapes.txt', outputDir, ['20170828_20170808-090059'])
   await metlinkShapes.upload('nz-wlg-20170828-20170808-090059', path.resolve(outputDir, '20170828_20170808-090059'))
 }
-connection.isReady.then(doShit)
+async function doOtherShit() {
+  const outputDir = '../cache/at.zipunarchived/shapes'
+  // cleans up old import if exists
+  if (fs.existsSync(outputDir)) {
+    await new Promise((resolve, reject) => {
+      rimraf(outputDir, resolve)
+    })
+  }
+  fs.mkdirSync(outputDir)
+
+  let atShapes = new createShapes()
+  await atShapes.create('../cache/at.zipunarchived/shapes.txt', outputDir, ['20170918162843_v58.15', '20170918164808_v58.16'])
+  await atShapes.upload('nz-akl-20170918164808-v58-16', path.resolve(outputDir, '20170918164808_v58.16'))
+  await atShapes.upload('nz-akl-20170918162843-v58-15', path.resolve(outputDir, '20170918162843_v58.15'))
+}
+// connection.isReady.then(doShit)
+connection.isReady.then(doOtherShit)

server/cache-new.js

@@ -19,18 +19,10 @@ blobSvc.createContainerIfNotExists('shapewkb', function(error, result, response)
   }
 })
 
-var shapeWKBOptions = {
-  url: 'https://api.at.govt.nz/v2/gtfs/shapes/geometry/',
-  headers: {
-    'Ocp-Apim-Subscription-Key': process.env.atApiKey
-  }
-}
 let lineOperators = {}
 
 function cacheOperatorsAndShapes(prefix = 'nz-akl') {
   let todo = []
-  let shapeCount = 0
-  let shapesToCache = []
   for (var key in allLines) {
     todo.push(key)
   }
@@ -173,15 +165,7 @@ var line = {
     let shape_id = req.params.shape_id
     tableSvc.retrieveEntity('meta', 'shapewkb', shape_id, function(err, result, response) {
       if (err) {
-        line.getShapeFromAt([shape_id], function(wkb) {
-          if (wkb.length < 1) {
-            res.status(404).send({
-              error: 'not found'
-            })
-          } else {
-            res.send(wkb[0].the_geom)
-          }
-        })
+        res.status(404).send()
         return
       }