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

[routing] Making kBicycleOptionsPedestrianFootwayAllowed for Belarus and Russia.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-06-21 07:04:42 +03:00 • committed by Tatiana Yan
parent 594c36e1d1
commit a2360a241d
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
routing_common/bicycle_model.cpp
View file

@ -168,6 +168,29 @@ VehicleModel::LimitsInitList const kBicycleOptionsBridlewayAllowed = {
{{"highway", "steps"}, true},
{{"highway", "platform"}, true}};
// Same as defaults except pedestrian and footway are allowed
VehicleModel::LimitsInitList const kBicycleOptionsPedestrianFootwayAllowed = {
{{"highway", "trunk"}, true},
{{"highway", "trunk_link"}, true},
{{"highway", "primary"}, true},
{{"highway", "primary_link"}, true},
{{"highway", "secondary"}, true},
{{"highway", "secondary_link"}, true},
{{"highway", "tertiary"}, true},
{{"highway", "tertiary_link"}, true},
{{"highway", "service"}, true},
{{"highway", "unclassified"}, true},
{{"highway", "road"}, true},
{{"highway", "track"}, true},
{{"highway", "path"}, true},
{{"highway", "cycleway"}, true},
{{"highway", "residential"}, true},
{{"highway", "living_street"}, true},
{{"highway", "steps"}, true},
{{"highway", "pedestrian"}, true},
{{"highway", "footway"}, true},
{{"highway", "platform"}, true}};
// Australia
VehicleModel::LimitsInitList const kBicycleOptionsAustralia = kBicycleOptionsAll;
@ -191,28 +214,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsAustria = {
{{"highway", "platform"}, true}};
// Belarus
VehicleModel::LimitsInitList const kBicycleOptionsBelarus = {
// Footway and pedestrian are allowed
{{"highway", "trunk"}, true},
{{"highway", "trunk_link"}, true},
{{"highway", "primary"}, true},
{{"highway", "primary_link"}, true},
{{"highway", "secondary"}, true},
{{"highway", "secondary_link"}, true},
{{"highway", "tertiary"}, true},
{{"highway", "tertiary_link"}, true},
{{"highway", "service"}, true},
{{"highway", "unclassified"}, true},
{{"highway", "road"}, true},
{{"highway", "track"}, true},
{{"highway", "path"}, true},
{{"highway", "cycleway"}, true},
{{"highway", "residential"}, true},
{{"highway", "living_street"}, true},
{{"highway", "steps"}, true},
{{"highway", "pedestrian"}, true},
{{"highway", "footway"}, true},
{{"highway", "platform"}, true}};
VehicleModel::LimitsInitList const kBicycleOptionsBelarus = kBicycleOptionsPedestrianFootwayAllowed;
// Belgium
VehicleModel::LimitsInitList const kBicycleOptionsBelgium = {
@ -318,7 +320,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsRomania = kBicycleOptionsNoTru
// https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions
// passing through service and living_street with a bicycle is prohibited
// it's allowed according to Russian traffic rules.
VehicleModel::LimitsInitList const kBicycleOptionsRussia = kBicycleOptionsBelarus;
VehicleModel::LimitsInitList const kBicycleOptionsRussia = kBicycleOptionsPedestrianFootwayAllowed;
// Slovakia
VehicleModel::LimitsInitList const kBicycleOptionsSlovakia = kBicycleOptionsNoTrunk;