fleetmap-reports 1.0.393 → 1.0.398

package/src/util/utils.js

@@ -1,198 +1,196 @@
 const axios = require('axios')
-const turf = require('turf')
-const {getUserPartner} = require("fleetmap-partners")
-const messages = require("../../lang")
+const turf = require('@turf/helpers')
+const { getUserPartner } = require('fleetmap-partners')
+const messages = require('../../lang')
+const distance = require('@turf/distance')
 
 exports.getTranslations = (userData) => {
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
-    return messages[lang] ? messages[lang] : messages['en-GB']
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  return messages[lang] ? messages[lang] : messages['en-GB']
 }
 
-function convertMS(duration, withSeconds) {
+function convertMS (duration, withSeconds) {
+  if (!duration || duration < 0) {
+    return '00:00'
+  }
 
-    if(!duration || duration < 0) {
-        return '00:00'
-    }
-
-    const ms = duration % 1000;
-    let s = (duration - ms) / 1000;
-    let seconds = s % 60;
-    s = (s - seconds) / 60;
-    let minutes = s % 60;
-    let hours = (s - minutes) / 60;
+  const ms = duration % 1000
+  let s = (duration - ms) / 1000
+  let seconds = s % 60
+  s = (s - seconds) / 60
+  let minutes = s % 60
+  let hours = (s - minutes) / 60
 
+  hours = (hours < 10) ? '0' + hours : hours
+  minutes = (minutes < 10) ? '0' + minutes : minutes
+  seconds = (seconds < 10) ? '0' + seconds : seconds
 
-    hours = (hours < 10) ? "0" + hours : hours
-    minutes = (minutes < 10) ? "0" + minutes : minutes
-    seconds = (seconds < 10) ? "0" + seconds : seconds
-
-    return withSeconds ? hours + ":" + minutes + ":" + seconds : hours + ":" + minutes
+  return withSeconds ? hours + ':' + minutes + ':' + seconds : hours + ':' + minutes
 }
 
-function coordsDistance(lon1, lat1, lon2, lat2) {
-    const from = turf.point([lon1, lat1])
-    const to = turf.point([lon2, lat2])
+function coordsDistance (lon1, lat1, lon2, lat2) {
+  const from = turf.point([lon1, lat1])
+  const to = turf.point([lon2, lat2])
 
-    return (turf.distance(from, to, 'meters'))
+  return distance.default(from, to, 'meters')
 }
 
-function convertPositionToFeature(position) {
-    const point = turf.point([position.longitude,position.latitude])
-    point.properties.position = position
-    return point
+function convertPositionToFeature (position) {
+  const point = turf.point([position.longitude, position.latitude])
+  point.properties.position = position
+  return point
 }
 
-function convertToFeature(geofence) {
-    if(geofence.area.startsWith('POLYGON')) {
-        const feature = {
-            "type": "Feature",
-            "properties": {
-                "geofence": geofence
-            },
-            "geometry": {
-                "type": "Polygon",
-                "coordinates": [[]]
-            }
-        }
-        const str = geofence.area.substring('POLYGON(('.length, geofence.area.length - 2)
-        const coord_list = str.split(',')
-        for (const i in coord_list) {
-            const coord = coord_list[i].trim().split(' ')
-            feature.geometry.coordinates[0].push([parseFloat(coord[1]), parseFloat(coord[0])])
-        }
-        return feature
+function convertToFeature (geofence) {
+  if (geofence.area.startsWith('POLYGON')) {
+    const feature = {
+      type: 'Feature',
+      properties: {
+        geofence
+      },
+      geometry: {
+        type: 'Polygon',
+        coordinates: [[]]
+      }
     }
-
-    if(geofence.area.startsWith('CIRCLE')) {
-        const str = geofence.area.substring('CIRCLE ('.length, geofence.area.length - 1)
-        const coord_list = str.split(',')
-        const coord = coord_list[0].trim().split(' ')
-        const point = turf.point([parseFloat(coord[1]), parseFloat(coord[0])])
-        point.properties.geofence = geofence
-        point.properties.distance = coord_list[1].trim()
-        console.log(point)
-        return point
+    const str = geofence.area.substring('POLYGON(('.length, geofence.area.length - 2)
+    const coord_list = str.split(',')
+    for (const i in coord_list) {
+      const coord = coord_list[i].trim().split(' ')
+      feature.geometry.coordinates[0].push([parseFloat(coord[1]), parseFloat(coord[0])])
     }
-
-    if(geofence.area.startsWith('LINESTRING')) {
-        const str = geofence.area.substring('LINESTRING ('.length, geofence.area.length - 1)
-        const coord_list = str.split(',')
-        const coordinates = coord_list.map(c => {
-            const coord = c.trim().split(' ')
-            return [parseFloat(coord[1]), parseFloat(coord[0])]
-        })
-        return  {
-            "type": "Feature",
-            "properties": {
-                "geofence": geofence
-            },
-            "geometry": {
-                "type": "LineString",
-                "coordinates": coordinates
-            }
-        }
+    return feature
+  }
+
+  if (geofence.area.startsWith('CIRCLE')) {
+    const str = geofence.area.substring('CIRCLE ('.length, geofence.area.length - 1)
+    const coord_list = str.split(',')
+    const coord = coord_list[0].trim().split(' ')
+    const point = turf.point([parseFloat(coord[1]), parseFloat(coord[0])])
+    point.properties.geofence = geofence
+    point.properties.distance = coord_list[1].trim()
+    console.log(point)
+    return point
+  }
+
+  if (geofence.area.startsWith('LINESTRING')) {
+    const str = geofence.area.substring('LINESTRING ('.length, geofence.area.length - 1)
+    const coord_list = str.split(',')
+    const coordinates = coord_list.map(c => {
+      const coord = c.trim().split(' ')
+      return [parseFloat(coord[1]), parseFloat(coord[0])]
+    })
+    return {
+      type: 'Feature',
+      properties: {
+        geofence
+      },
+      geometry: {
+        type: 'LineString',
+        coordinates
+      }
     }
+  }
 }
 
-function getDates(startDate, endDate) {
-    const dates = []
-    let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00:00.000 PM')
-    const addDays = function (days) {
-        const date = new Date(this.valueOf())
-        date.setDate(date.getDate() + days)
-        return date
-    }
-    while (currentDate <= endDate) {
-        dates.push(currentDate)
-        currentDate = addDays.call(currentDate, 1)
-    }
-    return dates
+function getDates (startDate, endDate) {
+  const dates = []
+  let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00:00.000 PM')
+  const addDays = function (days) {
+    const date = new Date(this.valueOf())
+    date.setDate(date.getDate() + days)
+    return date
+  }
+  while (currentDate <= endDate) {
+    dates.push(currentDate)
+    currentDate = addDays.call(currentDate, 1)
+  }
+  return dates
 }
 
-function getImage(url) {
-    return axios.get(url, {responseType: 'arraybuffer'}).then(d => d.data)
+function getImage (url) {
+  return axios.get(url, { responseType: 'arraybuffer' }).then(d => d.data)
 }
 
-async function getImageBase64(url) {
-    const response = await getImage(url);
-    return Buffer.from(response, 'binary').toString('base64')
+async function getImageBase64 (url) {
+  const response = await getImage(url)
+  return Buffer.from(response, 'binary').toString('base64')
 }
 
-function getLogoUrl(hostname) {
-    const path = `/img/logos/${hostname}.png`
-    return window ? path : `https://${hostname}${path}`
+function getLogoUrl (hostname) {
+  const path = `/img/logos/${hostname}.png`
+  return window ? path : `https://${hostname}${path}`
 }
 
-async function getImgFromUrl(hostname) {
-    const url = getLogoUrl(hostname)
-    try {
-        const img = new Image()
-        img.src = url
-        return img
-    } catch (e) {
-        return await getImageBase64(url);
-    }
+async function getImgFromUrl (hostname) {
+  const url = getLogoUrl(hostname)
+  try {
+    const img = new Image()
+    img.src = url
+    return img
+  } catch (e) {
+    return await getImageBase64(url)
+  }
 }
 
-function isClientSide() { return (typeof window !== "undefined") }
+function isClientSide () { return (typeof window !== 'undefined') }
 
-
-function convertToLocaleString(value, lang, timezone){
-    if(isClientSide()){
-        return new Date(value).toLocaleString()
-    } else {
-        return new Date(value).toLocaleString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
+function convertToLocaleString (value, lang, timezone) {
+  if (isClientSide()) {
+    return new Date(value).toLocaleString()
+  } else {
+    return new Date(value).toLocaleString(lang, {
+      timeZone: timezone,
+      hour12: false
+    })
+  }
 }
 
-function convertToLocaleDateString(value, lang, timezone){
-    if(isClientSide()){
-        return new Date(value).toLocaleDateString()
-    } else {
-        return new Date(value).toLocaleDateString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
+function convertToLocaleDateString (value, lang, timezone) {
+  if (isClientSide()) {
+    return new Date(value).toLocaleDateString()
+  } else {
+    return new Date(value).toLocaleDateString(lang, {
+      timeZone: timezone,
+      hour12: false
+    })
+  }
 }
 
-function convertToLocaleTimeString(value, lang, timezone){
-    if(isClientSide()){
-        return new Date(value).toLocaleTimeString()
-    } else {
-        return new Date(value).toLocaleTimeString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
+function convertToLocaleTimeString (value, lang, timezone) {
+  if (isClientSide()) {
+    return new Date(value).toLocaleTimeString()
+  } else {
+    return new Date(value).toLocaleTimeString(lang, {
+      timeZone: timezone,
+      hour12: false
+    })
+  }
 }
 
-function getTimezoneOffset(timezone){
-    if(isClientSide()){
-        return new Date().getTimezoneOffset()
-    } else {
-        const utcDate = new Date(new Date().toLocaleString('en-US', { timeZone: 'UTC' }))
-        const tzDate = new Date(new Date().toLocaleString('en-US', { timeZone: timezone }))
-        return (utcDate.getTime() - tzDate.getTime()) / 6e4
-    }
+function getTimezoneOffset (timezone) {
+  if (isClientSide()) {
+    return new Date().getTimezoneOffset()
+  } else {
+    const utcDate = new Date(new Date().toLocaleString('en-US', { timeZone: 'UTC' }))
+    const tzDate = new Date(new Date().toLocaleString('en-US', { timeZone: timezone }))
+    return (utcDate.getTime() - tzDate.getTime()) / 6e4
+  }
 }
 
-function convertFromUTC(value, timezone) {
-    const offset = getTimezoneOffset(timezone)
+function convertFromUTC (value, timezone) {
+  const offset = getTimezoneOffset(timezone)
 
-    const valueDate = new Date(value)
-    valueDate.setTime(valueDate.getTime() - (offset * 60 * 1000))
-    return valueDate
+  const valueDate = new Date(value)
+  valueDate.setTime(valueDate.getTime() - (offset * 60 * 1000))
+  return valueDate
 }
 
-function weekDaySelected(date, weekDays){
-    return (date.getDay() === 0 && weekDays.sunday) ||
+function weekDaySelected (date, weekDays) {
+  return (date.getDay() === 0 && weekDays.sunday) ||
     (date.getDay() === 1 && weekDays.monday) ||
     (date.getDay() === 2 && weekDays.tuesday) ||
-    (date.getDay() === 3 && weekDays.wednesday)  ||
+    (date.getDay() === 3 && weekDays.wednesday) ||
     (date.getDay() === 4 && weekDays.thursday) ||
     (date.getDay() === 5 && weekDays.friday) ||
     (date.getDay() === 6 && weekDays.saturday)
@@ -210,8 +208,8 @@ exports.getTimezoneOffset = getTimezoneOffset
 exports.convertFromUTC = convertFromUTC
 exports.weekDaySelected = weekDaySelected
 exports.getLogo = (user) => {
-    const host = window ? window.location.hostname : getUserPartner(user).host
-    return getImage(getLogoUrl(host))
+  const host = window ? window.location.hostname : getUserPartner(user).host
+  return getImage(getLogoUrl(host))
 }
 exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature

package/src/zone-report.js

@@ -8,8 +8,9 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const {devicesToProcess} = require("./util/device")
 const traccarHelper = require("./util/traccar")
-const turf = require('turf')
-const {pointToLineDistance} = require("@turf/turf");
+const pointToLineDistance = require("@turf/point-to-line-distance")
+const pointOnFeature = require("@turf/point-on-feature")
+const distance = require("@turf/distance")
 
 const fileName = 'ZoneReport'
 
@@ -75,7 +76,7 @@ async function createZoneReport(from, to, userData, traccar) {
     return reportData
 }
 
-async function processDevices(from, to, devices, drivers, geofences, data, traccar) {
+async function processDevices(from, to, devices, drivers, geofences, data) {
     const devicesResult = []
 
     for (const d of devices) {
@@ -160,7 +161,7 @@ function getInAndOutEvents(devices, route, userData) {
         routePoints.forEach(p => {
             geofencesFeatures.forEach(g => {
                 if(g.geometry.type === 'Polygon') {
-                    if (turf.inside(p, g)) {
+                    if (pointOnFeature(p, g)) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)
@@ -174,7 +175,7 @@ function getInAndOutEvents(devices, route, userData) {
                     }
                 }
                 if(g.geometry.type === 'Point') {
-                    if (turf.distance(p, g, 'meters') < g.properties.distance) {
+                    if (distance(p, g, 'meters') < g.properties.distance) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)