From a9d1a151924707c338e631b192470d86d9ad0208 Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Sun, 19 May 2024 20:40:36 +0100 Subject: [PATCH] [platform] remove redundant `=` from osm.org/go link tiny fix, looks a bit strange to have an empty query string Signed-off-by: Harry Bond --- platform/measurement_utils.cpp | 4 ++-- platform/platform_tests/measurement_tests.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 017e28cbf4..ddb2b0fc5e 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -215,8 +215,8 @@ string FormatOsmLink(double lat, double lon, int zoom) for (int i = 0; i < (zoom + 8) % 3; ++i) osmUrl += "-"; - - return osmUrl + "?m="; + // ?m tells OSM to display a marker + return osmUrl + "?m"; } bool OSMDistanceToMeters(string const & osmRawValue, double & outMeters) diff --git a/platform/platform_tests/measurement_tests.cpp b/platform/platform_tests/measurement_tests.cpp index 78146785fa..11ab0c9ab9 100644 --- a/platform/platform_tests/measurement_tests.cpp +++ b/platform/platform_tests/measurement_tests.cpp @@ -51,17 +51,17 @@ UNIT_TEST(LatLonToDMS_NoRounding) UNIT_TEST(FormatOsmLink) { // Zero point - TEST_EQUAL(FormatOsmLink(0, 0, 5), "https://osm.org/go/wAAAA-?m=", ()); + TEST_EQUAL(FormatOsmLink(0, 0, 5), "https://osm.org/go/wAAAA-?m", ()); // Eifel tower - TEST_EQUAL(FormatOsmLink(48.85825, 2.29450, 15), "https://osm.org/go/0BOdUs9e--?m=", ()); + TEST_EQUAL(FormatOsmLink(48.85825, 2.29450, 15), "https://osm.org/go/0BOdUs9e--?m", ()); // Buenos Aires - TEST_EQUAL(FormatOsmLink(-34.6061, -58.4360, 10), "https://osm.org/go/Mnx6SB?m=", ()); + TEST_EQUAL(FormatOsmLink(-34.6061, -58.4360, 10), "https://osm.org/go/Mnx6SB?m", ()); // Formally, lat = -90 and lat = 90 are the same for OSM links, but Mercator is valid until 85. auto link = FormatOsmLink(-90, -180, 10); - TEST(link == "https://osm.org/go/AAAAAA?m=" || link == "https://osm.org/go/~~~~~~?m=", (link)); + TEST(link == "https://osm.org/go/AAAAAA?m" || link == "https://osm.org/go/~~~~~~?m", (link)); link = FormatOsmLink(90, 180, 10); - TEST(link == "https://osm.org/go/AAAAAA?m=" || link == "https://osm.org/go/~~~~~~?m=", (link)); + TEST(link == "https://osm.org/go/AAAAAA?m" || link == "https://osm.org/go/~~~~~~?m", (link)); } UNIT_TEST(FormatSpeedNumeric)