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

Fix

Browse source
This commit is contained in:
Alexey Kulish 2015-10-12 15:07:06 +03:00
parent 54ea29899f
commit 6e096461f7
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -545,7 +545,7 @@ public class MapActivity extends AccessibleActivity {
dashboardOnMap.hideDashboard();
}
if (mapLabelToShow != null) {
// mapLayers.getContextMenuLayer().setSelectedObject(toShow);
mapLayers.getContextMenuLayer().setSelectedObject(toShow);
// if (toShow instanceof FavouritePoint) {
// mapLayers.getContextMenuLayer().showContextMenuForSelectedObjects(latLonToShow);
// } else {

7
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -21,7 +21,6 @@ import net.osmand.CallbackWithObject;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
@ -39,7 +38,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o);
public LatLon getObjectLocation(Object o);
// todo: remove
public String getObjectDescription(Object o);
public PointDescription getObjectName(Object o);
@ -220,6 +220,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
}
}
// Opens black box menu
// todo: needs to be removed (exchanged completly by new context menu)
public void setLocation(LatLon loc, String description){
latLon = loc;
if(latLon != null){
@ -482,7 +484,6 @@ public class ContextMenuLayer extends OsmandMapLayer {
}
public void showContextMenuForSelectedObjects(final LatLon l) {
final ContextMenuAdapter menuAdapter = new ContextMenuAdapter(activity);
if (selectedObjects.size() > 1) {
Builder builder = new AlertDialog.Builder(view.getContext());
String[] d = new String[selectedObjects.size()];