Feat/no line shapes (#266)

* chore: correct path for mount (#128)

* feat: add skåne gtfs feed

* feat: remove lineshapes and calculate them from trips

* fix: remove skane, it's in cache

* fix: remove subscriptions before starting new experiment

Author: irony

packages/simulator/lib/region.js

@@ -55,6 +55,7 @@ const tripsInKommun = (kommuner) => (stops) =>
         ),
         map(({ name }) => ({
           tripId: firstStop.tripId,
+          lineNumber: stops[0].lineNumber,
           stops,
           firstStop,
           lastStop,
@@ -65,7 +66,7 @@ const tripsInKommun = (kommuner) => (stops) =>
   )
 
 class Region {
-  constructor({ id, name, geometry, stops, lineShapes, kommuner }) {
+  constructor({ id, name, geometry, stops, kommuner }) {
     this.id = id
 
     this.geometry = geometry
@@ -79,7 +80,16 @@ class Region {
         )
       )
     )
-    this.lineShapes = lineShapes
+    this.lineShapes = this.trips.pipe(
+      map(({ tripId, stops, lineNumber, firstStop, lastStop, kommun }) => ({
+        tripId,
+        lineNumber,
+        from: firstStop.name,
+        to: lastStop.name,
+        kommun,
+        stops: stops.map(({ stop }) => stop.position),
+      }))
+    )
     this.kommuner = kommuner // TODO: Rename to municipalities.
 
     /**

packages/simulator/streams/publicTransport.js

@@ -73,22 +73,8 @@ function publicTransport(operator) {
     shareReplay()
   )
 
-  const lineShapes = todaysStops.pipe(
-    groupBy((line) => line.tripId),
-    mergeMap((group) => group.pipe(toArray())),
-    map((stops) => ({
-      tripId: stops[0].tripId,
-      lineNumber: stops[0].lineNumber,
-      from: stops[0].stop.name,
-      to: stops[stops.length - 1].stop.name,
-      stops: stops.map(({ stop }) => stop.position),
-    })),
-    catchError((err) => error('GTFS', err)),
-    shareReplay()
-  )
   return {
     stops: todaysStops,
-    lineShapes,
   }
 }
 

packages/simulator/streams/regions/norrbotten.js

@@ -1,4 +1,4 @@
-const { stops, lineShapes } = require('../publicTransport')('norrbotten')
+const { stops } = require('../publicTransport')('norrbotten')
 const { filter } = require('rxjs')
 const Region = require('../../lib/region')
 
@@ -32,7 +32,6 @@ const norrbotten = (municipalitiesStream) => {
 
     // Bus things.
     stops,
-    lineShapes,
   })
 }
 

packages/simulator/streams/regions/skane.js

@@ -1,7 +1,6 @@
-const { stops, lineShapes } = require('../publicTransport')('skane')
-const { filter, shareReplay, map } = require('rxjs')
+const { stops } = require('../publicTransport')('skane')
+const { filter, shareReplay } = require('rxjs')
 const Region = require('../../lib/region')
-const { isInsideCoordinates } = require('../../lib/polygon')
 
 const includedMunicipalities = [
   'Helsingborgs stad',
@@ -15,45 +14,11 @@ const skane = (municipalitiesStream) => {
     shareReplay()
   )
 
-  const geometries = []
-  municipalities
-    .pipe(
-      map((municipality) => {
-        geometries.push({
-          name: municipality.name,
-          coordinates: municipality.geometry.coordinates,
-        })
-      })
-    )
-    .subscribe()
-
-  /**
-   * Include line shapes that have at least one stop inside the active municipalities.
-   */
-  const localLineShapes = lineShapes.pipe(
-    filter((lineShape) => {
-      let lineShapeHasAnyStopInsideActiveMunicipalities = false
-      geometries.forEach((geometry) => {
-        lineShape.stops.forEach((stop) => {
-          if (isInsideCoordinates(stop, geometry.coordinates)) {
-            lineShapeHasAnyStopInsideActiveMunicipalities = true
-          }
-        })
-      })
-
-      return lineShapeHasAnyStopInsideActiveMunicipalities
-    }),
-    shareReplay()
-  )
-
   return new Region({
     id: 'skane',
     name: 'Skåne',
     kommuner: municipalities,
     stops,
-
-    // Bus things.
-    lineShapes: localLineShapes.pipe(shareReplay()),
   })
 }
 

packages/simulator/web/routes.js

@@ -86,17 +86,11 @@ function register(io) {
         clearTimeout(socket.data.timeout)
       }
     })
-
+*/
     socket.on('disconnect', (reason) => {
-      info('Client disconnected', reason, 'shutting down experiment in 60s...')
-
-      clearTimeout(socket.data.timeout)
-      socket.data.timeout = setTimeout(() => {
-        info('Shutting down experiment due to inactivity')
-        process.kill(process.pid, 'SIGUSR2')
-        socket.data.experiment.subscriptions.map((e) => e.unsubscribe())
-      }, 5 * 60_000)
-    })*/
+      info('Client disconnected', reason, 'Removing subscriptions..')
+      socket.data.experiment.subscriptions.map((e) => e.unsubscribe())
+    })
   })
 }
 module.exports = {