From 5162dacaea5daa827f748eaa24c45f550e3efaf5 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 16 Feb 2011 01:13:29 +0200 Subject: [PATCH] Fix nodes-type definition (process relations for nodes only if it hasn't native types). --- indexer/indexer_tool/osm_element.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indexer/indexer_tool/osm_element.hpp b/indexer/indexer_tool/osm_element.hpp index 7124ee3448..bbe371f2a0 100644 --- a/indexer/indexer_tool/osm_element.hpp +++ b/indexer/indexer_tool/osm_element.hpp @@ -251,10 +251,16 @@ protected: // try to get type from relations tags m_typeProcessor.Reset(id, &fValue); - if (p->name == "node") + if (p->name == "node" && !fValue.IsValid()) + { + // additional process of nodes ONLY if there is no native types m_holder.ForEachRelationByNodeCached(id, m_typeProcessor); + } else if (p->name == "way") + { + // always make additional process of ways m_holder.ForEachRelationByWayCached(id, m_typeProcessor); + } // remove duplicating types sort(fValue.types.begin(), fValue.types.end());