fleetmap-reports 1.0.286 → 1.0.287

package/.idea/workspace.xml

@@ -1,10 +1,9 @@
 <?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="Add idle report">
-      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="en translation">
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.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" />
@@ -236,7 +235,8 @@
       <workItem from="1641992912450" duration="1734000" />
       <workItem from="1642001918030" duration="2950000" />
       <workItem from="1642028703547" duration="9503000" />
-      <workItem from="1642073677104" duration="1289000" />
+      <workItem from="1642073677104" duration="1399000" />
+      <workItem from="1642077505676" duration="5779000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -448,7 +448,14 @@
       <option name="project" value="LOCAL" />
       <updated>1642040031237</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="en translation">
+      <created>1642075797776</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1642075797777</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -478,7 +485,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Kms report grouped by day" />
     <MESSAGE value="Fix pdf logo" />
     <MESSAGE value="kms report with parallel requests" />
     <MESSAGE value="Kms Report - Calculate distance with traccar trips" />
@@ -503,6 +509,7 @@
     <MESSAGE value="fix convert date to localeString" />
     <MESSAGE value="Fix activity and kms report by driver inside a time period" />
     <MESSAGE value="Add idle report" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add idle report" />
+    <MESSAGE value="en translation" />
+    <option name="LAST_COMMIT_MESSAGE" value="en translation" />
   </component>
 </project>

package/package.json

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

package/src/speeding-report.js

@@ -237,12 +237,10 @@ async function getCustomSpeedLimitEvents(devices, routes){
 async function getHereEvents(devices, routes, threshold){
   console.log('here speed limit events')
   const events = []
-  await Promise.all(devices.map(d =>
-      here.routeMatch(routes.filter(p => p.deviceId === d.id)).then(r => d.results = r)
-  ))
   for (const d of devices) {
+    const positions = routes.filter(p => p.deviceId === d.id)
     try {
-      const results = d.results
+      const results = await here.routeMatch(positions)
       const 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 {