fix: remove debugging info

Author: irony

packages/simulator/lib/models/citizen.js

@@ -115,7 +115,7 @@ class Citizen {
           case 'lunch':
             return of(this.workplace.position).pipe(
               mergeMap((position) =>
-                pelias.search('restaurang', position, 'venue')
+                pelias.searchOne('restaurang', position, 'venue')
               ),
               retryWhen((errors) => errors.pipe(delay(1000), take(3))), // retry 3 times - all lunch searches happens at the same time
               filter((position) => position != null),

packages/simulator/lib/osrm.js

@@ -25,7 +25,6 @@ module.exports = {
       [from.lon, from.lat],
       [to.lon, to.lat],
     ].join(';')
-    process.stdout.write('r')
     return (
       fetch(
         `${osrmUrl}/route/v1/driving/${coordinates}?steps=true&alternatives=false&overview=full&annotations=true`

packages/simulator/lib/pelias.js

@@ -5,8 +5,8 @@ const peliasUrl =
   process.env.PELIAS_URL || 'https://pelias.predictivemovement.se'
 
 info('Pelias URL', peliasUrl)
-module.exports = {
-  nearest(position, layers = 'address,venue') {
+
+const nearest = (position, layers = 'address,venue') => {
     const { lon, lat } = position
 
     const url = `${peliasUrl}/v1/reverse?point.lat=${lat}&point.lon=${lon}&size=1&layers=${layers}`
@@ -46,43 +46,44 @@ module.exports = {
       })
 
     return promise
-  },
-  search(name, near = null, layers = 'address,venue') {
+  }
+const  search = (name, near = null, layers = 'address,venue', size = 1000) => {
+    const encodedName = encodeURIComponent(name)
     const focus = near
-      ? `&focus.point.lat=${encodeURIComponent(
-          near.lat
-        )}&focus.point.lon=${encodeURIComponent(
-          near.lon
-        )}}&layers=${encodeURIComponent(layers)}`
+      ? `&focus.point.lat=${near.lat}&focus.point.lon=${near.lon}}&layers=${layers}`
       : ''
-    const url = `${peliasUrl}/v1/search?text=${encodeURIComponent(
-      name
-    )}${focus}&size=1`
-    debug('Pelias -> Search', url)
+    const url = `${peliasUrl}/v1/search?text=${encodedName}${focus}&size=${size}`
     process.stdout.write('p')
     return fetch(url)
       .then((response) => {
         if (!response.ok) throw 'pelias error: ' + response.statusText
         return response.json()
       })
-      .then((p) => {
-        process.stdout.write('pa')
-        debug('Pelias -> Search', p)
-
-        return p.features[0]?.geometry?.coordinates?.length
-          ? p
-          : Promise.reject('No coordinates found')
-      })
-      .then(({ features: [{ geometry, properties } = {}] = [] }) => ({
-        ...properties,
-        position: new Position({
-          lon: geometry.coordinates[0],
-          lat: geometry.coordinates[1],
-        }),
-      }))
+      .then((results) =>
+        results.features
+          .map(({ geometry, properties } = {}) => ({
+            ...properties,
+            position: new Position({
+              lon: geometry.coordinates[0],
+              lat: geometry.coordinates[1],
+            }),
+          }))
+          .filter((p) => p.position.isValid())
+      )
       .catch((e) => {
         const peliasError = new Error().stack
         error(`Error in pelias search\n${peliasError}\n${e}\n\n`)
       })
   },
-}
+
+  const searchOne = async (name, near = null, layers = 'address,venue') => {
+    const results = await pelias.search(name, near, layers, 1)
+    return results[0]
+  }
+
+
+module.exports = {
+  nearest,
+  search,
+  searchOne,
+}

packages/simulator/simulator/citizens.js

@@ -15,9 +15,9 @@ const getCitizensInSquare = (
     mergeAll()
   )
   return zip([
-    addresses,
+    addresses.pipe(take(nrOfCitizens)),
     randomNames.pipe(take(nrOfCitizens)),
-    workplaces,
+    workplaces.pipe(take(nrOfCitizens)),
   ]).pipe(
     map(([home, name, workplace]) => {
       return (

packages/simulator/streams/kommuner.js

@@ -7,8 +7,10 @@ const {
   filter,
   reduce,
   mergeMap,
-  tap,
   mergeAll,
+  defaultIfEmpty,
+  toArray,
+  take,
   repeat,
 } = require('rxjs/operators')
 const Kommun = require('../lib/kommun')
@@ -27,6 +29,7 @@ const Position = require('../lib/models/position')
 const { getAddressesInArea } = require('../simulator/address')
 const { includedMunicipalities } = require('../config')
 const { info, debug } = require('../lib/log')
+const assert = require('assert')
 
 const bookings = {
   hm: require('../streams/orders/hm.js'),
@@ -67,47 +70,14 @@ function getMeasureStations(kommunName) {
   )
 }
 
-async function centerPoint(namn, retries = 0) {
-  try {
-    return await Pelias.search(namn).then((res) => res.position)
-  } catch (err) {
-    if (retries < 3) {
-      info(
-        "Couldn't find center point for",
-        namn,
-        `retrying ${retries + 1}/3...`
-      )
-      return centerPoint(namn, retries + 1)
-    }
-    console.error('Could not find center point for', namn)
-    return { lat: 0, lon: 0 }
-  }
-}
-
-function getWorkplaces(commercialAreas) {
-  return commercialAreas.pipe(
-    mergeMap(async (commercialArea) => {
-      const {
-        X_koord: x,
-        Y_koord: y,
-        AREA_HA: area,
-        ARBST_DETH: nrOfWorkplaces,
-      } = commercialArea.properties
-      const position = new Position(
-        convertPosition(coords.toLatLng(y.toString(), x.toString()))
-      )
-      const adresses = await getAddressesInArea(position, area, nrOfWorkplaces)
-      return adresses.map((a) => ({ ...a, position: new Position(a.position) }))
-    }, 1),
-    mergeAll(),
-    shareReplay()
-  )
+async function getWorkplaces(position, nrOfWorkplaces = 100) {
+  const area = 10000
+  const adresses = await getAddressesInArea(position, area, nrOfWorkplaces)
+  return adresses.map((a) => ({ ...a, position: new Position(a.position) }))
 }
 
 // function read() {
 function read({ fleets }) {
-  const workplaces = getWorkplaces(commercialAreas)
-
   return from(data).pipe(
     filter(({ namn }) =>
       includedMunicipalities.some((name) => namn.startsWith(name))
@@ -133,15 +103,13 @@ function read({ fleets }) {
       }) => {
         const squares = getPopulationSquares({ geometry })
         const commercialAreas = getCommercialAreas(kod)
-        const center = await centerPoint(name)
-        const nearbyWorkplaces = workplaces.pipe(
-          // TODO: calculate based on a normal distribution and size of the municipality?
-          // or other data from SCB?
-          filter(
-            (workplace) => workplace?.position?.distanceTo(center) < 100_000
-          ),
+        const center = await Pelias.searchOne(name).then((res) => res.position)
+        const nearbyWorkplaces = from(getWorkplaces(center)).pipe(
+          mergeAll(),
+          take(100),
           repeat()
         )
+
         const citizens = squares.pipe(
           mergeMap(
             (square) => getCitizensInSquare(square, nearbyWorkplaces, name),

packages/simulator/streams/orders/hm.js

@@ -14,7 +14,7 @@ const {
 const moment = require('moment')
 const { readCsv } = require('../../adapters/csv')
 const { default: fetch } = require('node-fetch')
-const { search } = require('../../lib/pelias')
+const { searchOne } = require('../../lib/pelias')
 const Position = require('../../lib/models/position')
 const Booking = require('../../lib/models/booking')
 const { error } = require('../../lib/log')
@@ -99,7 +99,7 @@ function read() {
         pickup = distributionCenters[i % 4] // TODO: Improve handling of origins outside of Sweden.
       }
 
-      return search(distributionCenters[i % 4]).then(({ name, position }) =>
+      return searchOne(distributionCenters[i % 4]).then(({ name, position }) =>
         rows.map((row) => ({ pickup: { name, position }, ...row }))
       )
     }, 1),

packages/simulator/streams/orders/ikea.js

@@ -13,7 +13,7 @@ const {
 const moment = require('moment')
 const { readCsv } = require('../../adapters/csv')
 const { default: fetch } = require('node-fetch')
-const { search } = require('../../lib/pelias')
+const { searchOne } = require('../../lib/pelias')
 const Position = require('../../lib/models/position')
 const Booking = require('../../lib/models/booking')
 const { error } = require('../../lib/log')
@@ -136,7 +136,7 @@ function read() {
         'Strandbadsvägen 7, Helsingborg', // TNT.
       ]
 
-      return search(distributionCenters[i % 4]).then(({ name, position }) =>
+      return searchOne(distributionCenters[i % 4]).then(({ name, position }) =>
         rows.map((row) => ({ pickup: { name, position }, ...row }))
       )
     }, 1),