diff --git a/descriptors/descriptor_base.hpp b/descriptors/descriptor_base.hpp index 8166afb7b..815b1d5af 100644 --- a/descriptors/descriptor_base.hpp +++ b/descriptors/descriptor_base.hpp @@ -52,18 +52,16 @@ struct DescriptorTable : public std::unordered_map } }; - struct DescriptorConfig { DescriptorConfig() : instructions(true), geometry(true), encode_geometry(true), zoom_level(18) { } - template - DescriptorConfig(const OtherT &other) : instructions(other.print_instructions), - geometry(other.geometry), - encode_geometry(other.compression), - zoom_level(other.zoom_level) + template + DescriptorConfig(const OtherT &other) + : instructions(other.print_instructions), geometry(other.geometry), + encode_geometry(other.compression), zoom_level(other.zoom_level) { BOOST_ASSERT(zoom_level >= 0); } @@ -80,8 +78,8 @@ template class BaseDescriptor BaseDescriptor() {} // Maybe someone can explain the pure virtual destructor thing to me (dennis) virtual ~BaseDescriptor() {} - virtual void Run(const InternalRouteResult &, JSON::Object &) = 0; - virtual void SetConfig(const DescriptorConfig &) = 0; + virtual void Run(const InternalRouteResult &raw_route, JSON::Object &json_result) = 0; + virtual void SetConfig(const DescriptorConfig &c) = 0; }; #endif // DESCRIPTOR_BASE_HPP