fix: optimization route download

jobs and vehicles are correctly parsed for JSON export

Author: blackbirdem

src/fragments/forms/map-form/components/download/download.js

@@ -6,6 +6,7 @@ import Vehicle from '@/models/vehicle'
 import constants from '@/resources/constants'
 import toKml from '@maphubs/tokml'
 import toGpx from 'togpx'
+import vehicle from "@/models/vehicle";
 
 export default {
   data: () => ({
@@ -180,7 +181,7 @@ export default {
           if (context.downloadFormat === 'json') {
             // Get the ORS mapViewData model and stringify it
             if (this.mapViewData) {
-              jsonData = JSON.stringify(context.mapViewData)
+              jsonData = JSON.stringify(this.parseMapView(context.mapViewData))
             } else {
               jsonData = JSON.stringify(context.dataJson)
             }
@@ -199,6 +200,7 @@ export default {
             resolve(toGPX)
           } else if (context.downloadFormat === 'geojson') {
             if (this.mapViewData) {
+              // TODO: does not include vehicle and job information when downloading optimization route
               jsonData = context.mapViewData.getGeoJson()
             } else {
               jsonData = context.dataGeoJson
@@ -230,6 +232,27 @@ export default {
       })
     },
 
+    parseMapView (mapViewData) {
+      let localMapViewData = mapViewData
+
+      if (mapViewData.mode === constants.modes.optimization) {
+        // TODO: fix parsing of humanised distance and duration
+        let jsonJobs = []
+        for (const job of mapViewData.jobs) {
+          jsonJobs.push(job.toJSON())
+        }
+        localMapViewData.jobs = jsonJobs
+
+        let jsonVehicles = []
+        for (const v of mapViewData.vehicles) {
+          jsonVehicles.push(v.toJSON())
+        }
+        localMapViewData.vehicles = jsonVehicles
+      }
+
+      return localMapViewData
+    },
+
     copyToClipboard () {
       const data = this.dataJson
 

src/fragments/forms/map-form/components/optimization/optimization.js

@@ -443,6 +443,7 @@ export default {
               if (data) {
                 MapViewDataBuilder.buildMapData(data, context.$store.getters.appRouteData).then((mapViewData) => {
                   context.mapViewData = mapViewData
+                  context.mapViewData.mode = constants.modes.optimization
                   context.mapViewData.jobs = context.jobs
                   context.mapViewData.vehicles = context.vehicles
                   EventBus.$emit('mapViewDataChanged', mapViewData)