fleetmap-reports 1.0.249 → 1.0.250

package/.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Kms report with time period">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="kms report - show every selected day">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/utils.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -195,7 +195,8 @@
       <workItem from="1638888787940" duration="19894000" />
       <workItem from="1639074912454" duration="257000" />
       <workItem from="1639090037682" duration="2514000" />
-      <workItem from="1639135460686" duration="2390000" />
+      <workItem from="1639135460686" duration="3092000" />
+      <workItem from="1639151097761" duration="12693000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -267,7 +268,14 @@
       <option name="project" value="LOCAL" />
       <updated>1639057192382</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="kms report - show every selected day">
+      <created>1639139696407</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1639139696408</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -296,6 +304,7 @@
     <MESSAGE value="fix speeding report" />
     <MESSAGE value="refactor speeding and trip report" />
     <MESSAGE value="Kms report with time period" />
-    <option name="LAST_COMMIT_MESSAGE" value="Kms report with time period" />
+    <MESSAGE value="kms report - show every selected day" />
+    <option name="LAST_COMMIT_MESSAGE" value="kms report - show every selected day" />
   </component>
 </project>

package/package.json

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

package/src/index.js

@@ -19,8 +19,8 @@ function Reports(config, axios) {
             byGroup: false
         }
     }
-    this.speedingReport = (from, to, userData, roadSpeedLimits) => {
-        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
+    this.speedingReport = (from, to, userData) => {
+        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar)
     }
 
     this.speedingReportToPDF = (userData, reportData) => {

package/src/speeding-report.js

@@ -13,16 +13,18 @@ const {getUserPartner} = require("fleetmap-partners");
 const traccar = require("./util/traccar");
 
 let traccarInstance
+let userData
 
 const fileName = 'SpeedingReport'
 
-async function createSpeedingReport(from, to, userData, traccar, roadSpeedLimits) {
+async function createSpeedingReport(from, to, reportUserData, traccar) {
   traccarInstance = traccar
-  console.log('createSpeedingReport', from, to, userData, traccar, roadSpeedLimits)
+  userData = reportUserData
+  console.log('createSpeedingReport', from, to, userData, traccar)
   const reportData = []
 
   if(userData.byDriver){
-    const allData = await createSpeedingReportByDriver(from, to, userData, roadSpeedLimits)
+    const allData = await createSpeedingReportByDriver(from, to)
     reportData.push(allData)
   }
   else if(userData.byGroup){
@@ -37,48 +39,50 @@ async function createSpeedingReport(from, to, userData, traccar, roadSpeedLimits
           xpert: devices.filter(d => d.attributes.xpert).length > 0
         }
 
-        const events = ['deviceOverspeed']
-        const data = await traccar.getEvents(traccarInstance, from, to, devices, events)
+        const eventTypes = ['deviceOverspeed']
+        const events = await traccar.getEvents(traccarInstance, from, to, devices, eventTypes)
+        const routes = userData.useVehicleSpeedLimit ? [] : await traccar.getRoute(traccarInstance, from, to, devices)
 
         devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-        if (data.length > 0) {
-          groupData.devices = await processDevices(from, to, devices, userData.geofences, userData.drivers, data, roadSpeedLimits)
+        if (events.length > 0) {
+          groupData.devices = await processDevices(from, to, devices, events, routes)
           reportData.push(groupData)
         }
       }
     }
 
-    const withoutGroupData = await createSpeedingReportByDevice(from, to, userData)
+    const withoutGroupData = await createSpeedingReportByDevice(from, to)
     reportData.push(withoutGroupData)
   } else {
-    const allData = await createSpeedingReportByDevice(from, to, userData, roadSpeedLimits)
+    const allData = await createSpeedingReportByDevice(from, to)
     reportData.push(allData)
   }
 
   return reportData
 }
 
-async function createSpeedingReportByDevice(from, to, userData, roadSpeedLimits) {
+async function createSpeedingReportByDevice(from, to) {
   const groupIds = userData.groups.map(g => g.id)
   const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
   withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const events = ['deviceOverspeed']
-  const data = await traccar.getEvents(traccarInstance, from, to, withoutGroupDevices, events)
+  const eventTypes = ['deviceOverspeed']
+  const events = await traccar.getEvents(traccarInstance, from, to, withoutGroupDevices, eventTypes)
+  const routes = userData.useVehicleSpeedLimit ? [] : await traccar.getRoute(traccarInstance, from, to, withoutGroupDevices)
 
   const allData = { devices: [] }
 
-  if(data.length > 0 || roadSpeedLimits) {
-    allData.devices = await processDevices(from, to, withoutGroupDevices, userData.geofences, userData.drivers, data, roadSpeedLimits)
+  if(events.length > 0 || userData.roadSpeedLimits) {
+    allData.devices = await processDevices(from, to, withoutGroupDevices, events, routes)
     allData.xpert = withoutGroupDevices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 
   return allData
 }
 
-async function createSpeedingReportByDriver(from, to, userData) {
+async function createSpeedingReportByDriver(from, to) {
   const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver',deviceIds.length)
 
@@ -93,18 +97,18 @@ async function createSpeedingReportByDriver(from, to, userData) {
   }
   console.log(eventsData.length)
 
-  await getEventsPosition(from , to, userData.devices, userData.geofences, userData.drivers, eventsData)
-  allData.drivers = await processDrivers(from, to, userData.drivers, eventsData)
+  await getEventsPosition(from , to, userData.devices, eventsData)
+  allData.drivers = await processDrivers(from, to, eventsData)
   console.log(allData.drivers.length)
   return allData
 }
 
-async function processDrivers(from, to, drivers, data) {
+async function processDrivers(from, to, data) {
   console.log(data)
   const driversResult = []
   const alertsWithPosition = data.filter(a => a.position)
 
-  drivers.forEach(d => {
+  userData.drivers.forEach(d => {
     const alerts = alertsWithPosition.filter(e => e.position.attributes.driverUniqueId === d.uniqueId)
 
     if (alerts.length > 0) {
@@ -124,34 +128,70 @@ async function processDrivers(from, to, drivers, data) {
   return driversResult
 }
 
-async function processDevices(from, to, devices, geofences, drivers, data, roadSpeedLimits) {
+async function processDevices(from, to, devices, events, routes) {
   const devicesResult = []
 
-  await getEventsPosition(from , to, devices, geofences, drivers, data, roadSpeedLimits)
+  if(userData.useVehicleSpeedLimit) {
+    await getEventsPosition(from, to, devices, events)
 
-  console.log(data)
+    console.log(events)
 
-  for (const d of devices) {
-    const alerts = data.filter(t => t.deviceId === d.id)
+    for (const d of devices) {
+      const deviceEvents = events.filter(t => t.deviceId === d.id)
 
-    if (alerts.length > 0) {
-      const alertsWithPosition = alerts.filter(a => a.position).sort((a,b) => a.positionId - b.positionId)
-      devicesResult.push({
-        device: d,
-        from: from,
-        to: to,
-        alerts: alertsWithPosition,
-        maxSpeed: alertsWithPosition.reduce((a, b) => {
-          return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
-        }, 0),
-      })
+      if (deviceEvents.length > 0) {
+        const alertsWithPosition = deviceEvents.filter(a => a.position).sort((a, b) => a.positionId - b.positionId)
+        devicesResult.push({
+          device: d,
+          from: from,
+          to: to,
+          alerts: alertsWithPosition,
+          maxSpeed: alertsWithPosition.reduce((a, b) => {
+            return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
+          }, 0),
+        })
+      }
+    }
+  } else {
+    for (const d of devices) {
+      const positions = routes.filter(t => t.deviceId === d.id)
+      const maxSpeed = userData.customSpeed / 1.85200
+
+      const alerts = []
+      for(let pIndex = 0; pIndex < positions.length ; pIndex++){
+        const position = positions[pIndex]
+        if(position.speed > maxSpeed){
+          const alert = {
+            position: position,
+            attributes: {
+              speedLimit: maxSpeed,
+              speed: position.speed
+            }
+          }
+
+          pIndex = calculateEventData(positions, pIndex, alert)
+
+          alerts.push(alert)
+        }
+      }
+      if(alerts.length > 0){
+        devicesResult.push({
+          device: d,
+          from: from,
+          to: to,
+          alerts: alerts,
+          maxSpeed: alerts.reduce((a, b) => {
+            return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
+          }, 0),
+        })
+      }
     }
   }
 
   return devicesResult
 }
 
-async function getEventsPosition(from, to, devices, geofences, drivers, events, roadSpeedLimits){
+async function getEventsPosition(from, to, devices, events){
 
   const deviceIds = [...new Set(events.map(e => e.deviceId))]
   const routeData = await traccar.getRoute(traccarInstance, from, to, deviceIds.map(id => { return { id: id } } ))
@@ -161,10 +201,10 @@ async function getEventsPosition(from, to, devices, geofences, drivers, events,
   for (const d of devices) {
     let alerts = events.filter(t => t.deviceId === d.id)
 
-    if (alerts.length > 0 || roadSpeedLimits) {
+    if (alerts.length > 0 || userData.roadSpeedLimits) {
       const positions = routeData.filter(p => p.deviceId === d.id)
 
-      if (roadSpeedLimits && positions.length) {
+      if (userData.roadSpeedLimits && positions.length) {
         try {
           const results = await here.routeMatch(positions)
           const hereAlerts = results.map(r => {
@@ -202,7 +242,7 @@ async function getEventsPosition(from, to, devices, geofences, drivers, events,
           let geofence = null
 
           if (a.geofenceId) {
-            geofence = geofences.find(g => g.id === a.geofenceId)
+            geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (geofence) {
               a.geofenceName = geofence.name + ' (' + Math.round(a.attributes.speedLimit * 1.85200) + ' Km/h)'
             }
@@ -230,7 +270,7 @@ async function getEventsPosition(from, to, devices, geofences, drivers, events,
           }
 
           if (a.position.attributes.driverUniqueId) {
-            const driver = drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
+            const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
             a.driver = driver && driver.name
           }
 
@@ -243,6 +283,31 @@ async function getEventsPosition(from, to, devices, geofences, drivers, events,
   }
 }
 
+function calculateEventData(positions, pIndex, a, geofence){
+  let endEventPosition = a.position
+  let maxSpeed = a.position.speed
+  let dist = 0
+  while (pIndex + 1 < positions.length) {
+    pIndex++
+
+    dist += distance(point([endEventPosition.longitude, endEventPosition.latitude]),
+        point([positions[pIndex].longitude, positions[pIndex].latitude]))
+    endEventPosition = positions[pIndex]
+    if (endEventPosition.speed <= a.attributes.speedLimit || (geofence && isOutsideGeofence(geofence, endEventPosition))) {
+      a.eventTime = new Date(endEventPosition.fixTime) - new Date(a.position.fixTime)
+      a.attributes.maxSpeed = maxSpeed
+      a.distance = dist
+      break
+    } else {
+      if (maxSpeed < endEventPosition.speed) {
+        maxSpeed = endEventPosition.speed
+      }
+    }
+  }
+
+  return pIndex
+}
+
 function isOutsideGeofence(geofence, endEventPosition) {
   const v = turf.feature(turf.flip(parse(geofence.area)))
   const point = turf.point([endEventPosition.longitude, endEventPosition.latitude])