fleetmap-reports 1.0.250 → 1.0.255

package/src/util/trips.js

@@ -0,0 +1,23 @@
+const traccar = require("./traccar");
+
+const minDistance = 0
+const minAvgSpeed = 0
+
+async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
+    console.log('checkTripsKms')
+    const trips = tripsData.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
+    if(trips.length > 0) {
+        //Vehicles with imported positions. calculate trip distance with route positions
+        const route = routeData.length === 0 ? await traccar.getRoute(traccarInstance, from, to, devices) : routeData
+        trips.forEach(t => {
+            if(t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
+                const tripRoute = route.filter(p => p.deviceId === t.deviceId
+                    && new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime()
+                    && new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
+                t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
+            }
+        })
+    }
+}
+
+exports.checkTripsKms = checkTripsKms

package/src/util/utils.js

@@ -31,7 +31,7 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
 
 function getDates(startDate, endDate) {
     const dates = []
-    let currentDate = startDate
+    let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00 PM')
     const addDays = function (days) {
         const date = new Date(this.valueOf())
         date.setDate(date.getDate() + days)