diff --git a/coding/url.hpp b/coding/url.hpp index 811794525..88294f86e 100644 --- a/coding/url.hpp +++ b/coding/url.hpp @@ -11,7 +11,7 @@ namespace url { // Url in format: 'scheme://host/path?key1=value1&key2&key3=&key4=value4' -// host - any string ('omaps.app' or 'search'), without any valid domain check +// host - any string ('comaps.app' or 'search'), without any valid domain check class Url { public: diff --git a/data/test_data/kml/generated.kml b/data/test_data/kml/generated.kml index 4fdc443a2..3b5873338 100644 --- a/data/test_data/kml/generated.kml +++ b/data/test_data/kml/generated.kml @@ -4,119 +4,119 @@ Test category Test description 1 - + AAAA-BBBB-CCCC-DDDD Тестовая категория @@ -237,7 +237,7 @@ 1970-01-01T00:13:20Z #placemark-blue 45.9242,49.326859 - + Тестовая метка Test bookmark @@ -278,7 +278,7 @@ 1970-01-01T00:15:00Z 45.9242,49.326859,1 45.2244,48.941288,2 45.1964,49.401948,3 - + Тестовый трек Test track diff --git a/data/test_data/kml/generated_mixed_tracks.kml b/data/test_data/kml/generated_mixed_tracks.kml index 9c71b9b93..ecd57101f 100644 --- a/data/test_data/kml/generated_mixed_tracks.kml +++ b/data/test_data/kml/generated_mixed_tracks.kml @@ -4,119 +4,119 @@ Test category Test description 1 - + AAAA-BBBB-CCCC-DDDD Тестовая категория @@ -237,7 +237,7 @@ 1970-01-01T00:13:20Z #placemark-blue 45.9242,49.326859 - + Тестовая метка Test bookmark @@ -294,7 +294,7 @@ 45.2244 48.941288 2 - + Тестовый трек Test track diff --git a/data/test_data/kml/track_with_timestams_different_orders.kml b/data/test_data/kml/track_with_timestams_different_orders.kml index aebb5b3c8..efac093cf 100644 --- a/data/test_data/kml/track_with_timestams_different_orders.kml +++ b/data/test_data/kml/track_with_timestams_different_orders.kml @@ -4,119 +4,119 @@ Test category Test description 1 - + AAAA-BBBB-CCCC-DDDD Тестовая категория @@ -237,7 +237,7 @@ 1970-01-01T00:13:20Z #placemark-blue 45.9242,49.326859 - + Тестовая метка Test bookmark @@ -311,7 +311,7 @@ 1970-01-01T00:00:02Z - + Тестовый трек Test track diff --git a/ge0/ge0_tests/parser_tests.cpp b/ge0/ge0_tests/parser_tests.cpp index ce82c3153..ff0548869 100644 --- a/ge0/ge0_tests/parser_tests.cpp +++ b/ge0/ge0_tests/parser_tests.cpp @@ -302,14 +302,14 @@ UNIT_TEST(Bad_Base64) UNIT_TEST(OtherPrefixes) { - TestSuccess("http://omaps.app/Byqqqqqqqq/Name", 45, 0, 4.25, "Name"); - TestSuccess("https://omaps.app/Byqqqqqqqq/Name", 45, 0, 4.25, "Name"); - TestFailure("http://omapz.app/Byqqqqqqqq/Name"); - TestSuccess("http://omaps.app/AwAAAAAAAA/Super%5fPoi", 0, 0, 4, "Super Poi"); - TestSuccess("https://omaps.app/AwAAAAAAAA/Super%5fPoi", 0, 0, 4, "Super Poi"); - TestFailure("https://omapz.app/AwAAAAAAAA/Super%5fPoi"); + TestSuccess("http://comaps.app/Byqqqqqqqq/Name", 45, 0, 4.25, "Name"); + TestSuccess("https://comaps.app/Byqqqqqqqq/Name", 45, 0, 4.25, "Name"); + TestFailure("http://comapz.app/Byqqqqqqqq/Name"); + TestSuccess("http://comaps.app/AwAAAAAAAA/Super%5fPoi", 0, 0, 4, "Super Poi"); + TestSuccess("https://comaps.app/AwAAAAAAAA/Super%5fPoi", 0, 0, 4, "Super Poi"); + TestFailure("https://comapz.app/AwAAAAAAAA/Super%5fPoi"); - TestSuccess("https://omaps.app/Byqqqqqqqq", 45, 0, 4.25, ""); - TestFailure("https://omaps.app/Byqqqqqqq"); + TestSuccess("https://comaps.app/Byqqqqqqqq", 45, 0, 4.25, ""); + TestFailure("https://comaps.app/Byqqqqqqq"); } } // namespace ge0 diff --git a/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm b/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm index d24976a4c..455ba8399 100644 --- a/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm +++ b/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm @@ -18,16 +18,16 @@ [activityType isEqualToString:@"com.facebook.Facebook.ShareExtension"] || [activityType.lowercaseString rangeOfString:@"facebook"].length) { - NSString * url = [NSString stringWithFormat:@"https://omaps.app/fb-editor-v1?lang=%@", + NSString * url = [NSString stringWithFormat:@"https://comaps.app/fb-editor-v1?lang=%@", @(languages::GetCurrentNorm().c_str())]; return [NSURL URLWithString:url]; } - NSString * omapsURL = @"https://omaps.app/get"; + NSString * comapsURL = @"https://comaps.app/get"; if ([activityType isEqualToString:UIActivityTypePostToTwitter] || [activityType isEqualToString:UIActivityTypeMail]) - return [NSString stringWithFormat:@"%@ %@", L(@"whatsnew_editor_message_1"), omapsURL]; + return [NSString stringWithFormat:@"%@ %@", L(@"whatsnew_editor_message_1"), comapsURL]; - return [NSString stringWithFormat:@"%@.\n%@\n%@", L(@"editor_sharing_title"), L(@"whatsnew_editor_message_1"), omapsURL]; + return [NSString stringWithFormat:@"%@.\n%@\n%@", L(@"editor_sharing_title"), L(@"whatsnew_editor_message_1"), comapsURL]; } - (NSString *)activityViewController:(UIActivityViewController *)activityViewController diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm index 64ef1c9e9..12b6c87fa 100644 --- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm +++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm @@ -9,8 +9,8 @@ NSString * httpGe0Url(NSString * shortUrl) { - // Replace 'om://' with 'https://omaps.app/' - return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"https://omaps.app/"]; + // Replace 'cm://' with 'https://comaps.app/' + return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"https://comaps.app/"]; } @interface MWMShareActivityItem () diff --git a/kml/kml_tests/tests_data.hpp b/kml/kml_tests/tests_data.hpp index 0b5f0d848..f9c468c53 100644 --- a/kml/kml_tests/tests_data.hpp +++ b/kml/kml_tests/tests_data.hpp @@ -10,49 +10,49 @@ char const * kTextKml = "" "" "" "" "" "" "" diff --git a/kml/serdes.cpp b/kml/serdes.cpp index 7e66818e0..6225fb388 100644 --- a/kml/serdes.cpp +++ b/kml/serdes.cpp @@ -52,7 +52,7 @@ std::string_view constexpr kKmlFooter = "\n"; std::string_view constexpr kExtendedDataHeader = - "\n"; + "\n"; std::string_view constexpr kExtendedDataFooter = "\n"; @@ -145,7 +145,7 @@ void SaveStyle(Writer & writer, std::string const & style, writer << indent << kIndent2 << "\n"; diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp index 9db52475a..3b4eb7f7b 100644 --- a/map/map_tests/bookmarks_test.cpp +++ b/map/map_tests/bookmarks_test.cpp @@ -44,49 +44,49 @@ char const * kmlString = "" "" "" "" "" "" "" diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index 67c90daee..e5bb52cbb 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -274,11 +274,11 @@ UNIT_TEST(MapApiGe0) TEST_EQUAL(p0.m_name, "Zoo Zürich", ()); } { - ParsedMapApi api("http://omaps.app/o4B4pYZsRs/Zoo_Zürich"); + ParsedMapApi api("http://comaps.app/o4B4pYZsRs/Zoo_Zürich"); TEST_EQUAL(api.GetRequestType(), UrlType::Map, ()); } { - ParsedMapApi api("https://omaps.app/o4B4pYZsRs/Zoo_Zürich"); + ParsedMapApi api("https://comaps.app/o4B4pYZsRs/Zoo_Zürich"); TEST_EQUAL(api.GetRequestType(), UrlType::Map, ()); } { @@ -376,7 +376,7 @@ UNIT_TEST(CrosshairApi) TEST_EQUAL(api.GetAppName(), "Google Maps", ()); } { - ParsedMapApi api("https://omaps.app/crosshair?cll=47.3813,8.5889&appname=Google%20Maps"); + ParsedMapApi api("https://comaps.app/crosshair?cll=47.3813,8.5889&appname=Google%20Maps"); TEST_EQUAL(api.GetRequestType(), UrlType::Crosshair, ()); ms::LatLon latlon = api.GetCenterLatLon(); TEST_ALMOST_EQUAL_ABS(latlon.m_lat, 47.3813, kEps, ()); diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index 5c3768abe..b203f8aa4 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -1200,10 +1200,10 @@ UNIT_CLASS_TEST(ProcessorTest, SearchCoordinates) {"https://yandex.com.tr/harita/115707/fatih/?ll=28.967470%2C41.008857&z=10", 41.008857, 28.967470}, - {"http://omaps.app/kyuh76X_vf/Borgo_Maggiore", 43.941187, 12.447423}, + {"http://comaps.app/kyuh76X_vf/Borgo_Maggiore", 43.941187, 12.447423}, {"ge0://kyuh76X_vf/Borgo_Maggiore", 43.941187, 12.447423}, {"Check out Ospedale di Stato My Places • Hospital " - "http://omaps.app/syujRR7Xgi/Ospedale_di_Stato ge0://syujRR7Xgi/Ospedale_di_Stato", + "http://comaps.app/syujRR7Xgi/Ospedale_di_Stato ge0://syujRR7Xgi/Ospedale_di_Stato", 43.950255, 12.455579}, {"https://en.mapy.cz/zakladni?x=37.5516243&y=55.7638088&z=12", 55.7638088, 37.5516243},