drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace omaps.app links with comaps.app

Browse Source 
Co-authored-by: zyphlar <zyphlar@noreply.codeberg.org>
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-05-26 17:10:34 +07:00
parent 536c11079d
commit ca1776ee9f
12 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coding/url.hpp
View File

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

38
data/test_data/kml/generated.kml
View File

@@ -4,119 +4,119 @@
<Style id="placemark-red">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-red.png</href>
<href>https://comaps.app/placemarks/placemark-red.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-blue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-blue.png</href>
<href>https://comaps.app/placemarks/placemark-blue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-purple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-purple.png</href>
<href>https://comaps.app/placemarks/placemark-purple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-yellow">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-yellow.png</href>
<href>https://comaps.app/placemarks/placemark-yellow.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-pink">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-pink.png</href>
<href>https://comaps.app/placemarks/placemark-pink.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-brown">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-brown.png</href>
<href>https://comaps.app/placemarks/placemark-brown.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-green">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-green.png</href>
<href>https://comaps.app/placemarks/placemark-green.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-orange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-orange.png</href>
<href>https://comaps.app/placemarks/placemark-orange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeppurple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeppurple.png</href>
<href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lightblue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lightblue.png</href>
<href>https://comaps.app/placemarks/placemark-lightblue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-cyan">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-cyan.png</href>
<href>https://comaps.app/placemarks/placemark-cyan.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-teal">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-teal.png</href>
<href>https://comaps.app/placemarks/placemark-teal.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lime">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lime.png</href>
<href>https://comaps.app/placemarks/placemark-lime.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeporange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeporange.png</href>
<href>https://comaps.app/placemarks/placemark-deeporange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-gray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-gray.png</href>
<href>https://comaps.app/placemarks/placemark-gray.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-bluegray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-bluegray.png</href>
<href>https://comaps.app/placemarks/placemark-bluegray.png</href>
</Icon>
</IconStyle>
</Style>
<name>Test category</name>
<description>Test description</description>
<visibility>1</visibility>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:serverId>AAAA-BBBB-CCCC-DDDD</mwm:serverId>
<mwm:name>
<mwm:lang code="ru">Тестовая категория</mwm:lang>
@@ -237,7 +237,7 @@
<TimeStamp><when>1970-01-01T00:13:20Z</when></TimeStamp>
<styleUrl>#placemark-blue</styleUrl>
<Point><coordinates>45.9242,49.326859</coordinates></Point>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовая метка</mwm:lang>
<mwm:lang code="default">Test bookmark</mwm:lang>
@@ -278,7 +278,7 @@
</LineStyle></Style>
<TimeStamp><when>1970-01-01T00:15:00Z</when></TimeStamp>
<LineString><coordinates>45.9242,49.326859,1 45.2244,48.941288,2 45.1964,49.401948,3</coordinates></LineString>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовый трек</mwm:lang>
<mwm:lang code="default">Test track</mwm:lang>

38
data/test_data/kml/generated_mixed_tracks.kml
View File

