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
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2011-11-15 18:43:27 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:27:58 +0300
commitea292c3106a73c287cd84429ffabf718f3464dcb (patch)
treea15fb92541756d0ee7d80982c3e12c1701e07a04 /indexer/drawing_rules.hpp
parent7eac53c6c361bf6a52111c96197b24487f31a6f5 (diff)
Proto drawing rules store width in pixels now.
Left compatibility with binary drawing rules.
Diffstat (limited to 'indexer/drawing_rules.hpp')
-rw-r--r--indexer/drawing_rules.hpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp
index 6e3006e267..4c0d8add21 100644
--- a/indexer/drawing_rules.hpp
+++ b/indexer/drawing_rules.hpp
@@ -27,7 +27,7 @@ namespace drule
public:
static uint32_t const empty_id = 0xFFFFFFFF;
- BaseRule()
+ BaseRule() : m_type(node | way)
{
}
@@ -80,15 +80,7 @@ namespace drule
void SetClassName(string const & cl) { m_class = cl; }
void SetType(char type) { m_type = type; }
- inline char GetType() const
- {
-#ifdef USE_PROTO_STYLES
- // Assume that they all are acceptable.
- return (node | way);
-#else
- return m_type;
-#endif
- }
+ inline char GetType() const { return m_type; }
bool IsEqualBase(BaseRule const * p) const { return (m_type == p->m_type); }
void ReadBase(ReaderPtrStream & ar);