AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Changing anchors type from string to uint8_t.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-16 14:48:06 +03:00 • committed by mpimenov
parent 034c5b381d
commit 03635d3f38
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/generator_tests/transit_test.cpp
View file

@ -36,13 +36,13 @@ UNIT_TEST(DeserializerFromJson_TitleAnchors)
string const jsonBuffer = R"(
{
"title_anchors": [
{ "min_zoom": 11, "anchors": "r" },
{ "min_zoom": 14, "anchors": "bl" }
{ "min_zoom": 11, "anchor": 4 },
{ "min_zoom": 14, "anchor": 7 }
]})";
vector<TitleAnchor> expected = {
TitleAnchor(11 /* min zoom */, "r" /* anchors */),
TitleAnchor(14 /* min zoom */, "bl" /* anchors */)
TitleAnchor(11 /* min zoom */, 4 /* anchor */),
TitleAnchor(14 /* min zoom */, 7 /* anchor */)
};
TestDeserializerFromJson(jsonBuffer, "title_anchors", expected);
}
@ -77,8 +77,8 @@ UNIT_TEST(DeserializerFromJson_Stops)
"y": 64.25206634443111
},
"title_anchors": [
{ "min_zoom": 12, "anchors": "t" },
{ "min_zoom": 15, "anchors": "tl" }]
{ "min_zoom": 12, "anchor": 0 },
{ "min_zoom": 15, "anchor": 7 }]
}
]})";
@ -88,7 +88,7 @@ UNIT_TEST(DeserializerFromJson_Stops)
{} /* anchors */),
Stop(266680843 /* id */, 2345 /* featureId */, 5 /* transfer id */,
{19213568, 19213569} /* lineIds */, {27.5227942, 64.25206634443111} /* point */,
{ TitleAnchor(12 /* min zoom */, "t" /* anchors */), TitleAnchor(15, "tl")} /* anchors */)};
{ TitleAnchor(12 /* min zoom */, 0 /* anchor */), TitleAnchor(15, 7)} /* anchor */)};
TestDeserializerFromJson(jsonBuffer, "stops", expected);
}

8
routing_common/routing_common_tests/transit_test.cpp
View file

@ -56,15 +56,15 @@ UNIT_TEST(Transit_HeaderSerialization)
UNIT_TEST(Transit_TitleAnchorSerialization)
{
{
TitleAnchor anchor(17 /* min zoom */, "t" /* anchors */);
TitleAnchor anchor(17 /* min zoom */, 0 /* anchor */);
TestSerialization(anchor);
}
{
TitleAnchor anchor(10 /* min zoom */, "b" /* anchors */);
TitleAnchor anchor(10 /* min zoom */, 4 /* anchor */);
TestSerialization(anchor);
}
{
TitleAnchor anchor(18 /* min zoom */, "bl" /* anchors */);
TitleAnchor anchor(18 /* min zoom */, 3 /* anchor */);
TestSerialization(anchor);
}
}
@ -111,7 +111,7 @@ UNIT_TEST(Transit_EdgeSerialization)
UNIT_TEST(Transit_TransferSerialization)
{
Transfer transfer(1 /* id */, {40.0, 35.0} /* point */, {1, 2, 3} /* stop ids */,
{ TitleAnchor(16, "br")});
{ TitleAnchor(16, 3)});
TestSerialization(transfer);
}

5
routing_common/transit_types.cpp
View file

@ -55,14 +55,13 @@ bool TransitHeader::IsEqualForTesting(TransitHeader const & header) const
}
// TitleAnchor ------------------------------------------------------------------------------------
TitleAnchor::TitleAnchor(uint8_t minZoom, std::string const & anchors)
: m_minZoom(minZoom), m_anchors(anchors)
TitleAnchor::TitleAnchor(uint8_t minZoom, Anchor anchor) : m_minZoom(minZoom), m_anchor(anchor)
{
}
bool TitleAnchor::operator==(TitleAnchor const & titleAnchor) const
{
return m_minZoom == titleAnchor.m_minZoom && m_anchors == titleAnchor.m_anchors;
return m_minZoom == titleAnchor.m_minZoom && m_anchor == titleAnchor.m_anchor;
}
bool TitleAnchor::IsEqualForTesting(TitleAnchor const & titleAnchor) const

10
routing_common/transit_types.hpp
View file

@ -22,6 +22,7 @@ using NetworkId = uint32_t;
using FeatureId = uint32_t;
using ShapeId = uint32_t;
using Weight = double;
using Anchor = uint8_t;
LineId constexpr kInvalidLineId = std::numeric_limits<LineId>::max();
StopId constexpr kInvalidStopId = std::numeric_limits<StopId>::max();
@ -32,6 +33,7 @@ ShapeId constexpr kInvalidShapeId = std::numeric_limits<ShapeId>::max();
// Note. Weight may be a default param at json. The default value should be saved as uint32_t in mwm anyway.
// To convert double to uint32_t at better accuracy |kInvalidWeight| should be close to real weight.
Weight constexpr kInvalidWeight = -1.0;
Anchor constexpr kInvalidAnchor = std::numeric_limits<Anchor>::max();
#define DECLARE_TRANSIT_TYPE_FRIENDS \
template<class Sink> friend class Serializer; \
@ -77,21 +79,21 @@ class TitleAnchor
{
public:
TitleAnchor() = default;
TitleAnchor(uint8_t minZoom, std::string const & anchors);
TitleAnchor(uint8_t minZoom, Anchor anchor);
bool operator==(TitleAnchor const & titleAnchor) const;
bool IsEqualForTesting(TitleAnchor const & titleAnchor) const;
uint8_t GetMinZoom() const { return m_minZoom; }
std::string const & GetAnchors() const { return m_anchors; }
Anchor const & GetAnchor() const { return m_anchor; }
private:
DECLARE_TRANSIT_TYPE_FRIENDS
DECLARE_VISITOR_AND_DEBUG_PRINT(TitleAnchor, visitor(m_minZoom, "min_zoom"),
visitor(m_anchors, "anchors"))
visitor(m_anchor, "anchor"))
uint8_t m_minZoom = scales::UPPER_STYLE_SCALE;
std::string m_anchors;
Anchor m_anchor = kInvalidAnchor;
};
class Stop