Skip to content

Commit d2966ec

Browse files
committed
Fixes #102
1 parent 226c5a3 commit d2966ec

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

app/src/main/java/org/redcross/openmapkit/MapActivity.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import com.mapbox.mapboxsdk.geometry.BoundingBox;
3232
import com.mapbox.mapboxsdk.geometry.LatLng;
33+
import com.mapbox.mapboxsdk.overlay.Marker;
3334
import com.mapbox.mapboxsdk.views.MapView;
3435
import com.spatialdev.osm.OSMMap;
3536
import com.spatialdev.osm.events.OSMSelectionListener;
@@ -454,14 +455,24 @@ private void toggleMoveNodeMode() {
454455
}
455456

456457
private void hideSelectedMarker() {
457-
OSMNode node = (OSMNode)OSMElement.getSelectedElements().getFirst();
458-
node.getMarker().setVisibility(false);
458+
LinkedList<OSMElement> selectedElements = OSMElement.getSelectedElements();
459+
if (selectedElements.size() < 1) return;
460+
OSMNode node = (OSMNode)selectedElements.getFirst();
461+
Marker marker = node.getMarker();
462+
if (marker != null) {
463+
node.getMarker().setVisibility(false);
464+
}
459465
mapView.invalidate();
460466
}
461467

462468
private void showSelectedMarker() {
463-
OSMNode node = (OSMNode)OSMElement.getSelectedElements().getFirst();
464-
node.getMarker().setVisibility(true);
469+
LinkedList<OSMElement> selectedElements = OSMElement.getSelectedElements();
470+
if (selectedElements.size() < 1) return;
471+
OSMNode node = (OSMNode)selectedElements.getFirst();
472+
Marker marker = node.getMarker();
473+
if (marker != null) {
474+
node.getMarker().setVisibility(true);
475+
}
465476
mapView.invalidate();
466477
}
467478

0 commit comments

Comments
 (0)