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

Merge pull request #5495 from mpimenov/routing-traffic-fix-build

Browse source 
[routing][traffic] Removed a circular dependency.
This commit is contained in:
Vladimir Byko-Ianko 2017-03-06 17:23:50 +03:00 • committed by GitHub
commit 6c388e67db
126 changed files with 1001 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3party/osrm/osrm-backend/CMakeLists.txt
View file

@ -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"

1
CMakeLists.txt
View file

@ -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)

2
android/jni/Android.mk
View file

@ -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))))

1
generator/booking_quality_check/booking_quality_check.pro
View file

@ -10,6 +10,7 @@ DEPENDENCIES = \
generator \
search \
routing \
routing_common \
indexer \
geometry \
editor \

8
generator/feature_builder.cpp
View file

@ -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;
///////////////////////////////////////////////////////////////////////////////////////////////////

2
generator/feature_segments_checker/feature_segments_checker.cpp
View file

@ -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"

3
generator/feature_segments_checker/feature_segments_checker.pro
View file

@ -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)

1
generator/generator_tests/CMakeLists.txt
View file

@ -39,6 +39,7 @@ omim_link_libraries(
indexer
drape
traffic
routing_common
editor
platform
geometry

4
generator/generator_tests/generator_tests.pro
View file

@ -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

3
generator/generator_tests/osm_type_test.cpp
View file

@ -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)

1
generator/generator_tool/CMakeLists.txt
View file

@ -11,6 +11,7 @@ omim_link_libraries(
generator
routing
traffic
routing_common
search
storage
indexer

2
generator/generator_tool/generator_tool.pro
View file

@ -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)

2
generator/restaurants_info/restaurants_info.pro
View file

@ -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 \

7
generator/routing_index_generator.cpp
View file

@ -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"

2
generator/srtm_coverage_checker/srtm_coverage_checker.pro
View file

@ -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)

3
generator/traffic_generator.cpp
View file

@ -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"

1
indexer/indexer_tests/CMakeLists.txt
View file

@ -49,6 +49,7 @@ omim_link_libraries(
generator
search
routing
routing_common
indexer
storage
editor

2
indexer/indexer_tests/indexer_tests.pro
View file

@ -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

16
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons_obsolete.bin; path = ../../data/packed_polygons_obsolete.bin; sourceTree = "<group>"; };
671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts_obsolete.mwm; path = ../../data/WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
671E78D21E6A423300B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/librouting_common.a"; sourceTree = "<group>"; };
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 = "<group>"; };
6741AAA31BF356B9002C974C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
@ -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",

1
map/map_tests/CMakeLists.txt
View file

@ -26,6 +26,7 @@ omim_link_libraries(
drape_frontend
routing
traffic
routing_common
search
storage
tracking

5
map/map_tests/map_tests.pro
View file

@ -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

3
mapshot/mapshot.pro
View file

@ -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

18
omim.pro
View file

@ -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

3
openlr/openlr_simple_decoder.cpp
View file

@ -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"

1
openlr/openlr_stat/CMakeLists.txt
View file

@ -11,6 +11,7 @@ add_executable(${PROJECT_NAME} ${SRC})
omim_link_libraries(${PROJECT_NAME}
openlr
routing
routing_common
indexer
editor
platform

4
openlr/openlr_stat/openlr_stat.pro
View file

@ -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)

5
openlr/openlr_tests/openlr_tests.pro
View file

@ -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)

1
qt/CMakeLists.txt
View file

