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

Changing invalid value for edge weight.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-04 11:44:40 +03:00 • committed by Vladimir Byko-Ianko
parent 90d2a06820
commit c5edec5aea
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
generator/transit_generator.cpp
View file

@ -120,6 +120,11 @@ void BuildTransit(string const & mwmPath, string const & transitDir)
SerializeObject<Stop>(root, "stops", serializer);
header.m_gatesOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
// @TODO(bykoianko) Gates should be added after stops but before edges.
SerializeObject<Edge>(root, "edges", serializer);
header.m_transfersOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
// @TODO(bykoianko) It's necessary to serialize other transit graph data here.
header.m_endOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);

6
routing_common/transit_serdes.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include "routing_common/transit_types.hpp"
#include "geometry/point2d.hpp"
#include "coding/point_to_integer.hpp"
@ -26,7 +28,7 @@ namespace transit
{
// Note. For the time being double at transit section is used only for saving weight of edges (in seconds).
// Let us assume that it takes less than 10^7 seconds (115 days) to get from one station to a neighboring one.
double constexpr kMinDoubleAtTransit = 0.0;
double constexpr kMinDoubleAtTransit = kInvalidWeight;
double constexpr kMaxDoubleAtTransit = 10000000.0;
template <typename Sink>
@ -44,7 +46,7 @@ public:
void operator()(double d, char const * name = nullptr)
{
CHECK_GREATER_OR_EQUAL(d, 0, ());
CHECK_GREATER_OR_EQUAL(d, kMinDoubleAtTransit, ());
CHECK_LESS_OR_EQUAL(d, kMaxDoubleAtTransit, ());
(*this)(DoubleToUint32(d, kMinDoubleAtTransit, kMaxDoubleAtTransit, POINT_COORD_BITS), name);
}

4
routing_common/transit_types.hpp
View file

@ -26,7 +26,9 @@ TransferId constexpr kInvalidTransferId = std::numeric_limits<TransferId>::max()
NetworkId constexpr kInvalidNetworkId = std::numeric_limits<NetworkId>::max();
FeatureId constexpr kInvalidFeatureId = std::numeric_limits<FeatureId>::max();
ShapeId constexpr kInvalidShapeId = std::numeric_limits<ShapeId>::max();
Weight constexpr kInvalidWeight = std::numeric_limits<Weight>::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;
struct TransitHeader
{