remember followRoads per-segment

jeffbdye · Dec 10, 2021 · 52531d4 · 52531d4
1 parent e43c73e
commit 52531d4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/current-run.spec.ts b/src/current-run.spec.ts
@@ -24,15 +24,16 @@ describe('CurrentRun class', () => {
     let currentRun = new CurrentRun(new RunStart({} as LngLat));
 
     let initialExpectedDistance = 500;
-    let firstSegment = new RunSegment('some-uuid', {} as LngLat, initialExpectedDistance, {} as LineString);
+    let firstSegment = new RunSegment('some-uuid', {} as LngLat, initialExpectedDistance, {} as LineString, false);
     let marker = getMockMarker();
     currentRun.addSegment(firstSegment, marker);
 
     expect(currentRun.distance).toBe(initialExpectedDistance, 'Distance was not set correctly from the distance response.');
     expect(firstSegment.marker).toBe(marker);
+    expect(firstSegment.followsRoads).toBe(false);
 
     let secondDistance = 1337;
-    let secondSegment = new RunSegment('different-uuid', {} as LngLat, secondDistance, {} as LineString);
+    let secondSegment = new RunSegment('different-uuid', {} as LngLat, secondDistance, {} as LineString, true);
     currentRun.addSegment(secondSegment, getMockMarker());
     expect(currentRun.distance).toBe(initialExpectedDistance + secondDistance, 'Distance did not correctly add the incoming distance response value.');
   });
@@ -52,7 +53,7 @@ describe('CurrentRun class', () => {
 
     let expectedLngLat = { lng: 101, lat: 202 } as LngLat;
     let expectedDistance = 100;
-    let segment = new RunSegment('some-uuid', expectedLngLat, expectedDistance, {} as LineString);
+    let segment = new RunSegment('some-uuid', expectedLngLat, expectedDistance, {} as LineString, false);
     let marker = getMockMarker();
     spyOn(marker, 'remove').and.stub();
     currentRun.addSegment(segment, marker);

diff --git a/src/current-run.ts b/src/current-run.ts
@@ -27,12 +27,14 @@ export class RunSegment extends RunStart {
   public id: string;
   public distance: number; // in meters
   public geometry: LineString;
+  public followsRoads: boolean;
 
-  constructor(id: string, lngLat: LngLat, distance: number, geometry: LineString) {
+  constructor(id: string, lngLat: LngLat, distance: number, geometry: LineString, followsRoads: boolean) {
     super(lngLat);
     this.id = id;
     this.distance = distance;
     this.geometry = geometry;
+    this.followsRoads = followsRoads;
   }
 }
 

diff --git a/src/index.ts b/src/index.ts
@@ -157,8 +157,9 @@ function runToJson(run: CurrentRun): string {
   for (let i in run.segments) {
     runJSON.segments.push({
       lng: run.segments[i].lngLat.lng,
-      lat: run.segments[i].lngLat.lat
-    })
+      lat: run.segments[i].lngLat.lat,
+      followsRoads: run.segments[i].followsRoads
+    });
   }
   return JSON.stringify(runJSON);
 }
@@ -172,7 +173,7 @@ function jsonToRun(json: string) {
   let prev = lngLat;
   for (let i = 0; i < runJSON.segments.length; i++) {
     let lngLat = new LngLat(runJSON.segments[i].lng, runJSON.segments[i].lat);
-    if (runJSON.followRoads) {
+    if (runJSON.segments[i].followsRoads) {
       addSegmentFromDirectionsResponse(prev, lngLat, false);
     } else {
       addSegmentFromStraightLine(prev, lngLat, false);

diff --git a/src/next-segment-service.ts b/src/next-segment-service.ts
@@ -49,7 +49,8 @@ export class NextSegmentService {
           uuid(),
           nextLngLat,
           route.distance,
-          route.geometry as LineString
+          route.geometry as LineString,
+          true
         );
       } else {
         throw new Error(`Non-successful status code when getting directions: ${JSON.stringify(res)}`);
@@ -76,7 +77,8 @@ export class NextSegmentService {
       uuid(),
       nextLngLat,
       distance,
-      line
+      line,
+      false
     );
   }
 }