[api] [ge0] Renamed api/ to ge0/.

mapsme · Jan 31, 2020 · fe2b032 · fe2b032
1 parent 96b20d9
commit fe2b032
Show file tree

Hide file tree

Showing 39 changed files with 143 additions and 139 deletions.
diff --git a/.clang-format b/.clang-format
@@ -44,7 +44,7 @@ IncludeCategories:
   - Regex:           '^"map/map_integration_tests/'
     Priority:        4763
 
-  - Regex:           '^"api/api_tests/'
+  - Regex:           '^"ge0/ge0_tests/'
     Priority:        4765
 
   - Regex:           '^"openlr/openlr_tests/'
@@ -206,7 +206,7 @@ IncludeCategories:
   - Regex:           '^"map/'
     Priority:        47000
 
-  - Regex:           '^"api/'
+  - Regex:           '^"ge0/'
     Priority:        47050
 
   - Regex:           '^"openlr/'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -290,13 +290,13 @@ else()
   message(FATAL_ERROR "Cannot find python.")
 endif()
 
-add_subdirectory(api)
 add_subdirectory(base)
 add_subdirectory(coding)
 add_subdirectory(descriptions)
 add_subdirectory(drape)
 add_subdirectory(drape_frontend)
 add_subdirectory(editor)
+add_subdirectory(ge0)
 add_subdirectory(generator/mwm_diff)
 add_subdirectory(geometry)
 add_subdirectory(indexer)

diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt
@@ -114,7 +114,7 @@ target_link_libraries(
   z
   # MapsWithMe libs
   map
-  api
+  ge0
   tracking
   routing
   traffic

diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
diff --git a/ge0/CMakeLists.txt b/ge0/CMakeLists.txt
@@ -0,0 +1,13 @@
+project(ge0)
+
+set(
+  SRC
+  parser.cpp
+  parser.hpp
+  url_generator.cpp
+  url_generator.hpp
+)
+
+omim_add_library(${PROJECT_NAME} ${SRC})
+
+omim_add_test_subdirectory(ge0_tests)
diff --git a/api/ge0.php → ge0/ge0.php b/api/ge0.php → ge0/ge0.php
diff --git a/api/api_tests/CMakeLists.txt → ge0/ge0_tests/CMakeLists.txt b/api/api_tests/CMakeLists.txt → ge0/ge0_tests/CMakeLists.txt
@@ -1,16 +1,16 @@
-project(api_tests)
+project(ge0_tests)
 
 set(
   SRC
-  ge0_generator_tests.cpp
-  ge0_parser_tests.cpp
+  parser_tests.cpp
+  url_generator_tests.cpp
 )
 
 omim_add_test(${PROJECT_NAME} ${SRC})
 
 omim_link_libraries(
   ${PROJECT_NAME}
-  api
+  ge0
   platform
   coding
   base

diff --git a/api/api_tests/ge0_parser_tests.cpp → ge0/ge0_tests/parser_tests.cpp b/api/api_tests/ge0_parser_tests.cpp → ge0/ge0_tests/parser_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "map/mwm_url.hpp"
 
-#include "api/ge0_generator.hpp"
-#include "api/ge0_parser.hpp"
+#include "ge0/parser.hpp"
+#include "ge0/url_generator.hpp"
 
 #include "base/macros.hpp"
 

diff --git a/api/api_tests/ge0_generator_tests.cpp → ge0/ge0_tests/url_generator_tests.cpp b/api/api_tests/ge0_generator_tests.cpp → ge0/ge0_tests/url_generator_tests.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "api/ge0_generator.hpp"
+#include "ge0/url_generator.hpp"
 
 #include <string>
 

diff --git a/api/ge0_parser.cpp → ge0/parser.cpp b/api/ge0_parser.cpp → ge0/parser.cpp
@@ -1,11 +1,11 @@
-#include "api/ge0_parser.hpp"
+#include "ge0/parser.hpp"
+
+#include "ge0/url_generator.hpp"
 
 #include "geometry/mercator.hpp"
 
 #include "coding/url_encode.hpp"
 
-#include "api/ge0_generator.hpp"
-
 #include "base/math.hpp"
 #include "base/string_utils.hpp"
 

diff --git a/api/ge0_parser.hpp → ge0/parser.hpp b/api/ge0_parser.hpp → ge0/parser.hpp
diff --git a/api/ge0_generator.cpp → ge0/url_generator.cpp b/api/ge0_generator.cpp → ge0/url_generator.cpp
@@ -1,4 +1,4 @@
-#include "api/ge0_generator.hpp"
+#include "ge0/url_generator.hpp"
 
 #include "base/assert.hpp"
 

diff --git a/api/ge0_generator.hpp → ge0/url_generator.hpp b/api/ge0_generator.hpp → ge0/url_generator.hpp
diff --git a/generator/generator_integration_tests/CMakeLists.txt b/generator/generator_integration_tests/CMakeLists.txt
@@ -17,7 +17,7 @@ omim_link_libraries(
   drape_frontend
   shaders
   map
-  api
+  ge0
   routing
   search
   storage

diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -312,6 +312,7 @@
 		34F73FA31E08300E00AC1FD6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34F73FA11E08300E00AC1FD6 /* Images.xcassets */; };
 		34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */; };
 		34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */; };
