Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
85688e0de5
1 changed files with 10 additions and 4 deletions
|
@ -16,6 +16,7 @@ import android.widget.ImageButton;
|
|||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.FavouritePoint;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.LocationPoint;
|
||||
import net.osmand.data.PointDescription;
|
||||
|
@ -423,6 +424,10 @@ public class WaypointDialogHelper {
|
|||
if(ctx.getDashboard().isVisible()) {
|
||||
ctx.getDashboard().hideDashboard();
|
||||
ctx.getMapLayers().getContextMenuLayer().setSelectedObject(locationPoint);
|
||||
if (locationPoint instanceof FavouritePoint) {
|
||||
ctx.getMapLayers().getContextMenuLayer()
|
||||
.showContextMenuForSelectedObjects(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()));
|
||||
} else {
|
||||
ctx.getMapLayers()
|
||||
.getContextMenuLayer()
|
||||
.setLocation(new LatLon(locationPoint.getLatitude(), locationPoint.getLongitude()),
|
||||
|
@ -430,5 +435,6 @@ public class WaypointDialogHelper {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in a new issue