From 321165ac13e3d53420f982032d8c582e800c5304 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Fri, 4 Sep 2020 17:27:55 +0300
Subject: [PATCH] [coding] More liberal parsing of geo url params.

---
 coding/coding_tests/url_tests.cpp | 30 ++++++++++++++++++++++++++++++
 coding/url.cpp                    | 18 +++++++++---------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/coding/coding_tests/url_tests.cpp b/coding/coding_tests/url_tests.cpp
index c0f18da886..98e6f2a6e9 100644
--- a/coding/coding_tests/url_tests.cpp
+++ b/coding/coding_tests/url_tests.cpp
@@ -172,6 +172,36 @@ UNIT_TEST(ProcessURL_GoogleMaps)
   TEST_ALMOST_EQUAL_ABS(info.m_zoom, 16.0, kEps, ());
 }
 
+UNIT_TEST(ProcessURL_CaseInsensitive)
+{
+  GeoURLInfo info("geo:52.23405,21.01547?Z=10");
+  TEST(info.IsValid(), ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lat, 52.23405, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lon, 21.01547, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_zoom, 10.0, kEps, ());
+}
+
+UNIT_TEST(ProcessURL_BadZoom)
+{
+  GeoURLInfo info("geo:52.23405,21.01547?Z=19");
+  TEST(info.IsValid(), ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lat, 52.23405, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lon, 21.01547, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_zoom, 17.0, kEps, ());
+
+  info = GeoURLInfo("geo:52.23405,21.01547?Z=nineteen");
+  TEST(info.IsValid(), ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lat, 52.23405, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lon, 21.01547, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_zoom, 17.0, kEps, ());
+
+  info = GeoURLInfo("geo:52.23405,21.01547?Z=-1");
+  TEST(info.IsValid(), ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lat, 52.23405, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_lon, 21.01547, kEps, ());
+  TEST_ALMOST_EQUAL_ABS(info.m_zoom, 0.0, kEps, ());
+}
+
 UNIT_TEST(UrlValidScheme)
 {
   Url url("mapswithme://map?ll=10.3,12.3223&n=Hello%20World");
diff --git a/coding/url.cpp b/coding/url.cpp
index d91dba58e9..b471b0ff4c 100644
--- a/coding/url.cpp
+++ b/coding/url.cpp
@@ -47,7 +47,9 @@ public:
 
   void operator()(url::Param const & param)
   {
-    if (param.m_name == "z" || param.m_name == "zoom")
+    auto name = param.m_name;
+    strings::AsciiToLower(name);
+    if (name == "z" || name == "zoom")
     {
       double x;
       if (strings::to_double(param.m_value, x))
@@ -55,7 +57,7 @@ public:
       return;
     }
 
-    int const priority = GetCoordinatesPriority(param.m_name);
+    int const priority = GetCoordinatesPriority(name);
     if (priority == -1 || priority < m_latPriority || priority < m_lonPriority)
       return;
 
@@ -68,7 +70,7 @@ public:
     double x;
     if (strings::to_double(param.m_value, x))
     {
-      if (param.m_name == "lat" || param.m_name == "y")
+      if (name == "lat" || name == "y")
       {
         if (!m_info.SetLat(x))
           return;
@@ -76,7 +78,7 @@ public:
       }
       else
       {
-        ASSERT(param.m_name == "lon" || param.m_name == "x", (param.m_name));
+        ASSERT(name == "lon" || name == "x", (param.m_name, name));
         if (!m_info.SetLon(x))
           return;
         m_lonPriority = priority;
@@ -345,12 +347,11 @@ string UrlDecode(string const & encodedUrl)
 
 GeoURLInfo::GeoURLInfo(string const & s)
 {
+  Reset();
+
   Url url(s);
   if (!url.IsValid())
-  {
-    Reset();
     return;
-  }
 
   LatLonParser parser(url, *this);
   parser(url::Param(string(), url.GetPath()));
@@ -377,8 +378,7 @@ void GeoURLInfo::Reset()
 
 void GeoURLInfo::SetZoom(double x)
 {
-  if (x >= 0.0 && x <= kMaxZoom)
-    m_zoom = x;
+  m_zoom = clamp(x, 0.0, kMaxZoom);
 }
 
 bool GeoURLInfo::SetLat(double x)