+		39CDE69123E1B6C8007CDA58 /* libge0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39CDE69023E1B6C8007CDA58 /* libge0.a */; };
 		3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; };
 		3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; };
 		3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */; };
@@ -529,7 +530,6 @@
 		6741AA361BF340DE002C974C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3A1B13222600E6D4FD /* libz.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
 		6741AABD1BF356BA002C974C /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA21BF356B9002C974C /* libagg.a */; };
 		6741AABE1BF356BA002C974C /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA31BF356B9002C974C /* libalohalitics.a */; };
-		6741AAC01BF356BA002C974C /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA51BF356B9002C974C /* libapi.a */; };
 		6741AAC11BF356BA002C974C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA61BF356B9002C974C /* libbase.a */; };
 		6741AAC21BF356BA002C974C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA71BF356B9002C974C /* libcoding.a */; };
 		6741AAC31BF356BA002C974C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA81BF356B9002C974C /* libexpat.a */; };
@@ -1347,6 +1347,7 @@
 		34FE4C431BCC013500066718 /* MWMMapWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapWidgets.h; sourceTree = "<group>"; };
 		34FE4C441BCC013500066718 /* MWMMapWidgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgets.mm; sourceTree = "<group>"; };
 		34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrafficButtonArea.swift; sourceTree = "<group>"; };
+		39CDE69023E1B6C8007CDA58 /* libge0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libge0.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMObjectsCategorySelectorDataSource.mm; sourceTree = "<group>"; };
 		3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = "<group>"; };
 		3D1958EA213804B6009A83EC /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1550,7 +1551,6 @@
 		6741AA5D1BF340DE002C974C /* maps.me dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "maps.me 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>"; };
-		6741AAA51BF356B9002C974C /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<group>"; };
 		6741AAA61BF356B9002C974C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
 		6741AAA71BF356B9002C974C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
 		6741AAA81BF356B9002C974C /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../../omim-xcode-build/Debug/libexpat.a"; sourceTree = "<group>"; };
@@ -2043,6 +2043,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				39CDE69123E1B6C8007CDA58 /* libge0.a in Frameworks */,
 				47A65CAD2350044800DCD85F /* CoreApi.framework in Frameworks */,
 				4577B28121F2066A00864FAC /* libvulkan_wrapper.a in Frameworks */,
 				CDB4D4D5222D118E00104869 /* CarPlay.framework in Frameworks */,
@@ -2082,7 +2083,6 @@
 				3411387D1C15AE73002E3B3E /* libeditor.a in Frameworks */,
 				6741AABD1BF356BA002C974C /* libagg.a in Frameworks */,
 				6741AABE1BF356BA002C974C /* libalohalitics.a in Frameworks */,
-				6741AAC01BF356BA002C974C /* libapi.a in Frameworks */,
 				6741AAC11BF356BA002C974C /* libbase.a in Frameworks */,
 				F68BDF061EEA9A830009BB81 /* MyTargetSDK.framework in Frameworks */,
 				6741AAC21BF356BA002C974C /* libcoding.a in Frameworks */,
