From 7b6e7d3f36011d4cfe3f9e222b2eaf9f77d5dd94 Mon Sep 17 00:00:00 2001
From: Keith Wansbrough <keithw@lochan.org>
Date: Wed, 21 Oct 2015 21:58:30 +0100
Subject: [PATCH] Parse URL s= parameter as style.

---
 map/mwm_url.cpp | 8 ++++++++
 map/mwm_url.hpp | 1 +
 2 files changed, 9 insertions(+)

diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp
index 5156e35842..9b71960adf 100644
--- a/map/mwm_url.cpp
+++ b/map/mwm_url.cpp
@@ -70,6 +70,7 @@ bool ParsedMapApi::Parse(Uri const & uri)
     ApiMarkPoint * mark = static_cast<ApiMarkPoint *>(m_controller->CreateUserMark(glPoint));
     mark->SetName(p.m_name);
     mark->SetID(p.m_id);
+    mark->SetStyle(style::GetSupportedStyle(p.m_style, p.m_name));
   }
 
   return true;
@@ -134,6 +135,13 @@ void ParsedMapApi::AddKeyValue(string key, string const & value, vector<ApiPoint
     else
       LOG(LWARNING, ("Map API: Point url with no point. 'll' should come first!"));
   }
+  else if (key == "s")
+  {
+    if (!points.empty())
+      points.back().m_style = value;
+    else
+      LOG(LWARNING, ("Map API: Point style with no point. 'll' should come first!"));
+  }
   else if (key == "backurl")
   {
     // Fix missing :// in back url, it's important for iOS
diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp
index a15b43ca23..a0e71ee9dd 100644
--- a/map/mwm_url.hpp
+++ b/map/mwm_url.hpp
@@ -17,6 +17,7 @@ struct ApiPoint
   double m_lon;
   string m_name;
   string m_id;
+  string m_style;
 };
 
 class Uri;