renamed utility class

This commit is contained in:
Dennis Luxen 2013-09-19 22:10:49 +02:00
parent 387014dd37
commit 27b6627110
3 changed files with 7 additions and 7 deletions

View File

@ -36,8 +36,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <string> #include <string>
#include <vector> #include <vector>
struct _DescriptorConfig { struct DescriptorConfig {
_DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {} DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}
bool instructions; bool instructions;
bool geometry; bool geometry;
bool encodeGeometry; bool encodeGeometry;
@ -51,7 +51,7 @@ public:
//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;
}; };
#endif /* BASE_DESCRIPTOR_H_ */ #endif /* BASE_DESCRIPTOR_H_ */

View File

@ -28,12 +28,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
template<class DataFacadeT> template<class DataFacadeT>
class GPXDescriptor : public BaseDescriptor<DataFacadeT> { class GPXDescriptor : public BaseDescriptor<DataFacadeT> {
private: private:
_DescriptorConfig config; DescriptorConfig config;
FixedPointCoordinate current; FixedPointCoordinate current;
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(

View File

@ -37,7 +37,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
template<class DataFacadeT> template<class DataFacadeT>
class JSONDescriptor : public BaseDescriptor<DataFacadeT> { class JSONDescriptor : public BaseDescriptor<DataFacadeT> {
private: private:
_DescriptorConfig config; DescriptorConfig config;
DescriptionFactory description_factory; DescriptionFactory description_factory;
DescriptionFactory alternateDescriptionFactory; DescriptionFactory alternateDescriptionFactory;
FixedPointCoordinate current; FixedPointCoordinate current;
@ -71,7 +71,7 @@ private:
public: public:
JSONDescriptor() : entered_restricted_area_count(0) {} JSONDescriptor() : entered_restricted_area_count(0) {}
void SetConfig(const _DescriptorConfig & c) { config = c; } void SetConfig(const DescriptorConfig & c) { config = c; }
//TODO: reorder //TODO: reorder
void Run( void Run(