@@ -2227,6 +2227,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				39CDE69023E1B6C8007CDA58 /* libge0.a */,
 				450B5C822355F50200E9019E /* libweb_api.a */,
 				47A65CAC2350044800DCD85F /* CoreApi.framework */,
 				4577B28021F2066A00864FAC /* libvulkan_wrapper.a */,
@@ -2248,7 +2249,6 @@
 				340474DB1E08199D00C92850 /* 3party */,
 				6741AAA21BF356B9002C974C /* libagg.a */,
 				6741AAA31BF356B9002C974C /* libalohalitics.a */,
-				6741AAA51BF356B9002C974C /* libapi.a */,
 				6741AAA61BF356B9002C974C /* libbase.a */,
 				6741AAA71BF356B9002C974C /* libcoding.a */,
 				674A7E201C0DA55E003D48E1 /* libdrape_frontend.a */,

diff --git a/map/benchmark_tool/CMakeLists.txt b/map/benchmark_tool/CMakeLists.txt
@@ -18,7 +18,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   web_api
   editor
   indexer

diff --git a/map/extrapolation_benchmark/CMakeLists.txt b/map/extrapolation_benchmark/CMakeLists.txt
@@ -15,7 +15,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   web_api
   routing
   metrics

diff --git a/map/framework.cpp b/map/framework.cpp
@@ -15,7 +15,8 @@
 #include "map/utils.hpp"
 #include "map/viewport_search_params.hpp"
 
-#include "api/ge0_parser.hpp"
+#include "ge0/parser.hpp"
+#include "ge0/url_generator.hpp"
 
 #include "generator/borders.hpp"
 
@@ -97,8 +98,6 @@
 #include "partners_api/opentable_api.hpp"
 #include "partners_api/partners.hpp"
 
-#include "api/ge0_generator.hpp"
-
 #include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/math.hpp"

diff --git a/map/map_integration_tests/CMakeLists.txt b/map/map_integration_tests/CMakeLists.txt
@@ -10,7 +10,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   web_api
   search_tests_support
   editor_tests_support

diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt
@@ -40,7 +40,7 @@ omim_link_libraries(
   generator_tests_support
   generator
   map
-  api
+  ge0
   drape_frontend
   shaders
   drape

diff --git a/map/mwm_tests/CMakeLists.txt b/map/mwm_tests/CMakeLists.txt
@@ -11,7 +11,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   web_api
   search
   storage

diff --git a/mapshot/CMakeLists.txt b/mapshot/CMakeLists.txt
@@ -16,7 +16,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   software_renderer
   drape_frontend
   shaders

diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
@@ -34,7 +34,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
-  api
+  ge0
   drape_frontend
   shaders
   routing

diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
@@ -70,7 +70,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
-  api
+  ge0
   drape_frontend
   shaders
   generator

diff --git a/routing/routing_benchmarks/CMakeLists.txt b/routing/routing_benchmarks/CMakeLists.txt
@@ -16,7 +16,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   routing
   traffic
   routing_common

diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/routing/routing_consistency_tests/CMakeLists.txt
@@ -17,7 +17,7 @@ omim_add_executable(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   routing
   traffic
   routing_common

diff --git a/routing/routing_integration_tests/CMakeLists.txt b/routing/routing_integration_tests/CMakeLists.txt
@@ -41,7 +41,7 @@ omim_link_libraries(
   editor_tests_support
   generator
   map
-  api
+  ge0
   tracking
   drape_frontend
   shaders

diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt
@@ -47,7 +47,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   map
-  api
+  ge0
   routing
   platform_tests_support
   traffic

diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt
@@ -41,7 +41,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   qt_common
   map
-  api
+  ge0
   drape_frontend
   shaders
   routing

diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt
@@ -22,7 +22,7 @@ omim_link_libraries(
   ${PROJECT_NAME}
   platform_tests_support
   map
-  api
+  ge0
   drape_frontend
   shaders
   routing

diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt
@@ -27,7 +27,7 @@ omim_link_libraries(
   drape_frontend
   shaders
   map
-  api
+  ge0
   storage
   drape
   generator
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,7 @@ target_link_libraries( @@
       z
       # MapsWithMe libs
       map
-      api
+      ge0
       tracking
       routing
       traffic
@@ Expand Down @@