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:
authorOlga Khlopkova <o.khlopkova@corp.mail.ru>2020-07-24 09:56:55 +0300
committerVladimir Byko-Ianko <bykoianko@gmail.com>2020-08-10 14:35:50 +0300
commite30bd6837a87fe0160d061731852d836d9e32e76 (patch)
tree1e5eabbce5107f6d94214e0ca2bfb8f9f9144d0a /transit
parent1d2038bb55d25379ff0816231ea691b181c5b8b2 (diff)
[iOS] Temporary stub for compiling convertType(TransitType type) with new version of transit.
Diffstat (limited to 'transit')
-rw-r--r--transit/transit_display_info.hpp4
-rw-r--r--transit/transit_entities.hpp1
-rw-r--r--transit/transit_version.hpp4
3 files changed, 9 insertions, 0 deletions
diff --git a/transit/transit_display_info.hpp b/transit/transit_display_info.hpp
index 4cb8547a6f..3f9ea9c6bd 100644
--- a/transit/transit_display_info.hpp
+++ b/transit/transit_display_info.hpp
@@ -20,6 +20,10 @@ struct TransitFeatureInfo
using TransitFeaturesInfo = std::map<FeatureID, TransitFeatureInfo>;
+// We have two completely different versions of transit section: the actual one with subway-only
+// info and the experimental one with all public transport (PT) info. So we keep the old data
+// with suffix Subway and the new data with suffix PT. In the future we will remove the subway
+// version (after a year or so of PT usage).
using TransitStopsInfo = std::map<routing::transit::StopId, routing::transit::Stop>;
using TransitTransfersInfo = std::map<routing::transit::TransferId, routing::transit::Transfer>;
using TransitShapesInfo = std::map<routing::transit::ShapeId, routing::transit::Shape>;
diff --git a/transit/transit_entities.hpp b/transit/transit_entities.hpp
index c851a2f3eb..6addc4ba04 100644
--- a/transit/transit_entities.hpp
+++ b/transit/transit_entities.hpp
@@ -9,6 +9,7 @@
#include <cstdint>
#include <limits>
#include <string>
+#include <tuple>
#include <unordered_map>
#include <vector>
diff --git a/transit/transit_version.hpp b/transit/transit_version.hpp
index f4496b0928..97b3c85470 100644
--- a/transit/transit_version.hpp
+++ b/transit/transit_version.hpp
@@ -5,6 +5,7 @@
#include "base/assert.hpp"
#include <string>
+#include <type_traits>
namespace transit
{
@@ -26,6 +27,9 @@ inline std::string DebugPrint(TransitVersion version)
case TransitVersion::AllPublicTransport: return "AllPublicTransport";
case TransitVersion::Counter: return "Counter";
}
+
+ LOG(LERROR,
+ ("Unknown version:", static_cast<std::underlying_type<TransitVersion>::type>(version)));
UNREACHABLE();
}
} // namespace transit