Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Refactoring method names

Browse Source
This commit is contained in:
Dennis Luxen
2011-07-07 08:01:14 +00:00
parent 132c25fd3b
commit dae6d1c730
4 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/GPXDescriptor.h
+8 -19
View File
@@ -49,9 +49,9 @@ public:
startName = sEngine->GetEscapedNameForNameID(streetID);
streetID = sEngine->GetNameIDForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
targetName = sEngine->GetEscapedNameForNameID(streetID);
convertLatLon(phantomNodes->startCoord.lat, tmp);
convertInternalLatLonToString(phantomNodes->startCoord.lat, tmp);
bodyString += ("\t\t<rtept lat=\""+tmp+"\"");
convertLatLon(phantomNodes->startCoord.lon, tmp);
convertInternalLatLonToString(phantomNodes->startCoord.lon, tmp);
bodyString += (" lon=\""+tmp+"\">");
bodyString += ("\n\t\t\t<desc>Start from ");
bodyString += startName;
@@ -118,20 +118,15 @@ public:
nextType = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(it->node, (it+1)->node);
}
convertLatLon(current.lat, tmp);
convertInternalLatLonToString(current.lat, tmp);
bodyString += "\n\t\t<rtept lat=\"" + tmp + "\" ";
convertLatLon(current.lon, tmp);
convertInternalLatLonToString(current.lon, tmp);
bodyString += "lon=\"" + tmp + "\">\n";
double angle = GetAngleBetweenTwoEdges(startOfSegment, current, next);
if(178 > angle || 182 < angle) {
convertLatLon(current.lon, tmp);
convertInternalCoordinateToString(current, tmp);
lineString += tmp;
lineString += ",";
convertLatLon(current.lat, tmp);
lineString += tmp;
lineString += " ";
startOfSegment = current;
}
if(nextID == nameID) {
@@ -150,9 +145,6 @@ public:
bodyString += "follow road ";
if(nameID != 0)
bodyString += sEngine->GetEscapedNameForNameID(nameID);
string lat; string lon;
convertLatLon(lastPlace.lon, lon);
convertLatLon(lastPlace.lat, lat);
lastPlace = current;
if(angle > 160 && angle < 200) {
bodyString += /* " (" << angle << ")*/"drive ahead, ";
@@ -185,9 +177,9 @@ public:
previous = current;
type = nextType;
}
convertLatLon(phantomNodes->targetCoord.lat, tmp);
convertInternalLatLonToString(phantomNodes->targetCoord.lat, tmp);
bodyString += "\n\t\t<rtept lat=\"" + tmp + "\" ";
convertLatLon(phantomNodes->targetCoord.lon, tmp);
convertInternalLatLonToString(phantomNodes->targetCoord.lon, tmp);
bodyString += "lon=\"" + tmp + "\">\n";
bodyString += "\t\t\t<desc>";
@@ -210,10 +202,7 @@ public:
//put targetCoord to linestring
convertLatLon(phantomNodes->targetCoord.lon, tmp);
lineString += tmp;
lineString += ",";
convertLatLon(phantomNodes->targetCoord.lat, tmp);
convertInternalCoordinateToString(phantomNodes->targetCoord, tmp);
lineString += tmp;
ostringstream s;
s << 10*(round(entireDistance/10.));
Plugins/KMLDescriptor.h
+3 -18
View File
@@ -77,12 +77,8 @@ public:
reply.content += ("]]></name>\n");
//put start coord to linestring;
convertLatLon(phantomNodes->startCoord.lon, tmp);
convertInternalCoordinateToString(phantomNodes->startCoord, tmp);
lineString += tmp;
lineString += ",";
convertLatLon(phantomNodes->startCoord.lat, tmp);
lineString += tmp;
lineString += " ";
reply.content += ("\t</Placemark>\n");
_Coordinate previous(phantomNodes->startCoord.lat, phantomNodes->startCoord.lon);
@@ -114,13 +110,8 @@ public:
double angle = GetAngleBetweenTwoEdges(startOfSegment, current, next);
if(178 > angle || 182 < angle) {
convertLatLon(current.lon, tmp);
convertInternalCoordinateToString(current, tmp);
lineString += tmp;
lineString += ",";
convertLatLon(current.lat, tmp);
lineString += tmp;
lineString += " ";
startOfSegment = current;
}
if(nextID == nameID) {
@@ -153,9 +144,6 @@ public:
reply.content += numberString.str();
numberString.str("");
reply.content += "m</description>";
string lat; string lon;
convertLatLon(lastPlace.lon, lon);
convertLatLon(lastPlace.lat, lat);
lastPlace = current;
// reply.content += "\n <Point>";
// reply.content += "<Coordinates>";
@@ -217,10 +205,7 @@ public:
reply.content += "\t</Placemark>\n";
//put targetCoord to linestring
convertLatLon(phantomNodes->targetCoord.lon, tmp);
lineString += tmp;
lineString += ",";
convertLatLon(phantomNodes->targetCoord.lat, tmp);
convertInternalCoordinateToString(phantomNodes->targetCoord, tmp);
lineString += tmp;
if(!config.geometry){