Merge branch 'master' into curve-edge

Author: dsato80

NavCog/Model/TopoMap/TopoMap.mm

@@ -343,6 +343,8 @@ - (NSArray *)findShortestPathFromCurrentLocation:(NavLocation *)curLocation toNo
         nb.edge = tmpEdge2;
         nb.node = tmpNode;
 
+        [tmpEdge1.node1.infoFromEdges setObject:[tmpEdge1.node1.infoFromEdges objectForKey:curEdge.edgeID] forKey:tmpEdge1.edgeID];
+        [tmpEdge2.node2.infoFromEdges setObject:[tmpEdge2.node2.infoFromEdges objectForKey:curEdge.edgeID] forKey:tmpEdge2.edgeID];
 
         // copy edge localization for temp edges
         NavLightEdge* edgeInfo1 = [[NavLightEdge alloc] initWithEdge:tmpEdge1];
@@ -353,8 +355,6 @@ - (NSArray *)findShortestPathFromCurrentLocation:(NavLocation *)curLocation toNo
         [[NavLightEdgeHolder sharedInstance] appendNavLightEdge:edgeInfo2];
         NavEdgeLocalizer *nl2 = [NavLocalizerFactory cloneLocalizerForEdge:curEdge.edgeID withEdgeInfo:edgeInfo2];
 
-        [tmpEdge1.node1.infoFromEdges setObject:[tmpEdge1.node1.infoFromEdges objectForKey:curEdge.edgeID] forKey:tmpEdge1.edgeID];
-        [tmpEdge2.node2.infoFromEdges setObject:[tmpEdge2.node2.infoFromEdges objectForKey:curEdge.edgeID] forKey:tmpEdge2.edgeID];
 
 
         // add info from tmp edges for node1 and node2