From 912e395b1147e04915293b4ed37a10381e632f10 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Fri, 20 Jan 2017 18:20:13 +0300
Subject: [PATCH] Fixed map style switching on Android

---
 android/src/com/mapswithme/maps/Framework.java             | 3 +--
 android/src/com/mapswithme/maps/search/SearchFragment.java | 2 +-
 map/framework.cpp                                          | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java
index bddef7a50a..8cfba0e79c 100644
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@@ -23,9 +23,8 @@ import java.lang.annotation.RetentionPolicy;
  */
 public class Framework
 {
-  public static final int MAP_STYLE_LIGHT = 0;
+  public static final int MAP_STYLE_CLEAR = 0;
   public static final int MAP_STYLE_DARK = 1;
-  public static final int MAP_STYLE_CLEAR = 2;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({ROUTER_TYPE_VEHICLE, ROUTER_TYPE_PEDESTRIAN, ROUTER_TYPE_BICYCLE, ROUTER_TYPE_TAXI})
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 9b827e8bfb..f46ca25c35 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -447,7 +447,7 @@ public class SearchFragment extends BaseMwmFragment
     hideSearch();
 
     // change map style for the Map activity
-    final int mapStyle = isOld ? Framework.MAP_STYLE_LIGHT : (isDark ? Framework.MAP_STYLE_DARK : Framework.MAP_STYLE_CLEAR);
+    final int mapStyle = isDark ? Framework.MAP_STYLE_DARK : Framework.MAP_STYLE_CLEAR;
     Framework.nativeSetMapStyle(mapStyle);
 
     return true;
diff --git a/map/framework.cpp b/map/framework.cpp
index 1cce5b23d4..901c77308e 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1837,6 +1837,8 @@ void Framework::OnUpdateGpsTrackPointsCallback(vector<pair<size_t, location::Gps
 
 void Framework::MarkMapStyle(MapStyle mapStyle)
 {
+  ASSERT_NOT_EQUAL(mapStyle, MapStyle::MapStyleMerged, ());
+
   // Store current map style before classificator reloading
   std::string mapStyleStr = MapStyleToString(mapStyle);
   if (mapStyleStr.empty())