fleetmap-reports 1.0.886 → 1.0.888

package/package.json

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

package/src/speeding-report.js

@@ -357,7 +357,7 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
       const edge = edges[mp.edge_index]
       const position = route[mIndex + i]
       if (edge && (edge.speed_limit + (threshold || 0)) < position.speed * 1.852) {
-        results.push({ ...mp, ...edge, ...position })
+        results.push({ ...mp, ...edge, ...position, position })
       }
     })
   } catch (e) {
@@ -392,7 +392,6 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
         cur.attributes = { speedLimit: cur.speed_limit, speed: cur.speed, maxSpeed: cur.speed }
         cur.eventTime = 0
         cur.distance = 0
-        cur.position = { ...cur }
         acc.push(cur)
       }
       return acc
@@ -632,6 +631,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
     userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
   ]
 
+  if (userData.roadSpeedLimits) {
+    headers.push({ label: translations.report.info, value: 'info' })
+  }
+
   let data = []
   if (overspeedData) {
     overspeedData.forEach(d => {
@@ -650,7 +653,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
             ? a.roadSpeedLimit
             : userData.useVehicleSpeedLimit
               ? Math.round(a.attributes.speedLimit * 1.85200)
-              : userData.customSpeed
+              : userData.customSpeed,
+          ...(userData.roadSpeedLimits ? { info: `https://openstreetmap.org/way/${a.position.way_id}` } : {})
         }
       }))
     })

package/src/util/utils.js

@@ -254,4 +254,6 @@ exports.calculateDistance = (positions) => {
 
 exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()
 exports.getLogoUrl = getLogoUrl
-exports.convertFromUTCDate = (value, user) => convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
+exports.convertFromUTCDate = (value, user) => {
+  return convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
+}