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

Merge pull request #5177 from bykoianko/master-removing-highway-pedestrian-from-car-model

Browse source 
Removing highway=pedestrian.
This commit is contained in:
Добрый Ээх 2017-01-13 14:06:39 +03:00 • committed by GitHub
commit 1549c45b1c
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/car_model.cpp
View file

@ -19,7 +19,6 @@ double constexpr kSpeedSecondaryLinkKMpH = 50.0;
double constexpr kSpeedTertiaryKMpH = 40.0;
double constexpr kSpeedTertiaryLinkKMpH = 30.0;
double constexpr kSpeedResidentialKMpH = 25.0;
double constexpr kSpeedPedestrianKMpH = 25.0;
double constexpr kSpeedUnclassifiedKMpH = 25.0;
double constexpr kSpeedServiceKMpH = 15.0;
double constexpr kSpeedLivingStreetKMpH = 10.0;
@ -42,7 +41,6 @@ routing::VehicleModel::InitListT const s_carLimits = {
{{"highway", "tertiary"}, kSpeedTertiaryKMpH},
{{"highway", "tertiary_link"}, kSpeedTertiaryLinkKMpH},
{{"highway", "residential"}, kSpeedResidentialKMpH},
{{"highway", "pedestrian"}, kSpeedPedestrianKMpH},
{{"highway", "unclassified"}, kSpeedUnclassifiedKMpH},
{{"highway", "service"}, kSpeedServiceKMpH},
{{"highway", "living_street"}, kSpeedLivingStreetKMpH},

2
routing/edge_estimator.cpp
View file

@ -27,7 +27,7 @@ double constexpr kKMPH2MPS = 1000.0 / (60 * 60);
inline double TimeBetweenSec(m2::PointD const & from, m2::PointD const & to, double speedMPS)
{
ASSERT_GREATER(speedMPS, 0.0, ());
CHECK_GREATER(speedMPS, 0.0, ());
double const distanceM = MercatorBounds::DistanceOnEarth(from, to);
return distanceM / speedMPS;

6
routing/geometry.cpp
View file

@ -51,16 +51,14 @@ namespace routing
{
// RoadGeometry ------------------------------------------------------------------------------------
RoadGeometry::RoadGeometry(bool oneWay, double speed, Points const & points)
: m_points(points), m_speed(speed), m_isOneWay(oneWay)
: m_points(points), m_speed(speed), m_isOneWay(oneWay), m_valid(true)
{
ASSERT_GREATER(speed, 0.0, ());
}
void RoadGeometry::Load(IVehicleModel const & vehicleModel, FeatureType const & feature)
{
CHECK(vehicleModel.IsRoad(feature),
("Feature", feature.GetID().m_index, "is not a road in the current vehicle model"));
m_valid = vehicleModel.IsRoad(feature);
m_isOneWay = vehicleModel.IsOneWay(feature);
m_speed = vehicleModel.GetSpeed(feature);

8
routing/geometry.hpp
View file

@ -35,10 +35,18 @@ public:
}
uint32_t GetPointsCount() const { return static_cast<uint32_t>(m_points.size()); }
// Note. It's possible that car_model was changed after the map was built.
// For example, the map from 12.2016 contained highway=pedestrian
// in car_model but this type of highways is removed as of 01.2017.
// In such cases RoadGeometry is not valid.
bool IsValid() const { return m_valid; }
private:
Points m_points;
double m_speed = 0.0;
bool m_isOneWay = false;
bool m_valid = false;
};
class GeometryLoader

4
routing/index_graph.cpp
View file

@ -48,6 +48,10 @@ void IndexGraph::GetNeighboringEdges(Segment const & from, RoadPoint const & rp,
vector<SegmentEdge> & edges)
{
RoadGeometry const & road = m_geometry.GetRoad(rp.GetFeatureId());
if (!road.IsValid())
return;
bool const bidirectional = !road.IsOneWay();
if ((isOutgoing || bidirectional) && rp.GetPointId() + 1 < road.GetPointsCount())