diff --git a/routing/index_router.cpp b/routing/index_router.cpp index a7cfb1d11b..a25c2636c8 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -23,7 +23,7 @@ #include "routing_common/bicycle_model.hpp" #include "routing_common/car_model.hpp" #include "routing_common/pedestrian_model.hpp" -#include "routing_common/transit_max_speed.hpp" +#include "routing_common/transit_speed_limits.hpp" #include "indexer/feature_altitude.hpp" @@ -61,7 +61,7 @@ double CalcMaxSpeed(NumMwmIds const & numMwmIds, VehicleType vehicleType) { if (vehicleType == VehicleType::Transit) - return kTransitMaxSpeedKMpH; + return transit::kTransitMaxSpeedKMpH; double maxSpeed = 0.0; numMwmIds.ForEachId([&](NumMwmId id) { diff --git a/routing_common/CMakeLists.txt b/routing_common/CMakeLists.txt index b90162c0d0..796fec323b 100644 --- a/routing_common/CMakeLists.txt +++ b/routing_common/CMakeLists.txt @@ -9,7 +9,7 @@ set( num_mwm_id.hpp pedestrian_model.cpp pedestrian_model.hpp - transit_max_speed.hpp + transit_speed_limits.hpp transit_serdes.hpp transit_types.cpp transit_types.hpp diff --git a/routing_common/routing_common.pro b/routing_common/routing_common.pro index 5efa6fa3a6..a303607dc8 100644 --- a/routing_common/routing_common.pro +++ b/routing_common/routing_common.pro @@ -25,7 +25,7 @@ HEADERS += \ car_model.hpp \ num_mwm_id.hpp \ pedestrian_model.hpp \ - transit_max_speed.hpp \ + transit_speed_limits.hpp \ transit_serdes.hpp \ transit_types.hpp \ vehicle_model.hpp \ diff --git a/routing_common/transit_max_speed.hpp b/routing_common/transit_max_speed.hpp deleted file mode 100644 index 53319a6004..0000000000 --- a/routing_common/transit_max_speed.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -namespace routing -{ -double constexpr kTransitMaxSpeedKMpH = 400; -} // namespace routing diff --git a/routing_common/transit_speed_limits.hpp b/routing_common/transit_speed_limits.hpp new file mode 100644 index 0000000000..66516d42a1 --- /dev/null +++ b/routing_common/transit_speed_limits.hpp @@ -0,0 +1,9 @@ +#pragma once + +namespace routing +{ +namespace transit +{ + double constexpr kTransitMaxSpeedKMpH = 400; +} // namespace transit +} // namespace routing diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index ba3d567a86..d8c955c34d 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 40576F7A1F7AA1B4000B593B /* transit_max_speed.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 40576F791F7AA1B4000B593B /* transit_max_speed.hpp */; }; 40FF45D01F388EF80046BD40 /* vehicle_model_for_country_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40FF45CF1F388EF80046BD40 /* vehicle_model_for_country_test.cpp */; }; 5647A4511F72BEB600DE1125 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5647A4521F72BEB600DE1125 /* libicu.a */; }; 5667C1DD1F751F2700C6B31B /* transit_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5647A4531F72BF2B00DE1125 /* transit_test.cpp */; }; @@ -15,6 +14,7 @@ 56E2EDA61F7E3F8A0092E9C2 /* transit_serdes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */; }; 56E2EDA81F7E3F8A0092E9C2 /* transit_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */; }; 56E41D881F72B42F00E28E2D /* transit_types.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E41D861F72B42F00E28E2D /* transit_types.hpp */; }; + 56E6E7401F95D5690022CBD3 /* transit_speed_limits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */; }; 671E78881E6A3C5D00B2859B /* bicycle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */; }; 671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78811E6A3C5D00B2859B /* bicycle_model.hpp */; }; 671E788A1E6A3C5D00B2859B /* car_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78821E6A3C5D00B2859B /* car_model.cpp */; }; @@ -42,7 +42,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 40576F791F7AA1B4000B593B /* transit_max_speed.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_max_speed.hpp; sourceTree = ""; }; 40FF45CF1F388EF80046BD40 /* vehicle_model_for_country_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_for_country_test.cpp; sourceTree = ""; }; 5647A4521F72BEB600DE1125 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5647A4531F72BF2B00DE1125 /* transit_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_test.cpp; sourceTree = ""; }; @@ -51,6 +50,7 @@ 56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_serdes.hpp; sourceTree = ""; }; 56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_types.cpp; sourceTree = ""; }; 56E41D861F72B42F00E28E2D /* transit_types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_types.hpp; sourceTree = ""; }; + 56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transit_speed_limits.hpp; sourceTree = ""; }; 671E78721E6A3BE200B2859B /* librouting_common.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librouting_common.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_model.cpp; sourceTree = ""; }; 671E78811E6A3C5D00B2859B /* bicycle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bicycle_model.hpp; sourceTree = ""; }; @@ -138,6 +138,7 @@ 671E78741E6A3BE200B2859B /* routing_common */ = { isa = PBXGroup; children = ( + 56E6E73F1F95D5690022CBD3 /* transit_speed_limits.hpp */, 56D0E47C1F8E335D0084B18C /* num_mwm_id.hpp */, 56E2EDA31F7E3F890092E9C2 /* transit_serdes.hpp */, 56E2EDA51F7E3F8A0092E9C2 /* transit_types.cpp */, @@ -149,7 +150,6 @@ 671E78831E6A3C5D00B2859B /* car_model.hpp */, 671E78841E6A3C5D00B2859B /* pedestrian_model.cpp */, 671E78851E6A3C5D00B2859B /* pedestrian_model.hpp */, - 40576F791F7AA1B4000B593B /* transit_max_speed.hpp */, 671E78861E6A3C5D00B2859B /* vehicle_model.cpp */, 671E78871E6A3C5D00B2859B /* vehicle_model.hpp */, ); @@ -202,8 +202,8 @@ 671E788D1E6A3C5D00B2859B /* pedestrian_model.hpp in Headers */, 56E41D881F72B42F00E28E2D /* transit_types.hpp in Headers */, 56E2EDA61F7E3F8A0092E9C2 /* transit_serdes.hpp in Headers */, + 56E6E7401F95D5690022CBD3 /* transit_speed_limits.hpp in Headers */, 671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */, - 40576F7A1F7AA1B4000B593B /* transit_max_speed.hpp in Headers */, 671E788B1E6A3C5D00B2859B /* car_model.hpp in Headers */, 671E788F1E6A3C5D00B2859B /* vehicle_model.hpp in Headers */, );