fleetmap-reports 1.0.287 → 1.0.288

package/src/util/traccar.js

@@ -1,72 +0,0 @@
-const automaticReports = require("../automaticReports");
-
-async function getRoute(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
-
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
-
-    const result = await Promise.all(requests)
-    return result.map(r => r.data).flat()
-}
-
-async function getTrips(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
-
-    const result = await Promise.all(requests)
-    return result.map(r => r.data).flat()
-}
-
-async function getStops(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsStopsGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
-
-    const result = await Promise.all(requests)
-    return result.map(r => r.data).flat()
-}
-
-async function getEvents(traccar, from, to, devices, events){
-    const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, events)
-        requests = requests.concat(promise)
-    }
-    const result = await Promise.all(requests)
-    return result.map(r => r.data).flat()
-}
-
-async function getSummary(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsSummaryGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
-
-    const result = await Promise.all(requests)
-    return result.map(r => r.data).flat()
-}
-
-exports.getRoute = getRoute
-exports.getTrips = getTrips
-exports.getStops = getStops
-exports.getEvents = getEvents
-exports.getSummary = getSummary

package/src/util/trips.js

@@ -1,76 +0,0 @@
-const traccar = require("./traccar");
-const {coordsDistance} = require("./utils");
-
-const minDistance = 0
-const minAvgSpeed = 0
-
-function addNearestPOIs(trips, userData){
-    trips.forEach(t => {
-        t.totalKms = t.distance / 1000
-
-        const distance = userData.geofences
-            .filter(g => g && g.area.startsWith('CIRCLE'))
-            .map(g => {
-                const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
-                const coord = str.trim().split(' ')
-                return {
-                    p: g,
-                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
-                }
-            })
-        const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
-        if (nearestPOIs.length > 0) {
-            t.endPOIName = nearestPOIs[0].p.name
-        }
-    })
-}
-
-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)
-            }
-        })
-    }
-}
-
-function isInsideTimetable(t, userData){
-    const tripStart  = new Date(t.startTime)
-    const tripEnd  = new Date(t.endTime)
-
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
-
-        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-        console.log(tripStart, startDate, endDate)
-
-        //Trips inside time period
-        if(startDate.getTime() < endDate.getTime()) {
-            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-        } else {
-            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-                (tripStart.getTime() > startDate.getTime())
-        }
-    }
-
-    return false
-}
-
-exports.checkTripsKms = checkTripsKms
-exports.isInsideTimetable = isInsideTimetable
-exports.addNearestPOIs = addNearestPOIs