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:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2018-09-27 18:50:53 +0300
committerVladimir Byko-Ianko <bykoianko@gmail.com>2018-10-03 14:41:03 +0300
commit424037a4bb0513ea4a8ef82cf929dec6877a7023 (patch)
tree120f81f74f091a01524ad5159cee964258533fc8 /routing_common
parentb5259f225aeda9eb9a9eaf896236a909581abff5 (diff)
[routing] Added city roads, surfaces, day/night, one way road to the track analyzer's table comad.
Diffstat (limited to 'routing_common')
-rw-r--r--routing_common/car_model.cpp2
-rw-r--r--routing_common/car_model.hpp2
-rw-r--r--routing_common/vehicle_model.hpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/routing_common/car_model.cpp b/routing_common/car_model.cpp
index 1aa3d1c686..13065aca60 100644
--- a/routing_common/car_model.cpp
+++ b/routing_common/car_model.cpp
@@ -252,6 +252,8 @@ vector<routing::VehicleModel::AdditionalRoadTags> const & CarModel::GetAdditiona
{
return kAdditionalTags;
}
+// static
+VehicleModel::SurfaceInitList const & CarModel::GetSurfaces() { return g_carSurface; }
CarModelFactory::CarModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn)
: VehicleModelFactory(countryParentNameGetterFn)
diff --git a/routing_common/car_model.hpp b/routing_common/car_model.hpp
index f845240f12..ddc725c28f 100644
--- a/routing_common/car_model.hpp
+++ b/routing_common/car_model.hpp
@@ -17,7 +17,7 @@ public:
static CarModel const & AllLimitsInstance();
static LimitsInitList const & GetLimits();
static std::vector<AdditionalRoadTags> const & GetAdditionalTags();
-
+ static VehicleModel::SurfaceInitList const & GetSurfaces();
private:
void InitAdditionalRoadTypes();
};
diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp
index 6e9dfeef90..8f14c1c93c 100644
--- a/routing_common/vehicle_model.hpp
+++ b/routing_common/vehicle_model.hpp
@@ -245,7 +245,7 @@ private:
std::unordered_map<uint32_t, RoadLimits> m_highwayTypes;
// Mapping surface types (psurface|paved_good, psurface|paved_bad, psurface|unpaved_good,
// psurface|unpaved_bad) to surface speed factors.
- // Note. It's a vector (not map or unordered_map) because of perfomance reasons.
+ // Note. It's an array (not map or unordered_map) because of perfomance reasons.
std::array<TypeFactor, 4> m_surfaceFactors;
std::vector<AdditionalRoadType> m_addRoadTypes;