From ac15c787cc7b03bfd5aff2a5acbe7a8df4225dec Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 12 Nov 2012 10:59:13 +0100 Subject: [PATCH] Further refactorings --- Extractor/ExtractorStructs.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h index 6263925d5..6560dbd21 100644 --- a/Extractor/ExtractorStructs.h +++ b/Extractor/ExtractorStructs.h @@ -41,18 +41,25 @@ typedef boost::unordered_map StringMap; typedef boost::unordered_map > StringToIntPairMap; struct _Way { - _Way() : id(UINT_MAX), nameID(UINT_MAX) { - + _Way() { + Clear(); + } + + inline void Clear(){ + id = UINT_MAX; + nameID = UINT_MAX; + path.clear(); + keyVals.EraseAll(); direction = _Way::notSure; speed = -1; type = -1; -// useful = false; access = true; roundabout = false; isDurationSet = false; isAccessRestricted = false; ignoreInGrid = false; - } + + } enum { notSure = 0, oneway, bidirectional, opposite