ART-1434: shst matching robustness improvements

Author: edmabon

src/commands/match.ts

@@ -872,7 +872,7 @@ async function matchLines(outFile, params, lines, flags) {
       var gisRef:SharedStreetsReference = forwardReference(line);
 
       matchForward = await matcher.matchGeom(line);
-      if(matchForward && matchForward.score < matcher.searchRadius * 2) {
+      if(matchForward) {
         matchForwardSegments = getMatchedSegments(matchForward, gisRef);
       }
     }
@@ -885,7 +885,7 @@ async function matchLines(outFile, params, lines, flags) {
 
       var reversedLine = <turfHelpers.Feature<turfHelpers.LineString>>reverseLineString(line);
       matchBackward = await matcher.matchGeom(reversedLine);
-      if(matchBackward && matchBackward.score < matcher.searchRadius * 2) {
+      if(matchBackward) {
         matchBackwardSegments = getMatchedSegments(matchBackward, gisRef);
       }
     }

src/graph.ts

@@ -842,17 +842,23 @@ export class Graph {
         try {
             var matches = await new Promise((resolve, reject) => {
                 this.osrm.match(hmmOptions, function(err, response) {
-                    if (err) 
+                    if (err) {
+                        console.log("got error")
                         reject(err);
-                    else
+                    }
+                    else {
+                        console.log("Succesful match")
                         resolve(response)
+          }
                 });
             });
 
             var visitedEdges:Set<string> = new Set();
             var visitedEdgeList:string[] = [];
 
             if(matches['matchings'] &&  matches['matchings'].length > 0) {
+      //console.log(JSON.stringify(feature.geometry, null, 4))
+      //console.log(JSON.stringify(matches['matchings'][0]['geometry'], null, 4))
 
                 var match = matches['matchings'][0];
                 if(0 < match.confidence ) {
@@ -902,8 +908,13 @@ export class Graph {
             }
 
             if(visitedEdgeList.length > 0) {
-                var startPoint = turfHelpers.point(feature.geometry.coordinates[0]);
-                var endPoint = turfHelpers.point(feature.geometry.coordinates[feature.geometry.coordinates.length - 1]);
+                // Use the first non-null point (in the matches), rather than just the first point from the raw trace
+                // This way, we are guaranteed to get a match if the OSRM matching was successful
+                var firstNonNull = 0, lastNonNull = matches['tracepoints'].length - 1
+                while (!matches['tracepoints'][firstNonNull] && firstNonNull++);
+                while (!matches['tracepoints'][lastNonNull] && lastNonNull--);
+                var startPoint = turfHelpers.point(matches['tracepoints'][firstNonNull]['location']);
+                var endPoint = turfHelpers.point(matches['tracepoints'][lastNonNull]['location']);
 
 
                 var startCandidate:PointCandidate = await this.getPointCandidateFromRefId(startPoint, visitedEdgeList[0], null);

src/tiles.ts

@@ -38,14 +38,17 @@ export async function getTilesForId(id:string) {
 }
 
 export function getTileIdsForPolygon(polygon:turfHelpers.Feature<turfHelpers.Polygon>, buffer:number=0):string[] {
-
-    var polyBound = bbox(polygon)
-
-    var nwPoint = destination([polyBound[0],polyBound[1]], buffer, 315, {'units':'meters'});
-    var sePoint = destination([polyBound[2],polyBound[3]], buffer, 135, {'units':'meters'});
-    let bounds = [nwPoint.geometry.coordinates[0], nwPoint.geometry.coordinates[1], sePoint.geometry.coordinates[0], sePoint.geometry.coordinates[1]];
-    
-    return getTileIdsForBounds(bounds, false);
+    if (polygon === null) {
+        return [];
+    } else {
+      var polyBound = bbox(polygon)
+
+      var nwPoint = destination([polyBound[0],polyBound[1]], buffer, 315, {'units':'meters'});
+      var sePoint = destination([polyBound[2],polyBound[3]], buffer, 135, {'units':'meters'});
+      let bounds = [nwPoint.geometry.coordinates[0], nwPoint.geometry.coordinates[1], sePoint.geometry.coordinates[0], sePoint.geometry.coordinates[1]];
+      
+      return getTileIdsForBounds(bounds, false);
+    }
 
 }