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

Refactoring base descriptor class

Browse Source
This commit is contained in:
Dennis Luxen 2013-09-19 22:28:02 +02:00
parent f4e015a255
commit 64c75c8b57
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Descriptors/BaseDescriptor.h
View File

@ -44,11 +44,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
struct DescriptorConfig { struct DescriptorConfig {
DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {} DescriptorConfig() :
instructions(true),
geometry(true),
encode_geometry(true),
zoom_level(18)
{ }
bool instructions; bool instructions;
bool geometry; bool geometry;
bool encodeGeometry; bool encode_geometry;
unsigned short z; unsigned short zoom_level;
}; };
template<class DataFacadeT> template<class DataFacadeT>
@ -57,7 +62,12 @@ public:
BaseDescriptor() { } BaseDescriptor() { }
//Maybe someone can explain the pure virtual destructor thing to me (dennis) //Maybe someone can explain the pure virtual destructor thing to me (dennis)
virtual ~BaseDescriptor() { } virtual ~BaseDescriptor() { }
virtual void Run(http::Reply & reply, const RawRouteData &rawRoute, PhantomNodes &phantomNodes, const DataFacadeT * facade) = 0; virtual void Run(
http::Reply & reply,
const RawRouteData &rawRoute,
PhantomNodes &phantomNodes,
const DataFacadeT * facade
) = 0;
virtual void SetConfig(const DescriptorConfig & config) = 0; virtual void SetConfig(const DescriptorConfig & config) = 0;
}; };

2
Descriptors/GPXDescriptor.h
View File

@ -40,7 +40,7 @@ private:
std::string tmp; std::string tmp;
public: public:
void SetConfig(const DescriptorConfig& c) { config = c; } void SetConfig(const DescriptorConfig & c) { config = c; }
//TODO: reorder parameters //TODO: reorder parameters
void Run( void Run(

14
Descriptors/JSONDescriptor.h
View File

@ -107,10 +107,13 @@ public:
"\"status_message\": \"Cannot find route between points\","; "\"status_message\": \"Cannot find route between points\",";
} }
description_factory.Run(facade, config.z); description_factory.Run(facade, config.zoom_level);
reply.content += "\"route_geometry\": "; reply.content += "\"route_geometry\": ";
if(config.geometry) { if(config.geometry) {
description_factory.AppendEncodedPolylineString(reply.content, config.encodeGeometry); description_factory.AppendEncodedPolylineString(
reply.content,
config.encode_geometry
);
} else { } else {
reply.content += "[]"; reply.content += "[]";
} }
@ -173,13 +176,16 @@ public:
} }
alternateDescriptionFactory.SetEndSegment(phantom_nodes.targetPhantom); alternateDescriptionFactory.SetEndSegment(phantom_nodes.targetPhantom);
} }
alternateDescriptionFactory.Run(facade, config.z); alternateDescriptionFactory.Run(facade, config.zoom_level);
//give an array of alternative routes //give an array of alternative routes
reply.content += "\"alternative_geometries\": ["; reply.content += "\"alternative_geometries\": [";
if(config.geometry && INT_MAX != raw_route_information.lengthOfAlternativePath) { if(config.geometry && INT_MAX != raw_route_information.lengthOfAlternativePath) {
//Generate the linestrings for each alternative //Generate the linestrings for each alternative
alternateDescriptionFactory.AppendEncodedPolylineString(reply.content, config.encodeGeometry); alternateDescriptionFactory.AppendEncodedPolylineString(
reply.content,
config.encode_geometry
);
} }
reply.content += "],"; reply.content += "],";
reply.content += "\"alternative_instructions\":["; reply.content += "\"alternative_instructions\":[";