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

break out RouteParameters into compile unit

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-07 15:33:24 +02:00
parent 0ff7ac6aad
commit acef734643
2 changed files with 32 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -47,7 +47,7 @@ add_executable(osrm-prepare ${PrepareSources})
file(GLOB ServerGlob Server/*.cpp) file(GLOB ServerGlob Server/*.cpp)
file(GLOB DescriptorGlob Descriptors/*.cpp) file(GLOB DescriptorGlob Descriptors/*.cpp)
file(GLOB DatastructureGlob DataStructures/SearchEngineData.cpp) file(GLOB DatastructureGlob DataStructures/SearchEngineData.cpp DataStructures/RouteParameters.cpp)
file(GLOB CoordinateGlob DataStructures/Coordinate.cpp) file(GLOB CoordinateGlob DataStructures/Coordinate.cpp)
file(GLOB AlgorithmGlob Algorithms/*.cpp) file(GLOB AlgorithmGlob Algorithms/*.cpp)
file(GLOB HttpGlob Server/Http/*.cpp) file(GLOB HttpGlob Server/Http/*.cpp)

104
Include/osrm/RouteParameters.h
View File

@ -30,23 +30,40 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
#include <boost/fusion/container/vector.hpp> #include <boost/fusion/container/vector/vector_fwd.hpp>
#include <boost/fusion/sequence/intrinsic.hpp>
#include <boost/fusion/include/at_c.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
struct RouteParameters { struct RouteParameters
RouteParameters() : {
zoomLevel(18), RouteParameters();
printInstructions(false),
alternateRoute(true), void setZoomLevel(const short i);
geometry(true),
compression(true), void setAlternateRouteFlag(const bool b);
deprecatedAPI(false),
checkSum(-1) void setDeprecatedAPIFlag(const std::string &);
{ }
void setChecksum(const unsigned c);
void setInstructionFlag(const bool b);
void setService(const std::string &s);
void setOutputFormat(const std::string &s);
void setJSONpParameter(const std::string &s);
void addHint(const std::string &s);
void setLanguage(const std::string &s);
void setGeometryFlag(const bool b);
void setCompressionFlag(const bool b);
void addCoordinate(const boost::fusion::vector<double, double> &arg_);
short zoomLevel; short zoomLevel;
bool printInstructions; bool printInstructions;
@ -61,65 +78,6 @@ struct RouteParameters {
std::string language; std::string language;
std::vector<std::string> hints; std::vector<std::string> hints;
std::vector<FixedPointCoordinate> coordinates; std::vector<FixedPointCoordinate> coordinates;
void setZoomLevel(const short i) {
if (18 >= i && 0 <= i) {
zoomLevel = i;
}
}
void setAlternateRouteFlag(const bool b) {
alternateRoute = b;
}
void setDeprecatedAPIFlag(const std::string &) {
deprecatedAPI = true;
}
void setChecksum(const unsigned c) {
checkSum = c;
}
void setInstructionFlag(const bool b) {
printInstructions = b;
}
void setService( const std::string & s) {
service = s;
}
void setOutputFormat(const std::string & s) {
outputFormat = s;
}
void setJSONpParameter(const std::string & s) {
jsonpParameter = s;
}
void addHint(const std::string & s) {
hints.resize( coordinates.size() );
if( !hints.empty() ) {
hints.back() = s;
}
}
void setLanguage(const std::string & s) {
language = s;
}
void setGeometryFlag(const bool b) {
geometry = b;
}
void setCompressionFlag(const bool b) {
compression = b;
}
void addCoordinate(const boost::fusion::vector < double, double > & arg_) {
int lat = COORDINATE_PRECISION*boost::fusion::at_c < 0 > (arg_);
int lon = COORDINATE_PRECISION*boost::fusion::at_c < 1 > (arg_);
coordinates.push_back(FixedPointCoordinate(lat, lon));
}
}; };
#endif /*ROUTE_PARAMETERS_H*/ #endif // ROUTE_PARAMETERS_H