diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 3444cb0ac2..90103fc933 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -28,6 +28,8 @@ ice_road=yes : highway=ice_road winter_road=yes : highway=ice_road highway=turning_loop : highway=mini_roundabout +highway=platform : highway=pedestrian + natural=marsh : natural=wetland, wetland=marsh natural=waterfall : waterway=waterfall natural = forest : natural = wood diff --git a/generator/generator_integration_tests/features_tests.cpp b/generator/generator_integration_tests/features_tests.cpp index 9a3bdbced6..0fa1cfe0b3 100644 --- a/generator/generator_integration_tests/features_tests.cpp +++ b/generator/generator_integration_tests/features_tests.cpp @@ -135,8 +135,8 @@ CountryFeaturesCounters constexpr kNorthWellingtonCounters( 250276 /* area */, 95893 /* poi */, 297 /* cityTownOrVillage */, 1062 /* bookingHotels */); CountryFeaturesCounters constexpr kSouthCanterburyCounters( - 637228 /* fbs */, 6984528 /* geometryPoints */, 397947 /* point */, 81695 /* line */, - 157586 /* area */, 89664 /* poi */, 331 /* cityTownOrVillage */, 2085 /* bookingHotels */); + 637230 /* fbs */, 6984535 /* geometryPoints */, 397947 /* point */, 81697 /* line */, + 157586 /* area */, 89666 /* poi */, 331 /* cityTownOrVillage */, 2085 /* bookingHotels */); CountryFeaturesCounters constexpr kSouthSouthlandCounters( 340629 /* fbs */, 5342351 /* geometryPoints */, 185986 /* point */, 40117 /* line */, diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index e4b61dbb76..667afe9565 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -472,8 +472,6 @@ void PreprocessElement(OsmElement * p) { if (p->m_type == OsmElement::EntityType::Node) p->AddTag("highway", "bus_stop"); - else - p->AddTag("highway", "platform"); } else if (tag.m_value == "stop_position" && isTram && p->m_type == OsmElement::EntityType::Node) { diff --git a/indexer/indexer_tests/visibility_test.cpp b/indexer/indexer_tests/visibility_test.cpp index dd6b7f5499..e1006a3664 100644 --- a/indexer/indexer_tests/visibility_test.cpp +++ b/indexer/indexer_tests/visibility_test.cpp @@ -38,7 +38,6 @@ public: char const * arr[][2] = { {"highway", "bus_stop"}, {"highway", "speed_camera"}, - {"highway", "platform"}, {"highway", "world_level"}, {"highway", "world_towns_level"}, }; diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp index 263f1081af..5a07722194 100644 --- a/map/bookmark_helpers.cpp +++ b/map/bookmark_helpers.cpp @@ -185,7 +185,6 @@ std::map const kFeatureTypeToBookmarkMatchInfo = {"amenity-taxi", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, {"building-train_station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, {"highway-bus_stop", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, - {"highway-platform", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, {"public_transport-platform", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, {"railway-halt", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, {"railway-station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}}, diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp index c765a336e2..d06cf2040d 100644 --- a/routing_common/bicycle_model.cpp +++ b/routing_common/bicycle_model.cpp @@ -52,7 +52,6 @@ HighwayBasedMeanSpeeds const kDefaultSpeeds = { {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(1.0, 5.0))}, {HighwayType::HighwayPedestrian, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::HighwayFootway, InOutCitySpeedKMpH(SpeedKMpH(7.0, 5.0))}, - {HighwayType::HighwayPlatform, InOutCitySpeedKMpH(SpeedKMpH(3.0))}, {HighwayType::ManMadePier, InOutCitySpeedKMpH(SpeedKMpH(7.0))}, {HighwayType::RouteFerry, InOutCitySpeedKMpH(SpeedKMpH(3.0, 20.0))}, }; @@ -78,8 +77,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsDefault = { {{"highway", "cycleway"}, true}, {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, - {{"highway", "steps"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "steps"}, true}}; // All options available. VehicleModel::LimitsInitList const kBicycleOptionsAll = { @@ -102,8 +100,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsAll = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Same as defaults except trunk and trunk_link are not allowed VehicleModel::LimitsInitList const kBicycleOptionsNoTrunk = { @@ -121,8 +118,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsNoTrunk = { {{"highway", "cycleway"}, true}, {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, - {{"highway", "steps"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "steps"}, true}}; // Same as defaults except pedestrian is allowed VehicleModel::LimitsInitList const kBicycleOptionsPedestrianAllowed = { @@ -143,8 +139,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsPedestrianAllowed = { {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, - {{"highway", "pedestrian"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "pedestrian"}, true}}; // Same as defaults except bridleway is allowed VehicleModel::LimitsInitList const kBicycleOptionsBridlewayAllowed = { @@ -165,8 +160,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsBridlewayAllowed = { {{"highway", "cycleway"}, true}, {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, - {{"highway", "steps"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "steps"}, true}}; // Same as defaults except pedestrian and footway are allowed VehicleModel::LimitsInitList const kBicycleOptionsPedestrianFootwayAllowed = { @@ -188,8 +182,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsPedestrianFootwayAllowed = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Australia VehicleModel::LimitsInitList const kBicycleOptionsAustralia = kBicycleOptionsAll; @@ -210,8 +203,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsAustria = { {{"highway", "cycleway"}, true}, {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, - {{"highway", "steps"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "steps"}, true}}; // Belarus VehicleModel::LimitsInitList const kBicycleOptionsBelarus = kBicycleOptionsPedestrianFootwayAllowed; @@ -235,8 +227,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsBelgium = { {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, - {{"highway", "pedestrian"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "pedestrian"}, true}}; // Brazil VehicleModel::LimitsInitList const kBicycleOptionsBrazil = { @@ -259,8 +250,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsBrazil = { {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Denmark VehicleModel::LimitsInitList const kBicycleOptionsDenmark = kBicycleOptionsNoTrunk; @@ -284,8 +274,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsFrance = { {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, - {{"highway", "pedestrian"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "pedestrian"}, true}}; // Finland VehicleModel::LimitsInitList const kBicycleOptionsFinland = kBicycleOptionsPedestrianAllowed; @@ -355,8 +344,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsUkraine = { {{"highway", "living_street"}, false}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // United Kingdom VehicleModel::LimitsInitList const kBicycleOptionsUK = kBicycleOptionsBridlewayAllowed; @@ -382,8 +370,7 @@ VehicleModel::LimitsInitList const kBicycleOptionsUS = { {{"highway", "residential"}, true}, {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, - {{"highway", "pedestrian"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "pedestrian"}, true}}; VehicleModel::SurfaceInitList const kBicycleSurface = { // {{surfaceType, surfaceType}, {weightFactor, etaFactor}} diff --git a/routing_common/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp index e8c8a198e9..9f1c97ee87 100644 --- a/routing_common/pedestrian_model.cpp +++ b/routing_common/pedestrian_model.cpp @@ -52,7 +52,6 @@ HighwayBasedMeanSpeeds const kDefaultSpeeds = { {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(3.0))}, {HighwayType::HighwayPedestrian, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::HighwayFootway, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, - {HighwayType::HighwayPlatform, InOutCitySpeedKMpH(SpeedKMpH(5.0))}, {HighwayType::ManMadePier, InOutCitySpeedKMpH(SpeedKMpH(7.0))}, {HighwayType::RouteFerry, InOutCitySpeedKMpH(SpeedKMpH(1.0, 20.0))}, }; @@ -79,8 +78,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsDefault = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // All options available. VehicleModel::LimitsInitList const kPedestrianOptionsAll = { @@ -103,8 +101,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsAll = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Same as defaults except trunk and trunk link are not allowed. VehicleModel::LimitsInitList const kPedestrianOptionsNoTrunk = { @@ -124,8 +121,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsNoTrunk = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Same as defaults except cycleway is allowed. VehicleModel::LimitsInitList const kPedestrianOptionsCyclewayAllowed = { @@ -147,8 +143,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsCyclewayAllowed = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Same as defaults except cycleway is allowed and trunk and trunk_link are not allowed. VehicleModel::LimitsInitList const kPedestrianOptionsCyclewayAllowedNoTrunk = { @@ -168,8 +163,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsCyclewayAllowedNoTrunk = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Australia VehicleModel::LimitsInitList const kPedestrianOptionsAustralia = kPedestrianOptionsAll; @@ -201,8 +195,7 @@ VehicleModel::LimitsInitList const kPedestrianOptionsBelgium = { {{"highway", "living_street"}, true}, {{"highway", "steps"}, true}, {{"highway", "pedestrian"}, true}, - {{"highway", "footway"}, true}, - {{"highway", "platform"}, true}}; + {{"highway", "footway"}, true}}; // Brazil VehicleModel::LimitsInitList const kPedestrianOptionsBrazil = kPedestrianOptionsAll; diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp index 2beec38f3b..93ed24ddb1 100644 --- a/routing_common/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -459,7 +459,6 @@ string DebugPrint(HighwayType type) case HighwayType::RouteFerryMotorcar: return "route-ferry-motorcar"; case HighwayType::RouteFerryMotorVehicle: return "route-ferry-motor_vehicle"; case HighwayType::RailwayRailMotorVehicle: return "railway-rail-motor_vehicle"; - case HighwayType::HighwayPlatform: return "highway-platform"; case HighwayType::RouteShuttleTrain: return "route-shuttle_train"; } diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp index ec5aa11a66..7c34c930bd 100644 --- a/routing_common/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -60,7 +60,6 @@ enum class HighwayType : uint32_t RouteFerryMotorcar = 988, RouteFerryMotorVehicle = 993, RailwayRailMotorVehicle = 994, - HighwayPlatform = 1008, RouteShuttleTrain = 1054, };