polyline needs to be data, not array

This commit is contained in:
Dennis Luxen 2011-06-28 08:27:38 +00:00
parent e3b648ea72
commit 5b621d8fe9
2 changed files with 6 additions and 3 deletions

View File

@ -49,15 +49,18 @@ private:
} }
public: public:
inline void printEncodedString(vector<_Coordinate>& polyline, string &output) { inline void printEncodedString(vector<_Coordinate>& polyline, string &output) {
output += "\"";
output += encodeSignedNumber(polyline[0].lat); output += encodeSignedNumber(polyline[0].lat);
output += encodeSignedNumber(polyline[0].lon); output += encodeSignedNumber(polyline[0].lon);
for(unsigned i = 1; i < polyline.size(); i++) { for(unsigned i = 1; i < polyline.size(); i++) {
output += encodeSignedNumber(polyline[i].lat - polyline[i-1].lat); output += encodeSignedNumber(polyline[i].lat - polyline[i-1].lat);
output += encodeSignedNumber(polyline[i].lon - polyline[i-1].lon); output += encodeSignedNumber(polyline[i].lon - polyline[i-1].lon);
} }
output += "\"";
} }
inline void printUnencodedString(vector<_Coordinate> & polyline, string & output) { inline void printUnencodedString(vector<_Coordinate> & polyline, string & output) {
output += "[";
string tmp; string tmp;
for(unsigned i = 0; i < polyline.size(); i++) { for(unsigned i = 0; i < polyline.size(); i++) {
convertLatLon(polyline[i].lat, tmp); convertLatLon(polyline[i].lat, tmp);
@ -71,7 +74,7 @@ public:
output += ","; output += ",";
} }
} }
output += "]";
} }
}; };

View File

@ -286,7 +286,7 @@ public:
reply.content += "\"route_summary\": {"; reply.content += "\"route_summary\": {";
reply.content += routeSummaryString; reply.content += routeSummaryString;
reply.content += "},"; reply.content += "},";
reply.content += "\"route_geometry\": ["; reply.content += "\"route_geometry\": ";
if(config.geometry) { if(config.geometry) {
if(config.encodeGeometry) if(config.encodeGeometry)
config.pc.printEncodedString(polyline, routeGeometryString); config.pc.printEncodedString(polyline, routeGeometryString);
@ -295,7 +295,7 @@ public:
reply.content += routeGeometryString; reply.content += routeGeometryString;
} }
reply.content += "],"; reply.content += ",";
reply.content += "\"route_instructions\": ["; reply.content += "\"route_instructions\": [";
if(config.instructions) { if(config.instructions) {
reply.content += routeInstructionString; reply.content += routeInstructionString;