fleetmap-reports 1.0.289 → 1.0.293

package/.idea/aws.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeProfile" value="profile:default" />
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedProfiles">
+      <list>
+        <option value="profile:default" />
+      </list>
+    </option>
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>

package/{fleetmap-reports.iml → .idea/fleetmap-reports.iml}

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
+    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
   </component>
 </project>

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/fleetmap-reports.iml" filepath="$PROJECT_DIR$/fleetmap-reports.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
     </modules>
   </component>
 </project>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

package/package.json

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

package/src/speeding-report.js

@@ -19,7 +19,6 @@ const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
 
 async function createSpeedingReport(from, to, reportUserData, traccar) {
-  console.log('Create SpeedingReport')
   traccarInstance = traccar
   userData = reportUserData
   const reportData = []
@@ -34,7 +33,7 @@ async function createSpeedingReport(from, to, reportUserData, traccar) {
     const allData = await createSpeedingReportByGroup(from, to)
     reportData.push(...allData)
   } else {
-    console.log("ByDevice")
+    console.log("createSpeedingReportByDevice")
     const allData = await createSpeedingReportByDevice(from, to, userData.devices)
     reportData.push(allData)
   }
@@ -239,9 +238,14 @@ async function getHereEvents(devices, routes, threshold){
   const events = []
   for (const d of devices) {
     const positions = routes.filter(p => p.deviceId === d.id)
+    if (!positions.length) {
+      console.log('no positions on device', d.name)
+      continue
+    }
+    let hereAlerts = null
     try {
       const results = await here.routeMatch(positions)
-      const hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
+      hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
         const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
         return {
           ...r,
@@ -252,6 +256,10 @@ async function getHereEvents(devices, routes, threshold){
           attributes: {speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200}
         }
       })
+      if (!hereAlerts.length) {
+        console.log('empty array after filter on device', d.name)
+        continue
+      }
       const reduced = hereAlerts.reduce((acc, cur, idx, src) => {
         if (idx === 1) {
           return [cur]
@@ -263,7 +271,7 @@ async function getHereEvents(devices, routes, threshold){
       })
       events.push(...reduced)
     } catch (e) {
-      console.error(e)
+      console.error(hereAlerts, e)
     }
   }
   return events