drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-08 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[api] Replace om:// scheme with cm://

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-05-26 17:32:45 +07:00
parent ca1776ee9f
commit a8349ffa85
15 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
map/map_tests/mwm_url_tests.cpp
View File

@@ -78,7 +78,7 @@ UNIT_TEST(SearchApiAdvanced)
{
{
// Ignore wrong cll=.
ParsedMapApi test("om://search?query=aaa&cll=1,1,1");
ParsedMapApi test("cm://search?query=aaa&cll=1,1,1");
TEST_EQUAL(test.GetRequestType(), UrlType::Search, ());
auto const & request = test.GetSearchRequest();
ms::LatLon latlon = test.GetCenterLatLon();
@@ -91,7 +91,7 @@ UNIT_TEST(SearchApiAdvanced)
{
// Don't fail on unsupported parameters.
ParsedMapApi test("om://search?query=aaa&ignoreThisParam=sure");
ParsedMapApi test("cm://search?query=aaa&ignoreThisParam=sure");
TEST_EQUAL(test.GetRequestType(), UrlType::Search, ());
auto const & request = test.GetSearchRequest();
ms::LatLon latlon = test.GetCenterLatLon();
@@ -104,7 +104,7 @@ UNIT_TEST(SearchApiAdvanced)
{
// Query parameter position doesn't matter
ParsedMapApi test("om://search?cll=1,1&locale=ru&query=aaa");
ParsedMapApi test("cm://search?cll=1,1&locale=ru&query=aaa");
TEST_EQUAL(test.GetRequestType(), UrlType::Search, ());
auto const & request = test.GetSearchRequest();
ms::LatLon latlon = test.GetCenterLatLon();
@@ -256,7 +256,7 @@ UNIT_TEST(MapApiUrl)
UNIT_TEST(MapApiGe0)
{
{
ParsedMapApi api("om://o4B4pYZsRs");
ParsedMapApi api("cm://o4B4pYZsRs");
TEST_EQUAL(api.GetRequestType(), UrlType::Map, ());
TEST_EQUAL(api.GetMapPoints().size(), 1, ());
MapPoint const & p0 = api.GetMapPoints()[0];
@@ -265,7 +265,7 @@ UNIT_TEST(MapApiGe0)
}
{
ParsedMapApi api("om://o4B4pYZsRs/Zoo_Zürich");
ParsedMapApi api("cm://o4B4pYZsRs/Zoo_Zürich");
TEST_EQUAL(api.GetRequestType(), UrlType::Map, ());
TEST_EQUAL(api.GetMapPoints().size(), 1, ());
MapPoint const & p0 = api.GetMapPoints()[0];
@@ -368,7 +368,7 @@ UNIT_TEST(SearchApiGeoScheme)
UNIT_TEST(CrosshairApi)
{
{
ParsedMapApi api("om://crosshair?cll=47.3813,8.5889&appname=Google%20Maps");
ParsedMapApi api("cm://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, ());
@@ -397,8 +397,8 @@ UNIT_TEST(GlobalBackUrl)
TEST_EQUAL(api.GetGlobalBackUrl(), "ge0://", ());
}
{
ParsedMapApi api("om://map?ll=1,2&n=PointName&backurl=om://");
TEST_EQUAL(api.GetGlobalBackUrl(), "om://", ());
ParsedMapApi api("cm://map?ll=1,2&n=PointName&backurl=cm://");
TEST_EQUAL(api.GetGlobalBackUrl(), "cm://", ());
}
{
ParsedMapApi api("mwm://map?ll=1,2&n=PointName&backurl=ge0%3A%2F%2F");
@@ -477,16 +477,16 @@ UNIT_TEST(AppNameTest)
UNIT_TEST(OAuth2Test)
{
{
ParsedMapApi api("om://oauth2/osm/callback?code=THE_MEGA_CODE");
ParsedMapApi api("cm://oauth2/osm/callback?code=THE_MEGA_CODE");
TEST_EQUAL(api.GetRequestType(), UrlType::OAuth2, ());
TEST_EQUAL(api.GetOAuth2Code(), "THE_MEGA_CODE", ());
}
{
ParsedMapApi api("om://oauth2/google/callback?code=THE_MEGA_CODE");
ParsedMapApi api("cm://oauth2/google/callback?code=THE_MEGA_CODE");
TEST_EQUAL(api.GetRequestType(), UrlType::Incorrect, ());
}
{
ParsedMapApi api("om://oauth2/osm/callback?code=");
ParsedMapApi api("cm://oauth2/osm/callback?code=");
TEST_EQUAL(api.GetRequestType(), UrlType::Incorrect, ());
}
}