@@ -252,18 +225,6 @@ let job_view_history = (
);
-// Insert element into DOM - Will populate with AJAX results via checkAddressHistory()
-let job_asbestos_history = (
-
-);
-
let job_nearest_lhq = (
`,
{ permanent: true, offset: [0, 0] },
);
@@ -98,26 +106,26 @@ export class AssetPopupViewModel {
});
// Auto-update route when the team's first asset or job location moves
- const team = self.team;
+ const team = tasking.team;
if (team && team.trackableAssets && team.trackableAssets().length > 0) {
const a = team.trackableAssets()[0];
- self._routeSubs.push(a.latitude.subscribe(() => {
- const s = tasking.getTeamLatLng(); const d = tasking.getJobLatLng();
- if (s && d && routeControl) routeControl.setWaypoints([s, d]);
- }));
- self._routeSubs.push(a.longitude.subscribe(() => {
+
+ this._routeSubs.push(a.latLng.subscribe(() => {
+ if (!this.api.isRouteActive(routeControl)) return;
const s = tasking.getTeamLatLng(); const d = tasking.getJobLatLng();
if (s && d && routeControl) routeControl.setWaypoints([s, d]);
}));
}
- const j = self.job;
+ const j = tasking.job;
if (j) {
- self._routeSubs.push(j.address.latitude.subscribe(() => {
+ this._routeSubs.push(j.address.latitude.subscribe(() => {
+ if (!this.api.isRouteActive(routeControl)) return;
const s = tasking.getTeamLatLng(); const d = tasking.getJobLatLng();
if (s && d && routeControl) routeControl.setWaypoints([s, d]);
}));
- self._routeSubs.push(j.address.longitude.subscribe(() => {
+ this._routeSubs.push(j.address.longitude.subscribe(() => {
+ if (!this.api.isRouteActive(routeControl)) return;
const s = tasking.getTeamLatLng(); const d = tasking.getJobLatLng();
if (s && d && routeControl) routeControl.setWaypoints([s, d]);
}));
@@ -129,6 +137,8 @@ export class AssetPopupViewModel {
}
removeRouteToJob = () => {
+ this._routeSubs.forEach(sub => sub.dispose());
+ this._routeSubs = [];
this.api.clearRoutes();
}
diff --git a/src/pages/tasking/viewmodels/Config.js b/src/pages/tasking/viewmodels/Config.js
index 609ef341..5e3c460a 100644
--- a/src/pages/tasking/viewmodels/Config.js
+++ b/src/pages/tasking/viewmodels/Config.js
@@ -320,6 +320,7 @@ export function ConfigVM(root, deps) {
};
self.saveAndCloseAndLoad = () => {
+
self.save();
root.UserPressedSaveOnTheConfigModal()
diff --git a/src/pages/tasking/viewmodels/JobPopUp.js b/src/pages/tasking/viewmodels/JobPopUp.js
index f813bbab..a9aa43bb 100644
--- a/src/pages/tasking/viewmodels/JobPopUp.js
+++ b/src/pages/tasking/viewmodels/JobPopUp.js
@@ -2,11 +2,14 @@ var L = require('leaflet');
var moment = require('moment');
var ko = require('knockout');
+import AmazonLocationRouter from "../../../shared/als.js";
+
export class JobPopupViewModel {
constructor({ job, api }) {
this.job = job; // expects KO observables on the job (latitude/longitude/name/etc.)
this.api = api;
+ this._routeSubs = []
}
routeLoading = ko.observable(false);
@@ -50,13 +53,16 @@ export class JobPopupViewModel {
console.warn('Cannot draw route: missing team or job coordinates.');
return;
}
+
+ const router = new AmazonLocationRouter({
+ serviceUrl: "https://lambda.lighthouse-extension.com/lad/route",
+ travelMode: "Car",
+ });
+
this.routeLoading(true);
const routeControl = L.Routing.control({
waypoints: [from, to],
- router: L.Routing.graphHopper('lighthouse', {
- serviceUrl: 'https://graphhopper.lighthouse-extension.com/route',
- urlParameters: { 'ch.disable': true, instructions: false },
- }),
+ router,
lineOptions: {
styles: [{ opacity: 0.9, weight: 6 }, { opacity: 1.0, weight: 3, dashArray: '6,8' }]
},
@@ -74,7 +80,7 @@ export class JobPopupViewModel {
if (!route || !route.coordinates) return;
var r = e.routes[0]
- let middle = r.coordinates[Math.floor(r.coordinates.length / 4)];
+ let middle = r.summary.midpoint;
let distance = r.summary.totalDistance;
let time = r.summary.totalTime;
@@ -90,7 +96,7 @@ export class JobPopupViewModel {
distanceMarker.bindTooltip(
`
${(distance / 1000).toFixed(
1,
- )} km - ${timeText}
`,
+ )} km - ${timeText} ${r.summary.routeLabel}