fleetmap-reports 1.0.955 → 1.0.957

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.955",
+  "version": "1.0.957",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/trip-report.js

@@ -259,11 +259,18 @@ async function processDrivers (from, to, userData, data) {
     }
   }
 
-  userData.drivers.forEach(d => {
+  for (const d of userData.drivers) {
     const { route, trips } = getDriverData(d, data)
-    const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+    const filteredTrips = []
+    for (const t of trips) {
+      if (userData.allWeek ||
+        !userData.weekDays ||
+        isInsideTimetable(t, userData) ||
+        await isPartialInsideTimetable(t, userData, route)) {
+        filteredTrips.push(t)
+      }
+    }
     filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
     filteredTrips.forEach(function (trip, i) {
       trip.totalKms = trip.distance / 1000
 
@@ -287,7 +294,7 @@ async function processDrivers (from, to, userData, data) {
       }
       driversResult.push(driverData)
     }
-  })
+  }
 
   return driversResult
 }

package/src/util/geofence.js

@@ -22,13 +22,15 @@ function getNearestPOIs (long, lat, geofences) {
     .filter(g => g && g.area.startsWith('CIRCLE'))
     .map(g => {
       const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
+      const radius = g.area.substring(g.area.indexOf(',') + 1, g.area.indexOf(')'))
       const coord = str.trim().split(' ')
       return {
         p: g,
-        distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), long, lat))
+        distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), long, lat)),
+        r: parseFloat(radius)
       }
     })
-  return distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
+  return distance.filter(a => a.distance < a.r).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
 }
 exports.getNearestPOIs = getNearestPOIs