fleetmap-reports 2.0.245 → 2.0.248

package/package.json

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

package/src/speeding-report.js

@@ -8,7 +8,6 @@ const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const drivers = require('./util/driver')
-const here = require('./here')
 const {
   getUserPartner
 } = require('fleetmap-partners')
@@ -310,14 +309,7 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes.find(p => getCountry(p))
   const country = position && getCountry(position)
-  const config = {
-    Chile: getOSMSpeedingEvents,
-    CL: getOSMSpeedingEvents,
-    Brazil: getOSMSpeedingEvents,
-    BR: getOSMSpeedingEvents
-  }
-  const method = config[country] || getHereEvents
-  return method(devices, routes, threshold, minimumMinutes, country)
+  return getOSMSpeedingEvents(devices, routes, threshold, minimumMinutes, country)
 }
 
 exports.getRoadSpeedLimits = getRoadSpeedLimits
@@ -418,63 +410,6 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
   return events.filter(e => e.eventTime >= minimumMinutes * 60 * 1000)
 }
 
-async function getHereEvents (devices, routes, threshold, minimumMinutes = 0) {
-  try {
-    console.log('PROCESS_HERE_EVENTS', process.env.PROCESS_HERE_EVENTS)
-    console.log('here speed limit events', devices.length, 'devices')
-    const events = []
-    const promises = devices.map(d => new Promise((resolve) => {
-      const positions = routes.filter(p => p.deviceId === d.id)
-      if (!positions.length) {
-        console.log('no positions on device', d.name)
-        resolve()
-      }
-      console.log(d.name, 'sending', positions.length, 'to here')
-      here.routeMatch(positions).then(results => {
-        console.log(d.name, 'got', results.length, 'from here')
-        const timestamps = []
-        for (const p of positions) {
-          timestamps[new Date(p.fixTime).getTime()] = p
-        }
-        const reduced = results.reduce((acc, cur, idx, src) => {
-          cur.overSpeeding = cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)
-          const last = acc.length && acc.slice(-1)[0]
-          cur.position = timestamps[cur.timestamp]
-          if (cur.overSpeeding && last && src[idx - 1].overSpeeding && last.speedLimit === cur.speedLimit) {
-            last.eventTime = cur.timestamp - last.timestamp
-            last.attributes.maxSpeed = Math.max(last.attributes.maxSpeed, cur.position.speed)
-            last.distance = distance.default(point([cur.position.longitude, cur.position.latitude]), point([last.position.longitude, last.position.latitude]))
-          } else if (cur.overSpeeding) {
-            cur.positionId = cur.position && cur.position.id
-            cur.roadSpeedLimit = cur.speedLimit
-            cur.deviceId = d.id
-            cur.attributes = { speedLimit: cur.speedLimit, speed: cur.currentSpeedKmh / 1.85200, maxSpeed: cur.position.speed }
-            cur.eventTime = 0
-            cur.distance = 0
-            acc.push(cur)
-          }
-          return acc
-        }, [])
-        if (!reduced.length) {
-          console.log('empty array after filter on device', d.name)
-          resolve()
-        } else {
-          console.log(d.name, 'reduced to', reduced.length)
-        }
-        events.push(...reduced)
-        resolve()
-      }).catch(e => {
-        console.warn('route match, moving on', e.message, e.response && e.response.data)
-        resolve()
-      })
-    }))
-    await Promise.all(promises)
-    return events.filter(e => e.eventTime >= minimumMinutes * 60 * 1000)
-  } catch (e) {
-    console.error(e)
-  }
-}
-
 function calculateEventData (positions, pIndex, alert, device, geofence) {
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
@@ -485,7 +420,7 @@ function calculateEventData (positions, pIndex, alert, device, geofence) {
       point([positions[pIndex].longitude, positions[pIndex].latitude]))
     endEventPosition = positions[pIndex]
     if (endEventPosition.speed <= alert.attributes.speedLimit || (geofence && !insideGeofence(endEventPosition, geofence))) {
-      alert.eventTime = new Date(endEventPosition.fixTime) - new Date(alert.position.fixTime) + (device.attributes.overspeedMinimalDuration || 0)*1000
+      alert.eventTime = new Date(endEventPosition.fixTime) - new Date(alert.position.fixTime) + (device.attributes.overspeedMinimalDuration || 0) * 1000
       alert.attributes.maxSpeed = maxSpeed
       alert.distance = dist
       break

package/src/tests/speeding.test.js

@@ -4,8 +4,8 @@ const { getCountry } = require('../util/utils')
 
 async function getSpeedingReport (report, userData) {
   const data = await report.speedingReport(
-    new Date(Date.UTC(2023, 9, 4, 0, 0, 0, 0)),
-    new Date(Date.UTC(2023, 9, 4, 23, 59, 59, 0)),
+    new Date(Date.UTC(2025, 4, 5, 0, 0, 0, 0)),
+    new Date(Date.UTC(2025, 4, 5, 23, 59, 59, 0)),
     userData)
 
   const device = data[0].devices[0]

package/src/util/traccar.js

@@ -101,7 +101,7 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
 }
 
 function streamJson (traccar, u, filter) {
-  const cookie = traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie || require('axios').defaults.headers.cookie
+  const cookie = traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie || require('axios').defaults.headers?.common?.cookie
   return piscina.run({
     url: traccar.axios.defaults.baseURL + u,
     cookie,