fleetmap-reports 1.0.401 → 1.0.404

package/src/util/traccar.js

@@ -1,100 +1,99 @@
-const automaticReports = require("../automaticReports");
+const automaticReports = require('../automaticReports')
 
-async function getRoute(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
+async function getRoute (traccar, from, to, devices) {
+  const devicesToSlice = devices.slice()
 
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
+  const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
+  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()
+  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, 50)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
+async function getTrips (traccar, from, to, devices) {
+  const devicesToSlice = devices.slice()
+  const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
+  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()
+  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,50)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsStopsGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
+async function getStops (traccar, from, to, devices) {
+  const devicesToSlice = devices.slice()
+  const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
+  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()
+  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, 50)
-    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 getEvents (traccar, from, to, devices, events) {
+  const devicesToSlice = devices.slice()
+  const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
+  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, 50)
-    let requests = []
-    for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsSummaryGet(from, to, a.map(d => d.id))
-        requests = requests.concat(promise)
-    }
+async function getSummary (traccar, from, to, devices) {
+  const devicesToSlice = devices.slice()
+  const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
+  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()
+  const result = await Promise.all(requests)
+  return result.map(r => r.data).flat()
 }
 
-async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length){
-    let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
-    if(getRoutes)  url += `&type=route`
-    if(getTrips)   url += `&type=trips`
-    if(getStops)   url += `&type=stops`
-    if(getSummary) url += `&type=summary`
+async function getAllInOne (traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length) {
+  let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
+  if (getRoutes) url += '&type=route'
+  if (getTrips) url += '&type=trips'
+  if (getStops) url += '&type=stops'
+  if (getSummary) url += '&type=summary'
 
-    const sliced = automaticReports.sliceArray(devices, 5)
-    const result = []
-    let deviceCount = currentDeviceCount
-    for(const chunk of sliced) {
-        const requests = chunk.map(d =>
-            traccar.axios.get(url + '&' + `deviceId=${d.id}`, {
-            jar: traccar.cookieJar,
-            withCredentials: true
-        }).then(r => r.data).then(x => {
-                console.log('LOADING_MESSAGE:' + d.name)
-
-                deviceCount = deviceCount + 1
-                console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
-                return x
-            }))
-        result.push(...(await Promise.all(requests)))
-    }
-    return {
-        route: result.filter(t => t.route).map(r => r.route).flat(),
-        trips: result.filter(t => t.trips).map(r => r.trips).flat(),
-        stops: result.filter(t => t.stops).map(r => r.stops).flat(),
-        summary: result.filter(t => t.summary).map(r => r.summary).flat(),
-    }
+  const sliced = automaticReports.sliceArray(devices, 5)
+  const result = []
+  let deviceCount = currentDeviceCount
+  for (const chunk of sliced) {
+    const requests = chunk.map(d =>
+      traccar.axios.get(url + '&' + `deviceId=${d.id}`, {
+        jar: traccar.cookieJar,
+        withCredentials: true
+      }).then(r => r.data).then(x => {
+        console.log('LOADING_MESSAGE:' + d.name)
+        deviceCount = deviceCount + 1
+        console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+        return x
+      }))
+    result.push(...(await Promise.all(requests)))
+  }
+  return {
+    route: result.filter(t => t.route).map(r => r.route).flat(),
+    trips: result.filter(t => t.trips).map(r => r.trips).flat(),
+    stops: result.filter(t => t.stops).map(r => r.stops).flat(),
+    summary: result.filter(t => t.summary).map(r => r.summary).flat()
+  }
 }
 
 exports.getRoute = getRoute

package/src/zone-report.js

@@ -175,7 +175,7 @@ function getInAndOutEvents(devices, route, userData) {
                     }
                 }
                 if(g.geometry.type === 'Point') {
-                    if (distance(p, g, {units: 'meters'}) < g.properties.distance) {
+                    if (distance.default(p, g, {units: 'meters'}) < g.properties.distance) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)