Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@mapswithme.com>2013-07-03 23:21:28 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:57:52 +0300
commitca2092c22addd43b6599d67110e9427447e6fab2 (patch)
tree3a199106ded113ba8da5888f109e2bcfe6b95fee /map
parent1de9912e0f72cf20aeca315f095ca030637abca6 (diff)
Display only Primary names for features on the world zoom level
Diffstat (limited to 'map')
-rw-r--r--map/feature_styler.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/map/feature_styler.cpp b/map/feature_styler.cpp
index 4c99efe7a6..f0ff6fe72d 100644
--- a/map/feature_styler.cpp
+++ b/map/feature_styler.cpp
@@ -5,6 +5,7 @@
#include "../indexer/drawing_rules.hpp"
#include "../indexer/feature.hpp"
#include "../indexer/feature_visibility.hpp"
+#include "../indexer/scales.hpp"
#ifdef OMIM_PRODUCTION
#include "../indexer/drules_struct_lite.pb.h"
@@ -72,6 +73,13 @@ namespace di
f.GetPreferredNames(m_primaryText, m_secondaryText);
+ // Draw only primary text for features on the World zoom level
+ if (zoom <= scales::GetUpperWorldScale() && !m_secondaryText.empty())
+ {
+ m_primaryText.swap(m_secondaryText);
+ m_secondaryText.clear();
+ }
+
// Get house number if feature has one.
string houseNumber = f.GetHouseNumber();