From b1a6f766f4e96d499beab1c4b4c14ea01c523c6f Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Wed, 1 Mar 2017 13:42:38 +0300 Subject: [PATCH 1/3] [routing][traffic] Removed a circular dependency. --- 3party/osrm/osrm-backend/CMakeLists.txt | 1 + CMakeLists.txt | 1 + android/jni/Android.mk | 2 +- .../booking_quality_check.pro | 1 + generator/feature_builder.cpp | 8 ++--- .../feature_segments_checker.cpp | 2 +- .../feature_segments_checker.pro | 3 +- generator/generator_tests/CMakeLists.txt | 1 + generator/generator_tests/generator_tests.pro | 4 +-- generator/generator_tests/osm_type_test.cpp | 3 +- generator/generator_tool/CMakeLists.txt | 1 + generator/generator_tool/generator_tool.pro | 2 +- .../restaurants_info/restaurants_info.pro | 2 +- generator/routing_index_generator.cpp | 7 ++-- .../srtm_coverage_checker.pro | 2 +- generator/traffic_generator.cpp | 3 +- indexer/indexer_tests/CMakeLists.txt | 1 + indexer/indexer_tests/indexer_tests.pro | 2 +- map/map_tests/CMakeLists.txt | 1 + map/map_tests/map_tests.pro | 5 +-- mapshot/mapshot.pro | 3 +- omim.pro | 18 ++++++---- openlr/openlr_simple_decoder.cpp | 3 +- openlr/openlr_stat/CMakeLists.txt | 1 + openlr/openlr_stat/openlr_stat.pro | 4 +-- openlr/openlr_tests/openlr_tests.pro | 5 ++- qt/CMakeLists.txt | 1 + qt/qt.pro | 3 +- routing/CMakeLists.txt | 8 ----- routing/async_router.hpp | 8 ++--- routing/bicycle_directions.cpp | 3 +- routing/cross_mwm_road_graph.cpp | 5 +-- routing/cross_mwm_road_graph.hpp | 6 ++-- routing/cross_mwm_router.cpp | 6 ++-- routing/cross_mwm_router.hpp | 6 ++-- routing/edge_estimator.hpp | 3 +- routing/features_road_graph.cpp | 3 +- routing/features_road_graph.hpp | 4 ++- routing/geometry.hpp | 3 +- routing/index_graph_loader.hpp | 3 +- routing/index_router.cpp | 7 ++-- routing/index_router.hpp | 3 +- routing/nearest_edge_finder.hpp | 3 +- routing/online_absent_fetcher.cpp | 5 +-- routing/online_absent_fetcher.hpp | 2 +- routing/online_cross_fetcher.cpp | 2 +- routing/osrm2feature_map.cpp | 4 +-- routing/osrm2feature_map.hpp | 5 ++- routing/osrm_data_facade.hpp | 4 +-- routing/osrm_engine.cpp | 4 +-- routing/osrm_helpers.cpp | 5 +-- routing/osrm_path_segment_factory.cpp | 1 + routing/pedestrian_directions.cpp | 1 + routing/restriction_loader.cpp | 1 + routing/road_graph_router.cpp | 7 ++-- routing/road_graph_router.hpp | 3 +- routing/route.cpp | 1 + routing/router.cpp | 3 +- routing/router.hpp | 2 +- routing/router_delegate.cpp | 2 +- routing/routing.pro | 11 +----- .../bicycle_routing_tests.cpp | 3 +- routing/routing_benchmarks/helpers.hpp | 3 +- .../pedestrian_routing_tests.cpp | 3 +- .../routing_benchmarks/routing_benchmarks.pro | 2 +- .../routing_consistency_tests/CMakeLists.txt | 1 + .../routing_consistency_tests.pro | 2 +- routing/routing_helpers.hpp | 7 ++-- .../routing_integration_tests/CMakeLists.txt | 1 + .../routing_integration_tests.pro | 2 +- routing/routing_mapping.cpp | 2 +- routing/routing_mapping.hpp | 6 ++-- routing/routing_session.cpp | 4 +-- routing/routing_tests/CMakeLists.txt | 2 +- .../routing_tests/applying_traffic_test.cpp | 3 +- .../cumulative_restriction_test.cpp | 3 +- routing/routing_tests/index_graph_test.cpp | 3 +- routing/routing_tests/index_graph_tools.cpp | 2 +- routing/routing_tests/restriction_test.cpp | 3 +- routing/routing_tests/routing_tests.pro | 5 ++- routing/speed_camera.cpp | 2 +- routing/turns.cpp | 1 - routing/turns.hpp | 4 +-- routing/turns_generator.cpp | 7 ++-- routing/turns_tts_text.hpp | 1 - routing_common/CMakeLists.txt | 16 +++++++++ {routing => routing_common}/bicycle_model.cpp | 2 +- {routing => routing_common}/bicycle_model.hpp | 4 +-- {routing => routing_common}/car_model.cpp | 2 +- {routing => routing_common}/car_model.hpp | 3 +- .../pedestrian_model.cpp | 2 +- .../pedestrian_model.hpp | 4 +-- routing_common/routing_common.pro | 26 ++++++++++++++ .../routing_common_tests/CMakeLists.txt | 34 +++++++++++++++++++ .../routing_common_tests.pro | 20 +++++++++++ .../vehicle_model_test.cpp | 4 +-- {routing => routing_common}/vehicle_model.cpp | 2 +- {routing => routing_common}/vehicle_model.hpp | 1 + .../search_integration_tests/CMakeLists.txt | 1 + .../search_integration_tests.pro | 2 +- .../features_collector_tool.pro | 7 ++-- .../search_quality_tests.pro | 2 +- .../search_quality_tool.pro | 2 +- .../storage_integration_tests/CMakeLists.txt | 1 + .../storage_integration_tests.pro | 3 +- storage/storage_tests/CMakeLists.txt | 1 + storage/storage_tests/storage_tests.pro | 2 +- tracking/tracking_tests/tracking_tests.pro | 2 +- traffic/pytraffic/CMakeLists.txt | 3 +- traffic/traffic_cache.hpp | 1 + traffic/traffic_info.cpp | 3 +- traffic/traffic_tests/CMakeLists.txt | 2 +- traffic/traffic_tests/traffic_tests.pro | 2 +- 113 files changed, 289 insertions(+), 161 deletions(-) create mode 100644 routing_common/CMakeLists.txt rename {routing => routing_common}/bicycle_model.cpp (99%) rename {routing => routing_common}/bicycle_model.hpp (96%) rename {routing => routing_common}/car_model.cpp (98%) rename {routing => routing_common}/car_model.hpp (92%) rename {routing => routing_common}/pedestrian_model.cpp (99%) rename {routing => routing_common}/pedestrian_model.hpp (95%) create mode 100644 routing_common/routing_common.pro create mode 100644 routing_common/routing_common_tests/CMakeLists.txt create mode 100644 routing_common/routing_common_tests/routing_common_tests.pro rename {routing/routing_tests => routing_common/routing_common_tests}/vehicle_model_test.cpp (98%) rename {routing => routing_common}/vehicle_model.cpp (99%) rename {routing => routing_common}/vehicle_model.hpp (99%) diff --git a/3party/osrm/osrm-backend/CMakeLists.txt b/3party/osrm/osrm-backend/CMakeLists.txt index b8cd78b13d..87dec16335 100755 --- a/3party/osrm/osrm-backend/CMakeLists.txt +++ b/3party/osrm/osrm-backend/CMakeLists.txt @@ -232,6 +232,7 @@ include_directories(${Boost_INCLUDE_DIRS}) #Common libraries from omim set(OMIM_LIBRARIES "${OMIM_BUILD_PATH}/librouting.a" + "${OMIM_BUILD_PATH}/librouting_common.a" "${OMIM_BUILD_PATH}/libindexer.a" "${OMIM_BUILD_PATH}/libgeometry.a" "${OMIM_BUILD_PATH}/libcoding.a" diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f69705646..27d135f097 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,6 +251,7 @@ add_subdirectory(storage) add_subdirectory(editor) add_subdirectory(indexer) add_subdirectory(routing) +add_subdirectory(routing_common) add_subdirectory(search) add_subdirectory(tracking) add_subdirectory(traffic) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 71c6775844..9345fafb62 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -25,7 +25,7 @@ define add_prebuild_static_lib include $(PREBUILT_STATIC_LIBRARY) endef -prebuild_static_libs := map tracking routing traffic drape_frontend search storage indexer drape platform editor partners_api geometry coding base opening_hours +prebuild_static_libs := map tracking routing traffic routing_common drape_frontend search storage indexer drape platform editor partners_api geometry coding base opening_hours prebuild_static_libs += pugixml oauthcpp expat freetype fribidi minizip jansson protobuf osrm stats_client succinct stb_image sdf_image $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) diff --git a/generator/booking_quality_check/booking_quality_check.pro b/generator/booking_quality_check/booking_quality_check.pro index 9f5b1c4892..d8a0a0cd6e 100644 --- a/generator/booking_quality_check/booking_quality_check.pro +++ b/generator/booking_quality_check/booking_quality_check.pro @@ -10,6 +10,7 @@ DEPENDENCIES = \ generator \ search \ routing \ + routing_common \ indexer \ geometry \ editor \ diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index ed66b68c05..ba38702358 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -1,10 +1,11 @@ #include "generator/feature_builder.hpp" -#include "routing/bicycle_model.hpp" -#include "routing/car_model.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/routing_helpers.hpp" +#include "routing_common/bicycle_model.hpp" +#include "routing_common/car_model.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "indexer/feature_impl.hpp" #include "indexer/feature_visibility.hpp" #include "indexer/geometry_serialization.hpp" @@ -21,7 +22,6 @@ #include "std/cstring.hpp" #include "std/algorithm.hpp" - using namespace feature; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp index b37a45809b..f1aa81c7e3 100644 --- a/generator/feature_segments_checker/feature_segments_checker.cpp +++ b/generator/feature_segments_checker/feature_segments_checker.cpp @@ -1,6 +1,6 @@ #include "generator/srtm_parser.hpp" -#include "routing/bicycle_model.hpp" +#include "routing_common/bicycle_model.hpp" #include "coding/file_name_utils.hpp" diff --git a/generator/feature_segments_checker/feature_segments_checker.pro b/generator/feature_segments_checker/feature_segments_checker.pro index 3277e212dd..3885d301c9 100644 --- a/generator/feature_segments_checker/feature_segments_checker.pro +++ b/generator/feature_segments_checker/feature_segments_checker.pro @@ -7,7 +7,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator map traffic routing storage indexer platform geometry coding base minizip succinct protobuf gflags stats_client +DEPENDENCIES = generator map routing traffic routing_common storage indexer \ + platform geometry coding base minizip succinct protobuf gflags stats_client include($$ROOT_DIR/common.pri) diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt index 41b5fd6edd..cdc71a09b4 100644 --- a/generator/generator_tests/CMakeLists.txt +++ b/generator/generator_tests/CMakeLists.txt @@ -39,6 +39,7 @@ omim_link_libraries( indexer drape traffic + routing_common editor platform geometry diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index 53170ce14f..7315d9fa24 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -4,8 +4,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator_tests_support platform_tests_support generator drape_frontend routing search storage \ - indexer drape map traffic platform editor geometry \ +DEPENDENCIES = generator_tests_support platform_tests_support generator drape_frontend routing \ + search storage indexer drape map traffic routing_common platform editor geometry \ coding base freetype expat fribidi jansson protobuf osrm stats_client \ minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 82435281e4..60d3532332 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -8,7 +8,7 @@ #include "generator/osm2type.hpp" #include "generator/tag_admixer.hpp" -#include "routing/car_model.hpp" +#include "routing_common/car_model.hpp" #include "indexer/feature_data.hpp" #include "indexer/classificator.hpp" @@ -16,7 +16,6 @@ #include "std/iostream.hpp" - using namespace tests; UNIT_TEST(OsmType_SkipDummy) diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt index 1b9e09ea95..d84a7b3032 100644 --- a/generator/generator_tool/CMakeLists.txt +++ b/generator/generator_tool/CMakeLists.txt @@ -11,6 +11,7 @@ omim_link_libraries( generator routing traffic + routing_common search storage indexer diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro index 0e5e58b7d2..d0914b2be3 100644 --- a/generator/generator_tool/generator_tool.pro +++ b/generator/generator_tool/generator_tool.pro @@ -2,7 +2,7 @@ ROOT_DIR = ../.. -DEPENDENCIES = generator routing traffic search storage indexer editor platform geometry \ +DEPENDENCIES = generator routing traffic routing_common search storage indexer editor platform geometry \ coding base freetype expat fribidi jansson protobuf osrm stats_client \ minizip succinct pugixml tess2 gflags oauthcpp include($$ROOT_DIR/common.pri) diff --git a/generator/restaurants_info/restaurants_info.pro b/generator/restaurants_info/restaurants_info.pro index dd1a818ec4..fd6fb59247 100644 --- a/generator/restaurants_info/restaurants_info.pro +++ b/generator/restaurants_info/restaurants_info.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = \ - generator search routing indexer geometry \ + generator search routing routing_common indexer geometry \ editor platform coding base jansson \ pugixml stats_client opening_hours gflags \ oauthcpp expat protobuf \ diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp index bbd1d8caad..6db5e03755 100644 --- a/generator/routing_index_generator.cpp +++ b/generator/routing_index_generator.cpp @@ -1,12 +1,13 @@ #include "generator/routing_index_generator.hpp" -#include "routing/bicycle_model.hpp" -#include "routing/car_model.hpp" #include "routing/index_graph.hpp" #include "routing/index_graph_serialization.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/vehicle_mask.hpp" +#include "routing_common/bicycle_model.hpp" +#include "routing_common/car_model.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "indexer/feature.hpp" #include "indexer/feature_processor.hpp" #include "indexer/point_to_int64.hpp" diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.pro b/generator/srtm_coverage_checker/srtm_coverage_checker.pro index e901b2ae5d..85d1eefd28 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.pro +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.pro @@ -7,7 +7,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = generator map routing search storage indexer platform editor geometry coding base \ +DEPENDENCIES = generator map routing routing_common search storage indexer platform editor geometry coding base \ osrm jansson protobuf succinct stats_client pugixml minizip gflags stats_client include($$ROOT_DIR/common.pri) diff --git a/generator/traffic_generator.cpp b/generator/traffic_generator.cpp index c920946eb3..85e4698d7f 100644 --- a/generator/traffic_generator.cpp +++ b/generator/traffic_generator.cpp @@ -1,10 +1,11 @@ #include "generator/traffic_generator.hpp" -#include "routing/car_model.hpp" #include "routing/routing_helpers.hpp" #include "traffic/traffic_info.hpp" +#include "routing_common/car_model.hpp" + #include "platform/mwm_traits.hpp" #include "indexer/feature_algo.hpp" diff --git a/indexer/indexer_tests/CMakeLists.txt b/indexer/indexer_tests/CMakeLists.txt index c276b0b00a..5489408437 100644 --- a/indexer/indexer_tests/CMakeLists.txt +++ b/indexer/indexer_tests/CMakeLists.txt @@ -49,6 +49,7 @@ omim_link_libraries( generator search routing + routing_common indexer storage editor diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro index 1ff165f0ac..30b4d715a7 100644 --- a/indexer/indexer_tests/indexer_tests.pro +++ b/indexer/indexer_tests/indexer_tests.pro @@ -5,7 +5,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator_tests_support search_tests_support indexer_tests_support \ - platform_tests_support generator search routing indexer storage editor \ + platform_tests_support generator search routing routing_common indexer storage editor \ platform coding geometry base stats_client jansson tess2 protobuf \ succinct opening_hours pugixml diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index a7c86a4987..5b52e62ede 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -26,6 +26,7 @@ omim_link_libraries( drape_frontend routing traffic + routing_common search storage tracking diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index d07711f111..60b6b766d3 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -6,8 +6,9 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map drape_frontend routing traffic search storage tracking drape indexer partners_api platform editor geometry coding base \ - freetype fribidi expat protobuf jansson osrm stats_client minizip succinct pugixml stats_client stb_image sdf_image +DEPENDENCIES = map drape_frontend routing traffic routing_common search storage tracking drape \ + indexer partners_api platform editor geometry coding base freetype fribidi expat \ + protobuf jansson osrm stats_client minizip succinct pugixml stats_client stb_image sdf_image DEPENDENCIES *= opening_hours diff --git a/mapshot/mapshot.pro b/mapshot/mapshot.pro index c0d69fddf6..41bd7c936b 100644 --- a/mapshot/mapshot.pro +++ b/mapshot/mapshot.pro @@ -1,7 +1,8 @@ # mapshot binary ROOT_DIR = .. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic indexer drape partners_api platform editor geometry coding base \ +DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common indexer \ + drape partners_api platform editor geometry coding base \ freetype expat fribidi gflags jansson protobuf osrm stats_client minizip succinct \ pugixml opening_hours stb_image sdf_image diff --git a/omim.pro b/omim.pro index d4c4170b5e..d04db27586 100644 --- a/omim.pro +++ b/omim.pro @@ -23,7 +23,7 @@ HEADERS += defines.hpp CONFIG *= desktop } -SUBDIRS = 3party base coding geometry editor indexer routing search openlr +SUBDIRS = 3party base coding geometry editor indexer routing routing_common search openlr !CONFIG(osrm) { SUBDIRS *= platform stats storage @@ -62,13 +62,13 @@ SUBDIRS = 3party base coding geometry editor indexer routing search openlr srtm_coverage_checker.subdir = generator/srtm_coverage_checker srtm_coverage_checker.depends = $$SUBDIRS routing feature_segments_checker.subdir = generator/feature_segments_checker - feature_segments_checker.depends = $$SUBDIRS routing + feature_segments_checker.depends = $$SUBDIRS SUBDIRS *= routing_integration_tests routing_consistency_tests srtm_coverage_checker feature_segments_checker } } !CONFIG(gtool):!CONFIG(osrm) { - SUBDIRS *= drape drape_frontend partners_api tracking traffic map + SUBDIRS *= drape drape_frontend partners_api tracking traffic map CONFIG(map_designer):CONFIG(desktop) { SUBDIRS *= skin_generator @@ -157,7 +157,7 @@ SUBDIRS = 3party base coding geometry editor indexer routing search openlr SUBDIRS *= search_tests MapDepLibs = 3party base coding geometry editor platform storage indexer search map \ - routing drape drape_frontend + routing_common drape drape_frontend # @TODO storage_tests.depends is equal to map_tests because now storage/migrate_tests.cpp # is located in storage_tests. When the new map downloader is used and storage_integraion_tests @@ -184,8 +184,12 @@ SUBDIRS = 3party base coding geometry editor indexer routing search openlr style_tests.depends = $$MapDepLibs SUBDIRS *= style_tests + routing_common_tests.subdir = routing_common/routing_common_tests + routing_common_tests.depends = $$MapDepLibs + SUBDIRS *= routing_common_tests + routing_tests.subdir = routing/routing_tests - routing_tests.depends = $$MapDepLibs + routing_tests.depends = $$MapDepLibs routing SUBDIRS *= routing_tests routing_integration_tests.subdir = routing/routing_integration_tests @@ -248,11 +252,11 @@ SUBDIRS = 3party base coding geometry editor indexer routing search openlr SUBDIRS *= partners_api_tests tracking_tests.subdir = tracking/tracking_tests - tracking_tests.depends = 3party base routing tracking platform_tests_support platform coding geometry + tracking_tests.depends = 3party base routing routing_common tracking platform_tests_support platform coding geometry SUBDIRS *= tracking_tests traffic_tests.subdir = traffic/traffic_tests - traffic_tests.depends = 3party base routing traffic platform_tests_support platform coding geometry + traffic_tests.depends = 3party base traffic routing_common platform_tests_support platform coding geometry SUBDIRS *= traffic_tests openlr_tests.subdir = openlr/openlr_tests diff --git a/openlr/openlr_simple_decoder.cpp b/openlr/openlr_simple_decoder.cpp index 2ba8d2e8f7..60322b86d6 100644 --- a/openlr/openlr_simple_decoder.cpp +++ b/openlr/openlr_simple_decoder.cpp @@ -7,10 +7,11 @@ #include "openlr/router.hpp" #include "openlr/way_point.hpp" -#include "routing/car_model.hpp" #include "routing/features_road_graph.hpp" #include "routing/road_graph.hpp" +#include "routing_common/car_model.hpp" + #include "indexer/classificator.hpp" #include "indexer/index.hpp" diff --git a/openlr/openlr_stat/CMakeLists.txt b/openlr/openlr_stat/CMakeLists.txt index 54d2b10278..2200d15376 100644 --- a/openlr/openlr_stat/CMakeLists.txt +++ b/openlr/openlr_stat/CMakeLists.txt @@ -11,6 +11,7 @@ add_executable(${PROJECT_NAME} ${SRC}) omim_link_libraries(${PROJECT_NAME} openlr routing + routing_common indexer editor platform diff --git a/openlr/openlr_stat/openlr_stat.pro b/openlr/openlr_stat/openlr_stat.pro index bf3d233c7a..6bd1f4f63e 100644 --- a/openlr/openlr_stat/openlr_stat.pro +++ b/openlr/openlr_stat/openlr_stat.pro @@ -2,8 +2,8 @@ ROOT_DIR = ../.. -DEPENDENCIES = openlr routing search storage indexer editor platform geometry coding base protobuf \ - osrm stats_client pugixml jansson succinct gflags +DEPENDENCIES = openlr routing routing_common search storage indexer editor \ + platform geometry coding base protobuf osrm stats_client pugixml jansson succinct gflags include($$ROOT_DIR/common.pri) diff --git a/openlr/openlr_tests/openlr_tests.pro b/openlr/openlr_tests/openlr_tests.pro index 1d2cf5116e..ab7899c7a6 100644 --- a/openlr/openlr_tests/openlr_tests.pro +++ b/openlr/openlr_tests/openlr_tests.pro @@ -4,9 +4,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = routing search storage indexer editor platform_tests_support platform \ - geometry coding base protobuf \ - osrm stats_client pugixml openlr jansson succinct +DEPENDENCIES = routing routing_common search storage indexer editor platform_tests_support platform \ + geometry coding base protobuf osrm stats_client pugixml openlr jansson succinct include($$ROOT_DIR/common.pri) diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 236f74a117..f35a96173c 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -69,6 +69,7 @@ omim_link_libraries( storage tracking traffic + routing_common indexer drape partners_api diff --git a/qt/qt.pro b/qt/qt.pro index b2085a0a28..1c424a0825 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,6 +1,7 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = map drape_frontend openlr routing search storage tracking traffic indexer drape partners_api platform editor geometry \ +DEPENDENCIES = map drape_frontend openlr routing search storage tracking traffic routing_common \ + indexer drape partners_api platform editor geometry \ coding base freetype expat fribidi jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image diff --git a/routing/CMakeLists.txt b/routing/CMakeLists.txt index 76d127bd05..be86001356 100644 --- a/routing/CMakeLists.txt +++ b/routing/CMakeLists.txt @@ -16,10 +16,6 @@ set( base/followed_polyline.hpp bicycle_directions.cpp bicycle_directions.hpp - bicycle_model.cpp - bicycle_model.hpp - car_model.cpp - car_model.hpp car_router.cpp car_router.hpp cross_mwm_index_graph.cpp @@ -73,8 +69,6 @@ set( osrm_path_segment_factory.hpp pedestrian_directions.cpp pedestrian_directions.hpp - pedestrian_model.cpp - pedestrian_model.hpp restriction_loader.cpp restriction_loader.hpp restrictions_serialization.cpp @@ -120,8 +114,6 @@ set( turns_tts_text.cpp turns_tts_text.hpp vehicle_mask.hpp - vehicle_model.cpp - vehicle_model.hpp world_graph.cpp world_graph.hpp ) diff --git a/routing/async_router.hpp b/routing/async_router.hpp index beb75ab254..9dbe332e5f 100644 --- a/routing/async_router.hpp +++ b/routing/async_router.hpp @@ -1,9 +1,9 @@ #pragma once -#include "online_absent_fetcher.hpp" -#include "route.hpp" -#include "router.hpp" -#include "router_delegate.hpp" +#include "routing/online_absent_fetcher.hpp" +#include "routing/route.hpp" +#include "routing/router.hpp" +#include "routing/router_delegate.hpp" #include "base/thread.hpp" diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp index 0dd75d1a85..a28a3cc43a 100644 --- a/routing/bicycle_directions.cpp +++ b/routing/bicycle_directions.cpp @@ -1,5 +1,4 @@ #include "routing/bicycle_directions.hpp" -#include "routing/car_model.hpp" #include "routing/num_mwm_id.hpp" #include "routing/road_point.hpp" #include "routing/router_delegate.hpp" @@ -8,6 +7,8 @@ #include "traffic/traffic_info.hpp" +#include "routing_common/car_model.hpp" + #include "indexer/ftypes_matcher.hpp" #include "indexer/index.hpp" #include "indexer/scales.hpp" diff --git a/routing/cross_mwm_road_graph.cpp b/routing/cross_mwm_road_graph.cpp index 3cabed95ab..c89d63f10b 100644 --- a/routing/cross_mwm_road_graph.cpp +++ b/routing/cross_mwm_road_graph.cpp @@ -1,5 +1,6 @@ -#include "cross_mwm_road_graph.hpp" -#include "cross_mwm_router.hpp" +#include "routing/cross_mwm_road_graph.hpp" + +#include "routing/cross_mwm_router.hpp" #include "geometry/distance_on_sphere.hpp" diff --git a/routing/cross_mwm_road_graph.hpp b/routing/cross_mwm_road_graph.hpp index 7687c3246f..d8ce616669 100644 --- a/routing/cross_mwm_road_graph.hpp +++ b/routing/cross_mwm_road_graph.hpp @@ -1,8 +1,8 @@ #pragma once -#include "car_router.hpp" -#include "osrm_engine.hpp" -#include "router.hpp" +#include "routing/car_router.hpp" +#include "routing/osrm_engine.hpp" +#include "routing/router.hpp" #include "indexer/index.hpp" diff --git a/routing/cross_mwm_router.cpp b/routing/cross_mwm_router.cpp index 6b3bc3aef3..0924545910 100644 --- a/routing/cross_mwm_router.cpp +++ b/routing/cross_mwm_router.cpp @@ -1,5 +1,7 @@ -#include "cross_mwm_router.hpp" -#include "cross_mwm_road_graph.hpp" +#include "routing/cross_mwm_router.hpp" + +#include "routing/cross_mwm_road_graph.hpp" + #include "base/astar_algorithm.hpp" #include "base/timer.hpp" diff --git a/routing/cross_mwm_router.hpp b/routing/cross_mwm_router.hpp index abc5f0baf8..c5b19780f9 100644 --- a/routing/cross_mwm_router.hpp +++ b/routing/cross_mwm_router.hpp @@ -1,8 +1,8 @@ #pragma once -#include "osrm_engine.hpp" -#include "router.hpp" -#include "routing_mapping.hpp" +#include "routing/osrm_engine.hpp" +#include "routing/router.hpp" +#include "routing/routing_mapping.hpp" #include "std/string.hpp" #include "std/vector.hpp" diff --git a/routing/edge_estimator.hpp b/routing/edge_estimator.hpp index 3dc064ac13..06e6534073 100644 --- a/routing/edge_estimator.hpp +++ b/routing/edge_estimator.hpp @@ -4,10 +4,11 @@ #include "routing/num_mwm_id.hpp" #include "routing/segment.hpp" #include "routing/traffic_stash.hpp" -#include "routing/vehicle_model.hpp" #include "traffic/traffic_cache.hpp" +#include "routing_common/vehicle_model.hpp" + #include "indexer/mwm_set.hpp" #include "geometry/point2d.hpp" diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp index 78f1bfc33c..d46f150f1a 100644 --- a/routing/features_road_graph.cpp +++ b/routing/features_road_graph.cpp @@ -1,7 +1,8 @@ #include "routing/features_road_graph.hpp" #include "routing/nearest_edge_finder.hpp" #include "routing/route.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/classificator.hpp" #include "indexer/ftypes_matcher.hpp" diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp index 9634a1b307..eec48784c9 100644 --- a/routing/features_road_graph.hpp +++ b/routing/features_road_graph.hpp @@ -1,6 +1,8 @@ #pragma once + #include "routing/road_graph.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/altitude_loader.hpp" #include "indexer/feature_data.hpp" diff --git a/routing/geometry.hpp b/routing/geometry.hpp index 818290e54f..909cbc52b9 100644 --- a/routing/geometry.hpp +++ b/routing/geometry.hpp @@ -1,7 +1,8 @@ #pragma once #include "routing/road_point.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/index.hpp" diff --git a/routing/index_graph_loader.hpp b/routing/index_graph_loader.hpp index 3102b2c594..eb942e201f 100644 --- a/routing/index_graph_loader.hpp +++ b/routing/index_graph_loader.hpp @@ -3,7 +3,8 @@ #include "routing/edge_estimator.hpp" #include "routing/index_graph.hpp" #include "routing/num_mwm_id.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/index.hpp" diff --git a/routing/index_router.cpp b/routing/index_router.cpp index cc202f7b53..c02d9e950f 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -3,20 +3,21 @@ #include "routing/base/astar_algorithm.hpp" #include "routing/base/astar_progress.hpp" #include "routing/bicycle_directions.hpp" -#include "routing/bicycle_model.hpp" -#include "routing/car_model.hpp" #include "routing/index_graph.hpp" #include "routing/index_graph_loader.hpp" #include "routing/index_graph_serialization.hpp" #include "routing/index_graph_starter.hpp" #include "routing/index_road_graph.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/restriction_loader.hpp" #include "routing/route.hpp" #include "routing/routing_helpers.hpp" #include "routing/turns_generator.hpp" #include "routing/vehicle_mask.hpp" +#include "routing_common/bicycle_model.hpp" +#include "routing_common/car_model.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "indexer/feature_altitude.hpp" #include "geometry/distance.hpp" diff --git a/routing/index_router.hpp b/routing/index_router.hpp index 63dc2c193a..50f9ecc7b3 100644 --- a/routing/index_router.hpp +++ b/routing/index_router.hpp @@ -8,7 +8,8 @@ #include "routing/num_mwm_id.hpp" #include "routing/router.hpp" #include "routing/routing_mapping.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/index.hpp" #include "indexer/mwm_set.hpp" diff --git a/routing/nearest_edge_finder.hpp b/routing/nearest_edge_finder.hpp index ca83564abd..7edc2e5c61 100644 --- a/routing/nearest_edge_finder.hpp +++ b/routing/nearest_edge_finder.hpp @@ -1,7 +1,8 @@ #pragma once #include "routing/road_graph.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "geometry/point2d.hpp" diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp index 1bc624b7f1..c1abe3f6ab 100644 --- a/routing/online_absent_fetcher.cpp +++ b/routing/online_absent_fetcher.cpp @@ -1,5 +1,6 @@ -#include "online_absent_fetcher.hpp" -#include "online_cross_fetcher.hpp" +#include "routing/online_absent_fetcher.hpp" + +#include "routing/online_cross_fetcher.hpp" #include "platform/platform.hpp" #include "platform/country_file.hpp" diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp index dc8791e7d9..27760041f6 100644 --- a/routing/online_absent_fetcher.hpp +++ b/routing/online_absent_fetcher.hpp @@ -1,6 +1,6 @@ #pragma once -#include "routing_mapping.hpp" +#include "routing/routing_mapping.hpp" #include "geometry/point2d.hpp" diff --git a/routing/online_cross_fetcher.cpp b/routing/online_cross_fetcher.cpp index f114b985f1..43b4509800 100644 --- a/routing/online_cross_fetcher.cpp +++ b/routing/online_cross_fetcher.cpp @@ -1,4 +1,4 @@ -#include "online_cross_fetcher.hpp" +#include "routing/online_cross_fetcher.hpp" #include "platform/http_request.hpp" diff --git a/routing/osrm2feature_map.cpp b/routing/osrm2feature_map.cpp index 0d51b4168e..965aed39ac 100644 --- a/routing/osrm2feature_map.cpp +++ b/routing/osrm2feature_map.cpp @@ -1,7 +1,5 @@ #include "routing/osrm2feature_map.hpp" -#include "defines.hpp" - #include "indexer/data_header.hpp" #include "platform/local_country_file_utils.hpp" @@ -20,6 +18,8 @@ #include "std/sstream.hpp" #include "std/unordered_map.hpp" +#include "defines.hpp" + #include "3party/succinct/mapper.hpp" using platform::CountryIndexes; diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp index ec7e918161..261f601db7 100644 --- a/routing/osrm2feature_map.hpp +++ b/routing/osrm2feature_map.hpp @@ -15,11 +15,10 @@ #include "std/utility.hpp" #include "std/vector.hpp" -#include "3party/succinct/rs_bit_vector.hpp" -#include "3party/succinct/elias_fano_compressed_list.hpp" - #include "defines.hpp" +#include "3party/succinct/rs_bit_vector.hpp" +#include "3party/succinct/elias_fano_compressed_list.hpp" namespace routing { diff --git a/routing/osrm_data_facade.hpp b/routing/osrm_data_facade.hpp index 10010c5084..a0f293b336 100644 --- a/routing/osrm_data_facade.hpp +++ b/routing/osrm_data_facade.hpp @@ -2,8 +2,6 @@ #include "routing/cross_routing_context.hpp" -#include "defines.hpp" - #include "coding/file_container.hpp" #include "coding/read_write_utils.hpp" @@ -11,6 +9,8 @@ #include "std/string.hpp" +#include "defines.hpp" + #include "3party/succinct/elias_fano.hpp" #include "3party/succinct/elias_fano_compressed_list.hpp" #include "3party/succinct/gamma_vector.hpp" diff --git a/routing/osrm_engine.cpp b/routing/osrm_engine.cpp index 8c03db9258..e026de9e34 100644 --- a/routing/osrm_engine.cpp +++ b/routing/osrm_engine.cpp @@ -1,5 +1,5 @@ -#include "osrm_engine.hpp" -#include "osrm2feature_map.hpp" +#include "routing/osrm_engine.hpp" +#include "routing/osrm2feature_map.hpp" #include "base/logging.hpp" #include "base/timer.hpp" diff --git a/routing/osrm_helpers.cpp b/routing/osrm_helpers.cpp index 9a5274a75a..3590568cdf 100644 --- a/routing/osrm_helpers.cpp +++ b/routing/osrm_helpers.cpp @@ -1,5 +1,6 @@ -#include "car_model.hpp" -#include "osrm_helpers.hpp" +#include "routing/osrm_helpers.hpp" + +#include "routing_common/car_model.hpp" #include "indexer/scales.hpp" diff --git a/routing/osrm_path_segment_factory.cpp b/routing/osrm_path_segment_factory.cpp index c790364fc5..15261f9bf8 100644 --- a/routing/osrm_path_segment_factory.cpp +++ b/routing/osrm_path_segment_factory.cpp @@ -1,4 +1,5 @@ #include "routing/osrm_path_segment_factory.hpp" + #include "routing/road_graph.hpp" #include "routing/routing_mapping.hpp" diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp index 5fb7b03f20..fe4d60c45d 100644 --- a/routing/pedestrian_directions.cpp +++ b/routing/pedestrian_directions.cpp @@ -1,4 +1,5 @@ #include "routing/pedestrian_directions.hpp" + #include "routing/road_graph.hpp" #include "indexer/classificator.hpp" diff --git a/routing/restriction_loader.cpp b/routing/restriction_loader.cpp index 44efd6aace..b085e3f364 100644 --- a/routing/restriction_loader.cpp +++ b/routing/restriction_loader.cpp @@ -1,4 +1,5 @@ #include "routing/restriction_loader.hpp" + #include "routing/restrictions_serialization.hpp" #include "routing/road_index.hpp" diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 95b7fa4a64..903fc83a4a 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -1,15 +1,16 @@ #include "routing/road_graph_router.hpp" #include "routing/bicycle_directions.hpp" -#include "routing/bicycle_model.hpp" -#include "routing/car_model.hpp" #include "routing/features_road_graph.hpp" #include "routing/nearest_edge_finder.hpp" #include "routing/pedestrian_directions.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/route.hpp" #include "routing/routing_helpers.hpp" +#include "routing_common/bicycle_model.hpp" +#include "routing_common/car_model.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "coding/reader_wrapper.hpp" #include "indexer/feature.hpp" diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp index b7a9f00cd9..a5e632aa4f 100644 --- a/routing/road_graph_router.hpp +++ b/routing/road_graph_router.hpp @@ -4,7 +4,8 @@ #include "routing/road_graph.hpp" #include "routing/router.hpp" #include "routing/routing_algorithm.hpp" -#include "routing/vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "indexer/mwm_set.hpp" diff --git a/routing/route.cpp b/routing/route.cpp index 37500a6dd6..eb48faa70d 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -1,4 +1,5 @@ #include "routing/route.hpp" + #include "routing/turns_generator.hpp" #include "traffic/speed_groups.hpp" diff --git a/routing/router.cpp b/routing/router.cpp index bd6e5af5ff..2cbb645db8 100644 --- a/routing/router.cpp +++ b/routing/router.cpp @@ -1,8 +1,7 @@ -#include "router.hpp" +#include "routing/router.hpp" namespace routing { - std::string ToString(RouterType type) { switch(type) diff --git a/routing/router.hpp b/routing/router.hpp index 31fe361ad1..9c7d110dc0 100644 --- a/routing/router.hpp +++ b/routing/router.hpp @@ -1,6 +1,6 @@ #pragma once -#include "router_delegate.hpp" +#include "routing/router_delegate.hpp" #include "geometry/point2d.hpp" diff --git a/routing/router_delegate.cpp b/routing/router_delegate.cpp index caaca88a63..94a58a53f6 100644 --- a/routing/router_delegate.cpp +++ b/routing/router_delegate.cpp @@ -1,4 +1,4 @@ -#include "router_delegate.hpp" +#include "routing/router_delegate.hpp" namespace routing { diff --git a/routing/routing.pro b/routing/routing.pro index ce480092d2..6441f1a865 100644 --- a/routing/routing.pro +++ b/routing/routing.pro @@ -1,4 +1,4 @@ -# Base functions project. +# Routing project. TARGET = routing TEMPLATE = lib CONFIG += staticlib warn_on c++11 @@ -16,8 +16,6 @@ SOURCES += \ async_router.cpp \ base/followed_polyline.cpp \ bicycle_directions.cpp \ - bicycle_model.cpp \ - car_model.cpp \ car_router.cpp \ cross_mwm_index_graph.cpp \ cross_mwm_road_graph.cpp \ @@ -43,7 +41,6 @@ SOURCES += \ osrm_helpers.cpp \ osrm_path_segment_factory.cpp \ pedestrian_directions.cpp \ - pedestrian_model.cpp \ restriction_loader.cpp \ restrictions_serialization.cpp \ road_graph.cpp \ @@ -62,17 +59,13 @@ SOURCES += \ turns_notification_manager.cpp \ turns_sound_settings.cpp \ turns_tts_text.cpp \ - vehicle_model.cpp \ world_graph.cpp \ - HEADERS += \ async_router.hpp \ base/astar_algorithm.hpp \ base/followed_polyline.hpp \ bicycle_directions.hpp \ - bicycle_model.hpp \ - car_model.hpp \ car_router.hpp \ cross_mwm_index_graph.hpp \ cross_mwm_road_graph.hpp \ @@ -101,7 +94,6 @@ HEADERS += \ osrm_helpers.hpp \ osrm_path_segment_factory.hpp \ pedestrian_directions.hpp \ - pedestrian_model.hpp \ restriction_loader.hpp \ restrictions_serialization.hpp \ road_graph.hpp \ @@ -129,5 +121,4 @@ HEADERS += \ turns_sound_settings.hpp \ turns_tts_text.hpp \ vehicle_mask.hpp \ - vehicle_model.hpp \ world_graph.hpp \ diff --git a/routing/routing_benchmarks/bicycle_routing_tests.cpp b/routing/routing_benchmarks/bicycle_routing_tests.cpp index c646bd6439..39b513cbdd 100644 --- a/routing/routing_benchmarks/bicycle_routing_tests.cpp +++ b/routing/routing_benchmarks/bicycle_routing_tests.cpp @@ -3,9 +3,10 @@ #include "routing/routing_benchmarks/helpers.hpp" #include "routing/bicycle_directions.hpp" -#include "routing/bicycle_model.hpp" #include "routing/road_graph.hpp" +#include "routing_common/bicycle_model.hpp" + #include "geometry/mercator.hpp" #include "std/set.hpp" diff --git a/routing/routing_benchmarks/helpers.hpp b/routing/routing_benchmarks/helpers.hpp index 9d442d97e1..f72309e1d6 100644 --- a/routing/routing_benchmarks/helpers.hpp +++ b/routing/routing_benchmarks/helpers.hpp @@ -2,9 +2,10 @@ #include "routing/road_graph.hpp" #include "routing/router.hpp" -#include "routing/vehicle_model.hpp" #include "routing/road_graph_router.hpp" +#include "routing_common/vehicle_model.hpp" + #include "indexer/index.hpp" #include "storage/country_info_getter.hpp" diff --git a/routing/routing_benchmarks/pedestrian_routing_tests.cpp b/routing/routing_benchmarks/pedestrian_routing_tests.cpp index 61cfcefe16..c0120a4198 100644 --- a/routing/routing_benchmarks/pedestrian_routing_tests.cpp +++ b/routing/routing_benchmarks/pedestrian_routing_tests.cpp @@ -3,9 +3,10 @@ #include "routing/routing_benchmarks/helpers.hpp" #include "routing/pedestrian_directions.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/road_graph.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "std/set.hpp" #include "std/string.hpp" diff --git a/routing/routing_benchmarks/routing_benchmarks.pro b/routing/routing_benchmarks/routing_benchmarks.pro index 1577441eed..28570fc45c 100644 --- a/routing/routing_benchmarks/routing_benchmarks.pro +++ b/routing/routing_benchmarks/routing_benchmarks.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../../ -DEPENDENCIES = map routing traffic search storage indexer platform editor geometry coding base \ +DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base \ osrm jansson protobuf stats_client succinct pugixml macx-*: LIBS *= "-framework IOKit" diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt index f2f9646039..c2a1535b61 100644 --- a/routing/routing_consistency_tests/CMakeLists.txt +++ b/routing/routing_consistency_tests/CMakeLists.txt @@ -19,6 +19,7 @@ omim_link_libraries( map routing traffic + routing_common search storage indexer diff --git a/routing/routing_consistency_tests/routing_consistency_tests.pro b/routing/routing_consistency_tests/routing_consistency_tests.pro index 6b29e73ecb..fe39afc7b9 100644 --- a/routing/routing_consistency_tests/routing_consistency_tests.pro +++ b/routing/routing_consistency_tests/routing_consistency_tests.pro @@ -7,7 +7,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map routing traffic search storage indexer platform editor geometry coding base osrm \ +DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base osrm \ jansson protobuf succinct stats_client generator gflags pugixml include($$ROOT_DIR/common.pri) diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp index 095dedc61f..ee8103bac5 100644 --- a/routing/routing_helpers.hpp +++ b/routing/routing_helpers.hpp @@ -1,15 +1,16 @@ #pragma once -#include "routing/bicycle_model.hpp" -#include "routing/car_model.hpp" #include "routing/directions_engine.hpp" -#include "routing/pedestrian_model.hpp" #include "routing/road_graph.hpp" #include "routing/route.hpp" #include "routing/traffic_stash.hpp" #include "traffic/traffic_info.hpp" +#include "routing_common/bicycle_model.hpp" +#include "routing_common/car_model.hpp" +#include "routing_common/pedestrian_model.hpp" + #include "base/cancellable.hpp" #include "std/shared_ptr.hpp" diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt index cbf75f285e..e8bbab0b4e 100644 --- a/routing/routing_integration_tests/CMakeLists.txt +++ b/routing/routing_integration_tests/CMakeLists.txt @@ -33,6 +33,7 @@ omim_link_libraries( indexer editor traffic + routing_common platform oauthcpp geometry diff --git a/routing/routing_integration_tests/routing_integration_tests.pro b/routing/routing_integration_tests/routing_integration_tests.pro index 74803b98cb..aeaf06f212 100644 --- a/routing/routing_integration_tests/routing_integration_tests.pro +++ b/routing/routing_integration_tests/routing_integration_tests.pro @@ -11,7 +11,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map routing traffic search storage indexer platform editor geometry coding base \ +DEPENDENCIES = map routing traffic routing_common search storage indexer platform editor geometry coding base \ osrm jansson protobuf succinct stats_client pugixml DEPENDENCIES += opening_hours diff --git a/routing/routing_mapping.cpp b/routing/routing_mapping.cpp index 51a7b0a228..cec3570c50 100644 --- a/routing/routing_mapping.cpp +++ b/routing/routing_mapping.cpp @@ -1,4 +1,4 @@ -#include "routing_mapping.hpp" +#include "routing/routing_mapping.hpp" #include "routing/cross_routing_context.hpp" #include "routing/osrm2feature_map.hpp" diff --git a/routing/routing_mapping.hpp b/routing/routing_mapping.hpp index 2d76c2ca41..9e7dc3d2ab 100644 --- a/routing/routing_mapping.hpp +++ b/routing/routing_mapping.hpp @@ -1,8 +1,8 @@ #pragma once -#include "osrm2feature_map.hpp" -#include "osrm_data_facade.hpp" -#include "router.hpp" +#include "routing/osrm2feature_map.hpp" +#include "routing/osrm_data_facade.hpp" +#include "routing/router.hpp" #include "indexer/index.hpp" diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index d626bccdb7..2e255ab8c2 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -1,6 +1,6 @@ -#include "routing_session.hpp" +#include "routing/routing_session.hpp" -#include "speed_camera.hpp" +#include "routing/speed_camera.hpp" #include "geometry/mercator.hpp" diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt index cbe5f9106e..b960860ef9 100644 --- a/routing/routing_tests/CMakeLists.txt +++ b/routing/routing_tests/CMakeLists.txt @@ -26,7 +26,6 @@ set( turns_generator_test.cpp turns_sound_test.cpp turns_tts_text_tests.cpp - vehicle_model_test.cpp ) omim_add_test(${PROJECT_NAME} ${SRC}) @@ -38,6 +37,7 @@ omim_link_libraries( platform_tests_support editor traffic + routing_common platform oauthcpp geometry diff --git a/routing/routing_tests/applying_traffic_test.cpp b/routing/routing_tests/applying_traffic_test.cpp index a9ec4dfbb5..57a244fd76 100644 --- a/routing/routing_tests/applying_traffic_test.cpp +++ b/routing/routing_tests/applying_traffic_test.cpp @@ -1,6 +1,5 @@ #include "testing/testing.hpp" -#include "routing/car_model.hpp" #include "routing/geometry.hpp" #include "routing/index_graph.hpp" #include "routing/index_graph_starter.hpp" @@ -10,6 +9,8 @@ #include "traffic/traffic_info.hpp" +#include "routing_common/car_model.hpp" + #include "indexer/classificator_loader.hpp" #include "geometry/point2d.hpp" diff --git a/routing/routing_tests/cumulative_restriction_test.cpp b/routing/routing_tests/cumulative_restriction_test.cpp index 2e2e81d181..3c469e8319 100644 --- a/routing/routing_tests/cumulative_restriction_test.cpp +++ b/routing/routing_tests/cumulative_restriction_test.cpp @@ -2,11 +2,12 @@ #include "routing/routing_tests/index_graph_tools.hpp" -#include "routing/car_model.hpp" #include "routing/geometry.hpp" #include "traffic/traffic_cache.hpp" +#include "routing_common/car_model.hpp" + #include "geometry/point2d.hpp" #include diff --git a/routing/routing_tests/index_graph_test.cpp b/routing/routing_tests/index_graph_test.cpp index 3753e609a2..d3cdb2f7e9 100644 --- a/routing/routing_tests/index_graph_test.cpp +++ b/routing/routing_tests/index_graph_test.cpp @@ -1,7 +1,6 @@ #include "testing/testing.hpp" #include "routing/base/astar_algorithm.hpp" -#include "routing/car_model.hpp" #include "routing/edge_estimator.hpp" #include "routing/index_graph.hpp" #include "routing/index_graph_serialization.hpp" @@ -10,6 +9,8 @@ #include "routing/routing_tests/index_graph_tools.hpp" +#include "routing_common/car_model.hpp" + #include "geometry/point2d.hpp" #include "coding/reader.hpp" diff --git a/routing/routing_tests/index_graph_tools.cpp b/routing/routing_tests/index_graph_tools.cpp index a8e34fef50..2545d4ca7b 100644 --- a/routing/routing_tests/index_graph_tools.cpp +++ b/routing/routing_tests/index_graph_tools.cpp @@ -2,7 +2,7 @@ #include "testing/testing.hpp" -#include "routing/car_model.hpp" +#include "routing_common/car_model.hpp" namespace routing_test { diff --git a/routing/routing_tests/restriction_test.cpp b/routing/routing_tests/restriction_test.cpp index 024c79f5fc..2018ce1449 100644 --- a/routing/routing_tests/restriction_test.cpp +++ b/routing/routing_tests/restriction_test.cpp @@ -2,10 +2,11 @@ #include "routing/routing_tests/index_graph_tools.hpp" -#include "routing/car_model.hpp" #include "routing/geometry.hpp" #include "routing/restriction_loader.hpp" +#include "routing_common/car_model.hpp" + #include "indexer/classificator_loader.hpp" #include "geometry/point2d.hpp" diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro index f4c315d499..c144590a22 100644 --- a/routing/routing_tests/routing_tests.pro +++ b/routing/routing_tests/routing_tests.pro @@ -1,4 +1,4 @@ - # Routing lib unit tests +# Routing lib unit tests TARGET = routing_tests CONFIG += console warn_on @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = routing indexer platform_tests_support platform editor geometry coding base \ +DEPENDENCIES = routing routing_common indexer platform_tests_support platform editor geometry coding base \ osrm protobuf succinct jansson stats_client map traffic pugixml stats_client macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration" @@ -43,7 +43,6 @@ SOURCES += \ turns_generator_test.cpp \ turns_sound_test.cpp \ turns_tts_text_tests.cpp \ - vehicle_model_test.cpp \ HEADERS += \ index_graph_tools.hpp \ diff --git a/routing/speed_camera.cpp b/routing/speed_camera.cpp index 23ec51215f..d650c77968 100644 --- a/routing/speed_camera.cpp +++ b/routing/speed_camera.cpp @@ -1,4 +1,4 @@ -#include "speed_camera.hpp" +#include "routing/speed_camera.hpp" #include "indexer/classificator.hpp" #include "indexer/ftypes_matcher.hpp" diff --git a/routing/turns.cpp b/routing/turns.cpp index b5149dff6d..3373dbafcb 100644 --- a/routing/turns.cpp +++ b/routing/turns.cpp @@ -7,7 +7,6 @@ #include "std/array.hpp" #include "std/utility.hpp" - namespace { using namespace routing::turns; diff --git a/routing/turns.hpp b/routing/turns.hpp index 43d1fd3820..df928aeae8 100644 --- a/routing/turns.hpp +++ b/routing/turns.hpp @@ -4,13 +4,13 @@ #include "geometry/point2d.hpp" -#include "3party/osrm/osrm-backend/typedefs.h" - #include "std/initializer_list.hpp" #include "std/limits.hpp" #include "std/string.hpp" #include "std/vector.hpp" +#include "3party/osrm/osrm-backend/typedefs.h" + namespace routing { using TNodeId = uint32_t; diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp index 8cf222a98e..2c95c6b067 100644 --- a/routing/turns_generator.cpp +++ b/routing/turns_generator.cpp @@ -1,8 +1,9 @@ -#include "routing/car_model.hpp" #include "routing/osrm_helpers.hpp" #include "routing/routing_mapping.hpp" #include "routing/turns_generator.hpp" +#include "routing_common/car_model.hpp" + #include "indexer/ftypes_matcher.hpp" #include "indexer/scales.hpp" @@ -10,12 +11,12 @@ #include "base/macros.hpp" -#include "3party/osrm/osrm-backend/data_structures/internal_route_result.hpp" - #include "std/cmath.hpp" #include "std/numeric.hpp" #include "std/string.hpp" +#include "3party/osrm/osrm-backend/data_structures/internal_route_result.hpp" + using namespace routing; using namespace routing::turns; diff --git a/routing/turns_tts_text.hpp b/routing/turns_tts_text.hpp index 8072b0e6bf..d4ec7c547c 100644 --- a/routing/turns_tts_text.hpp +++ b/routing/turns_tts_text.hpp @@ -5,7 +5,6 @@ #include "std/string.hpp" #include "std/unique_ptr.hpp" - namespace routing { namespace turns diff --git a/routing_common/CMakeLists.txt b/routing_common/CMakeLists.txt new file mode 100644 index 0000000000..e1c15d6259 --- /dev/null +++ b/routing_common/CMakeLists.txt @@ -0,0 +1,16 @@ +project(routing_common) + +set( + SRC + bicycle_model.cpp + bicycle_model.hpp + car_model.cpp + car_model.hpp + pedestrian_model.cpp + pedestrian_model.hpp + vehicle_model.cpp + vehicle_model.hpp +) + +add_library(${PROJECT_NAME} ${SRC}) +omim_add_test_subdirectory(routing_common_tests) diff --git a/routing/bicycle_model.cpp b/routing_common/bicycle_model.cpp similarity index 99% rename from routing/bicycle_model.cpp rename to routing_common/bicycle_model.cpp index d1540f3b21..0f24d4fb9a 100644 --- a/routing/bicycle_model.cpp +++ b/routing_common/bicycle_model.cpp @@ -1,4 +1,4 @@ -#include "bicycle_model.hpp" +#include "routing_common/bicycle_model.hpp" #include "base/assert.hpp" #include "base/macros.hpp" diff --git a/routing/bicycle_model.hpp b/routing_common/bicycle_model.hpp similarity index 96% rename from routing/bicycle_model.hpp rename to routing_common/bicycle_model.hpp index 9defeda9be..d96dad687e 100644 --- a/routing/bicycle_model.hpp +++ b/routing_common/bicycle_model.hpp @@ -1,10 +1,10 @@ #pragma once +#include "routing_common/vehicle_model.hpp" + #include "std/shared_ptr.hpp" #include "std/unordered_map.hpp" -#include "vehicle_model.hpp" - namespace routing { diff --git a/routing/car_model.cpp b/routing_common/car_model.cpp similarity index 98% rename from routing/car_model.cpp rename to routing_common/car_model.cpp index d95185a43d..07be768d81 100644 --- a/routing/car_model.cpp +++ b/routing_common/car_model.cpp @@ -1,4 +1,4 @@ -#include "car_model.hpp" +#include "routing_common/car_model.hpp" #include "base/macros.hpp" diff --git a/routing/car_model.hpp b/routing_common/car_model.hpp similarity index 92% rename from routing/car_model.hpp rename to routing_common/car_model.hpp index 44378202e7..2281691ac3 100644 --- a/routing/car_model.hpp +++ b/routing_common/car_model.hpp @@ -1,5 +1,6 @@ #pragma once -#include "vehicle_model.hpp" + +#include "routing_common/vehicle_model.hpp" #include "std/shared_ptr.hpp" diff --git a/routing/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp similarity index 99% rename from routing/pedestrian_model.cpp rename to routing_common/pedestrian_model.cpp index 275d19d772..0f6350da02 100644 --- a/routing/pedestrian_model.cpp +++ b/routing_common/pedestrian_model.cpp @@ -1,4 +1,4 @@ -#include "pedestrian_model.hpp" +#include "routing_common/pedestrian_model.hpp" #include "base/assert.hpp" #include "base/macros.hpp" diff --git a/routing/pedestrian_model.hpp b/routing_common/pedestrian_model.hpp similarity index 95% rename from routing/pedestrian_model.hpp rename to routing_common/pedestrian_model.hpp index bcff1db241..8637f9b41c 100644 --- a/routing/pedestrian_model.hpp +++ b/routing_common/pedestrian_model.hpp @@ -1,10 +1,10 @@ #pragma once +#include "routing_common/vehicle_model.hpp" + #include "std/shared_ptr.hpp" #include "std/unordered_map.hpp" -#include "vehicle_model.hpp" - namespace routing { diff --git a/routing_common/routing_common.pro b/routing_common/routing_common.pro new file mode 100644 index 0000000000..450f01cb42 --- /dev/null +++ b/routing_common/routing_common.pro @@ -0,0 +1,26 @@ +# A higher level routing project used to avoid cyclic dependencies. +TARGET = routing_common +TEMPLATE = lib +CONFIG += staticlib warn_on c++11 + +ROOT_DIR = .. + +include($$ROOT_DIR/common.pri) + +DEFINES *= BOOST_ERROR_CODE_HEADER_ONLY +INCLUDEPATH += $$ROOT_DIR/3party/jansson/src \ + $$ROOT_DIR/3party/osrm/osrm-backend/include \ + $$ROOT_DIR/3party/osrm/osrm-backend/third_party + +SOURCES += \ + bicycle_model.cpp \ + car_model.cpp \ + pedestrian_model.cpp \ + vehicle_model.cpp \ + + +HEADERS += \ + bicycle_model.hpp \ + car_model.hpp \ + pedestrian_model.hpp \ + vehicle_model.hpp \ diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/routing_common/routing_common_tests/CMakeLists.txt new file mode 100644 index 0000000000..e17bf093f8 --- /dev/null +++ b/routing_common/routing_common_tests/CMakeLists.txt @@ -0,0 +1,34 @@ +project(routing_common_tests) + +set( + SRC + vehicle_model_test.cpp +) + +omim_add_test(${PROJECT_NAME} ${SRC}) + +omim_link_libraries( + ${PROJECT_NAME} + indexer + platform_tests_support + editor + traffic + routing_common + platform + oauthcpp + geometry + coding + base + osrm + protobuf + succinct + opening_hours + jansson + stats_client + map + pugixml + stats_client + ${LIBZ} +) + +link_qt5_core(${PROJECT_NAME}) diff --git a/routing_common/routing_common_tests/routing_common_tests.pro b/routing_common/routing_common_tests/routing_common_tests.pro new file mode 100644 index 0000000000..33aeca1780 --- /dev/null +++ b/routing_common/routing_common_tests/routing_common_tests.pro @@ -0,0 +1,20 @@ +# Routing common lib unit tests + +TARGET = routing_common_tests +CONFIG += console warn_on +CONFIG -= app_bundle +TEMPLATE = app + +ROOT_DIR = ../.. +DEPENDENCIES = routing_common indexer platform_tests_support platform editor geometry coding base \ + osrm protobuf succinct jansson stats_client map traffic pugixml stats_client + +macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration" + +include($$ROOT_DIR/common.pri) + +QT *= core + +SOURCES += \ + ../../testing/testingmain.cpp \ + vehicle_model_test.cpp \ diff --git a/routing/routing_tests/vehicle_model_test.cpp b/routing_common/routing_common_tests/vehicle_model_test.cpp similarity index 98% rename from routing/routing_tests/vehicle_model_test.cpp rename to routing_common/routing_common_tests/vehicle_model_test.cpp index 3b416f4b07..769ed3e24d 100644 --- a/routing/routing_tests/vehicle_model_test.cpp +++ b/routing_common/routing_common_tests/vehicle_model_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "routing/vehicle_model.hpp" +#include "routing_common/vehicle_model.hpp" #include "indexer/classificator.hpp" #include "indexer/classificator_loader.hpp" @@ -8,10 +8,8 @@ #include "base/macros.hpp" - namespace { - routing::VehicleModel::InitListT const s_testLimits = { {{"highway", "trunk"}, 150}, {{"highway", "primary"}, 120}, diff --git a/routing/vehicle_model.cpp b/routing_common/vehicle_model.cpp similarity index 99% rename from routing/vehicle_model.cpp rename to routing_common/vehicle_model.cpp index c44496e5bb..cc76f96c8a 100644 --- a/routing/vehicle_model.cpp +++ b/routing_common/vehicle_model.cpp @@ -1,4 +1,4 @@ -#include "routing/vehicle_model.hpp" +#include "routing_common/vehicle_model.hpp" #include "indexer/classificator.hpp" #include "indexer/feature.hpp" diff --git a/routing/vehicle_model.hpp b/routing_common/vehicle_model.hpp similarity index 99% rename from routing/vehicle_model.hpp rename to routing_common/vehicle_model.hpp index f0ff71c298..2080027e2c 100644 --- a/routing/vehicle_model.hpp +++ b/routing_common/vehicle_model.hpp @@ -1,4 +1,5 @@ #pragma once + #include "std/cstdint.hpp" #include "std/initializer_list.hpp" #include "std/shared_ptr.hpp" diff --git a/search/search_integration_tests/CMakeLists.txt b/search/search_integration_tests/CMakeLists.txt index bb22141e27..bb8536ad3a 100644 --- a/search/search_integration_tests/CMakeLists.txt +++ b/search/search_integration_tests/CMakeLists.txt @@ -23,6 +23,7 @@ omim_link_libraries( indexer_tests_support generator routing + routing_common search storage stats_client diff --git a/search/search_integration_tests/search_integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro index 03ff6dca47..b962a46225 100644 --- a/search/search_integration_tests/search_integration_tests.pro +++ b/search/search_integration_tests/search_integration_tests.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator_tests_support search_tests_support indexer_tests_support generator \ - routing search storage stats_client indexer platform editor geometry coding base \ + routing routing_common search storage stats_client indexer platform editor geometry coding base \ tess2 protobuf jansson succinct pugixml opening_hours include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/features_collector_tool/features_collector_tool.pro b/search/search_quality/features_collector_tool/features_collector_tool.pro index fc57253608..347ffda7e8 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.pro +++ b/search/search_quality/features_collector_tool/features_collector_tool.pro @@ -7,10 +7,9 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise -DEPENDENCIES = map drape_frontend traffic routing search_tests_support search search_quality storage indexer drape \ - platform editor geometry coding base freetype expat fribidi gflags \ - jansson protobuf osrm stats_client minizip succinct \ - opening_hours pugixml stb_image sdf_image +DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality \ + storage indexer drape platform editor geometry coding base freetype expat fribidi gflags \ + jansson protobuf osrm stats_client minizip succinct opening_hours pugixml stb_image sdf_image include($$ROOT_DIR/common.pri) diff --git a/search/search_quality/search_quality_tests/search_quality_tests.pro b/search/search_quality/search_quality_tests/search_quality_tests.pro index 0772787881..2b1935c378 100644 --- a/search/search_quality/search_quality_tests/search_quality_tests.pro +++ b/search/search_quality/search_quality_tests/search_quality_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise -DEPENDENCIES = map drape_frontend traffic routing search_tests_support search search_quality storage indexer drape platform geometry coding base \ +DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality storage indexer drape platform geometry coding base \ freetype expat fribidi gflags jansson protobuf osrm stats_client minizip succinct \ opening_hours stb_image sdf_image diff --git a/search/search_quality/search_quality_tool/search_quality_tool.pro b/search/search_quality/search_quality_tool/search_quality_tool.pro index 6e71e6b301..42914e1ad5 100644 --- a/search/search_quality/search_quality_tool/search_quality_tool.pro +++ b/search/search_quality/search_quality_tool/search_quality_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../../.. # todo(@m) revise -DEPENDENCIES = map drape_frontend traffic routing search_tests_support search search_quality storage indexer drape \ +DEPENDENCIES = map drape_frontend routing traffic routing_common search_tests_support search search_quality storage indexer drape \ platform editor geometry coding base freetype expat fribidi gflags \ jansson protobuf osrm stats_client minizip succinct \ opening_hours pugixml stb_image sdf_image diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 1e8fc35df3..819484bab7 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -22,6 +22,7 @@ omim_link_libraries( map drape_frontend routing + routing_common search storage tracking diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro index d9ddd4ce5c..4188439612 100644 --- a/storage/storage_integration_tests/storage_integration_tests.pro +++ b/storage/storage_integration_tests/storage_integration_tests.pro @@ -6,7 +6,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic indexer drape partners_api platform_tests_support platform editor opening_hours geometry \ +DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common indexer drape \ + partners_api platform_tests_support platform editor opening_hours geometry \ coding base freetype expat fribidi jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index 1dd9ea51dc..eaf31cce26 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -32,6 +32,7 @@ omim_link_libraries( generator search routing + routing_common indexer platform_tests_support osrm diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index 764c5410ae..32016578bc 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -11,7 +11,7 @@ macx*|win32*|linux* { DEPENDENCIES = generator_tests_support generator } -DEPENDENCIES *= drape_frontend map routing traffic \ +DEPENDENCIES *= drape_frontend map routing traffic routing_common \ search storage indexer drape platform_tests_support platform editor opening_hours geometry \ coding base freetype expat fribidi jansson tess2 protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image diff --git a/tracking/tracking_tests/tracking_tests.pro b/tracking/tracking_tests/tracking_tests.pro index 6009b5ffda..5c101f634c 100644 --- a/tracking/tracking_tests/tracking_tests.pro +++ b/tracking/tracking_tests/tracking_tests.pro @@ -7,7 +7,7 @@ ROOT_DIR = ../.. INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src -DEPENDENCIES = routing tracking platform_tests_support platform coding geometry base stats_client +DEPENDENCIES = routing routing_common tracking platform_tests_support platform coding geometry base stats_client include($$ROOT_DIR/common.pri) diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt index 79c8b78754..2d1946bdf5 100644 --- a/traffic/pytraffic/CMakeLists.txt +++ b/traffic/pytraffic/CMakeLists.txt @@ -24,8 +24,9 @@ endif() omim_link_libraries( ${PROJECT_NAME} - traffic routing + traffic + routing_common indexer editor platform diff --git a/traffic/traffic_cache.hpp b/traffic/traffic_cache.hpp index 13dff76da5..9cfb20ac36 100644 --- a/traffic/traffic_cache.hpp +++ b/traffic/traffic_cache.hpp @@ -1,4 +1,5 @@ #pragma once + #include "traffic/traffic_info.hpp" #include "indexer/mwm_set.hpp" diff --git a/traffic/traffic_info.cpp b/traffic/traffic_info.cpp index 48c2600af0..6599b446cd 100644 --- a/traffic/traffic_info.cpp +++ b/traffic/traffic_info.cpp @@ -2,8 +2,7 @@ #include "platform/http_client.hpp" -#include "routing/car_model.hpp" -#include "routing/routing_helpers.hpp" +#include "routing_common/car_model.hpp" #include "indexer/feature_algo.hpp" #include "indexer/feature_processor.hpp" diff --git a/traffic/traffic_tests/CMakeLists.txt b/traffic/traffic_tests/CMakeLists.txt index 78b1606216..074ef8dff7 100644 --- a/traffic/traffic_tests/CMakeLists.txt +++ b/traffic/traffic_tests/CMakeLists.txt @@ -14,7 +14,7 @@ omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( ${PROJECT_NAME} traffic - routing + routing_common indexer editor pugixml diff --git a/traffic/traffic_tests/traffic_tests.pro b/traffic/traffic_tests/traffic_tests.pro index 0402ae4742..dd0d0c8e7d 100644 --- a/traffic/traffic_tests/traffic_tests.pro +++ b/traffic/traffic_tests/traffic_tests.pro @@ -7,7 +7,7 @@ ROOT_DIR = ../.. INCLUDEPATH *= $$ROOT_DIR/3party/jansson/src -DEPENDENCIES = routing traffic indexer platform_tests_support platform coding geometry base stats_client protobuf +DEPENDENCIES = traffic routing_common indexer platform_tests_support platform coding geometry base stats_client protobuf include($$ROOT_DIR/common.pri) From 917177cfe76f9b047fb1bbcbd4c3dec47f0478fd Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Sat, 4 Mar 2017 04:41:11 +0300 Subject: [PATCH 2/3] Fix Qt Application include path --- qt/mainwindow.cpp | 2 +- qt/traffic_mode.cpp | 2 +- qt/traffic_mode.hpp | 2 +- qt/traffic_panel.cpp | 12 ++++++------ qt/traffic_panel.hpp | 2 +- qt/trafficmodeinitdlg.cpp | 2 +- qt/trafficmodeinitdlg.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 7540330499..2d8225ee56 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -21,7 +21,7 @@ #include "std/target_os.hpp" #include -#include +#include #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include diff --git a/qt/traffic_mode.cpp b/qt/traffic_mode.cpp index 174c48b4e2..ce8b53ca44 100644 --- a/qt/traffic_mode.cpp +++ b/qt/traffic_mode.cpp @@ -9,7 +9,7 @@ #include "3party/pugixml/src/pugixml.hpp" -#include +#include // DecodedSample ----------------------------------------------------------------------------------- DecodedSample::DecodedSample(Index const & index, openlr::SamplePool const & sample) diff --git a/qt/traffic_mode.hpp b/qt/traffic_mode.hpp index f16eb1b571..d8e8bfbacc 100644 --- a/qt/traffic_mode.hpp +++ b/qt/traffic_mode.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include class Index; class QItemSelection; diff --git a/qt/traffic_panel.cpp b/qt/traffic_panel.cpp index 57e79c75dd..a073a777b9 100644 --- a/qt/traffic_panel.cpp +++ b/qt/traffic_panel.cpp @@ -1,12 +1,12 @@ #include "qt/traffic_panel.hpp" #include "qt/traffic_mode.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // ComboBoxDelegate -------------------------------------------------------------------------------- ComboBoxDelegate::ComboBoxDelegate(QObject * parent) diff --git a/qt/traffic_panel.hpp b/qt/traffic_panel.hpp index 833d061555..0cf25e3357 100644 --- a/qt/traffic_panel.hpp +++ b/qt/traffic_panel.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include class QAbstractItemModel; class QComboBox; diff --git a/qt/trafficmodeinitdlg.cpp b/qt/trafficmodeinitdlg.cpp index fef3a16232..2484a2bd34 100644 --- a/qt/trafficmodeinitdlg.cpp +++ b/qt/trafficmodeinitdlg.cpp @@ -3,7 +3,7 @@ #include "platform/settings.hpp" -#include +#include namespace { diff --git a/qt/trafficmodeinitdlg.h b/qt/trafficmodeinitdlg.h index d182507a50..b790e626d7 100644 --- a/qt/trafficmodeinitdlg.h +++ b/qt/trafficmodeinitdlg.h @@ -2,7 +2,7 @@ #include -#include +#include class QLineEdit; From 8a247f5c880cb26df05a9f80ba6adb177e97685f Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Sat, 4 Mar 2017 04:41:26 +0300 Subject: [PATCH 3/3] Fix XCode projects --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 16 + .../omim.xcworkspace/contents.xcworkspacedata | 6 + xcode/openlr/openlr.xcodeproj/project.pbxproj | 241 ++++++++++++ .../qtMapsMe.xcodeproj/project.pbxproj | 92 +++-- .../routing/routing.xcodeproj/project.pbxproj | 36 -- .../routing_common.xcodeproj/project.pbxproj | 369 ++++++++++++++++++ 6 files changed, 700 insertions(+), 60 deletions(-) create mode 100644 xcode/openlr/openlr.xcodeproj/project.pbxproj create mode 100644 xcode/routing_common/routing_common.xcodeproj/project.pbxproj diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 5a0a181851..12169feeb7 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -487,6 +487,7 @@ 671182E41C7F0DD800CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */; }; 671182E51C7F0DDB00CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */; }; 671182E61C7F0DDD00CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */; }; + 671E78D31E6A423300B2859B /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78D21E6A423300B2859B /* librouting_common.a */; }; 6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; }; 6741A9451BF340DE002C974C /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; 6741A9491BF340DE002C974C /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; }; @@ -1825,6 +1826,7 @@ 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries_obsolete.txt; path = ../../data/countries_obsolete.txt; sourceTree = ""; }; 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons_obsolete.bin; path = ../../data/packed_polygons_obsolete.bin; sourceTree = ""; }; 671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts_obsolete.mwm; path = ../../data/WorldCoasts_obsolete.mwm; sourceTree = ""; }; + 671E78D21E6A423300B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/librouting_common.a"; sourceTree = ""; }; 6741AA5D1BF340DE002C974C /* xc dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "xc dbg.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6741AAA21BF356B9002C974C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = ""; }; 6741AAA31BF356B9002C974C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = ""; }; @@ -2295,6 +2297,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 671E78D31E6A423300B2859B /* librouting_common.a in Frameworks */, 67B78B551E42333C0018E590 /* AdSupport.framework in Frameworks */, 67B78B471E422E0A0018E590 /* MobileCoreServices.framework in Frameworks */, 67B78B451E422C970018E590 /* iAd.framework in Frameworks */, @@ -2497,6 +2500,7 @@ 6741AAB41BF356B9002C974C /* libosrm.a */, 6741AAB51BF356B9002C974C /* libplatform.a */, 6741AAB61BF356BA002C974C /* libprotobuf.a */, + 671E78D21E6A423300B2859B /* librouting_common.a */, 6741AAB81BF356BA002C974C /* librouting.a */, 6741AAB91BF356BA002C974C /* libsearch.a */, 6741AABA1BF356BA002C974C /* libstorage.a */, @@ -5748,6 +5752,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -5793,6 +5798,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -5838,6 +5844,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -5883,6 +5890,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -5928,6 +5936,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -5973,6 +5982,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6072,6 +6082,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6167,6 +6178,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6265,6 +6277,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6363,6 +6376,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6461,6 +6475,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", @@ -6560,6 +6575,7 @@ "-ldrape", "-lstorage", "-lrouting", + "-lrouting_common", "-lindexer", "-lplatform", "-lpartners_api", diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 92273b6a0f..e455906a86 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -277,6 +277,9 @@ + + @@ -286,6 +289,9 @@ + + diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..8e0330557b --- /dev/null +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -0,0 +1,241 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 671E79101E6A502200B2859B /* openlr_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79011E6A502200B2859B /* openlr_model.cpp */; }; + 671E79111E6A502200B2859B /* openlr_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79021E6A502200B2859B /* openlr_model.hpp */; }; + 671E79121E6A502200B2859B /* openlr_sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79031E6A502200B2859B /* openlr_sample.cpp */; }; + 671E79131E6A502200B2859B /* openlr_sample.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79041E6A502200B2859B /* openlr_sample.hpp */; }; + 671E79141E6A502200B2859B /* openlr_simple_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */; }; + 671E79151E6A502200B2859B /* openlr_simple_decoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */; }; + 671E79161E6A502200B2859B /* openlr_simple_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79071E6A502200B2859B /* openlr_simple_parser.cpp */; }; + 671E79171E6A502200B2859B /* openlr_simple_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E79081E6A502200B2859B /* openlr_simple_parser.hpp */; }; + 671E79181E6A502200B2859B /* road_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E79091E6A502200B2859B /* road_info_getter.cpp */; }; + 671E79191E6A502200B2859B /* road_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790A1E6A502200B2859B /* road_info_getter.hpp */; }; + 671E791A1E6A502200B2859B /* road_type_checkers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E790B1E6A502200B2859B /* road_type_checkers.cpp */; }; + 671E791B1E6A502200B2859B /* road_type_checkers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790C1E6A502200B2859B /* road_type_checkers.hpp */; }; + 671E791C1E6A502200B2859B /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E790D1E6A502200B2859B /* router.cpp */; }; + 671E791D1E6A502200B2859B /* router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790E1E6A502200B2859B /* router.hpp */; }; + 671E791E1E6A502200B2859B /* way_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E790F1E6A502200B2859B /* way_point.hpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 671E78F31E6A4FE400B2859B /* libopenlr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenlr.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 671E79011E6A502200B2859B /* openlr_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_model.cpp; sourceTree = ""; }; + 671E79021E6A502200B2859B /* openlr_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_model.hpp; sourceTree = ""; }; + 671E79031E6A502200B2859B /* openlr_sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_sample.cpp; sourceTree = ""; }; + 671E79041E6A502200B2859B /* openlr_sample.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_sample.hpp; sourceTree = ""; }; + 671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_simple_decoder.cpp; sourceTree = ""; }; + 671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_simple_decoder.hpp; sourceTree = ""; }; + 671E79071E6A502200B2859B /* openlr_simple_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openlr_simple_parser.cpp; sourceTree = ""; }; + 671E79081E6A502200B2859B /* openlr_simple_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openlr_simple_parser.hpp; sourceTree = ""; }; + 671E79091E6A502200B2859B /* road_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_info_getter.cpp; sourceTree = ""; }; + 671E790A1E6A502200B2859B /* road_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_info_getter.hpp; sourceTree = ""; }; + 671E790B1E6A502200B2859B /* road_type_checkers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_type_checkers.cpp; sourceTree = ""; }; + 671E790C1E6A502200B2859B /* road_type_checkers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_type_checkers.hpp; sourceTree = ""; }; + 671E790D1E6A502200B2859B /* router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router.cpp; sourceTree = ""; }; + 671E790E1E6A502200B2859B /* router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = router.hpp; sourceTree = ""; }; + 671E790F1E6A502200B2859B /* way_point.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = way_point.hpp; sourceTree = ""; }; + 671E791F1E6A503F00B2859B /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 671E79201E6A503F00B2859B /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 671E78F01E6A4FE400B2859B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 671E78EA1E6A4FE400B2859B = { + isa = PBXGroup; + children = ( + 671E791F1E6A503F00B2859B /* common-debug.xcconfig */, + 671E79201E6A503F00B2859B /* common-release.xcconfig */, + 671E78F51E6A4FE400B2859B /* openlr */, + 671E78F41E6A4FE400B2859B /* Products */, + ); + sourceTree = ""; + }; + 671E78F41E6A4FE400B2859B /* Products */ = { + isa = PBXGroup; + children = ( + 671E78F31E6A4FE400B2859B /* libopenlr.a */, + ); + name = Products; + sourceTree = ""; + }; + 671E78F51E6A4FE400B2859B /* openlr */ = { + isa = PBXGroup; + children = ( + 671E79011E6A502200B2859B /* openlr_model.cpp */, + 671E79021E6A502200B2859B /* openlr_model.hpp */, + 671E79031E6A502200B2859B /* openlr_sample.cpp */, + 671E79041E6A502200B2859B /* openlr_sample.hpp */, + 671E79051E6A502200B2859B /* openlr_simple_decoder.cpp */, + 671E79061E6A502200B2859B /* openlr_simple_decoder.hpp */, + 671E79071E6A502200B2859B /* openlr_simple_parser.cpp */, + 671E79081E6A502200B2859B /* openlr_simple_parser.hpp */, + 671E79091E6A502200B2859B /* road_info_getter.cpp */, + 671E790A1E6A502200B2859B /* road_info_getter.hpp */, + 671E790B1E6A502200B2859B /* road_type_checkers.cpp */, + 671E790C1E6A502200B2859B /* road_type_checkers.hpp */, + 671E790D1E6A502200B2859B /* router.cpp */, + 671E790E1E6A502200B2859B /* router.hpp */, + 671E790F1E6A502200B2859B /* way_point.hpp */, + ); + name = openlr; + path = ../../openlr; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 671E78F11E6A4FE400B2859B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E791D1E6A502200B2859B /* router.hpp in Headers */, + 671E791B1E6A502200B2859B /* road_type_checkers.hpp in Headers */, + 671E79131E6A502200B2859B /* openlr_sample.hpp in Headers */, + 671E79111E6A502200B2859B /* openlr_model.hpp in Headers */, + 671E79191E6A502200B2859B /* road_info_getter.hpp in Headers */, + 671E791E1E6A502200B2859B /* way_point.hpp in Headers */, + 671E79151E6A502200B2859B /* openlr_simple_decoder.hpp in Headers */, + 671E79171E6A502200B2859B /* openlr_simple_parser.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 671E78F21E6A4FE400B2859B /* openlr */ = { + isa = PBXNativeTarget; + buildConfigurationList = 671E78FE1E6A4FE400B2859B /* Build configuration list for PBXNativeTarget "openlr" */; + buildPhases = ( + 671E78EF1E6A4FE400B2859B /* Sources */, + 671E78F01E6A4FE400B2859B /* Frameworks */, + 671E78F11E6A4FE400B2859B /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = openlr; + productName = openlr; + productReference = 671E78F31E6A4FE400B2859B /* libopenlr.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 671E78EB1E6A4FE400B2859B /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0820; + ORGANIZATIONNAME = Mail.Ru; + TargetAttributes = { + 671E78F21E6A4FE400B2859B = { + CreatedOnToolsVersion = 8.2.1; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 671E78EE1E6A4FE400B2859B /* Build configuration list for PBXProject "openlr" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 671E78EA1E6A4FE400B2859B; + productRefGroup = 671E78F41E6A4FE400B2859B /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 671E78F21E6A4FE400B2859B /* openlr */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 671E78EF1E6A4FE400B2859B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E79101E6A502200B2859B /* openlr_model.cpp in Sources */, + 671E79121E6A502200B2859B /* openlr_sample.cpp in Sources */, + 671E79181E6A502200B2859B /* road_info_getter.cpp in Sources */, + 671E791C1E6A502200B2859B /* router.cpp in Sources */, + 671E79161E6A502200B2859B /* openlr_simple_parser.cpp in Sources */, + 671E79141E6A502200B2859B /* openlr_simple_decoder.cpp in Sources */, + 671E791A1E6A502200B2859B /* road_type_checkers.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 671E78FC1E6A4FE400B2859B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671E791F1E6A503F00B2859B /* common-debug.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 671E78FD1E6A4FE400B2859B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671E79201E6A503F00B2859B /* common-release.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 671E78FF1E6A4FE400B2859B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 671E79001E6A4FE400B2859B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 671E78EE1E6A4FE400B2859B /* Build configuration list for PBXProject "openlr" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671E78FC1E6A4FE400B2859B /* Debug */, + 671E78FD1E6A4FE400B2859B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 671E78FE1E6A4FE400B2859B /* Build configuration list for PBXNativeTarget "openlr" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671E78FF1E6A4FE400B2859B /* Debug */, + 671E79001E6A4FE400B2859B /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 671E78EB1E6A4FE400B2859B /* Project object */; +} diff --git a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj index 89c8c74a8f..2e6e28158d 100644 --- a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj +++ b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj @@ -44,6 +44,16 @@ 6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; }; 6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6001BD14016008AB603 /* resources-mdpi_clear */; }; 6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6011BD14016008AB603 /* resources-mdpi_dark */; }; + 671E78DC1E6A44C600B2859B /* traffic_mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D61E6A44C600B2859B /* traffic_mode.cpp */; }; + 671E78DD1E6A44C600B2859B /* traffic_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D81E6A44C600B2859B /* traffic_panel.cpp */; }; + 671E78DE1E6A44C600B2859B /* trafficmodeinitdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */; }; + 671E78E01E6A455D00B2859B /* trafficmodeinitdlg.ui in Resources */ = {isa = PBXBuildFile; fileRef = 671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */; }; + 671E78E31E6A4BE300B2859B /* trafficmodeinitdlg.ui in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */; }; + 671E78E51E6A4E1A00B2859B /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78E41E6A4E1A00B2859B /* librouting_common.a */; }; + 671E78E61E6A4E4A00B2859B /* traffic_mode.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D71E6A44C600B2859B /* traffic_mode.hpp */; }; + 671E78E71E6A4E4A00B2859B /* traffic_panel.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D91E6A44C600B2859B /* traffic_panel.hpp */; }; + 671E78E91E6A4F3700B2859B /* trafficmodeinitdlg.h in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */; }; + 671E79221E6A508600B2859B /* libopenlr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E79211E6A508600B2859B /* libopenlr.a */; }; 671F59021B8755FE0032311E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F59011B8755FE0032311E /* libz.dylib */; }; 671F59301B8759460032311E /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F592F1B8759460032311E /* libminizip.a */; }; 672292B11DE307DC005BA3A7 /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 672292B01DE307DC005BA3A7 /* libtraffic.a */; }; @@ -123,10 +133,21 @@ /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ + 671E78E11E6A45BD00B2859B /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*.ui"; + fileType = pattern.proxy; + isEditable = 1; + outputFiles = ( + "$(DERIVED_FILE_DIR)/ui_$(INPUT_FILE_NAME).h", + ); + script = "/usr/local/opt/qt5/bin/uic -o ${DERIVED_FILE_DIR}/ui_${INPUT_FILE_BASE}.h ${SCRIPT_INPUT_FILE}\n"; + }; 6729A45A1A684436007D5872 /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = com.apple.compilers.proxy.script; - filePatterns = "*.hpp"; + filePatterns = "*.hpp *.h"; fileType = pattern.proxy; isEditable = 1; outputFiles = ( @@ -214,6 +235,15 @@ 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = ""; }; 6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = ""; }; 6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = ""; }; + 671E78D61E6A44C600B2859B /* traffic_mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_mode.cpp; sourceTree = ""; }; + 671E78D71E6A44C600B2859B /* traffic_mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_mode.hpp; sourceTree = ""; }; + 671E78D81E6A44C600B2859B /* traffic_panel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_panel.cpp; sourceTree = ""; }; + 671E78D91E6A44C600B2859B /* traffic_panel.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_panel.hpp; sourceTree = ""; }; + 671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trafficmodeinitdlg.cpp; sourceTree = ""; }; + 671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trafficmodeinitdlg.h; sourceTree = ""; }; + 671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = trafficmodeinitdlg.ui; sourceTree = ""; }; + 671E78E41E6A4E1A00B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "/Users/darkserj/mapsme/omim/xcode/routing_common/../../../omim-build/xcode/Debug/librouting_common.a"; sourceTree = ""; }; + 671E79211E6A508600B2859B /* libopenlr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenlr.a; path = "/Users/darkserj/mapsme/omim/xcode/openlr/../../../omim-build/xcode/Debug/libopenlr.a"; sourceTree = ""; }; 671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 671F592F1B8759460032311E /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = ""; }; 672292B01DE307DC005BA3A7 /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = ""; }; @@ -309,6 +339,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 671E79221E6A508600B2859B /* libopenlr.a in Frameworks */, + 671E78E51E6A4E1A00B2859B /* librouting_common.a in Frameworks */, 672292B11DE307DC005BA3A7 /* libtraffic.a in Frameworks */, 3462FD8F1DC1E05D00906FD7 /* liboauthcpp.a in Frameworks */, 3462FD8D1DC1E03300906FD7 /* libpugixml.a in Frameworks */, @@ -357,27 +389,8 @@ 3475E0DC1DBF5772004C7E69 /* Frameworks */ = { isa = PBXGroup; children = ( - 672292B01DE307DC005BA3A7 /* libtraffic.a */, - 3462FD8E1DC1E05D00906FD7 /* liboauthcpp.a */, - 3462FD8C1DC1E03300906FD7 /* libpugixml.a */, - 3462FD881DC1DE4600906FD7 /* libeditor.a */, - 3475E0E31DBF593D004C7E69 /* libtracking.a */, - 3475E0DD1DBF5772004C7E69 /* libpartners_api.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - 670D055E1B0C9A900013A7AC /* res */ = { - isa = PBXGroup; - children = ( - 6729A6671A69394D007D5872 /* resources.qrc */, - ); - path = res; - sourceTree = ""; - }; - 6729A4591A684401007D5872 /* Libs */ = { - isa = PBXGroup; - children = ( + 671E79211E6A508600B2859B /* libopenlr.a */, + 671E78E41E6A4E1A00B2859B /* librouting_common.a */, 674A7E321C0DB727003D48E1 /* libdrape_frontend.a */, 674A7E331C0DB727003D48E1 /* libdrape.a */, 674A7E341C0DB727003D48E1 /* libsdf_image.a */, @@ -411,8 +424,22 @@ 675345A71A40535E00A0A8C3 /* Cocoa.framework */, 675345A51A40534F00A0A8C3 /* CoreFoundation.framework */, 675345A31A40534500A0A8C3 /* IOKit.framework */, + 672292B01DE307DC005BA3A7 /* libtraffic.a */, + 3462FD8E1DC1E05D00906FD7 /* liboauthcpp.a */, + 3462FD8C1DC1E03300906FD7 /* libpugixml.a */, + 3462FD881DC1DE4600906FD7 /* libeditor.a */, + 3475E0E31DBF593D004C7E69 /* libtracking.a */, + 3475E0DD1DBF5772004C7E69 /* libpartners_api.a */, ); - name = Libs; + name = Frameworks; + sourceTree = ""; + }; + 670D055E1B0C9A900013A7AC /* res */ = { + isa = PBXGroup; + children = ( + 6729A6671A69394D007D5872 /* resources.qrc */, + ); + path = res; sourceTree = ""; }; 6729A5C91A693045007D5872 /* Resources */ = { @@ -472,7 +499,6 @@ 34EBB4821DBF53D8005BE9B8 /* common-debug.xcconfig */, 34EBB4831DBF53D8005BE9B8 /* common-release.xcconfig */, 6729A5C91A693045007D5872 /* Resources */, - 6729A4591A684401007D5872 /* Libs */, 6753454B1A404C6100A0A8C3 /* qtMapsMe */, 6753454A1A404C6100A0A8C3 /* Products */, 3475E0DC1DBF5772004C7E69 /* Frameworks */, @@ -490,6 +516,13 @@ 6753454B1A404C6100A0A8C3 /* qtMapsMe */ = { isa = PBXGroup; children = ( + 671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */, + 671E78D61E6A44C600B2859B /* traffic_mode.cpp */, + 671E78D71E6A44C600B2859B /* traffic_mode.hpp */, + 671E78D81E6A44C600B2859B /* traffic_panel.cpp */, + 671E78D91E6A44C600B2859B /* traffic_panel.hpp */, + 671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */, + 671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */, 45B5B5861CA4216B00D93E36 /* create_feature_dialog.cpp */, 45B5B5871CA4216B00D93E36 /* create_feature_dialog.hpp */, 45B5B5881CA4216B00D93E36 /* place_page_dialog.cpp */, @@ -550,6 +583,7 @@ 6729A5B81A692C7D007D5872 /* CopyFiles */, ); buildRules = ( + 671E78E11E6A45BD00B2859B /* PBXBuildRule */, 6729A6661A6938AD007D5872 /* PBXBuildRule */, 6729A45A1A684436007D5872 /* PBXBuildRule */, ); @@ -609,6 +643,7 @@ 671182DD1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm in Resources */, 671182F61C80E09A00CB8177 /* colors.txt in Resources */, 6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */, + 671E78E01E6A455D00B2859B /* trafficmodeinitdlg.ui in Resources */, 6729A6681A69394D007D5872 /* resources.qrc in Resources */, 45B5B5A31CA422EE00D93E36 /* resources-hdpi_dark in Resources */, 45B5B5A61CA422EE00D93E36 /* resources-xxhdpi_dark in Resources */, @@ -627,6 +662,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 671E78E91E6A4F3700B2859B /* trafficmodeinitdlg.h in Sources */, + 671E78E61E6A4E4A00B2859B /* traffic_mode.hpp in Sources */, + 671E78E71E6A4E4A00B2859B /* traffic_panel.hpp in Sources */, + 671E78E31E6A4BE300B2859B /* trafficmodeinitdlg.ui in Sources */, 45B5B58C1CA4219C00D93E36 /* create_feature_dialog.hpp in Sources */, 45B5B58D1CA4219C00D93E36 /* place_page_dialog.hpp in Sources */, 675340A11C528A1C002CF0D9 /* editor_dialog.hpp in Sources */, @@ -642,10 +681,13 @@ 45B5B58B1CA4216B00D93E36 /* place_page_dialog.cpp in Sources */, 670D05971B0CBD320013A7AC /* slider_ctrl.hpp in Sources */, 670D05981B0CBD320013A7AC /* update_dialog.hpp in Sources */, + 671E78DC1E6A44C600B2859B /* traffic_mode.cpp in Sources */, + 671E78DD1E6A44C600B2859B /* traffic_panel.cpp in Sources */, 6729A6691A69395E007D5872 /* resources.qrc in Sources */, 675345901A404CB200A0A8C3 /* search_panel.cpp in Sources */, 45B5B58A1CA4216B00D93E36 /* create_feature_dialog.cpp in Sources */, 675345861A404CB200A0A8C3 /* about.cpp in Sources */, + 671E78DE1E6A44C600B2859B /* trafficmodeinitdlg.cpp in Sources */, 675345911A404CB200A0A8C3 /* slider_ctrl.cpp in Sources */, 6753458D1A404CB200A0A8C3 /* proxystyle.cpp in Sources */, 6753409F1C5289E0002CF0D9 /* editor_dialog.cpp in Sources */, @@ -672,6 +714,7 @@ "$(OMIM_ROOT)/3party/freetype/include", "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/glm", + "$(DERIVED_FILE_DIR)", ); SUPPORTED_PLATFORMS = macosx; SYMROOT = build; @@ -688,6 +731,7 @@ "$(OMIM_ROOT)/3party/freetype/include", "$(QT_PATH)/include", "$(OMIM_ROOT)/3party/glm", + "$(DERIVED_FILE_DIR)", ); SUPPORTED_PLATFORMS = macosx; SYMROOT = build; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index 0750442b90..4810e0ec8e 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -51,8 +51,6 @@ 56099E331CC9247E00A7772A /* bicycle_directions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56099E301CC9247E00A7772A /* bicycle_directions.cpp */; }; 56099E341CC9247E00A7772A /* bicycle_directions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E311CC9247E00A7772A /* bicycle_directions.hpp */; }; 56099E351CC9247E00A7772A /* directions_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56099E321CC9247E00A7772A /* directions_engine.cpp */; }; - 563B91C51CC4F1DC00222BC1 /* bicycle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 563B91C31CC4F1DC00222BC1 /* bicycle_model.cpp */; }; - 563B91C61CC4F1DC00222BC1 /* bicycle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 563B91C41CC4F1DC00222BC1 /* bicycle_model.hpp */; }; 56555E561D897C90009D786D /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6742ACE61C68A23B009CB89E /* libalohalitics.a */; }; 56555E581D897C9D009D786D /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6742ACFA1C68A2D7009CB89E /* liboauthcpp.a */; }; 56555E591D897D28009D786D /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACDE1C68A13F009CB89E /* testingmain.cpp */; }; @@ -135,7 +133,6 @@ 6742AD351C68A9DF009CB89E /* turns_generator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACB51C68A0B1009CB89E /* turns_generator_test.cpp */; }; 6742AD361C68A9DF009CB89E /* turns_sound_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACB61C68A0B1009CB89E /* turns_sound_test.cpp */; }; 6742AD371C68A9DF009CB89E /* turns_tts_text_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACB71C68A0B1009CB89E /* turns_tts_text_tests.cpp */; }; - 6742AD381C68A9DF009CB89E /* vehicle_model_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACB81C68A0B1009CB89E /* vehicle_model_test.cpp */; }; 6742AD391C68AA04009CB89E /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6742AD041C68A317009CB89E /* libplatform_tests_support.a */; }; 6742AD3A1C68AA04009CB89E /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6742AD051C68A317009CB89E /* libsuccinct.a */; }; 6742AD3B1C68AA04009CB89E /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6742ACFE1C68A2F4009CB89E /* libjansson.a */; }; @@ -182,8 +179,6 @@ 6753441D1A3F644F00A0A8C3 /* router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753440F1A3F644F00A0A8C3 /* router.hpp */; }; 6753441E1A3F644F00A0A8C3 /* turns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344101A3F644F00A0A8C3 /* turns.cpp */; }; 6753441F1A3F644F00A0A8C3 /* turns.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344111A3F644F00A0A8C3 /* turns.hpp */; }; - 675344201A3F644F00A0A8C3 /* vehicle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344121A3F644F00A0A8C3 /* vehicle_model.cpp */; }; - 675344211A3F644F00A0A8C3 /* vehicle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344131A3F644F00A0A8C3 /* vehicle_model.hpp */; }; 67AB92E51B7B3E6E00AB5194 /* routing_mapping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92E01B7B3E6E00AB5194 /* routing_mapping.hpp */; }; 67AB92E61B7B3E6E00AB5194 /* turns_tts_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */; }; 67AB92E71B7B3E6E00AB5194 /* turns_tts_text.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */; }; @@ -237,10 +232,6 @@ 67BD36051C69F51C003AA26F /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36021C69F513003AA26F /* WorldCoasts.mwm */; }; 67C79BA11E2CEE1400C40034 /* restriction_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */; }; 67C79BA21E2CEE1400C40034 /* restriction_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */; }; - 67C7D4291B4EB48F00FE41AA /* car_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4211B4EB48F00FE41AA /* car_model.cpp */; }; - 67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4221B4EB48F00FE41AA /* car_model.hpp */; }; - 67C7D42B1B4EB48F00FE41AA /* pedestrian_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */; }; - 67C7D42C1B4EB48F00FE41AA /* pedestrian_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4241B4EB48F00FE41AA /* pedestrian_model.hpp */; }; 67C7D42D1B4EB48F00FE41AA /* turns_sound_settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */; }; 67C7D42E1B4EB48F00FE41AA /* turns_sound_settings.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */; }; A120B3451B4A7BE5002F3808 /* cross_mwm_road_graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A120B3411B4A7BE5002F3808 /* cross_mwm_road_graph.cpp */; }; @@ -308,8 +299,6 @@ 56099E301CC9247E00A7772A /* bicycle_directions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_directions.cpp; sourceTree = ""; }; 56099E311CC9247E00A7772A /* bicycle_directions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bicycle_directions.hpp; sourceTree = ""; }; 56099E321CC9247E00A7772A /* directions_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = directions_engine.cpp; sourceTree = ""; }; - 563B91C31CC4F1DC00222BC1 /* bicycle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_model.cpp; sourceTree = ""; }; - 563B91C41CC4F1DC00222BC1 /* bicycle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bicycle_model.hpp; sourceTree = ""; }; 56826BCE1DB51C4E00807C62 /* car_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_router.cpp; sourceTree = ""; }; 56826BCF1DB51C4E00807C62 /* car_router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_router.hpp; sourceTree = ""; }; 56CA09DE1E30E73B00D05C9A /* applying_traffic_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = applying_traffic_test.cpp; sourceTree = ""; }; @@ -359,7 +348,6 @@ 6742ACB51C68A0B1009CB89E /* turns_generator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns_generator_test.cpp; sourceTree = ""; }; 6742ACB61C68A0B1009CB89E /* turns_sound_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_sound_test.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 6742ACB71C68A0B1009CB89E /* turns_tts_text_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_tts_text_tests.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - 6742ACB81C68A0B1009CB89E /* vehicle_model_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_test.cpp; sourceTree = ""; }; 6742ACDE1C68A13F009CB89E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; 6742ACE21C68A203009CB89E /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; 6742ACE31C68A203009CB89E /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; @@ -410,8 +398,6 @@ 6753440F1A3F644F00A0A8C3 /* router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = router.hpp; sourceTree = ""; }; 675344101A3F644F00A0A8C3 /* turns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns.cpp; sourceTree = ""; }; 675344111A3F644F00A0A8C3 /* turns.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turns.hpp; sourceTree = ""; }; - 675344121A3F644F00A0A8C3 /* vehicle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model.cpp; sourceTree = ""; }; - 675344131A3F644F00A0A8C3 /* vehicle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vehicle_model.hpp; sourceTree = ""; }; 67AB92E01B7B3E6E00AB5194 /* routing_mapping.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_mapping.hpp; sourceTree = ""; }; 67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns_tts_text.cpp; sourceTree = ""; }; 67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turns_tts_text.hpp; sourceTree = ""; }; @@ -442,10 +428,6 @@ 67BD36021C69F513003AA26F /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts.mwm; sourceTree = ""; }; 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_loader.cpp; sourceTree = ""; }; 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_loader.hpp; sourceTree = ""; }; - 67C7D4211B4EB48F00FE41AA /* car_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_model.cpp; sourceTree = ""; }; - 67C7D4221B4EB48F00FE41AA /* car_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model.hpp; sourceTree = ""; }; - 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pedestrian_model.cpp; sourceTree = ""; }; - 67C7D4241B4EB48F00FE41AA /* pedestrian_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pedestrian_model.hpp; sourceTree = ""; }; 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_sound_settings.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turns_sound_settings.hpp; sourceTree = ""; }; A120B3411B4A7BE5002F3808 /* cross_mwm_road_graph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_road_graph.cpp; sourceTree = ""; }; @@ -612,7 +594,6 @@ 6742ACB51C68A0B1009CB89E /* turns_generator_test.cpp */, 6742ACB61C68A0B1009CB89E /* turns_sound_test.cpp */, 6742ACB71C68A0B1009CB89E /* turns_tts_text_tests.cpp */, - 6742ACB81C68A0B1009CB89E /* vehicle_model_test.cpp */, ); name = routing_tests; path = ../../routing/routing_tests; @@ -721,10 +702,6 @@ 671F58BA1B874EA20032311E /* base */, 56099E301CC9247E00A7772A /* bicycle_directions.cpp */, 56099E311CC9247E00A7772A /* bicycle_directions.hpp */, - 563B91C31CC4F1DC00222BC1 /* bicycle_model.cpp */, - 563B91C41CC4F1DC00222BC1 /* bicycle_model.hpp */, - 67C7D4211B4EB48F00FE41AA /* car_model.cpp */, - 67C7D4221B4EB48F00FE41AA /* car_model.hpp */, 56826BCE1DB51C4E00807C62 /* car_router.cpp */, 56826BCF1DB51C4E00807C62 /* car_router.hpp */, A120B3411B4A7BE5002F3808 /* cross_mwm_road_graph.cpp */, @@ -777,8 +754,6 @@ 6753440C1A3F644F00A0A8C3 /* osrm2feature_map.hpp */, 670EE56F1B664796001E8064 /* pedestrian_directions.cpp */, 670EE5701B664796001E8064 /* pedestrian_directions.hpp */, - 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */, - 67C7D4241B4EB48F00FE41AA /* pedestrian_model.hpp */, 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */, 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */, 349D1CDE1E3F589900A878FD /* restrictions_serialization.cpp */, @@ -824,8 +799,6 @@ 675344101A3F644F00A0A8C3 /* turns.cpp */, 675344111A3F644F00A0A8C3 /* turns.hpp */, 0C08AA361DF8324D004195DD /* vehicle_mask.hpp */, - 675344121A3F644F00A0A8C3 /* vehicle_model.cpp */, - 675344131A3F644F00A0A8C3 /* vehicle_model.hpp */, 0C090C851E4E276700D52AFD /* world_graph.cpp */, 0C090C861E4E276700D52AFD /* world_graph.hpp */, ); @@ -891,7 +864,6 @@ 670EE55F1B6001E7001E8064 /* routing_settings.hpp in Headers */, 56CA09E61E30E73B00D05C9A /* index_graph_tools.hpp in Headers */, 671F58BE1B874EC80032311E /* followed_polyline.hpp in Headers */, - 67C7D42C1B4EB48F00FE41AA /* pedestrian_model.hpp in Headers */, 0C5FEC6A1DDE193F0017688C /* road_index.hpp in Headers */, 674F9BCD1B0A580E00704FFA /* features_road_graph.hpp in Headers */, 670EE5741B664796001E8064 /* pedestrian_directions.hpp in Headers */, @@ -906,7 +878,6 @@ 0C0DF9221DE898B70055A22F /* index_graph_starter.hpp in Headers */, 0C090C881E4E276700D52AFD /* world_graph.hpp in Headers */, 56099E2F1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp in Headers */, - 67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */, 0C08AA351DF83223004195DD /* index_graph_serialization.hpp in Headers */, 670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */, A120B34F1B4A7C0A002F3808 /* online_absent_fetcher.hpp in Headers */, @@ -914,11 +885,9 @@ 56826BD11DB51C4E00807C62 /* car_router.hpp in Headers */, A120B3511B4A7C0A002F3808 /* routing_algorithm.hpp in Headers */, 0C5FEC6B1DDE193F0017688C /* road_point.hpp in Headers */, - 675344211A3F644F00A0A8C3 /* vehicle_model.hpp in Headers */, 56099E2B1CC7C97D00A7772A /* turn_candidate.hpp in Headers */, 0C5FEC551DDE191E0017688C /* edge_estimator.hpp in Headers */, 670B84C11A9381D900CE4492 /* cross_routing_context.hpp in Headers */, - 563B91C61CC4F1DC00222BC1 /* bicycle_model.hpp in Headers */, 0C12ED241E5C822A0080D0F4 /* index_router.hpp in Headers */, 0C5FEC651DDE192A0017688C /* joint.hpp in Headers */, ); @@ -1112,7 +1081,6 @@ files = ( 6742AD311C68A9DF009CB89E /* road_graph_nearest_edges_test.cpp in Sources */, 6742AD2E1C68A9DF009CB89E /* online_cross_fetcher_test.cpp in Sources */, - 6742AD381C68A9DF009CB89E /* vehicle_model_test.cpp in Sources */, 6742AD291C68A9DF009CB89E /* astar_router_test.cpp in Sources */, 6742AD371C68A9DF009CB89E /* turns_tts_text_tests.cpp in Sources */, 6742AD2B1C68A9DF009CB89E /* cross_routing_tests.cpp in Sources */, @@ -1144,11 +1112,9 @@ 0C090C811E4E274000D52AFD /* index_graph_loader.cpp in Sources */, 56099E2E1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp in Sources */, 349D1CE01E3F589900A878FD /* restrictions_serialization.cpp in Sources */, - 675344201A3F644F00A0A8C3 /* vehicle_model.cpp in Sources */, 56099E351CC9247E00A7772A /* directions_engine.cpp in Sources */, A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */, 6741AA9C1BF35331002C974C /* turns_notification_manager.cpp in Sources */, - 67C7D42B1B4EB48F00FE41AA /* pedestrian_model.cpp in Sources */, 56D637D61E4B12AA00B86D7B /* cross_mwm_index_graph.cpp in Sources */, 0C0DF9211DE898B70055A22F /* index_graph_starter.cpp in Sources */, A120B3471B4A7BE5002F3808 /* cross_mwm_router.cpp in Sources */, @@ -1159,14 +1125,12 @@ 670D049E1B0B4A970013A7AC /* nearest_edge_finder.cpp in Sources */, 674F9BD61B0A580E00704FFA /* turns_generator.cpp in Sources */, A17B42981BCFBD0E00A1EAE4 /* osrm_helpers.cpp in Sources */, - 563B91C51CC4F1DC00222BC1 /* bicycle_model.cpp in Sources */, 674F9BD21B0A580E00704FFA /* road_graph_router.cpp in Sources */, A1876BC61BB19C4300C9C743 /* speed_camera.cpp in Sources */, 0C5FEC691DDE193F0017688C /* road_index.cpp in Sources */, 671F58BD1B874EC80032311E /* followed_polyline.cpp in Sources */, 670EE55D1B6001E7001E8064 /* routing_session.cpp in Sources */, A120B3451B4A7BE5002F3808 /* cross_mwm_road_graph.cpp in Sources */, - 67C7D4291B4EB48F00FE41AA /* car_model.cpp in Sources */, 56099E331CC9247E00A7772A /* bicycle_directions.cpp in Sources */, 674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */, 0C08AA341DF83223004195DD /* index_graph_serialization.cpp in Sources */, diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..56f26afbe2 --- /dev/null +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -0,0 +1,369 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 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 */; }; + 671E788B1E6A3C5D00B2859B /* car_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78831E6A3C5D00B2859B /* car_model.hpp */; }; + 671E788C1E6A3C5D00B2859B /* pedestrian_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78841E6A3C5D00B2859B /* pedestrian_model.cpp */; }; + 671E788D1E6A3C5D00B2859B /* pedestrian_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78851E6A3C5D00B2859B /* pedestrian_model.hpp */; }; + 671E788E1E6A3C5D00B2859B /* vehicle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78861E6A3C5D00B2859B /* vehicle_model.cpp */; }; + 671E788F1E6A3C5D00B2859B /* vehicle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671E78871E6A3C5D00B2859B /* vehicle_model.hpp */; }; + 671E78B11E6A3FF400B2859B /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78AF1E6A3FEF00B2859B /* testingmain.cpp */; }; + 671E78B21E6A3FF900B2859B /* vehicle_model_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */; }; + 671E78B61E6A404F00B2859B /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78B51E6A404F00B2859B /* libplatform.a */; }; + 671E78B71E6A405700B2859B /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78721E6A3BE200B2859B /* librouting_common.a */; }; + 671E78BA1E6A407500B2859B /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78B81E6A407500B2859B /* libbase.a */; }; + 671E78BB1E6A407500B2859B /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78B91E6A407500B2859B /* libcoding.a */; }; + 671E78BD1E6A40A000B2859B /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78BC1E6A40A000B2859B /* libindexer.a */; }; + 671E78C31E6A40EC00B2859B /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78BE1E6A40EC00B2859B /* libalohalitics.a */; }; + 671E78C41E6A40EC00B2859B /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78BF1E6A40EC00B2859B /* libeditor.a */; }; + 671E78C51E6A40EC00B2859B /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78C01E6A40EC00B2859B /* libgeometry.a */; }; + 671E78C61E6A40EC00B2859B /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78C11E6A40EC00B2859B /* liboauthcpp.a */; }; + 671E78C71E6A40EC00B2859B /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78C21E6A40EC00B2859B /* libpugixml.a */; }; + 671E78C91E6A410200B2859B /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78C81E6A410200B2859B /* libprotobuf.a */; }; + 671E78CD1E6A413F00B2859B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78CC1E6A413F00B2859B /* libz.tbd */; }; + 671E78CF1E6A414600B2859B /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78CE1E6A414600B2859B /* libjansson.a */; }; + 671E78D11E6A414B00B2859B /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78D01E6A414B00B2859B /* libopening_hours.a */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 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 = ""; }; + 671E78821E6A3C5D00B2859B /* car_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_model.cpp; sourceTree = ""; }; + 671E78831E6A3C5D00B2859B /* car_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model.hpp; sourceTree = ""; }; + 671E78841E6A3C5D00B2859B /* pedestrian_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pedestrian_model.cpp; sourceTree = ""; }; + 671E78851E6A3C5D00B2859B /* pedestrian_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pedestrian_model.hpp; sourceTree = ""; }; + 671E78861E6A3C5D00B2859B /* vehicle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model.cpp; sourceTree = ""; }; + 671E78871E6A3C5D00B2859B /* vehicle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vehicle_model.hpp; sourceTree = ""; }; + 671E78901E6A3C9C00B2859B /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 671E78911E6A3C9C00B2859B /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; + 671E78961E6A3DA700B2859B /* routing_common_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_common_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_test.cpp; sourceTree = ""; }; + 671E78AF1E6A3FEF00B2859B /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; + 671E78B51E6A404F00B2859B /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libplatform.a"; sourceTree = ""; }; + 671E78B81E6A407500B2859B /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libbase.a"; sourceTree = ""; }; + 671E78B91E6A407500B2859B /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libcoding.a"; sourceTree = ""; }; + 671E78BC1E6A40A000B2859B /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libindexer.a"; sourceTree = ""; }; + 671E78BE1E6A40EC00B2859B /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libalohalitics.a"; sourceTree = ""; }; + 671E78BF1E6A40EC00B2859B /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libeditor.a"; sourceTree = ""; }; + 671E78C01E6A40EC00B2859B /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libgeometry.a"; sourceTree = ""; }; + 671E78C11E6A40EC00B2859B /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/liboauthcpp.a"; sourceTree = ""; }; + 671E78C21E6A40EC00B2859B /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libpugixml.a"; sourceTree = ""; }; + 671E78C81E6A410200B2859B /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libprotobuf.a"; sourceTree = ""; }; + 671E78CA1E6A411E00B2859B /* libdz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libdz.tbd; path = usr/lib/libdz.tbd; sourceTree = SDKROOT; }; + 671E78CC1E6A413F00B2859B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 671E78CE1E6A414600B2859B /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libjansson.a"; sourceTree = ""; }; + 671E78D01E6A414B00B2859B /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libopening_hours.a"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 671E786F1E6A3BE200B2859B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 671E78931E6A3DA700B2859B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E78D11E6A414B00B2859B /* libopening_hours.a in Frameworks */, + 671E78CF1E6A414600B2859B /* libjansson.a in Frameworks */, + 671E78CD1E6A413F00B2859B /* libz.tbd in Frameworks */, + 671E78C91E6A410200B2859B /* libprotobuf.a in Frameworks */, + 671E78C31E6A40EC00B2859B /* libalohalitics.a in Frameworks */, + 671E78C41E6A40EC00B2859B /* libeditor.a in Frameworks */, + 671E78C51E6A40EC00B2859B /* libgeometry.a in Frameworks */, + 671E78C61E6A40EC00B2859B /* liboauthcpp.a in Frameworks */, + 671E78C71E6A40EC00B2859B /* libpugixml.a in Frameworks */, + 671E78BD1E6A40A000B2859B /* libindexer.a in Frameworks */, + 671E78BA1E6A407500B2859B /* libbase.a in Frameworks */, + 671E78BB1E6A407500B2859B /* libcoding.a in Frameworks */, + 671E78B71E6A405700B2859B /* librouting_common.a in Frameworks */, + 671E78B61E6A404F00B2859B /* libplatform.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 671E78691E6A3BE200B2859B = { + isa = PBXGroup; + children = ( + 671E78901E6A3C9C00B2859B /* common-debug.xcconfig */, + 671E78911E6A3C9C00B2859B /* common-release.xcconfig */, + 671E78741E6A3BE200B2859B /* routing_common */, + 671E78971E6A3DA800B2859B /* routing_common_tests */, + 671E78731E6A3BE200B2859B /* Products */, + 671E78B41E6A404F00B2859B /* Frameworks */, + ); + sourceTree = ""; + }; + 671E78731E6A3BE200B2859B /* Products */ = { + isa = PBXGroup; + children = ( + 671E78721E6A3BE200B2859B /* librouting_common.a */, + 671E78961E6A3DA700B2859B /* routing_common_tests.app */, + ); + name = Products; + sourceTree = ""; + }; + 671E78741E6A3BE200B2859B /* routing_common */ = { + isa = PBXGroup; + children = ( + 671E78801E6A3C5D00B2859B /* bicycle_model.cpp */, + 671E78811E6A3C5D00B2859B /* bicycle_model.hpp */, + 671E78821E6A3C5D00B2859B /* car_model.cpp */, + 671E78831E6A3C5D00B2859B /* car_model.hpp */, + 671E78841E6A3C5D00B2859B /* pedestrian_model.cpp */, + 671E78851E6A3C5D00B2859B /* pedestrian_model.hpp */, + 671E78861E6A3C5D00B2859B /* vehicle_model.cpp */, + 671E78871E6A3C5D00B2859B /* vehicle_model.hpp */, + ); + name = routing_common; + path = ../../routing_common; + sourceTree = ""; + }; + 671E78971E6A3DA800B2859B /* routing_common_tests */ = { + isa = PBXGroup; + children = ( + 671E78AF1E6A3FEF00B2859B /* testingmain.cpp */, + 671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */, + ); + name = routing_common_tests; + path = ../../routing_common/routing_common_tests; + sourceTree = ""; + }; + 671E78B41E6A404F00B2859B /* Frameworks */ = { + isa = PBXGroup; + children = ( + 671E78D01E6A414B00B2859B /* libopening_hours.a */, + 671E78CE1E6A414600B2859B /* libjansson.a */, + 671E78CC1E6A413F00B2859B /* libz.tbd */, + 671E78CA1E6A411E00B2859B /* libdz.tbd */, + 671E78C81E6A410200B2859B /* libprotobuf.a */, + 671E78BE1E6A40EC00B2859B /* libalohalitics.a */, + 671E78BF1E6A40EC00B2859B /* libeditor.a */, + 671E78C01E6A40EC00B2859B /* libgeometry.a */, + 671E78C11E6A40EC00B2859B /* liboauthcpp.a */, + 671E78C21E6A40EC00B2859B /* libpugixml.a */, + 671E78BC1E6A40A000B2859B /* libindexer.a */, + 671E78B81E6A407500B2859B /* libbase.a */, + 671E78B91E6A407500B2859B /* libcoding.a */, + 671E78B51E6A404F00B2859B /* libplatform.a */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 671E78701E6A3BE200B2859B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E788D1E6A3C5D00B2859B /* pedestrian_model.hpp in Headers */, + 671E78891E6A3C5D00B2859B /* bicycle_model.hpp in Headers */, + 671E788B1E6A3C5D00B2859B /* car_model.hpp in Headers */, + 671E788F1E6A3C5D00B2859B /* vehicle_model.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 671E78711E6A3BE200B2859B /* routing_common */ = { + isa = PBXNativeTarget; + buildConfigurationList = 671E787D1E6A3BE200B2859B /* Build configuration list for PBXNativeTarget "routing_common" */; + buildPhases = ( + 671E786E1E6A3BE200B2859B /* Sources */, + 671E786F1E6A3BE200B2859B /* Frameworks */, + 671E78701E6A3BE200B2859B /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = routing_common; + productName = routing_common; + productReference = 671E78721E6A3BE200B2859B /* librouting_common.a */; + productType = "com.apple.product-type.library.static"; + }; + 671E78951E6A3DA700B2859B /* routing_common_tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 671E78AA1E6A3DA800B2859B /* Build configuration list for PBXNativeTarget "routing_common_tests" */; + buildPhases = ( + 671E78921E6A3DA700B2859B /* Sources */, + 671E78931E6A3DA700B2859B /* Frameworks */, + 671E78941E6A3DA700B2859B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = routing_common_tests; + productName = routing_common_tests; + productReference = 671E78961E6A3DA700B2859B /* routing_common_tests.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 671E786A1E6A3BE200B2859B /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0820; + ORGANIZATIONNAME = Mail.Ru; + TargetAttributes = { + 671E78711E6A3BE200B2859B = { + CreatedOnToolsVersion = 8.2.1; + ProvisioningStyle = Automatic; + }; + 671E78951E6A3DA700B2859B = { + CreatedOnToolsVersion = 8.2.1; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 671E786D1E6A3BE200B2859B /* Build configuration list for PBXProject "routing_common" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 671E78691E6A3BE200B2859B; + productRefGroup = 671E78731E6A3BE200B2859B /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 671E78711E6A3BE200B2859B /* routing_common */, + 671E78951E6A3DA700B2859B /* routing_common_tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 671E78941E6A3DA700B2859B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 671E786E1E6A3BE200B2859B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E788A1E6A3C5D00B2859B /* car_model.cpp in Sources */, + 671E78881E6A3C5D00B2859B /* bicycle_model.cpp in Sources */, + 671E788E1E6A3C5D00B2859B /* vehicle_model.cpp in Sources */, + 671E788C1E6A3C5D00B2859B /* pedestrian_model.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 671E78921E6A3DA700B2859B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 671E78B21E6A3FF900B2859B /* vehicle_model_test.cpp in Sources */, + 671E78B11E6A3FF400B2859B /* testingmain.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 671E787B1E6A3BE200B2859B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671E78901E6A3C9C00B2859B /* common-debug.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 671E787C1E6A3BE200B2859B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 671E78911E6A3C9C00B2859B /* common-release.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 671E787E1E6A3BE200B2859B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 671E787F1E6A3BE200B2859B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 671E78AB1E6A3DA800B2859B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 671E78AC1E6A3DA800B2859B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 671E786D1E6A3BE200B2859B /* Build configuration list for PBXProject "routing_common" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671E787B1E6A3BE200B2859B /* Debug */, + 671E787C1E6A3BE200B2859B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 671E787D1E6A3BE200B2859B /* Build configuration list for PBXNativeTarget "routing_common" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671E787E1E6A3BE200B2859B /* Debug */, + 671E787F1E6A3BE200B2859B /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 671E78AA1E6A3DA800B2859B /* Build configuration list for PBXNativeTarget "routing_common_tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 671E78AB1E6A3DA800B2859B /* Debug */, + 671E78AC1E6A3DA800B2859B /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 671E786A1E6A3BE200B2859B /* Project object */; +}