fleetmap-reports 2.0.48 → 2.0.50

package/package.json

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

package/src/speeding-report.js

@@ -1,7 +1,8 @@
 const jsPDF = require('jspdf')
 const {
   convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage,
-  getCountry
+  getCountry,
+  getServerHost
 } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
@@ -20,7 +21,6 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
 const { default: axios } = require('axios')
 const { getDriverName, getDriverData } = require('./util/driver')
-const { getServerHost } = require('./util')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -385,7 +385,7 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
 }
 
 async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
-  const chunk = 200
+  const chunk = 100
   const events = []
   for (const d of devices) {
     const route = routes.filter(r => r.deviceId === d.id)

package/src/util/utils.js

@@ -1,8 +1,11 @@
 const turf = require('@turf/helpers')
-const { getUserPartner } = require('fleetmap-partners')
+const {
+  getUserPartner,
+  newDomains
+} = require('fleetmap-partners')
 const messages = require('../../lang')
 const distance = require('@turf/distance')
-const { getServerHost } = require('./index')
+const { devicesToProcess } = require('./device')
 
 exports.getTranslations = (userData) => {
   const lang = this.getLanguage(userData)
@@ -318,3 +321,14 @@ exports.getCountry = (position) => {
   }
   return country && country.code
 }
+
+exports.processServerSide = (userData) => {
+  const devices = devicesToProcess(userData)
+  return devices.length > 100 && isClientSide()
+}
+
+const getServerHost = () =>
+  newDomains.includes(window.location.hostname)
+    ? `${window.location.hostname}/pinmeapi`
+    : process.env.SERVER_HOST
+exports.getServerHost = getServerHost

package/src/zone-report.js

@@ -4,7 +4,8 @@ const {
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
   isClientSide,
-  getLanguage, convertFromUTC, convertFromLocal
+  getLanguage, convertFromUTC, convertFromLocal,
+  getServerHost
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -22,7 +23,6 @@ const {
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
-const { getServerHost } = require('./util')
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'

package/src/util/index.js

@@ -1,13 +0,0 @@
-const { devicesToProcess } = require('./device')
-const { isClientSide } = require('./utils')
-const { newDomains } = require('fleetmap-partners')
-
-exports.processServerSide = (userData) => {
-  const devices = devicesToProcess(userData)
-  return devices.length > 100 && isClientSide()
-}
-
-exports.getServerHost = () =>
-  newDomains.includes(window.location.hostname)
-    ? `${window.location.hostname}/pinmeapi`
-    : process.env.SERVER_HOST