@@ -4,119 +4,119 @@
<Style id="placemark-red">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-red.png</href>
<href>https://comaps.app/placemarks/placemark-red.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-blue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-blue.png</href>
<href>https://comaps.app/placemarks/placemark-blue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-purple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-purple.png</href>
<href>https://comaps.app/placemarks/placemark-purple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-yellow">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-yellow.png</href>
<href>https://comaps.app/placemarks/placemark-yellow.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-pink">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-pink.png</href>
<href>https://comaps.app/placemarks/placemark-pink.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-brown">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-brown.png</href>
<href>https://comaps.app/placemarks/placemark-brown.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-green">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-green.png</href>
<href>https://comaps.app/placemarks/placemark-green.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-orange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-orange.png</href>
<href>https://comaps.app/placemarks/placemark-orange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeppurple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeppurple.png</href>
<href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lightblue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lightblue.png</href>
<href>https://comaps.app/placemarks/placemark-lightblue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-cyan">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-cyan.png</href>
<href>https://comaps.app/placemarks/placemark-cyan.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-teal">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-teal.png</href>
<href>https://comaps.app/placemarks/placemark-teal.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lime">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lime.png</href>
<href>https://comaps.app/placemarks/placemark-lime.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeporange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeporange.png</href>
<href>https://comaps.app/placemarks/placemark-deeporange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-gray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-gray.png</href>
<href>https://comaps.app/placemarks/placemark-gray.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-bluegray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-bluegray.png</href>
<href>https://comaps.app/placemarks/placemark-bluegray.png</href>
</Icon>
</IconStyle>
</Style>
<name>Test category</name>
<description>Test description</description>
<visibility>1</visibility>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:serverId>AAAA-BBBB-CCCC-DDDD</mwm:serverId>
<mwm:name>
<mwm:lang code="ru">Тестовая категория</mwm:lang>
@@ -237,7 +237,7 @@
<TimeStamp><when>1970-01-01T00:13:20Z</when></TimeStamp>
<styleUrl>#placemark-blue</styleUrl>
<Point><coordinates>45.9242,49.326859</coordinates></Point>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовая метка</mwm:lang>
<mwm:lang code="default">Test bookmark</mwm:lang>
@@ -294,7 +294,7 @@
<gx:coord>45.2244 48.941288 2</gx:coord>
</gx:Track>
</gx:MultiTrack>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовый трек</mwm:lang>
<mwm:lang code="default">Test track</mwm:lang>

38
data/test_data/kml/track_with_timestams_different_orders.kml
View File

@@ -4,119 +4,119 @@
<Style id="placemark-red">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-red.png</href>
<href>https://comaps.app/placemarks/placemark-red.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-blue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-blue.png</href>
<href>https://comaps.app/placemarks/placemark-blue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-purple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-purple.png</href>
<href>https://comaps.app/placemarks/placemark-purple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-yellow">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-yellow.png</href>
<href>https://comaps.app/placemarks/placemark-yellow.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-pink">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-pink.png</href>
<href>https://comaps.app/placemarks/placemark-pink.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-brown">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-brown.png</href>
<href>https://comaps.app/placemarks/placemark-brown.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-green">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-green.png</href>
<href>https://comaps.app/placemarks/placemark-green.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-orange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-orange.png</href>
<href>https://comaps.app/placemarks/placemark-orange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeppurple">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeppurple.png</href>
<href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lightblue">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lightblue.png</href>
<href>https://comaps.app/placemarks/placemark-lightblue.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-cyan">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-cyan.png</href>
<href>https://comaps.app/placemarks/placemark-cyan.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-teal">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-teal.png</href>
<href>https://comaps.app/placemarks/placemark-teal.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-lime">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-lime.png</href>
<href>https://comaps.app/placemarks/placemark-lime.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-deeporange">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-deeporange.png</href>
<href>https://comaps.app/placemarks/placemark-deeporange.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-gray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-gray.png</href>
<href>https://comaps.app/placemarks/placemark-gray.png</href>
</Icon>
</IconStyle>
</Style>
<Style id="placemark-bluegray">
<IconStyle>
<Icon>
<href>https://omaps.app/placemarks/placemark-bluegray.png</href>
<href>https://comaps.app/placemarks/placemark-bluegray.png</href>
</Icon>
</IconStyle>
</Style>
<name>Test category</name>
<description>Test description</description>
<visibility>1</visibility>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:serverId>AAAA-BBBB-CCCC-DDDD</mwm:serverId>
<mwm:name>
<mwm:lang code="ru">Тестовая категория</mwm:lang>
@@ -237,7 +237,7 @@
<TimeStamp><when>1970-01-01T00:13:20Z</when></TimeStamp>
<styleUrl>#placemark-blue</styleUrl>
<Point><coordinates>45.9242,49.326859</coordinates></Point>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовая метка</mwm:lang>
<mwm:lang code="default">Test bookmark</mwm:lang>
@@ -311,7 +311,7 @@
<when>1970-01-01T00:00:02Z</when>
</gx:Track>
</gx:MultiTrack>
<ExtendedData xmlns:mwm="https://omaps.app">
<ExtendedData xmlns:mwm="https://comaps.app">
<mwm:name>
<mwm:lang code="ru">Тестовый трек</mwm:lang>
<mwm:lang code="default">Test track</mwm:lang>

