diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 49e3abdc05..6ec7119387 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -77,6 +77,7 @@
+
@@ -91,6 +92,12 @@
+
+
diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
index 0c01ac30cf..c1d4ba2c1a 100644
--- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
@@ -90,8 +90,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
@NonNull
private final IntentProcessor[] mIntentProcessors = {
Factory.createGeoIntentProcessor(),
- Factory.createHttpGe0IntentProcessor(),
- Factory.createGe0IntentProcessor(),
+ Factory.createHttpGeoIntentProcessor(),
Factory.createMapsWithMeIntentProcessor(),
Factory.createGoogleMapsIntentProcessor(),
Factory.createOldLeadUrlProcessor(),
diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java
index cd95d67f5f..a6ac1b9411 100644
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@@ -167,7 +167,8 @@ public class Framework
public static String getHttpGe0Url(double lat, double lon, double zoomLevel, String name)
{
- return nativeGetGe0Url(lat, lon, zoomLevel, name).replaceFirst(Constants.Url.GE0_PREFIX, Constants.Url.HTTP_GE0_PREFIX);
+ return nativeGetGe0Url(lat, lon, zoomLevel, name).replaceFirst(
+ Constants.Url.SHORT_SHARE_PREFIX, Constants.Url.HTTP_SHARE_PREFIX);
}
/**
@@ -199,7 +200,7 @@ public class Framework
public static native void nativeShowTrackRect(long track);
public static native int nativeGetDrawScale();
-
+
public static native int nativePokeSearchInViewport();
@Size(2)
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
index c2186794da..d203fc6759 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
@@ -148,6 +148,6 @@ public class Bookmark extends MapObject
@NonNull
public String getHttpGe0Url(boolean addName)
{
- return getGe0Url(addName).replaceFirst(Constants.Url.GE0_PREFIX, Constants.Url.HTTP_GE0_PREFIX);
+ return getGe0Url(addName).replaceFirst(Constants.Url.SHORT_SHARE_PREFIX, Constants.Url.HTTP_SHARE_PREFIX);
}
}
diff --git a/android/src/com/mapswithme/maps/intent/Factory.java b/android/src/com/mapswithme/maps/intent/Factory.java
index 666ed84dcc..57e990982e 100644
--- a/android/src/com/mapswithme/maps/intent/Factory.java
+++ b/android/src/com/mapswithme/maps/intent/Factory.java
@@ -98,15 +98,9 @@ public class Factory
}
@NonNull
- public static IntentProcessor createGe0IntentProcessor()
+ public static IntentProcessor createHttpGeoIntentProcessor()
{
- return new Ge0IntentProcessor();
- }
-
- @NonNull
- public static IntentProcessor createHttpGe0IntentProcessor()
- {
- return new HttpGe0IntentProcessor();
+ return new HttpGeoIntentProcessor();
}
@NonNull
@@ -174,23 +168,11 @@ public class Factory
@Override
public boolean isSupported(@NonNull Intent intent)
{
- return (intent.getData() != null && "geo".equals(intent.getScheme()));
- }
+ final String scheme = intent.getScheme();
+ if (intent.getData() != null && scheme != null)
+ return "geo".equals(scheme) || "ge0".equals(scheme) || "om".equals(scheme);
- @NonNull
- @Override
- MapTask createMapTask(@NonNull String uri)
- {
- return new OpenUrlTask(uri);
- }
- }
-
- private static class Ge0IntentProcessor extends BaseOpenUrlProcessor
- {
- @Override
- public boolean isSupported(@NonNull Intent intent)
- {
- return (intent.getData() != null && "ge0".equals(intent.getScheme()));
+ return false;
}
@NonNull
@@ -217,16 +199,18 @@ public class Factory
}
}
- private static class HttpGe0IntentProcessor implements IntentProcessor
+ private static class HttpGeoIntentProcessor implements IntentProcessor
{
@Override
public boolean isSupported(@NonNull Intent intent)
{
- if ("http".equalsIgnoreCase(intent.getScheme()))
+ final String scheme = intent.getScheme();
+ final Uri data = intent.getData();
+ if (data != null && scheme != null &&
+ "http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme))
{
- final Uri data = intent.getData();
- if (data != null)
- return "ge0.me".equals(data.getHost());
+ final String host = data.getHost();
+ return "ge0.me".equals(host) || "omaps.app".equals(host);
}
return false;
@@ -237,7 +221,7 @@ public class Factory
public MapTask process(@NonNull Intent intent)
{
final Uri data = intent.getData();
- final String ge0Url = "ge0:/" + data.getPath();
+ final String ge0Url = "om:/" + data.getPath();
return new OpenUrlTask(ge0Url);
}
}
diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java
index 604e50cfc0..c1a4823a5f 100644
--- a/android/src/com/mapswithme/util/Constants.java
+++ b/android/src/com/mapswithme/util/Constants.java
@@ -13,11 +13,12 @@ public final class Constants
public static class Url
{
- public static final String GE0_PREFIX = "ge0://";
+ public static final String SHORT_SHARE_PREFIX = "om://";
+ public static final String HTTP_SHARE_PREFIX = "http://omaps.app/";
+
public static final String MAILTO_SCHEME = "mailto:";
public static final String MAIL_SUBJECT = "?subject=";
public static final String MAIL_BODY = "&body=";
- public static final String HTTP_GE0_PREFIX = "http://ge0.me/";
public static final String FB_MAPSME_COMMUNITY_HTTP = "https://www.facebook.com/OrganicMaps";
// Profile id is taken from http://graph.facebook.com/MapsWithMe
diff --git a/ge0/ge0_tests/parser_tests.cpp b/ge0/ge0_tests/parser_tests.cpp
index a7fbf5e330..f8f4a121f3 100644
--- a/ge0/ge0_tests/parser_tests.cpp
+++ b/ge0/ge0_tests/parser_tests.cpp
@@ -243,9 +243,10 @@ UNIT_TEST(LatLonFullAndClippedCoordinates)
for (double lon = -180; lon < 180; lon += 0.7)
{
string const buf = ge0::GenerateShortShowMapUrl(lat, lon, 4, "");
+ size_t const coordInd = buf.find("://") + 4;
for (int i = 9; i >= 1; --i)
{
- string const str = buf.substr(7, i);
+ string const str = buf.substr(coordInd, i);
size_t const coordSize = str.size();
Ge0ParserForTest parser;
double latTmp, lonTmp;
diff --git a/ge0/ge0_tests/url_generator_tests.cpp b/ge0/ge0_tests/url_generator_tests.cpp
index 5142b45a53..aebd77c213 100644
--- a/ge0/ge0_tests/url_generator_tests.cpp
+++ b/ge0/ge0_tests/url_generator_tests.cpp
@@ -252,90 +252,90 @@ UNIT_TEST(LatLonToString_StringDensity)
UNIT_TEST(GenerateShortShowMapUrl_SmokeTest)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "Name");
- TEST_EQUAL("ge0://8wAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_NameIsEmpty)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "");
- TEST_EQUAL("ge0://8wAAAAAAAA", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_ZoomVerySmall)
{
string res = GenerateShortShowMapUrl(0, 0, 2, "Name");
- TEST_EQUAL("ge0://AwAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://AwAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_ZoomNegative)
{
string res = GenerateShortShowMapUrl(0, 0, -5, "Name");
- TEST_EQUAL("ge0://AwAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://AwAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_ZoomLarge)
{
string res = GenerateShortShowMapUrl(0, 0, 20, "Name");
- TEST_EQUAL("ge0://_wAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://_wAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_ZoomVeryLarge)
{
string res = GenerateShortShowMapUrl(0, 0, 2000000000, "Name");
- TEST_EQUAL("ge0://_wAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://_wAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_FractionalZoom)
{
string res = GenerateShortShowMapUrl(0, 0, 8.25, "Name");
- TEST_EQUAL("ge0://RwAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://RwAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_FractionalZoomRoundsDown)
{
string res = GenerateShortShowMapUrl(0, 0, 8.499, "Name");
- TEST_EQUAL("ge0://RwAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://RwAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_FractionalZoomNextStep)
{
string res = GenerateShortShowMapUrl(0, 0, 8.5, "Name");
- TEST_EQUAL("ge0://SwAAAAAAAA/Name", res, ());
+ TEST_EQUAL("om://SwAAAAAAAA/Name", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_SpaceIsReplacedWithUnderscore)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "Hello World");
- TEST_EQUAL("ge0://8wAAAAAAAA/Hello_World", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/Hello_World", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_NamesAreEscaped)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "'Hello,World!%$");
- TEST_EQUAL("ge0://8wAAAAAAAA/%27Hello%2CWorld%21%25%24", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/%27Hello%2CWorld%21%25%24", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_UnderscoreIsReplacedWith_Percent_20)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "Hello_World");
- TEST_EQUAL("ge0://8wAAAAAAAA/Hello%20World", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/Hello%20World", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_ControlCharsAreEscaped)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "Hello\tWorld\n");
- TEST_EQUAL("ge0://8wAAAAAAAA/Hello%09World%0A", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/Hello%09World%0A", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_Unicode)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "\xe2\x98\x84");
- TEST_EQUAL("ge0://8wAAAAAAAA/\xe2\x98\x84", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/\xe2\x98\x84", res, ());
}
UNIT_TEST(GenerateShortShowMapUrl_UnicodeMixedWithOtherChars)
{
string res = GenerateShortShowMapUrl(0, 0, 19, "Back_in \xe2\x98\x84!\xd1\x8e\xd0\xbc");
- TEST_EQUAL("ge0://8wAAAAAAAA/Back%20in_\xe2\x98\x84%21\xd1\x8e\xd0\xbc", res, ());
+ TEST_EQUAL("om://8wAAAAAAAA/Back%20in_\xe2\x98\x84%21\xd1\x8e\xd0\xbc", res, ());
}
} // namespace ge0
diff --git a/ge0/parser.cpp b/ge0/parser.cpp
index 4507e76bcd..24401a8406 100644
--- a/ge0/parser.cpp
+++ b/ge0/parser.cpp
@@ -36,12 +36,14 @@ bool Ge0Parser::Parse(string const & url, Result & result)
// |+-------+--------- 9 bytes: lat,lon
// || | +--+---- Variable number of bytes: point name
// || | | |
- // ge0://ZCoordba64/Name
+ // om://ZCoordba64/Name
// Alternative format (differs only in the prefix):
- // http://ge0.me/ZCoordba64/Name
+ // http://omaps.app/ZCoordba64/Name
- for (string const & prefix : {"ge0://", "http://ge0.me/", "https://ge0.me/"})
+ // Support ge0 from MapsMe.
+ for (string const & prefix : {"ge0://", "http://ge0.me/", "https://ge0.me/",
+ "om://", "http://omaps.app/", "https://omaps.app/"})
{
if (strings::StartsWith(url, prefix))
return ParseAfterPrefix(url, prefix.size(), result);
diff --git a/ge0/url_generator.cpp b/ge0/url_generator.cpp
index 99a5a84b72..41b4cd6b40 100644
--- a/ge0/url_generator.cpp
+++ b/ge0/url_generator.cpp
@@ -85,21 +85,21 @@ namespace ge0
{
string GenerateShortShowMapUrl(double lat, double lon, double zoom, string const & name)
{
- string urlPrefix = "ge0://ZCoordba64";
+ size_t constexpr schemaLength = 5; // strlen("om://")
+ string urlSample = "om://ZCoordba64";
int const zoomI = (zoom <= 4 ? 0 : (zoom >= 19.75 ? 63 : static_cast((zoom - 4) * 4)));
- urlPrefix[6] = Base64Char(zoomI);
+ urlSample[schemaLength] = Base64Char(zoomI);
- LatLonToString(lat, lon, urlPrefix.data() + 7, 9);
+ LatLonToString(lat, lon, urlSample.data() + schemaLength + 1, 9);
- string result = urlPrefix;
if (!name.empty())
{
- result += "/";
- result += UrlEncodeString(TransformName(name));
+ urlSample += '/';
+ urlSample += UrlEncodeString(TransformName(name));
}
- return result;
+ return urlSample;
}
char Base64Char(int x)
diff --git a/ge0/url_generator.hpp b/ge0/url_generator.hpp
index 1de173a503..ee3e554517 100644
--- a/ge0/url_generator.hpp
+++ b/ge0/url_generator.hpp
@@ -16,7 +16,7 @@ inline static int const kMaxCoordBits = kMaxPointBytes * 3;
// |+-------+--------- 9 bytes: lat,lon
// || | +--+---- Variable number of bytes: point name
// || | | |
-// ge0://ZCoordba64/Name
+// om://ZCoordba64/Name
std::string GenerateShortShowMapUrl(double lat, double lon, double zoomLevel, std::string const & name);
// Exposed for testing.
diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
index 6bbedc2d66..c1ea058ddb 100644
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
@@ -8,8 +8,8 @@
NSString * httpGe0Url(NSString * shortUrl)
{
- return
- [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 6) withString:@"http://ge0.me/"];
+ // Replace 'om://' with 'http://omaps.app/'
+ return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"http://omaps.app/"];
}
@interface MWMShareActivityItem ()
diff --git a/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift b/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift
index 5d7277208d..6ca92c16a5 100644
--- a/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift
+++ b/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift
@@ -1,11 +1,11 @@
class DeepLinkStrategyFactory {
static func create(url deeplinkURL: DeepLinkURL) -> IDeepLinkHandlerStrategy {
switch deeplinkURL.url.scheme {
- case "geo", "ge0":
+ case "geo", "ge0", "om":
return DeepLinkGeoStrategy(url: deeplinkURL)
case "file":
return DeepLinkFileStrategy(url: deeplinkURL)
- case "mapswithme", "mapsme", "mwm", "om":
+ case "mapswithme", "mapsme", "mwm":
return DeepLinkStrategyFactory.createCommon(url: deeplinkURL)
default:
return DeepLinkIncorrectStrategy(url: deeplinkURL)
diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist
index aa1d13677a..d486fa8da3 100644
--- a/iphone/Maps/OMaps.plist
+++ b/iphone/Maps/OMaps.plist
@@ -72,7 +72,7 @@
mapsme
ge0
geo
- fb185237551520383
+ om
mapswithmepro
diff --git a/map/framework.cpp b/map/framework.cpp
index a215dbd088..8cc3786d02 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1774,7 +1774,7 @@ bool Framework::ShowMapForURL(string const & url)
enum ResultT { FAILED, NEED_CLICK, NO_NEED_CLICK };
ResultT result = FAILED;
- if (strings::StartsWith(url, "ge0"))
+ if (strings::StartsWith(url, "om") || strings::StartsWith(url, "ge0"))
{
ge0::Ge0Parser parser;
ge0::Ge0Parser::Result parseResult;
diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp
index 686d737edf..81aba0f669 100644
--- a/map/map_tests/mwm_url_tests.cpp
+++ b/map/map_tests/mwm_url_tests.cpp
@@ -296,6 +296,10 @@ UNIT_TEST(GlobalBackUrl)
ApiTest api("mwm://map?ll=1,2&n=PointName&backurl=ge0://");
TEST_EQUAL(api.GetGlobalBackUrl(), "ge0://", ());
}
+ {
+ ApiTest api("om://map?ll=1,2&n=PointName&backurl=om://");
+ TEST_EQUAL(api.GetGlobalBackUrl(), "om://", ());
+ }
{
ApiTest api("mwm://map?ll=1,2&n=PointName&backurl=ge0%3A%2F%2F");
TEST_EQUAL(api.GetGlobalBackUrl(), "ge0://", ());