From 0e0b7f1955c792ff930693c8a04bb315da431fb2 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Mon, 7 Oct 2019 17:43:57 +0300 Subject: [PATCH] [generator] Using ref tag if there's one for highway-motorway_junction. --- generator/feature_builder.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index 99893c9137..c570d166b5 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -9,6 +9,7 @@ #include "indexer/feature_algo.hpp" #include "indexer/feature_impl.hpp" #include "indexer/feature_visibility.hpp" +#include "indexer/ftypes_matcher.hpp" #include "coding/bit_streams.hpp" #include "coding/byte_stream.hpp" @@ -246,8 +247,11 @@ bool FeatureBuilder::PreSerialize() // Store ref's in name field (used in "highway-motorway_junction"). // Also can be used to save post_box postcodes. - if (m_params.name.IsEmpty() && !m_params.ref.empty()) - m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref); + if (!m_params.ref.empty()) + { + if (ftypes::IsMotorwayJunctionChecker::Instance()(GetTypes()) || m_params.name.IsEmpty()) + m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref); + } m_params.ref.clear(); break;