Implement #495
This commit is contained in:
@@ -22,6 +22,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
|
||||
#define BASEPLUGIN_H_
|
||||
|
||||
#include "RouteParameters.h"
|
||||
#include "../DataStructures/Coordinate.h"
|
||||
#include "../Server/BasicDatastructures.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
content << "language: " << routeParameters.language << "<br>";
|
||||
content << "Number of locations: " << routeParameters.coordinates.size() << "\n";
|
||||
for(unsigned i = 0; i < routeParameters.coordinates.size(); ++i) {
|
||||
content << " [" << i << "] " << routeParameters.coordinates[i].lat/100000. << "," << routeParameters.coordinates[i].lon/100000. << "\n";
|
||||
content << " [" << i << "] " << routeParameters.coordinates[i].lat/COORDINATE_PRECISION << "," << routeParameters.coordinates[i].lon/COORDINATE_PRECISION << "\n";
|
||||
}
|
||||
content << "Number of hints: " << routeParameters.hints.size() << "\n";
|
||||
for(unsigned i = 0; i < routeParameters.hints.size(); ++i) {
|
||||
|
||||
@@ -101,7 +101,12 @@ public:
|
||||
}
|
||||
private:
|
||||
inline bool checkCoord(const _Coordinate & c) {
|
||||
if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
|
||||
if(
|
||||
c.lat > 90*COORDINATE_PRECISION ||
|
||||
c.lat < -90*COORDINATE_PRECISION ||
|
||||
c.lon > 180*COORDINATE_PRECISION ||
|
||||
c.lon < -180*COORDINATE_PRECISION
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -109,7 +109,12 @@ public:
|
||||
}
|
||||
private:
|
||||
inline bool checkCoord(const _Coordinate & c) {
|
||||
if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
|
||||
if(
|
||||
c.lat > 90*COORDINATE_PRECISION ||
|
||||
c.lat < -90*COORDINATE_PRECISION ||
|
||||
c.lon > 180*COORDINATE_PRECISION ||
|
||||
c.lon < -180*COORDINATE_PRECISION
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -106,9 +106,8 @@ struct RouteParameters {
|
||||
}
|
||||
|
||||
void addCoordinate(boost::fusion::vector < double, double > arg_) {
|
||||
int lat = 100000.*boost::fusion::at_c < 0 > (arg_);
|
||||
int lon = 100000.*boost::fusion::at_c < 1 > (arg_);
|
||||
_Coordinate myCoordinate(lat, lon);
|
||||
int lat = COORDINATE_PRECISION*boost::fusion::at_c < 0 > (arg_);
|
||||
int lon = COORDINATE_PRECISION*boost::fusion::at_c < 1 > (arg_);
|
||||
coordinates.push_back(_Coordinate(lat, lon));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -201,7 +201,6 @@ public:
|
||||
reply.headers[2].name = "Content-Disposition";
|
||||
reply.headers[2].value = "attachment; filename=\"route.json\"";
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -210,7 +209,12 @@ public:
|
||||
}
|
||||
private:
|
||||
inline bool checkCoord(const _Coordinate & c) {
|
||||
if(c.lat > 90*100000 || c.lat < -90*100000 || c.lon > 180*100000 || c.lon <-180*100000) {
|
||||
if(
|
||||
c.lat > 90*COORDINATE_PRECISION ||
|
||||
c.lat < -90*COORDINATE_PRECISION ||
|
||||
c.lon > 180*COORDINATE_PRECISION ||
|
||||
c.lon < -180*COORDINATE_PRECISION
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user