From 82e7d98a29001ce941f080a716a1054a1876fdf6 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Mon, 7 Dec 2015 13:52:56 +0300 Subject: [PATCH] Move mercator.hpp to geometry. --- .../osrm-backend/plugins/MapsMePlugin.hpp | 2 +- android/YoPme/jni/Framework.cpp | 2 +- .../drape_frontend_tests/tile_tree_tests.cpp | 2 +- drape_frontend/gui/ruler_helper.cpp | 2 +- drape_frontend/my_position_controller.cpp | 2 +- drape_frontend/tile_key.cpp | 2 +- drape_frontend/visual_params.cpp | 2 +- generator/borders_generator.cpp | 2 +- generator/borders_loader.cpp | 2 +- generator/feature_generator.cpp | 2 +- generator/generator_tests/coasts_test.cpp | 2 +- .../triangles_tree_coding_test.cpp | 2 +- generator/kml_parser.cpp | 2 +- generator/osm2type.cpp | 2 +- generator/osm_source.cpp | 2 +- generator/routing_generator.cpp | 2 +- geometry/geometry.pro | 2 ++ geometry/geometry_tests/geometry_tests.pro | 5 ++-- geometry/geometry_tests/latlon_test.cpp | 2 +- .../geometry_tests}/mercator_test.cpp | 2 +- {indexer => geometry}/mercator.cpp | 2 +- {indexer => geometry}/mercator.hpp | 0 indexer/cell_id.hpp | 2 +- indexer/geometry_serialization.cpp | 2 +- indexer/indexer.pro | 2 -- .../indexer_tests/geometry_coding_test.cpp | 2 +- .../geometry_serialization_test.cpp | 2 +- indexer/indexer_tests/indexer_tests.pro | 1 - indexer/scales.cpp | 2 +- .../Search/TableView/MWMSearchCommonCell.mm | 2 +- iphone/Maps/Platform/LocationManager.h | 2 +- .../MWMNoMapInterfaceController.mm | 2 +- .../FrameworkUtils/MWMFrameworkUtils.mm | 4 +-- .../MWMWatchLocationTracker.mm | 2 +- map/benchmark_provider.cpp | 2 +- map/bookmark.cpp | 2 +- map/ge0_parser.cpp | 2 +- map/geourl_process.cpp | 2 +- map/mwm_url.cpp | 2 +- map/track.cpp | 2 +- mapshot/mapshot.cpp | 2 +- omim.pro | 2 +- platform/measurement_utils.cpp | 2 +- routing/async_router.cpp | 2 +- routing/base/astar_progress.hpp | 2 +- routing/base/followed_polyline.hpp | 2 +- routing/cross_routing_context.cpp | 2 +- routing/online_cross_fetcher.cpp | 2 +- routing/osrm_router.cpp | 2 +- routing/road_graph.cpp | 2 +- routing/route.cpp | 2 +- routing/routing_algorithm.cpp | 2 +- .../routing_consistency_tests.cpp | 2 +- .../osrm_route_test.cpp | 2 +- .../pedestrian_route_test.cpp | 2 +- routing/routing_session.cpp | 2 +- routing/routing_tests/osrm_router_test.cpp | 2 +- .../routing_tests/turns_generator_test.cpp | 2 +- search/geometry_utils.cpp | 2 +- search/params.cpp | 2 +- search/search_engine.cpp | 2 +- .../country_info_getter_test.cpp | 2 +- .../geometry.xcodeproj/project.pbxproj | 16 +++++++++--- .../indexer/indexer.xcodeproj/project.pbxproj | 26 ++++--------------- 64 files changed, 79 insertions(+), 89 deletions(-) rename {indexer/indexer_tests => geometry/geometry_tests}/mercator_test.cpp (98%) rename {indexer => geometry}/mercator.cpp (98%) rename {indexer => geometry}/mercator.hpp (100%) diff --git a/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp b/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp index af6eb7a920..322eb8c7b4 100644 --- a/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp +++ b/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp @@ -7,7 +7,7 @@ #include "../../../../defines.hpp" #include "../../../../geometry/region2d.hpp" #include "../../../../indexer/geometry_serialization.hpp" -#include "../../../../indexer/mercator.hpp" +#include "../../../../geometry/mercator.hpp" #include "../../../../storage/country_decl.hpp" #include "../../../../storage/country_polygon.hpp" diff --git a/android/YoPme/jni/Framework.cpp b/android/YoPme/jni/Framework.cpp index 712545b22e..e1edc19075 100644 --- a/android/YoPme/jni/Framework.cpp +++ b/android/YoPme/jni/Framework.cpp @@ -4,7 +4,7 @@ #include "../../../map/navigator.hpp" #include "../../../map/yopme_render_policy.hpp" -#include "../../../indexer/mercator.hpp" +#include "../../../geometry/mercator.hpp" #include "../../../platform/platform.hpp" diff --git a/drape_frontend/drape_frontend_tests/tile_tree_tests.cpp b/drape_frontend/drape_frontend_tests/tile_tree_tests.cpp index bd8acbcb4f..ef31fbd11c 100644 --- a/drape_frontend/drape_frontend_tests/tile_tree_tests.cpp +++ b/drape_frontend/drape_frontend_tests/tile_tree_tests.cpp @@ -4,7 +4,7 @@ #include "drape/glstate.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/logging.hpp" diff --git a/drape_frontend/gui/ruler_helper.cpp b/drape_frontend/gui/ruler_helper.cpp index c720e4eda2..406851e705 100644 --- a/drape_frontend/gui/ruler_helper.cpp +++ b/drape_frontend/gui/ruler_helper.cpp @@ -6,7 +6,7 @@ #include "platform/settings.hpp" #include "platform/measurement_utils.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/screenbase.hpp" #include "base/macros.hpp" diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index db621180b0..90cfaa107d 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -4,7 +4,7 @@ #include "animation/interpolations.hpp" #include "animation/model_view_animation.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/math.hpp" diff --git a/drape_frontend/tile_key.cpp b/drape_frontend/tile_key.cpp index 56289c0b93..6af420cc37 100755 --- a/drape_frontend/tile_key.cpp +++ b/drape_frontend/tile_key.cpp @@ -1,6 +1,6 @@ #include "drape_frontend/tile_key.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" namespace df { diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp index f043ed0a15..7734b3681e 100644 --- a/drape_frontend/visual_params.cpp +++ b/drape_frontend/visual_params.cpp @@ -4,7 +4,7 @@ #include "base/math.hpp" #include "base/assert.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "std/limits.hpp" #include "std/algorithm.hpp" diff --git a/generator/borders_generator.cpp b/generator/borders_generator.cpp index 2ba4ca2304..e1f5530c13 100644 --- a/generator/borders_generator.cpp +++ b/generator/borders_generator.cpp @@ -1,6 +1,6 @@ #include "generator/borders_generator.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp index f109d046fd..d14393e571 100644 --- a/generator/borders_loader.cpp +++ b/generator/borders_loader.cpp @@ -9,7 +9,7 @@ #include "indexer/geometry_serialization.hpp" #include "indexer/scales.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/simplification.hpp" #include "geometry/distance.hpp" diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp index 5dda06a183..a756e48533 100644 --- a/generator/feature_generator.cpp +++ b/generator/feature_generator.cpp @@ -6,7 +6,7 @@ #include "indexer/cell_id.hpp" #include "indexer/data_header.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/varint.hpp" diff --git a/generator/generator_tests/coasts_test.cpp b/generator/generator_tests/coasts_test.cpp index 8e4e65bea9..94439cea34 100644 --- a/generator/generator_tests/coasts_test.cpp +++ b/generator/generator_tests/coasts_test.cpp @@ -4,7 +4,7 @@ #include "generator/feature_sorter.hpp" #include "generator/feature_generator.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/cell_id.hpp" #include "indexer/scales.hpp" diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp index 1ab03f0fde..99414f4844 100644 --- a/generator/generator_tests/triangles_tree_coding_test.cpp +++ b/generator/generator_tests/triangles_tree_coding_test.cpp @@ -1,7 +1,7 @@ #include "generator/tesselator.hpp" #include "indexer/geometry_serialization.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/point_to_int64.hpp" #include "indexer/coding_params.hpp" diff --git a/generator/kml_parser.cpp b/generator/kml_parser.cpp index 2fd2f5b28f..757a475c49 100644 --- a/generator/kml_parser.cpp +++ b/generator/kml_parser.cpp @@ -11,7 +11,7 @@ #include "generator/geometry/cellid.hpp" #include "generator/indexer/cell_id.hpp" -#include "generator/indexer/mercator.hpp" +#include "generator/geometry/mercator.hpp" #include "generator/indexer/feature.hpp" #include "generator/indexer/covering.hpp" diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index b082833dfb..1a0331c9a3 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -4,7 +4,7 @@ #include "indexer/classificator.hpp" #include "indexer/feature_visibility.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/assert.hpp" #include "base/string_utils.hpp" diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index 335dd25e6d..26980c0820 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -11,7 +11,7 @@ #include "generator/osm_element.hpp" #include "indexer/classificator.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/parse_xml.hpp" diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp index 5cd8a17ad8..3bac4929fd 100644 --- a/generator/routing_generator.cpp +++ b/generator/routing_generator.cpp @@ -15,7 +15,7 @@ #include "indexer/feature.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/index.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/distance_on_sphere.hpp" diff --git a/geometry/geometry.pro b/geometry/geometry.pro index 67102fd5ef..d51bfbb054 100644 --- a/geometry/geometry.pro +++ b/geometry/geometry.pro @@ -12,6 +12,7 @@ SOURCES += \ angles.cpp \ distance_on_sphere.cpp \ latlon.cpp \ + mercator.cpp \ packer.cpp \ region2d/binary_operators.cpp \ robust_orientation.cpp \ @@ -28,6 +29,7 @@ HEADERS += \ distance.hpp \ distance_on_sphere.hpp \ latlon.hpp \ + mercator.hpp \ packer.hpp \ point2d.hpp \ pointu_to_uint64.hpp \ diff --git a/geometry/geometry_tests/geometry_tests.pro b/geometry/geometry_tests/geometry_tests.pro index 8ad7164d13..3f5bd05170 100644 --- a/geometry/geometry_tests/geometry_tests.pro +++ b/geometry/geometry_tests/geometry_tests.pro @@ -6,9 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -# TODO(AlexZ): latlon.hpp introduces indexer dependency for tests, -# because of indexer/mercator.hpp. Either move latlon to indexer, or mercator to geometry. -DEPENDENCIES = indexer geometry base +DEPENDENCIES = geometry base include($$ROOT_DIR/common.pri) @@ -28,6 +26,7 @@ SOURCES += \ distance_test.cpp \ intersect_test.cpp \ latlon_test.cpp \ + mercator_test.cpp \ packer_test.cpp \ point_test.cpp \ pointu_to_uint64_test.cpp \ diff --git a/geometry/geometry_tests/latlon_test.cpp b/geometry/geometry_tests/latlon_test.cpp index e57cbbbd32..5242c8a2ba 100644 --- a/geometry/geometry_tests/latlon_test.cpp +++ b/geometry/geometry_tests/latlon_test.cpp @@ -1,7 +1,7 @@ #include "testing/testing.hpp" #include "geometry/latlon.hpp" #include "geometry/point2d.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" UNIT_TEST(LatLonPointConstructorTest) { diff --git a/indexer/indexer_tests/mercator_test.cpp b/geometry/geometry_tests/mercator_test.cpp similarity index 98% rename from indexer/indexer_tests/mercator_test.cpp rename to geometry/geometry_tests/mercator_test.cpp index 676b78beee..add1f33929 100644 --- a/indexer/indexer_tests/mercator_test.cpp +++ b/geometry/geometry_tests/mercator_test.cpp @@ -2,7 +2,7 @@ #include "testing/testing.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/math.hpp" #include "base/macros.hpp" diff --git a/indexer/mercator.cpp b/geometry/mercator.cpp similarity index 98% rename from indexer/mercator.cpp rename to geometry/mercator.cpp index d7a2c495d4..df93104f85 100644 --- a/indexer/mercator.cpp +++ b/geometry/mercator.cpp @@ -1,4 +1,4 @@ -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/distance_on_sphere.hpp" diff --git a/indexer/mercator.hpp b/geometry/mercator.hpp similarity index 100% rename from indexer/mercator.hpp rename to geometry/mercator.hpp diff --git a/indexer/cell_id.hpp b/indexer/cell_id.hpp index 6d9a014366..7d64d339ac 100644 --- a/indexer/cell_id.hpp +++ b/indexer/cell_id.hpp @@ -1,5 +1,5 @@ #pragma once -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/point_to_int64.hpp" #include "base/assert.hpp" diff --git a/indexer/geometry_serialization.cpp b/indexer/geometry_serialization.cpp index da84f21c0b..e92304551c 100644 --- a/indexer/geometry_serialization.cpp +++ b/indexer/geometry_serialization.cpp @@ -1,5 +1,5 @@ #include "indexer/geometry_serialization.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/point_to_int64.hpp" #include "indexer/geometry_coding.hpp" diff --git a/indexer/indexer.pro b/indexer/indexer.pro index f41ec5bf01..d500f56030 100644 --- a/indexer/indexer.pro +++ b/indexer/indexer.pro @@ -40,7 +40,6 @@ SOURCES += \ index_builder.cpp \ map_style.cpp \ map_style_reader.cpp \ - mercator.cpp \ mwm_set.cpp \ old/feature_loader_101.cpp \ point_to_int64.cpp \ @@ -88,7 +87,6 @@ HEADERS += \ interval_index_iface.hpp \ map_style.hpp \ map_style_reader.hpp \ - mercator.hpp \ mwm_set.hpp \ old/feature_loader_101.hpp \ old/interval_index_101.hpp \ diff --git a/indexer/indexer_tests/geometry_coding_test.cpp b/indexer/indexer_tests/geometry_coding_test.cpp index fb7867b76b..57ddad2a49 100644 --- a/indexer/indexer_tests/geometry_coding_test.cpp +++ b/indexer/indexer_tests/geometry_coding_test.cpp @@ -2,7 +2,7 @@ #include "indexer/geometry_coding.hpp" #include "indexer/point_to_int64.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/coding_params.hpp" #include "indexer/indexer_tests/test_polylines.hpp" diff --git a/indexer/indexer_tests/geometry_serialization_test.cpp b/indexer/indexer_tests/geometry_serialization_test.cpp index 5521e694a2..87cbb60a96 100644 --- a/indexer/indexer_tests/geometry_serialization_test.cpp +++ b/indexer/indexer_tests/geometry_serialization_test.cpp @@ -4,7 +4,7 @@ #include "indexer/geometry_serialization.hpp" #include "indexer/coding_params.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/reader.hpp" #include "coding/byte_stream.hpp" diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro index 8ea3baf487..3b0202ff8f 100644 --- a/indexer/indexer_tests/indexer_tests.pro +++ b/indexer/indexer_tests/indexer_tests.pro @@ -29,7 +29,6 @@ SOURCES += \ index_builder_test.cpp \ index_test.cpp \ interval_index_test.cpp \ - mercator_test.cpp \ mwm_set_test.cpp \ point_to_int64_test.cpp \ scales_test.cpp \ diff --git a/indexer/scales.cpp b/indexer/scales.cpp index b91bda7902..f3aaeafebf 100644 --- a/indexer/scales.cpp +++ b/indexer/scales.cpp @@ -1,5 +1,5 @@ #include "indexer/scales.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/math.hpp" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm index 92a008e149..3124b5735a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm @@ -5,7 +5,7 @@ #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/measurement_utils.hpp" static NSDictionary * const kSelectedAttributes = @{ diff --git a/iphone/Maps/Platform/LocationManager.h b/iphone/Maps/Platform/LocationManager.h index 5f3b5ef389..05f5058487 100644 --- a/iphone/Maps/Platform/LocationManager.h +++ b/iphone/Maps/Platform/LocationManager.h @@ -2,7 +2,7 @@ #import #import -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/location.hpp" #include "std/utility.hpp" diff --git a/iphone/Maps/maps.me WatchKit Extension/Controllers/MapDownload/MWMNoMapInterfaceController.mm b/iphone/Maps/maps.me WatchKit Extension/Controllers/MapDownload/MWMNoMapInterfaceController.mm index 7b2df63aa0..5d7af8b14c 100644 --- a/iphone/Maps/maps.me WatchKit Extension/Controllers/MapDownload/MWMNoMapInterfaceController.mm +++ b/iphone/Maps/maps.me WatchKit Extension/Controllers/MapDownload/MWMNoMapInterfaceController.mm @@ -6,7 +6,7 @@ #import "Macros.h" #import "Common.h" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" extern NSString * const kNoMapControllerIdentifier = @"NoMapController"; static NSUInteger const kMaxPercent = 100; diff --git a/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm b/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm index 2a469c013a..d4ca1ebc68 100644 --- a/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm +++ b/iphone/Maps/maps.me WatchKit Extension/FrameworkUtils/MWMFrameworkUtils.mm @@ -3,7 +3,7 @@ #include "Framework.h" #include "indexer/scales.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "drape_frontend/watch/frame_image.hpp" @@ -127,4 +127,4 @@ extern NSString * const kSearchResultPointKey; GetFramework().Search(params); } -@end \ No newline at end of file +@end diff --git a/iphone/Maps/maps.me WatchKit Extension/LocationTracker/MWMWatchLocationTracker.mm b/iphone/Maps/maps.me WatchKit Extension/LocationTracker/MWMWatchLocationTracker.mm index 3d5d720fb5..75738560f9 100644 --- a/iphone/Maps/maps.me WatchKit Extension/LocationTracker/MWMWatchLocationTracker.mm +++ b/iphone/Maps/maps.me WatchKit Extension/LocationTracker/MWMWatchLocationTracker.mm @@ -1,6 +1,6 @@ #import "MWMWatchLocationTracker.h" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/measurement_utils.hpp" static CLLocationDistance const kNoMovementThreshold = 5.0; diff --git a/map/benchmark_provider.cpp b/map/benchmark_provider.cpp index 4471d3a969..779325ab01 100644 --- a/map/benchmark_provider.cpp +++ b/map/benchmark_provider.cpp @@ -1,6 +1,6 @@ #include "base/SRC_FIRST.hpp" #include "map/benchmark_provider.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" BenchmarkRectProvider::BenchmarkRectProvider(int startLevel, m2::RectD const & startRect, int endLevel) : m_endLevel(endLevel) diff --git a/map/bookmark.cpp b/map/bookmark.cpp index d5c6d840b3..7c3a384463 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -5,7 +5,7 @@ #include "base/scope_guard.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/file_reader.hpp" #include "coding/parse_xml.hpp" // LoadFromKML diff --git a/map/ge0_parser.cpp b/map/ge0_parser.cpp index 16ec7c4613..e330bafa3f 100644 --- a/map/ge0_parser.cpp +++ b/map/ge0_parser.cpp @@ -3,7 +3,7 @@ #include "api/internal/c/api-client-internals.h" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/url_encode.hpp" diff --git a/map/geourl_process.cpp b/map/geourl_process.cpp index dc972d445b..c309a2c373 100644 --- a/map/geourl_process.cpp +++ b/map/geourl_process.cpp @@ -1,6 +1,6 @@ #include "map/geourl_process.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/scales.hpp" #include "coding/uri.hpp" diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 6ba57150c4..4b1ff56b06 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -3,7 +3,7 @@ #include "map/api_mark_point.hpp" #include "map/bookmark_manager.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/scales.hpp" #include "drape_frontend/visual_params.hpp" diff --git a/map/track.cpp b/map/track.cpp index 9b509935ca..fa9cc3a02e 100644 --- a/map/track.cpp +++ b/map/track.cpp @@ -1,6 +1,6 @@ #include "map/track.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "drape/color.hpp" diff --git a/mapshot/mapshot.cpp b/mapshot/mapshot.cpp index 5a3a29d6bd..96534c515a 100644 --- a/mapshot/mapshot.cpp +++ b/mapshot/mapshot.cpp @@ -1,6 +1,6 @@ #include "map/framework.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/string_utils.hpp" diff --git a/omim.pro b/omim.pro index 5ce5f4bbba..4f7c822222 100644 --- a/omim.pro +++ b/omim.pro @@ -84,7 +84,7 @@ SUBDIRS = 3party base coding geometry indexer routing SUBDIRS *= coding_tests geometry_tests.subdir = geometry/geometry_tests - geometry_tests.depends = 3party base geometry indexer + geometry_tests.depends = 3party base geometry SUBDIRS *= geometry_tests indexer_tests.subdir = indexer/indexer_tests diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index c0b1cfb52e..8e6360cc52 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -1,7 +1,7 @@ #include "platform/measurement_utils.hpp" #include "platform/settings.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "base/string_utils.hpp" #include "base/math.hpp" diff --git a/routing/async_router.cpp b/routing/async_router.cpp index a6d045788d..b021167358 100644 --- a/routing/async_router.cpp +++ b/routing/async_router.cpp @@ -7,7 +7,7 @@ #include "base/string_utils.hpp" #include "base/timer.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" namespace routing { diff --git a/routing/base/astar_progress.hpp b/routing/base/astar_progress.hpp index 9b3b429743..f1447de34b 100644 --- a/routing/base/astar_progress.hpp +++ b/routing/base/astar_progress.hpp @@ -2,7 +2,7 @@ #include "geometry/point2d.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" namespace routing { diff --git a/routing/base/followed_polyline.hpp b/routing/base/followed_polyline.hpp index a7224a170f..36d700d27d 100644 --- a/routing/base/followed_polyline.hpp +++ b/routing/base/followed_polyline.hpp @@ -1,6 +1,6 @@ #pragma once -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/point2d.hpp" #include "geometry/polyline2d.hpp" diff --git a/routing/cross_routing_context.cpp b/routing/cross_routing_context.cpp index 9705abe141..ecaededd23 100644 --- a/routing/cross_routing_context.cpp +++ b/routing/cross_routing_context.cpp @@ -1,6 +1,6 @@ #include "routing/cross_routing_context.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/point_to_int64.hpp" namespace diff --git a/routing/online_cross_fetcher.cpp b/routing/online_cross_fetcher.cpp index afc911934d..5602a82899 100644 --- a/routing/online_cross_fetcher.cpp +++ b/routing/online_cross_fetcher.cpp @@ -7,7 +7,7 @@ #include "3party/jansson/myjansson.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "std/bind.hpp" diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index 9835cbb9f0..193d1a7ac4 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -13,7 +13,7 @@ #include "geometry/distance_on_sphere.hpp" #include "indexer/ftypes_matcher.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/index.hpp" #include "indexer/scales.hpp" diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp index 2be9a5d809..c0a314ca23 100644 --- a/routing/road_graph.cpp +++ b/routing/road_graph.cpp @@ -3,7 +3,7 @@ #include "routing/route.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/distance_on_sphere.hpp" diff --git a/routing/route.cpp b/routing/route.cpp index e7442a8931..13fecabcb4 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -1,7 +1,7 @@ #include "route.hpp" #include "turns_generator.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/location.hpp" diff --git a/routing/routing_algorithm.cpp b/routing/routing_algorithm.cpp index df4cf9d6a9..43806ebfa3 100644 --- a/routing/routing_algorithm.cpp +++ b/routing/routing_algorithm.cpp @@ -5,7 +5,7 @@ #include "base/assert.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" namespace routing { diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/routing/routing_consistency_tests/routing_consistency_tests.cpp index 2a0554302a..0a75dbfc92 100644 --- a/routing/routing_consistency_tests/routing_consistency_tests.cpp +++ b/routing/routing_consistency_tests/routing_consistency_tests.cpp @@ -5,7 +5,7 @@ #include "storage/country_decl.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/point2d.hpp" diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp index b100b0334a..4058ae9dd5 100644 --- a/routing/routing_integration_tests/osrm_route_test.cpp +++ b/routing/routing_integration_tests/osrm_route_test.cpp @@ -2,7 +2,7 @@ #include "routing/routing_integration_tests/routing_test_tools.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" using namespace routing; diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp index 2eb4979199..587b55fda3 100644 --- a/routing/routing_integration_tests/pedestrian_route_test.cpp +++ b/routing/routing_integration_tests/pedestrian_route_test.cpp @@ -2,7 +2,7 @@ #include "routing/routing_integration_tests/routing_test_tools.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" using namespace routing; using namespace routing::turns; diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index 74320bcc87..1e8a6816b5 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -2,7 +2,7 @@ #include "speed_camera.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/location.hpp" #include "platform/measurement_utils.hpp" diff --git a/routing/routing_tests/osrm_router_test.cpp b/routing/routing_tests/osrm_router_test.cpp index e05f7f271d..8835e0c0e4 100644 --- a/routing/routing_tests/osrm_router_test.cpp +++ b/routing/routing_tests/osrm_router_test.cpp @@ -3,7 +3,7 @@ #include "routing/osrm_router.hpp" #include "indexer/features_offsets_table.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/country_file.hpp" #include "platform/local_country_file.hpp" diff --git a/routing/routing_tests/turns_generator_test.cpp b/routing/routing_tests/turns_generator_test.cpp index 2a7384c735..e394922230 100644 --- a/routing/routing_tests/turns_generator_test.cpp +++ b/routing/routing_tests/turns_generator_test.cpp @@ -4,7 +4,7 @@ #include "routing/turns.hpp" #include "routing/turns_generator.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "geometry/point2d.hpp" diff --git a/search/geometry_utils.cpp b/search/geometry_utils.cpp index a6ba235410..c8c6db1ebf 100644 --- a/search/geometry_utils.cpp +++ b/search/geometry_utils.cpp @@ -1,6 +1,6 @@ #include "geometry_utils.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/scales.hpp" diff --git a/search/params.cpp b/search/params.cpp index 78a2683cc3..ff90ef110b 100644 --- a/search/params.cpp +++ b/search/params.cpp @@ -1,6 +1,6 @@ #include "params.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "coding/multilang_utf8_string.hpp" diff --git a/search/search_engine.cpp b/search/search_engine.cpp index f87869598f..70e1b7991f 100644 --- a/search/search_engine.cpp +++ b/search/search_engine.cpp @@ -7,7 +7,7 @@ #include "indexer/categories_holder.hpp" #include "indexer/search_string_utils.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "indexer/scales.hpp" #include "indexer/classificator.hpp" diff --git a/storage/storage_tests/country_info_getter_test.cpp b/storage/storage_tests/country_info_getter_test.cpp index 3862bde2ba..663d3c51fb 100644 --- a/storage/storage_tests/country_info_getter_test.cpp +++ b/storage/storage_tests/country_info_getter_test.cpp @@ -3,7 +3,7 @@ #include "storage/country_info_getter.hpp" #include "storage/country.hpp" -#include "indexer/mercator.hpp" +#include "geometry/mercator.hpp" #include "platform/platform.hpp" diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 30e623dec8..3b99a61f20 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -71,8 +71,9 @@ 675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675344DB1A3F68F900A0A8C3 /* binary_operators.cpp */; }; 675344DF1A3F68F900A0A8C3 /* binary_operators.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344DC1A3F68F900A0A8C3 /* binary_operators.hpp */; }; 675344E01A3F68F900A0A8C3 /* boost_concept.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344DD1A3F68F900A0A8C3 /* boost_concept.hpp */; }; - 675D21951BFB874500717E4F /* latlon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675D21931BFB874500717E4F /* latlon.cpp */; }; - 675D21961BFB874500717E4F /* latlon.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675D21941BFB874500717E4F /* latlon.hpp */; }; + E92D8BD11C15AF9100A98D17 /* mercator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92D8BD01C15AF9100A98D17 /* mercator_test.cpp */; }; + E92D8BD41C15AFAA00A98D17 /* mercator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E92D8BD21C15AFAA00A98D17 /* mercator.cpp */; }; + E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E92D8BD31C15AFAA00A98D17 /* mercator.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -154,8 +155,9 @@ 675344DB1A3F68F900A0A8C3 /* binary_operators.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = binary_operators.cpp; sourceTree = ""; }; 675344DC1A3F68F900A0A8C3 /* binary_operators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = binary_operators.hpp; sourceTree = ""; }; 675344DD1A3F68F900A0A8C3 /* boost_concept.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = boost_concept.hpp; sourceTree = ""; }; - 675D21931BFB874500717E4F /* latlon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon.cpp; sourceTree = ""; }; - 675D21941BFB874500717E4F /* latlon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = latlon.hpp; sourceTree = ""; }; + E92D8BD01C15AF9100A98D17 /* mercator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator_test.cpp; sourceTree = ""; }; + E92D8BD21C15AFAA00A98D17 /* mercator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator.cpp; sourceTree = ""; }; + E92D8BD31C15AFAA00A98D17 /* mercator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mercator.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -182,6 +184,7 @@ 670F29211BA9D25D00F2ABF4 /* geometry_tests */ = { isa = PBXGroup; children = ( + E92D8BD01C15AF9100A98D17 /* mercator_test.cpp */, 670F299F1BAAC61C00F2ABF4 /* libs */, 670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */, 670F29221BA9D2E700F2ABF4 /* angle_test.cpp */, @@ -247,6 +250,8 @@ 675344931A3F684600A0A8C3 /* geometry */ = { isa = PBXGroup; children = ( + E92D8BD21C15AFAA00A98D17 /* mercator.cpp */, + E92D8BD31C15AFAA00A98D17 /* mercator.hpp */, 6741AA9E1BF35476002C974C /* latlon.cpp */, 6741AA9F1BF35476002C974C /* latlon.hpp */, 675344DA1A3F68E200A0A8C3 /* region2d */, @@ -305,6 +310,7 @@ 675344C01A3F687400A0A8C3 /* cellid.hpp in Headers */, 675344CB1A3F687400A0A8C3 /* polyline2d.hpp in Headers */, 675344D21A3F687400A0A8C3 /* screenbase.hpp in Headers */, + E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */, 675344BF1A3F687400A0A8C3 /* avg_vector.hpp in Headers */, 675344D31A3F687400A0A8C3 /* simplification.hpp in Headers */, 675344CC1A3F687400A0A8C3 /* rect_intersect.hpp in Headers */, @@ -446,6 +452,8 @@ 675344D11A3F687400A0A8C3 /* screenbase.cpp in Sources */, 675344BC1A3F687400A0A8C3 /* angles.cpp in Sources */, 6741AAA01BF35476002C974C /* latlon.cpp in Sources */, + E92D8BD41C15AFAA00A98D17 /* mercator.cpp in Sources */, + E92D8BD11C15AF9100A98D17 /* mercator_test.cpp in Sources */, 675344C61A3F687400A0A8C3 /* packer.cpp in Sources */, 675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */, ); diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index e830b625ba..34ef71d14f 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 670C61131AB065B100C38A8C /* index_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61001AB065B100C38A8C /* index_builder_test.cpp */; }; 670C61141AB065B100C38A8C /* index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61011AB065B100C38A8C /* index_test.cpp */; }; 670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61021AB065B100C38A8C /* interval_index_test.cpp */; }; - 670C61161AB065B100C38A8C /* mercator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61031AB065B100C38A8C /* mercator_test.cpp */; }; 670C61171AB065B100C38A8C /* mwm_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61041AB065B100C38A8C /* mwm_set_test.cpp */; }; 670C61181AB065B100C38A8C /* point_to_int64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */; }; 670C61191AB065B100C38A8C /* scales_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C61061AB065B100C38A8C /* scales_test.cpp */; }; @@ -42,7 +41,6 @@ 670C615C1AB0691900C38A8C /* features_offsets_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61591AB0691900C38A8C /* features_offsets_table.hpp */; }; 670C615D1AB0691900C38A8C /* string_file_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C615A1AB0691900C38A8C /* string_file_values.hpp */; }; 670C620B1AC3550F00C38A8C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C620A1AC3550F00C38A8C /* libopening_hours.a */; }; - 670C620D1AC59E6300C38A8C /* opening_hours_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */; }; 670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */; }; 670D04AC1B0BA8580013A7AC /* feature_loader_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */; }; 670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */; }; @@ -109,8 +107,6 @@ 675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */; }; 675341331A3F540F00A0A8C3 /* interval_index_iface.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */; }; 675341341A3F540F00A0A8C3 /* interval_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E11A3F540F00A0A8C3 /* interval_index.hpp */; }; - 675341351A3F540F00A0A8C3 /* mercator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E21A3F540F00A0A8C3 /* mercator.cpp */; }; - 675341361A3F540F00A0A8C3 /* mercator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E31A3F540F00A0A8C3 /* mercator.hpp */; }; 675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */; }; 675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */; }; 6753413B1A3F540F00A0A8C3 /* point_to_int64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340E91A3F540F00A0A8C3 /* point_to_int64.cpp */; }; @@ -131,11 +127,11 @@ 6753414C1A3F540F00A0A8C3 /* tree_structure.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340FA1A3F540F00A0A8C3 /* tree_structure.hpp */; }; 6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340FB1A3F540F00A0A8C3 /* types_mapping.cpp */; }; 6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340FC1A3F540F00A0A8C3 /* types_mapping.hpp */; }; - 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; settings = {ASSET_TAGS = (); }; }; - 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; settings = {ASSET_TAGS = (); }; }; - 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; settings = {ASSET_TAGS = (); }; }; + 6758AED11BB4413000C26E27 /* drules_selector_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECD1BB4413000C26E27 /* drules_selector_parser.cpp */; }; + 6758AED21BB4413000C26E27 /* drules_selector_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AECE1BB4413000C26E27 /* drules_selector_parser.hpp */; }; + 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; }; + 6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; }; + 67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -161,7 +157,6 @@ 670C61001AB065B100C38A8C /* index_builder_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index_builder_test.cpp; sourceTree = ""; }; 670C61011AB065B100C38A8C /* index_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index_test.cpp; sourceTree = ""; }; 670C61021AB065B100C38A8C /* interval_index_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interval_index_test.cpp; sourceTree = ""; }; - 670C61031AB065B100C38A8C /* mercator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator_test.cpp; sourceTree = ""; }; 670C61041AB065B100C38A8C /* mwm_set_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_set_test.cpp; sourceTree = ""; }; 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_to_int64_test.cpp; sourceTree = ""; }; 670C61061AB065B100C38A8C /* scales_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scales_test.cpp; sourceTree = ""; }; @@ -186,7 +181,6 @@ 670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = ""; }; 670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = ""; }; 670C615A1AB0691900C38A8C /* string_file_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_file_values.hpp; sourceTree = ""; }; - 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opening_hours_test.cpp; sourceTree = ""; }; 670C620A1AC3550F00C38A8C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = ../opening_hours/build/Debug/libopening_hours.a; sourceTree = ""; }; 670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_loader_101.cpp; sourceTree = ""; }; 670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_loader_101.hpp; sourceTree = ""; }; @@ -257,8 +251,6 @@ 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_builder.hpp; sourceTree = ""; }; 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_iface.hpp; sourceTree = ""; }; 675340E11A3F540F00A0A8C3 /* interval_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index.hpp; sourceTree = ""; }; - 675340E21A3F540F00A0A8C3 /* mercator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mercator.cpp; sourceTree = ""; }; - 675340E31A3F540F00A0A8C3 /* mercator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mercator.hpp; sourceTree = ""; }; 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_set.cpp; sourceTree = ""; }; 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_set.hpp; sourceTree = ""; }; 675340E91A3F540F00A0A8C3 /* point_to_int64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = point_to_int64.cpp; sourceTree = ""; }; @@ -330,7 +322,6 @@ 670C61001AB065B100C38A8C /* index_builder_test.cpp */, 670C61011AB065B100C38A8C /* index_test.cpp */, 670C61021AB065B100C38A8C /* interval_index_test.cpp */, - 670C61031AB065B100C38A8C /* mercator_test.cpp */, 670C61041AB065B100C38A8C /* mwm_set_test.cpp */, 670C61051AB065B100C38A8C /* point_to_int64_test.cpp */, 670C61061AB065B100C38A8C /* scales_test.cpp */, @@ -339,7 +330,6 @@ 670C61091AB065B100C38A8C /* test_polylines.hpp */, 670C610A1AB065B100C38A8C /* test_type.cpp */, 670C610B1AB065B100C38A8C /* visibility_test.cpp */, - 670C615E1AB0B02B00C38A8C /* opening_hours_test.cpp */, ); name = indexer_tests; path = ../../indexer/indexer_tests; @@ -468,8 +458,6 @@ 675340DF1A3F540F00A0A8C3 /* interval_index_builder.hpp */, 675340E01A3F540F00A0A8C3 /* interval_index_iface.hpp */, 675340E11A3F540F00A0A8C3 /* interval_index.hpp */, - 675340E21A3F540F00A0A8C3 /* mercator.cpp */, - 675340E31A3F540F00A0A8C3 /* mercator.hpp */, 675340E41A3F540F00A0A8C3 /* mwm_set.cpp */, 675340E51A3F540F00A0A8C3 /* mwm_set.hpp */, 675340E91A3F540F00A0A8C3 /* point_to_int64.cpp */, @@ -503,7 +491,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 675341361A3F540F00A0A8C3 /* mercator.hpp in Headers */, 6753414E1A3F540F00A0A8C3 /* types_mapping.hpp in Headers */, 6753411F1A3F540F00A0A8C3 /* feature_loader.hpp in Headers */, 675341151A3F540F00A0A8C3 /* feature_covering.hpp in Headers */, @@ -640,7 +627,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 670C620D1AC59E6300C38A8C /* opening_hours_test.cpp in Sources */, 670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -656,9 +642,7 @@ 6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */, 6753411A1A3F540F00A0A8C3 /* feature_impl.cpp in Sources */, 670C61111AB065B100C38A8C /* geometry_coding_test.cpp in Sources */, - 675341351A3F540F00A0A8C3 /* mercator.cpp in Sources */, 6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */, - 670C61161AB065B100C38A8C /* mercator_test.cpp in Sources */, 675341421A3F540F00A0A8C3 /* search_delimiters.cpp in Sources */, 670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */, 675341301A3F540F00A0A8C3 /* index.cpp in Sources */,