pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed map style switching on Android

Browse source
This commit is contained in:
r.kuznetsov 2017-01-20 18:20:13 +03:00 • committed by Vladimir Byko-Ianko
parent 3dc6d2f411
commit 912e395b11
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/Framework.java
View file

@ -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})

2
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -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;

2
map/framework.cpp
View file

@ -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())