From 35103aa314730c88b814908a97222aee22b88804 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Thu, 30 Jan 2020 13:00:57 +0300 Subject: [PATCH] [ge0] Rewrote the URL generator to mostly use std::string. --- ge0/ge0_tests/parser_tests.cpp | 9 +- ge0/ge0_tests/url_generator_tests.cpp | 176 ++++++------------- ge0/url_generator.cpp | 240 +++++++++++--------------- ge0/url_generator.hpp | 25 +-- map/framework.cpp | 13 +- 5 files changed, 166 insertions(+), 297 deletions(-) diff --git a/ge0/ge0_tests/parser_tests.cpp b/ge0/ge0_tests/parser_tests.cpp index bb90680374..74a9f25f13 100644 --- a/ge0/ge0_tests/parser_tests.cpp +++ b/ge0/ge0_tests/parser_tests.cpp @@ -1,12 +1,8 @@ #include "testing/testing.hpp" -#include "map/mwm_url.hpp" - #include "ge0/parser.hpp" #include "ge0/url_generator.hpp" -#include "base/macros.hpp" - #include #include @@ -241,11 +237,10 @@ UNIT_TEST(LatLonFullAndClippedCoordinates) { for (double lon = -180; lon < 180; lon += 0.7) { - char buf[20] = {0}; - ge0::GenShortShowMapUrl(lat, lon, 4, "", buf, ARRAY_SIZE(buf)); + string const buf = ge0::GenerateShortShowMapUrl(lat, lon, 4, ""); for (int i = 9; i >= 1; --i) { - string const str = string(buf).substr(7, i); + string const str = buf.substr(7, 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 d76f3bfa86..5142b45a53 100644 --- a/ge0/ge0_tests/url_generator_tests.cpp +++ b/ge0/ge0_tests/url_generator_tests.cpp @@ -225,8 +225,10 @@ UNIT_TEST(LatLonToString_StringDensity) } } - int min1 = 1 << 30, min2 = 1 << 30; - int max1 = 0, max2 = 0; + int min1 = 1 << 30; + int min2 = 1 << 30; + int max1 = 0; + int max2 = 0; for (int i = 0; i < 256; ++i) { if (num1[i] != 0 && num1[i] < min1) @@ -247,173 +249,93 @@ UNIT_TEST(LatLonToString_StringDensity) TEST((max2 - min2) * 1.0 / max2 < 0.05, ()); } -UNIT_TEST(GenShortShowMapUrl_SmokeTest) +UNIT_TEST(GenerateShortShowMapUrl_SmokeTest) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Name", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "Name"); + TEST_EQUAL("ge0://8wAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_NameIsNull) +UNIT_TEST(GenerateShortShowMapUrl_NameIsEmpty) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, 0, buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA", string(buf), ()); - TEST_EQUAL(16, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, ""); + TEST_EQUAL("ge0://8wAAAAAAAA", res, ()); } -UNIT_TEST(GenShortShowMapUrl_NameIsEmpty) +UNIT_TEST(GenerateShortShowMapUrl_ZoomVerySmall) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA", string(buf), ()); - TEST_EQUAL(16, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 2, "Name"); + TEST_EQUAL("ge0://AwAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_ZoomVerySmall) +UNIT_TEST(GenerateShortShowMapUrl_ZoomNegative) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 2, "Name", buf, 100); - TEST_EQUAL("ge0://AwAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, -5, "Name"); + TEST_EQUAL("ge0://AwAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_ZoomNegative) +UNIT_TEST(GenerateShortShowMapUrl_ZoomLarge) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, -5, "Name", buf, 100); - TEST_EQUAL("ge0://AwAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 20, "Name"); + TEST_EQUAL("ge0://_wAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_ZoomLarge) +UNIT_TEST(GenerateShortShowMapUrl_ZoomVeryLarge) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 20, "Name", buf, 100); - TEST_EQUAL("ge0://_wAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 2000000000, "Name"); + TEST_EQUAL("ge0://_wAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_ZoomVeryLarge) +UNIT_TEST(GenerateShortShowMapUrl_FractionalZoom) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 2000000000, "Name", buf, 100); - TEST_EQUAL("ge0://_wAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 8.25, "Name"); + TEST_EQUAL("ge0://RwAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_FractionalZoom) +UNIT_TEST(GenerateShortShowMapUrl_FractionalZoomRoundsDown) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 8.25, "Name", buf, 100); - TEST_EQUAL("ge0://RwAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 8.499, "Name"); + TEST_EQUAL("ge0://RwAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_FractionalZoomRoundsDown) +UNIT_TEST(GenerateShortShowMapUrl_FractionalZoomNextStep) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 8.499, "Name", buf, 100); - TEST_EQUAL("ge0://RwAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 8.5, "Name"); + TEST_EQUAL("ge0://SwAAAAAAAA/Name", res, ()); } -UNIT_TEST(GenShortShowMapUrl_FractionalZoomNextStep) +UNIT_TEST(GenerateShortShowMapUrl_SpaceIsReplacedWithUnderscore) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 8.5, "Name", buf, 100); - TEST_EQUAL("ge0://SwAAAAAAAA/Name", string(buf), ()); - TEST_EQUAL(21, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "Hello World"); + TEST_EQUAL("ge0://8wAAAAAAAA/Hello_World", res, ()); } -UNIT_TEST(GenShortShowMapUrl_SpaceIsReplacedWithUnderscore) +UNIT_TEST(GenerateShortShowMapUrl_NamesAreEscaped) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Hello World", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/Hello_World", string(buf), ()); - TEST_EQUAL(28, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "'Hello,World!%$"); + TEST_EQUAL("ge0://8wAAAAAAAA/%27Hello%2CWorld%21%25%24", res, ()); } -UNIT_TEST(GenShortShowMapUrl_NamesAreEscaped) +UNIT_TEST(GenerateShortShowMapUrl_UnderscoreIsReplacedWith_Percent_20) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "'Hello,World!%$", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/%27Hello%2CWorld%21%25%24", string(buf), ()); - TEST_EQUAL(42, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "Hello_World"); + TEST_EQUAL("ge0://8wAAAAAAAA/Hello%20World", res, ()); } -UNIT_TEST(GenShortShowMapUrl_UnderscoreIsReplacedWith_Percent_20) +UNIT_TEST(GenerateShortShowMapUrl_ControlCharsAreEscaped) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Hello_World", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/Hello%20World", string(buf), ()); - TEST_EQUAL(30, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "Hello\tWorld\n"); + TEST_EQUAL("ge0://8wAAAAAAAA/Hello%09World%0A", res, ()); } -UNIT_TEST(GenShortShowMapUrl_ControlCharsAreEscaped) +UNIT_TEST(GenerateShortShowMapUrl_Unicode) { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Hello\tWorld\n", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/Hello%09World%0A", string(buf), ()); - TEST_EQUAL(33, res, ()); + string res = GenerateShortShowMapUrl(0, 0, 19, "\xe2\x98\x84"); + TEST_EQUAL("ge0://8wAAAAAAAA/\xe2\x98\x84", res, ()); } -UNIT_TEST(GenShortShowMapUrl_BufferNullAndEmpty) +UNIT_TEST(GenerateShortShowMapUrl_UnicodeMixedWithOtherChars) { - int res = GenShortShowMapUrl(0, 0, 19, "Name", nullptr, 0); - TEST_EQUAL(21, res, ()); -} - -UNIT_TEST(GenShortShowMapUrl_BufferNotNullAndEmpty) -{ - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Name", buf, 0); - TEST_EQUAL(21, res, ()); -} - -UNIT_TEST(GenShortShowMapUrl_TerminatingNullIsNotWritten) -{ - char buf[] = "xxxxxxxxxxxxxxxxxxxxxxxxxxx"; - int res = GenShortShowMapUrl(0, 0, 19, "Name", buf, 27); - TEST_EQUAL("ge0://8wAAAAAAAA/Namexxxxxx", string(buf), ()); - TEST_EQUAL(21, res, ()); -} - -UNIT_TEST(GenShortShowMapUrl_BufferIs1Byte) -{ - char buf; - int res = GenShortShowMapUrl(0, 0, 19, "Name", &buf, 1); - TEST_EQUAL('g', buf, ()); - TEST_EQUAL(21, res, ()); -} - -UNIT_TEST(GenShortShowMapUrl_BufferTooSmall) -{ - for (int bufSize = 1; bufSize <= 21; ++bufSize) - { - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Name", buf, bufSize); - char expected[] = "ge0://8wAAAAAAAA/Name"; - expected[bufSize] = 0; - TEST_EQUAL(string(expected), string(buf), ()); - TEST_EQUAL(21, res, ()); - } -} - -UNIT_TEST(GenShortShowMapUrl_Unicode) -{ - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "\xe2\x98\x84", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/\xe2\x98\x84", string(buf), ()); - TEST_EQUAL(20, res, ()); -} - -UNIT_TEST(GenShortShowMapUrl_UnicodeMixedWithOtherChars) -{ - char buf[100] = {0}; - int res = GenShortShowMapUrl(0, 0, 19, "Back_in \xe2\x98\x84!\xd1\x8e\xd0\xbc", buf, 100); - TEST_EQUAL("ge0://8wAAAAAAAA/Back%20in_\xe2\x98\x84%21\xd1\x8e\xd0\xbc", string(buf), ()); - TEST_EQUAL(37, res, ()); + 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, ()); } } // namespace ge0 diff --git a/ge0/url_generator.cpp b/ge0/url_generator.cpp index 002390fa2c..99a5a84b72 100644 --- a/ge0/url_generator.cpp +++ b/ge0/url_generator.cpp @@ -3,106 +3,37 @@ #include "base/assert.hpp" #include -#include -#include -#include using namespace std; -namespace ge0 +namespace { -char Base64Char(int x) -{ - CHECK_GREATER_OR_EQUAL(x, 0, ()); - CHECK_LESS(x, 64, ()); - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"[x]; -} - -// Map latitude: [-90, 90] -> [0, maxValue] -int LatToInt(double lat, int maxValue) -{ - // M = maxValue, L = maxValue-1 - // lat: -90 90 - // x: 0 1 2 L M - // |--+--|--+--|--...--|--+--| - // 000111111222222...LLLLLMMMM - - double const x = (lat + 90.0) / 180.0 * maxValue; - return (x < 0 ? 0 : (x > maxValue ? maxValue : (int)(x + 0.5))); -} - -// Make lon in [-180, 180) -double LonIn180180(double lon) -{ - if (lon >= 0) - return fmod(lon + 180.0, 360.0) - 180.0; - else - { - // Handle the case of l = -180 - double const l = fmod(lon - 180.0, 360.0) + 180.0; - return l < 180.0 ? l : l - 360.0; - } -} - -// Map longitude: [-180, 180) -> [0, maxValue] -int LonToInt(double lon, int maxValue) -{ - double const x = (LonIn180180(lon) + 180.0) / 360.0 * (maxValue + 1.0) + 0.5; - return (x <= 0 || x >= maxValue + 1) ? 0 : (int)x; -} - -void LatLonToString(double lat, double lon, char * s, int nBytes) -{ - if (nBytes > kMaxPointBytes) - nBytes = kMaxPointBytes; - - int const latI = LatToInt(lat, (1 << kMaxCoordBits) - 1); - int const lonI = LonToInt(lon, (1 << kMaxCoordBits) - 1); - - int i, shift; - for (i = 0, shift = kMaxCoordBits - 3; i < nBytes; ++i, shift -= 3) - { - int const latBits = latI >> shift & 7; - int const lonBits = lonI >> shift & 7; - - int const nextByte = - (latBits >> 2 & 1) << 5 | - (lonBits >> 2 & 1) << 4 | - (latBits >> 1 & 1) << 3 | - (lonBits >> 1 & 1) << 2 | - (latBits & 1) << 1 | - (lonBits & 1); - - s[i] = Base64Char(nextByte); - } -} - // Replaces ' ' with '_' and vice versa. -void TransformName(char * s) +string TransformName(string const & s) { - for (; *s != 0; ++s) + string result = s; + for (auto & c : result) { - if (*s == ' ') - *s = '_'; - else if (*s == '_') - *s = ' '; + if (c == ' ') + c = '_'; + else if (c == '_') + c = ' '; } + return result; } -// URL Encode string s. -// Allocates memory that should be freed. -// Returns the lenghts of the resulting string in bytes including terminating 0. +// URL-encodes string |s|. // URL restricted / unsafe / unwise characters are %-encoded. // See rfc3986, rfc1738, rfc2396. -size_t UrlEncodeString(char const * s, size_t size, char ** res) +// +// Not compatible with the url encode function from coding/. +string UrlEncodeString(string const & s) { - size_t i; - char * out; - *res = (char*)malloc(size * 3 + 1); - out = *res; - for (i = 0; i < size; ++i) + string result; + result.reserve(s.size() * 3 + 1); + for (size_t i = 0; i < s.size(); ++i) { - unsigned char c = (unsigned char)(s[i]); + auto const c = static_cast(s[i]); switch (c) { case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: @@ -138,76 +69,101 @@ size_t UrlEncodeString(char const * s, size_t size, char ** res) case '|': case '^': case '`': - *(out++) = '%'; - *(out++) = "0123456789ABCDEF"[c >> 4]; - *(out++) = "0123456789ABCDEF"[c & 15]; + result += '%'; + result += "0123456789ABCDEF"[c >> 4]; + result += "0123456789ABCDEF"[c & 15]; break; default: - *(out++) = s[i]; + result += s[i]; } } - *(out++) = 0; - return out - *res - 1; + return result; } +} // namespace -// Append s to buf (is there is space). Increment *bytesAppended by size. -void AppendString(char * buf, int bufSize, int * bytesAppended, char const * s, size_t size) +namespace ge0 { - int64_t const bytesAvailable = - static_cast(bufSize) - static_cast(*bytesAppended); - if (bytesAvailable > 0) - { - int64_t const toCopy = - static_cast(size) < bytesAvailable ? static_cast(size) : bytesAvailable; - memcpy(buf + *bytesAppended, s, static_cast(toCopy)); - } - - *bytesAppended += size; -} - -int GetMaxBufferSize(int nameSize) +string GenerateShortShowMapUrl(double lat, double lon, double zoom, string const & name) { - return ((nameSize == 0) ? 17 : 17 + 3 * nameSize + 1); -} + string urlPrefix = "ge0://ZCoordba64"; -int GenShortShowMapUrl(double lat, double lon, double zoom, char const * name, char * buf, - int bufSize) -{ - // URL format: - // - // +------------------ 1 byte: zoom level - // |+-------+--------- 9 bytes: lat,lon - // || | +--+---- Variable number of bytes: point name - // || | | | - // ge0://ZCoordba64/Name - - int fullUrlSize = 0; - - char urlPrefix[] = "ge0://ZCoord6789"; - - int const zoomI = (zoom <= 4 ? 0 : (zoom >= 19.75 ? 63 : (int) ((zoom - 4) * 4))); + int const zoomI = (zoom <= 4 ? 0 : (zoom >= 19.75 ? 63 : static_cast((zoom - 4) * 4))); urlPrefix[6] = Base64Char(zoomI); - LatLonToString(lat, lon, urlPrefix + 7, 9); + LatLonToString(lat, lon, urlPrefix.data() + 7, 9); - AppendString(buf, bufSize, &fullUrlSize, urlPrefix, 16); - - if (name != 0 && name[0] != 0) + string result = urlPrefix; + if (!name.empty()) { - AppendString(buf, bufSize, &fullUrlSize, "/", 1); - - char * newName = strdup(name); - TransformName(newName); - - char * encName; - size_t const encNameSize = UrlEncodeString(newName, strlen(newName), &encName); - - AppendString(buf, bufSize, &fullUrlSize, encName, encNameSize); - - free(encName); - free(newName); + result += "/"; + result += UrlEncodeString(TransformName(name)); } - return fullUrlSize; + return result; +} + +char Base64Char(int x) +{ + CHECK_GREATER_OR_EQUAL(x, 0, ()); + CHECK_LESS(x, 64, ()); + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"[x]; +} + +// Map latitude: [-90, 90] -> [0, maxValue] +int LatToInt(double lat, int maxValue) +{ + // M = maxValue, L = maxValue-1 + // lat: -90 90 + // x: 0 1 2 L M + // |--+--|--+--|--...--|--+--| + // 000111111222222...LLLLLMMMM + + double const x = (lat + 90.0) / 180.0 * maxValue; + return x < 0 ? 0 : (x > maxValue ? maxValue : static_cast(x + 0.5)); +} + +// Make lon in [-180, 180) +double LonIn180180(double lon) +{ + if (lon >= 0) + return fmod(lon + 180.0, 360.0) - 180.0; + + // Handle the case of l = -180 + double const l = fmod(lon - 180.0, 360.0) + 180.0; + return l < 180.0 ? l : l - 360.0; +} + +// Map longitude: [-180, 180) -> [0, maxValue] +int LonToInt(double lon, int maxValue) +{ + double const x = (LonIn180180(lon) + 180.0) / 360.0 * (maxValue + 1.0) + 0.5; + return (x <= 0 || x >= maxValue + 1) ? 0 : static_cast(x); +} + +void LatLonToString(double lat, double lon, char * s, size_t nBytes) +{ + if (nBytes > kMaxPointBytes) + nBytes = kMaxPointBytes; + + int const latI = LatToInt(lat, (1 << kMaxCoordBits) - 1); + int const lonI = LonToInt(lon, (1 << kMaxCoordBits) - 1); + + size_t i; + int shift; + for (i = 0, shift = kMaxCoordBits - 3; i < nBytes; ++i, shift -= 3) + { + int const latBits = latI >> shift & 7; + int const lonBits = lonI >> shift & 7; + + int const nextByte = + (latBits >> 2 & 1) << 5 | + (lonBits >> 2 & 1) << 4 | + (latBits >> 1 & 1) << 3 | + (lonBits >> 1 & 1) << 2 | + (latBits & 1) << 1 | + (lonBits & 1); + + s[i] = Base64Char(nextByte); + } } } // namespace ge0 diff --git a/ge0/url_generator.hpp b/ge0/url_generator.hpp index efba1ff377..ebb3e5bf56 100644 --- a/ge0/url_generator.hpp +++ b/ge0/url_generator.hpp @@ -1,25 +1,30 @@ #pragma once +#include + namespace ge0 { // Max number of base64 bytes to encode a geo point. inline static int const kMaxPointBytes = 10; inline static int const kMaxCoordBits = kMaxPointBytes * 3; +// Generates a short url. +// +// URL format: +// +// +------------------ 1 byte: zoom level +// |+-------+--------- 9 bytes: lat,lon +// || | +--+---- Variable number of bytes: point name +// || | | | +// ge0://ZCoordba64/Name +std::string GenerateShortShowMapUrl(double lat, double lon, double zoomLevel, std::string const & name); + +// Exposed for testing. char Base64Char(int x); int LatToInt(double lat, int maxValue); double LonIn180180(double lon); int LonToInt(double lon, int maxValue); -void LatLonToString(double lat, double lon, char * s, int nBytes); - -// Helper function to calculate maximum buffer size for -// GenShortShowMapUrl (with null-terminator). -int GetMaxBufferSize(int nameSize); - -// Helper method to generate short url. -// Returns the number of bytes required to fit the whole URL or an error_code < 0 on error. -int GenShortShowMapUrl(double lat, double lon, double zoomLevel, char const * name, char * buf, - int bufSize); +void LatLonToString(double lat, double lon, char * s, size_t nBytes); /* @TODO(melnichek): Finish URL Scheme API implementation and uncomment. typedef struct diff --git a/map/framework.cpp b/map/framework.cpp index 478e09c105..b69e249c2a 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2656,22 +2656,13 @@ string Framework::CodeGe0url(Bookmark const * bmk, bool addName) { double lat = mercator::YToLat(bmk->GetPivot().y); double lon = mercator::XToLon(bmk->GetPivot().x); - return CodeGe0url(lat, lon, bmk->GetScale(), addName ? bmk->GetPreferredName() : ""); + return ge0::GenerateShortShowMapUrl(lat, lon, bmk->GetScale(), addName ? bmk->GetPreferredName() : ""); } // static string Framework::CodeGe0url(double lat, double lon, double zoomLevel, string const & name) { - size_t const resultSize = ge0::GetMaxBufferSize(static_cast(name.size())); - - string res(resultSize, 0); - int const len = ge0::GenShortShowMapUrl(lat, lon, zoomLevel, name.c_str(), &res[0], - static_cast(res.size())); - - ASSERT_LESS_OR_EQUAL(len, static_cast(res.size()), ()); - res.resize(len); - - return res; + return ge0::GenerateShortShowMapUrl(lat, lon, zoomLevel, name); } string Framework::GenerateApiBackUrl(ApiMarkPoint const & point) const