Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #985 from Bars107/master

Browse source 
Bugfixes.
This commit is contained in:
vshcherb 2014-12-03 16:27:48 +01:00
commit ed84e4eeb4
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -348,12 +348,8 @@ public class MapActivityActions implements DialogProvider {
standardId == R.string.context_menu_item_destination_point) {
boolean dest = standardId == R.string.context_menu_item_destination_point;
String selected = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName();
String target = null;
if(dest && selected != null){
target = selected.replaceAll(getString(R.string.context_menu_item_destination_point), "");
}
targets.navigateToPoint(new LatLon(latitude, longitude), true,
dest ? -1 : targets.getIntermediatePoints().size(), dest? target : selected);
targets.navigateToPoint(new LatLon(latitude, longitude), true,
dest ? -1 : targets.getIntermediatePoints().size(), dest? "" : selected);
if(targets.getIntermediatePoints().size() > 0) {
openIntermediatePointsDialog();
}

4
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -325,8 +325,10 @@ public class ConfigureMapMenu {
private void createCustomRenderingProperties(final ContextMenuAdapter adapter , final MapActivity activity,
List<RenderingRuleProperty> customRules ){
final OsmandMapTileView view = activity.getMapView();
final OsmandApplication app = view.getApplication();
for (final RenderingRuleProperty p : customRules) {
if (p.getAttrName().equals("appMode")){
continue;
}
String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(),
p.getName());
// test old descr as title