From b597317f3cc4cde9d9bb30924fd7ee852e121e80 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Mon, 13 Apr 2015 16:57:03 +0300 Subject: [PATCH] Pedestrian routing stairs reading bugfix --- routing/features_road_graph.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp index 7a991220df..64e81889cf 100644 --- a/routing/features_road_graph.cpp +++ b/routing/features_road_graph.cpp @@ -2,9 +2,10 @@ #include "routing/route.hpp" #include "routing/vehicle_model.hpp" -#include "indexer/index.hpp" #include "indexer/classificator.hpp" #include "indexer/ftypes_matcher.hpp" +#include "indexer/index.hpp" +#include "indexer/scales.hpp" #include "geometry/distance_on_sphere.hpp" @@ -15,7 +16,6 @@ namespace routing namespace { uint32_t const FEATURE_CACHE_SIZE = 10; -uint32_t const READ_ROAD_SCALE = 13; double const READ_CROSS_EPSILON = 1.0E-4; double const KMPH2MPS = 1000.0 / (60 * 60); @@ -34,7 +34,7 @@ FeaturesRoadGraph::FeaturesRoadGraph(Index const * pIndex, size_t mwmID) uint32_t FeaturesRoadGraph::GetStreetReadScale() { - return READ_ROAD_SCALE; + return scales::GetUpperScale(); } class CrossFeaturesLoader @@ -156,7 +156,7 @@ void FeaturesRoadGraph::GetNearestTurns(RoadPos const & pos, vectorForEachInRect(crossLoader, m2::RectD(point.x - READ_CROSS_EPSILON, point.y - READ_CROSS_EPSILON, point.x + READ_CROSS_EPSILON, point.y + READ_CROSS_EPSILON), - READ_ROAD_SCALE); + scales::GetUpperScale()); indexCheck++;