From 4919f720602179616ce08da573ff393fb18fcd09 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Sat, 6 Aug 2011 18:31:20 +0000 Subject: [PATCH] Minor fixes --- Plugins/KMLDescriptor.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/KMLDescriptor.h b/Plugins/KMLDescriptor.h index 4c6f82497..4739e877b 100644 --- a/Plugins/KMLDescriptor.h +++ b/Plugins/KMLDescriptor.h @@ -46,8 +46,8 @@ public: appendCoordinateToString(phantomNodes.startPhantom.location, descriptorState.routeGeometryString); descriptorState.startOfSegmentCoordinate = phantomNodes.startPhantom.location; //Generate initial instruction for start of route (order of NodeIDs does not matter, its the same name anyway) - summary.startName = sEngine.GetEscapedNameForOriginDestinationNodeID(phantomNodes.targetPhantom.startNode, phantomNodes.startPhantom.startNode); - descriptorState.lastNameID = sEngine.GetNameIDForOriginDestinationNodeID(phantomNodes.targetPhantom.startNode, phantomNodes.startPhantom.startNode); + summary.startName = sEngine.GetEscapedNameForOriginDestinationNodeID(phantomNodes.startPhantom.startNode, phantomNodes.startPhantom.targetNode); + descriptorState.lastNameID = sEngine.GetNameIDForOriginDestinationNodeID(phantomNodes.startPhantom.startNode, phantomNodes.startPhantom.targetNode); //If we have a route, i.e. start and dest not on same edge, than get it if(rawRoute.routeSegments[0].size() > 0) @@ -72,13 +72,13 @@ public: continue; if ( UINT_MAX == lastNodeID) { - lastNodeID = (phantomNodes.startPhantom.startNode == (*path.begin()).node ? phantomNodes.targetPhantom.startNode : phantomNodes.startPhantom.startNode); + lastNodeID = (phantomNodes.startPhantom.startNode == (*path.begin()).node ? phantomNodes.startPhantom.targetNode : phantomNodes.startPhantom.startNode); } //Check, if there is overlap between current and previous route segment //if not, than we are fine and can route over this edge without paying any special attention. if(lastNodeID == (*path.begin()).node) { appendCoordinateToString(descriptorState.currentCoordinate, descriptorState.routeGeometryString); - lastNodeID = (lastNodeID == rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.startNode ? rawRoute.segmentEndCoordinates[segmentIdx].targetPhantom.startNode : rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.startNode); + lastNodeID = (lastNodeID == rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.startNode ? rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.targetNode : rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.startNode); //output of the via nodes coordinates appendCoordinateToString(rawRoute.segmentEndCoordinates[segmentIdx].startPhantom.location, descriptorState.routeGeometryString); @@ -149,7 +149,7 @@ public: } } } - descriptorState.currentNameID = sEngine.GetNameIDForOriginDestinationNodeID(phantomNodes.startPhantom.targetNode, phantomNodes.targetPhantom.targetNode); + descriptorState.currentNameID = sEngine.GetNameIDForOriginDestinationNodeID(phantomNodes.targetPhantom.startNode, phantomNodes.startPhantom.targetNode); descriptorState.nextCoordinate = phantomNodes.targetPhantom.location; appendCoordinateToString(descriptorState.currentCoordinate, descriptorState.routeGeometryString);