break out PhantomNode.h into a header/impl combo, rename to new naming scheme.

This commit is contained in:
Dennis Luxen
2014-10-27 17:56:06 -04:00
parent 1c56671f01
commit 369f669227
11 changed files with 145 additions and 95 deletions
+7 -7
View File
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef BASE_DESCRIPTOR_H
#define BASE_DESCRIPTOR_H
#include "../DataStructures/PhantomNodes.h"
#include "../DataStructures/phantom_node.hpp"
#include "../DataStructures/RawRouteData.h"
#include "../typedefs.h"
@@ -44,14 +44,14 @@ struct DescriptorTable : public std::unordered_map<std::string, unsigned>
unsigned get_id(const std::string &key)
{
auto iter = find(key);
if (iter != end())
if (iter != end())
{
return iter->second;
}
}
return 0;
}
};
struct DescriptorConfig
{
@@ -60,9 +60,9 @@ struct DescriptorConfig
}
template<class OtherT>
DescriptorConfig(const OtherT &other) : instructions(other.print_instructions),
geometry(other.geometry),
encode_geometry(other.compression),
DescriptorConfig(const OtherT &other) : instructions(other.print_instructions),
geometry(other.geometry),
encode_geometry(other.compression),
zoom_level(other.zoom_level) { }
bool instructions;
bool geometry;
-1
View File
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../typedefs.h"
#include "../Algorithms/PolylineCompressor.h"
#include "../DataStructures/PhantomNodes.h"
#include "../DataStructures/RawRouteData.h"
#include "../DataStructures/SegmentInformation.h"
#include "../DataStructures/TurnInstructions.h"
+1 -1
View File
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Algorithms/DouglasPeucker.h"
#include "../Algorithms/PolylineCompressor.h"
#include "../DataStructures/PhantomNodes.h"
#include "../DataStructures/phantom_node.hpp"
#include "../DataStructures/SegmentInformation.h"
#include "../DataStructures/TurnInstructions.h"
#include "../typedefs.h"