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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-11 17:19:55 +02:00
commit 85688e0de5
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -16,6 +16,7 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.LocationPoint; import net.osmand.data.LocationPoint;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
@ -423,6 +424,10 @@ public class WaypointDialogHelper {
if(ctx.getDashboard().isVisible()) { if(ctx.getDashboard().isVisible()) {
ctx.getDashboard().hideDashboard(); ctx.getDashboard().hideDashboard();
ctx.getMapLayers().getContextMenuLayer().setSelectedObject(locationPoint); ctx.getMapLayers().getContextMenuLayer().setSelectedObject(locationPoint);
if (locationPoint instanceof FavouritePoint) {
ctx.getMapLayers().getContextMenuLayer()
.showContextMenuForSelectedObjects(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()));
} else {
ctx.getMapLayers() ctx.getMapLayers()
.getContextMenuLayer() .getContextMenuLayer()
.setLocation(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()), .setLocation(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()),
@ -430,5 +435,6 @@ public class WaypointDialogHelper {
} }
} }
} }
}
} }