diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index 8d3eaa39aa..8044e41833 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -114,14 +114,6 @@ public class ConfigureMapMenu { if (isChecked) { selectPOILayer(settings); } - } else if (itemId == R.string.layer_map) { - if(OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) { - Intent intent = new Intent(ma, PluginActivity.class); - intent.putExtra(PluginActivity.EXTRA_PLUGIN_ID, OsmandRasterMapsPlugin.ID); - ma.startActivity(intent); - } else { - ma.getMapLayers().selectMapLayer(ma.getMapView()); - } } else if (itemId == R.string.layer_amenity_label) { settings.SHOW_POI_LABEL.set(isChecked); } else if (itemId == R.string.shared_string_favorites) { @@ -139,6 +131,14 @@ public class ConfigureMapMenu { } }); } + } else if (itemId == R.string.layer_map) { + if(OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) { + Intent intent = new Intent(ma, PluginActivity.class); + intent.putExtra(PluginActivity.EXTRA_PLUGIN_ID, OsmandRasterMapsPlugin.ID); + ma.startActivity(intent); + } else { + ma.getMapLayers().selectMapLayer(ma.getMapView()); + } } else if (itemId == R.string.layer_transport_route) { ma.getMapLayers().getTransportInfoLayer().setVisible(isChecked); } @@ -168,8 +168,6 @@ public class ConfigureMapMenu { // String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] "; adapter.item(R.string.layer_poi).selected(settings.SELECTED_POI_FILTER_FOR_MAP.get() != null ? 1 : 0) .iconColor(R.drawable.ic_action_info_dark).listen(l).reg(); - adapter.item(R.string.layer_map).iconColor(R.drawable.ic_world_globe_dark) - .listen(l).reg(); adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0) .iconColor(R.drawable.ic_action_text_dark).listen(l).reg(); adapter.item(R.string.shared_string_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0) @@ -178,6 +176,8 @@ public class ConfigureMapMenu { app.getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0) .iconColor(R.drawable.ic_action_polygom_dark) .listen(l).reg(); + adapter.item(R.string.layer_map).iconColor(R.drawable.ic_world_globe_dark) + .listen(l).reg(); if(TransportRouteHelper.getInstance().routeIsCalculated()){ adapter.item(R.string.layer_transport_route).selected(1) .iconColor(R.drawable.ic_action_bus_dark).listen(l).reg();