fix: optimization route download as GeoJSON

Author: blackbirdem

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

@@ -198,7 +198,6 @@ 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

src/models/job.js

@@ -132,26 +132,23 @@ class Job extends Place {
   }
 
   toGeoJSON(stringify = false) {
-    let props = {
-      id: this.id,
-      service: this.service,
-      delivery: this.delivery,
-      pickup: this.pickup
+    let props = {label: 'Job ' + this.id}
+    for (const p in ['id', 'service', 'delivery', 'pickup', 'time_windows']) {
+      if (this[p] && this[p].length) {
+        props[p] = this[p]
+      }
     }
 
-    if (this.skills) {
+    if (this.skills && this.skills.length) {
       let skillIds = []
       for (const skill of this.skills) {
         skillIds.push(skill.id)
       }
       skillIds.sort((a,b) => a-b)
       props.skills = skillIds
     }
-    if (this.time_windows) {
-      props.time_windows = this.time_windows
-    }
 
-    const geoJsonData = { type: 'Feature', geometry: { type: 'Point', coordinates: this.location }, properties: props }
+    const geoJsonData = { type: 'Feature',  properties: props, geometry: { type: 'Point', coordinates: this.location }}
     return stringify ? JSON.stringify(geoJsonData) : geoJsonData
   }
 

src/models/map-view-data.js

@@ -167,7 +167,6 @@ class MapViewData {
       geoJsonData.features.push(routeFeature)
     }
 
-    // TODO: OPTIMIZATION - build Points with properties for jobs and vehicles
     // Build and add places/points features to the GeoJSON
     for (const plaKey in this.places) {
       const placeFeature = {
@@ -181,16 +180,12 @@ class MapViewData {
       geoJsonData.features.push(placeFeature)
     }
 
-    // Build and add polygons features to the GeoJSON
-    for (const polKey in this.polygons) {
-      const polygon = this.polygons[polKey]
+    for (const jobKey in this.jobs) {
+      geoJsonData.features.push(this.jobs[jobKey].toGeoJSON())
+    }
 
-      const polygonFeature = {
-        type: 'Feature',
-        properties: polygon.properties,
-        geometry: polygon.geometry
-      }
-      geoJsonData.features.push(polygonFeature)
+    for (const vKey in this.vehicles) {
+      geoJsonData.features.push(this.vehicles[vKey].toGeoJSON())
     }
 
     // Return GeoJSON with features

src/models/vehicle.js

@@ -150,14 +150,14 @@ class Vehicle extends Place {
   }
 
   toGeoJSON(stringify = false) {
-    let props = {
-      id: this.id,
-      description: this.description,
-      profile: this.profile,
-      capacity: this.capacity,
+    let props = {label: 'Vehicle ' + this.id}
+    for (const p in ['id', 'description', 'profile', 'capacity']) {
+      if (this[p] && this[p].length) {
+        props[p] = this[p]
+      }
     }
 
-    if (this.skills) {
+    if (this.skills && this.skills.length) {
       let skillIds = []
       for (const skill of this.skills) {
         skillIds.push(skill.id)
@@ -169,9 +169,8 @@ class Vehicle extends Place {
       props.time_windows = this.time_windows
     }
 
-    const geoJsonData = { type: 'Feature',
-      geometry: { type: 'MultiPoint', coordinates: [this.start, this.end] },
-      properties: props }
+    const geoJsonData = { type: 'Feature', properties: props,
+      geometry: { type: 'MultiPoint', coordinates: [this.start, this.end] }}
     return stringify ? JSON.stringify(geoJsonData) : geoJsonData
   }