@ -69,6 +69,7 @@ omim_link_libraries(
storage
tracking
traffic
routing_common
indexer
drape
partners_api

2
qt/mainwindow.cpp
View file

@ -21,7 +21,7 @@
#include "std/target_os.hpp"
#include <QtGui/QCloseEvent>
#include <QFileDialog>
#include <QtWidgets/QFileDialog>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QtGui/QAction>

3
qt/qt.pro
View file

@ -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

2
qt/traffic_mode.cpp
View file

@ -9,7 +9,7 @@
#include "3party/pugixml/src/pugixml.hpp"
#include <QItemSelection>
#include <QtCore/QItemSelection>
// DecodedSample -----------------------------------------------------------------------------------
DecodedSample::DecodedSample(Index const & index, openlr::SamplePool const & sample)

2
qt/traffic_mode.hpp
View file

@ -9,7 +9,7 @@
#include <string>
#include <unordered_map>
#include <QAbstractTableModel>
#include <QtCore/QAbstractTableModel>
class Index;
class QItemSelection;

12
qt/traffic_panel.cpp
View file

@ -1,12 +1,12 @@
#include "qt/traffic_panel.hpp"
#include "qt/traffic_mode.hpp"
#include <QAbstractTableModel>
#include <QBoxLayout>
#include <QComboBox>
#include <QHeaderView>
#include <QStyledItemDelegate>
#include <QTableView>
#include <QtCore/QAbstractTableModel>
#include <QtWidgets/QBoxLayout>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QStyledItemDelegate>
#include <QtWidgets/QTableView>
// ComboBoxDelegate --------------------------------------------------------------------------------
ComboBoxDelegate::ComboBoxDelegate(QObject * parent)

2
qt/traffic_panel.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include <QStyledItemDelegate>
#include <QtWidgets/QStyledItemDelegate>
class QAbstractItemModel;
class QComboBox;

2
qt/trafficmodeinitdlg.cpp
View file

@ -3,7 +3,7 @@
#include "platform/settings.hpp"
#include <QFileDialog>
#include <QtWidgets/QFileDialog>
namespace
{

2
qt/trafficmodeinitdlg.h
View file

@ -2,7 +2,7 @@
#include <string>
#include <QDialog>
#include <QtWidgets/QDialog>
class QLineEdit;

8
routing/CMakeLists.txt
View file

@ -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
)

8
routing/async_router.hpp
View file

@ -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"

3
routing/bicycle_directions.cpp
View file

@ -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"

5
routing/cross_mwm_road_graph.cpp
View file

@ -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"

6
routing/cross_mwm_road_graph.hpp
View file

@ -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"

6
routing/cross_mwm_router.cpp
View file

@ -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"

6
routing/cross_mwm_router.hpp
View file

@ -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"

3
routing/edge_estimator.hpp
View file

@ -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"

3
routing/features_road_graph.cpp
View file

@ -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"

4
routing/features_road_graph.hpp
View file

@ -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"

3
routing/geometry.hpp
View file

@ -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"

3
routing/index_graph_loader.hpp
View file

@ -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"

7
routing/index_router.cpp
View file

@ -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"

3
routing/index_router.hpp
View file

@ -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"

3
routing/nearest_edge_finder.hpp
View file

@ -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"

5
routing/online_absent_fetcher.cpp
View file

@ -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"

2
routing/online_absent_fetcher.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include "routing_mapping.hpp"
#include "routing/routing_mapping.hpp"
#include "geometry/point2d.hpp"

2
routing/online_cross_fetcher.cpp
View file

@ -1,4 +1,4 @@
#include "online_cross_fetcher.hpp"
#include "routing/online_cross_fetcher.hpp"
#include "platform/http_request.hpp"

4
routing/osrm2feature_map.cpp
View file

@ -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;

5
routing/osrm2feature_map.hpp
View file

@ -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
{

4
routing/osrm_data_facade.hpp
View file

@ -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"

4
routing/osrm_engine.cpp
View file

@ -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"

5
routing/osrm_helpers.cpp
View file

@ -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"

1
routing/osrm_path_segment_factory.cpp
View file

@ -1,4 +1,5 @@
#include "routing/osrm_path_segment_factory.hpp"
#include "routing/road_graph.hpp"
#include "routing/routing_mapping.hpp"

1
routing/pedestrian_directions.cpp
View file

@ -1,4 +1,5 @@
#include "routing/pedestrian_directions.hpp"
#include "routing/road_graph.hpp"
#include "indexer/classificator.hpp"

1
routing/restriction_loader.cpp
View file

@ -1,4 +1,5 @@
#include "routing/restriction_loader.hpp"
#include "routing/restrictions_serialization.hpp"
#include "routing/road_index.hpp"

7
routing/road_graph_router.cpp
View file

@ -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"

3
routing/road_graph_router.hpp
View file

@ -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"

1
routing/route.cpp
View file

@ -1,4 +1,5 @@
#include "routing/route.hpp"
#include "routing/turns_generator.hpp"
#include "traffic/speed_groups.hpp"

3
routing/router.cpp
View file

@ -1,8 +1,7 @@
#include "router.hpp"
#include "routing/router.hpp"
namespace routing
{
std::string ToString(RouterType type)
{
switch(type)

2
routing/router.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include "router_delegate.hpp"
#include "routing/router_delegate.hpp"
#include "geometry/point2d.hpp"

2
routing/router_delegate.cpp
View file

@ -1,4 +1,4 @@
#include "router_delegate.hpp"
#include "routing/router_delegate.hpp"
namespace routing
{

11
routing/routing.pro
View file

@ -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 \

3
routing/routing_benchmarks/bicycle_routing_tests.cpp
View file

@ -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"

3
routing/routing_benchmarks/helpers.hpp
View file

@ -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"

3
routing/routing_benchmarks/pedestrian_routing_tests.cpp
View file

@ -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"

2
routing/routing_benchmarks/routing_benchmarks.pro
View file

@ -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"

1
routing/routing_consistency_tests/CMakeLists.txt
View file

@ -19,6 +19,7 @@ omim_link_libraries(
map
routing
traffic
routing_common
search
storage
indexer

2
routing/routing_consistency_tests/routing_consistency_tests.pro
View file

@ -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)

7
routing/routing_helpers.hpp
View file

@ -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"

1
routing/routing_integration_tests/CMakeLists.txt
View file

@ -33,6 +33,7 @@ omim_link_libraries(
indexer
editor
traffic
routing_common
platform
oauthcpp
geometry

2
routing/routing_integration_tests/routing_integration_tests.pro
View file

@ -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

2
routing/routing_mapping.cpp
View file

@ -1,4 +1,4 @@
#include "routing_mapping.hpp"
#include "routing/routing_mapping.hpp"
#include "routing/cross_routing_context.hpp"
#include "routing/osrm2feature_map.hpp"

6
routing/routing_mapping.hpp
View file

@ -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"

4
routing/routing_session.cpp
View file

@ -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"

2
routing/routing_tests/CMakeLists.txt
View file

@ -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

3
routing/routing_tests/applying_traffic_test.cpp
View file

@ -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"

3
routing/routing_tests/cumulative_restriction_test.cpp
View file

@ -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 <memory>

3
routing/routing_tests/index_graph_test.cpp
View file

@ -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"

2
routing/routing_tests/index_graph_tools.cpp
View file

@ -2,7 +2,7 @@
#include "testing/testing.hpp"
#include "routing/car_model.hpp"
#include "routing_common/car_model.hpp"
namespace routing_test
{

3
routing/routing_tests/restriction_test.cpp
View file

@ -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"

5
routing/routing_tests/routing_tests.pro
View file

@ -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 \

2
routing/speed_camera.cpp
View file

@ -1,4 +1,4 @@
#include "speed_camera.hpp"
#include "routing/speed_camera.hpp"
#include "indexer/classificator.hpp"
#include "indexer/ftypes_matcher.hpp"

1
routing/turns.cpp
View file

@ -7,7 +7,6 @@
#include "std/array.hpp"
#include "std/utility.hpp"
namespace
{
using namespace routing::turns;

4
routing/turns.hpp
View file

@ -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;

7
routing/turns_generator.cpp
View file

@ -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;

1
routing/turns_tts_text.hpp
View file

@ -5,7 +5,6 @@
#include "std/string.hpp"
#include "std/unique_ptr.hpp"
namespace routing
{
namespace turns

16
routing_common/CMakeLists.txt Normal file
View file

@ -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)

2
routing/bicycle_model.cpp → routing_common/bicycle_model.cpp
View file

@ -1,4 +1,4 @@
#include "bicycle_model.hpp"
#include "routing_common/bicycle_model.hpp"
#include "base/assert.hpp"
#include "base/macros.hpp"

4
routing/bicycle_model.hpp → routing_common/bicycle_model.hpp
View file

@ -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
{

2
routing/car_model.cpp → routing_common/car_model.cpp
View file

@ -1,4 +1,4 @@
#include "car_model.hpp"
#include "routing_common/car_model.hpp"
#include "base/macros.hpp"

3
routing/car_model.hpp → routing_common/car_model.hpp
View file

@ -1,5 +1,6 @@
#pragma once
#include "vehicle_model.hpp"
#include "routing_common/vehicle_model.hpp"
#include "std/shared_ptr.hpp"

2
routing/pedestrian_model.cpp → routing_common/pedestrian_model.cpp
View file

@ -1,4 +1,4 @@
#include "pedestrian_model.hpp"
#include "routing_common/pedestrian_model.hpp"
#include "base/assert.hpp"
#include "base/macros.hpp"

4
routing/pedestrian_model.hpp → routing_common/pedestrian_model.hpp
View file

@ -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
{

Some files were not shown because too many files have changed in this diff Show more