16
ge0/ge0_tests/parser_tests.cpp
View File

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

8
iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
View File

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

4
iphone/Maps/Classes/Share/MWMShareActivityItem.mm
View File

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

14
kml/kml_tests/tests_data.hpp
View File

@@ -10,49 +10,49 @@ char const * kTextKml =
"<Style id=\"placemark-blue\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-blue.png</href>"
"<href>https://comaps.app/placemarks/placemark-blue.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-brown\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-brown.png</href>"
"<href>https://comaps.app/placemarks/placemark-brown.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-green\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-green.png</href>"
"<href>https://comaps.app/placemarks/placemark-green.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-orange\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-orange.png</href>"
"<href>https://comaps.app/placemarks/placemark-orange.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-pink\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-pink.png</href>"
"<href>https://comaps.app/placemarks/placemark-pink.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-purple\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-purple.png</href>"
"<href>https://comaps.app/placemarks/placemark-purple.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-red\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-red.png</href>"
"<href>https://comaps.app/placemarks/placemark-red.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"

4
kml/serdes.cpp
View File

@@ -52,7 +52,7 @@ std::string_view constexpr kKmlFooter =
"</kml>\n";
std::string_view constexpr kExtendedDataHeader =
"<ExtendedData xmlns:mwm=\"https://omaps.app\">\n";
"<ExtendedData xmlns:mwm=\"https://comaps.app\">\n";
std::string_view constexpr kExtendedDataFooter =
"</ExtendedData>\n";
@@ -145,7 +145,7 @@ void SaveStyle(Writer & writer, std::string const & style,
writer << indent << kIndent2 << "<Style id=\"" << style << "\">\n"
<< indent << kIndent4 << "<IconStyle>\n"
<< indent << kIndent6 << "<Icon>\n"
<< indent << kIndent8 << "<href>https://omaps.app/placemarks/" << style << ".png</href>\n"
<< indent << kIndent8 << "<href>https://comaps.app/placemarks/" << style << ".png</href>\n"
<< indent << kIndent6 << "</Icon>\n"
<< indent << kIndent4 << "</IconStyle>\n"
<< indent << kIndent2 << "</Style>\n";

14
map/map_tests/bookmarks_test.cpp
View File

@@ -44,49 +44,49 @@ char const * kmlString =
"<Style id=\"placemark-blue\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-blue.png</href>"
"<href>https://comaps.app/placemarks/placemark-blue.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-brown\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-brown.png</href>"
"<href>https://comaps.app/placemarks/placemark-brown.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-green\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-green.png</href>"
"<href>https://comaps.app/placemarks/placemark-green.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-orange\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-orange.png</href>"
"<href>https://comaps.app/placemarks/placemark-orange.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-pink\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-pink.png</href>"
"<href>https://comaps.app/placemarks/placemark-pink.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-purple\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-purple.png</href>"
"<href>https://comaps.app/placemarks/placemark-purple.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"
"<Style id=\"placemark-red\">"
"<IconStyle>"
"<Icon>"
"<href>https://omaps.app/placemarks/placemark-red.png</href>"
"<href>https://comaps.app/placemarks/placemark-red.png</href>"
"</Icon>"
"</IconStyle>"
"</Style>"

6
map/map_tests/mwm_url_tests.cpp
View File

@@ -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, ());

4
search/search_integration_tests/processor_test.cpp
View File

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