diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2011-08-17 15:15:53 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:22:01 +0300 |
| commit | 7732d884c71c3f44a57b5db788a10640621e73ea (patch) | |
| tree | 7002a34f599cef7216b401f74679aa9033d40284 | |
| parent | a9c853e3941e8ad6577981c566e8dab17ac07ff8 (diff) | |
Renamed variables
| -rw-r--r-- | generator/feature_merger.cpp | 6 | ||||
| -rw-r--r-- | generator/feature_merger.hpp | 4 | ||||
| -rw-r--r-- | generator/world_map_generator.hpp | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/generator/feature_merger.cpp b/generator/feature_merger.cpp index 0fe6a7d375..3b6994e1ef 100644 --- a/generator/feature_merger.cpp +++ b/generator/feature_merger.cpp @@ -254,7 +254,7 @@ uint32_t FeatureTypesProcessor::GetType(char const * arr[], size_t n) void FeatureTypesProcessor::CorrectType(uint32_t & t) const { - if (m_dontNormilize.count(t) > 0) return; + if (m_dontNormalize.count(t) > 0) return; // 1. get normalized type: // highway-motorway-bridge => highway-motorway @@ -277,9 +277,9 @@ void FeatureTypesProcessor::SetMappingTypes(char const * arr1[2], char const * a m_mapping[GetType(arr1, 2)] = GetType(arr2, 2); } -void FeatureTypesProcessor::SetDontNormilizeType(char const * arr[3]) +void FeatureTypesProcessor::SetDontNormalizeType(char const * arr[3]) { - m_dontNormilize.insert(GetType(arr, 3)); + m_dontNormalize.insert(GetType(arr, 3)); } MergedFeatureBuilder1 * FeatureTypesProcessor::operator() (FeatureBuilder1 const & fb) diff --git a/generator/feature_merger.hpp b/generator/feature_merger.hpp index 69665d3512..45b606c3c7 100644 --- a/generator/feature_merger.hpp +++ b/generator/feature_merger.hpp @@ -88,7 +88,7 @@ public: /// Feature types corrector. class FeatureTypesProcessor { - set<uint32_t> m_dontNormilize; + set<uint32_t> m_dontNormalize; map<uint32_t, uint32_t> m_mapping; static uint32_t GetType(char const * arr[], size_t n); @@ -108,7 +108,7 @@ public: void SetMappingTypes(char const * arr1[2], char const * arr2[2]); /// Leave original types, for example: boundary-administrative-2. - void SetDontNormilizeType(char const * arr[3]); + void SetDontNormalizeType(char const * arr[3]); MergedFeatureBuilder1 * operator() (FeatureBuilder1 const & fb); }; diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp index 268c4ef335..1b600121ac 100644 --- a/generator/world_map_generator.hpp +++ b/generator/world_map_generator.hpp @@ -82,12 +82,14 @@ public: // m_typesCorrector.SetMappingTypes(arr1, arr2); //} - char const * arrDontNormilize[][3] = { + // Do not strip last types for given tags, + // for example, do not cut "-2" in "boundary-administrative-2" + char const * arrDontNormalize[][3] = { { "boundary", "administrative", "2" } }; - for (size_t i = 0; i < ARRAY_SIZE(arrDontNormilize); ++i) - m_typesCorrector.SetDontNormilizeType(arrDontNormilize[i]); + for (size_t i = 0; i < ARRAY_SIZE(arrDontNormalize); ++i) + m_typesCorrector.SetDontNormalizeType(arrDontNormalize[i]); } ~WorldMapGenerator() |