diff --git a/vtm-android-app b/vtm-android-app index 130efd06..79fa1320 160000 --- a/vtm-android-app +++ b/vtm-android-app @@ -1 +1 @@ -Subproject commit 130efd06be3efba0d99322cfdb007bcac08922b6 +Subproject commit 79fa132039562f0e71a62758d2b16fd188e30e46 diff --git a/vtm/src/org/oscim/layers/marker/ItemizedLayer.java b/vtm/src/org/oscim/layers/marker/ItemizedLayer.java index 3c31dc1b..e39f3619 100644 --- a/vtm/src/org/oscim/layers/marker/ItemizedLayer.java +++ b/vtm/src/org/oscim/layers/marker/ItemizedLayer.java @@ -169,7 +169,7 @@ public class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer<Item> int eventY = (int) event.getY() - mMap.getHeight() / 2; Viewport mapPosition = mMap.viewport(); - BoundingBox bbox = mapPosition.getViewBox(); + BoundingBox bbox = mapPosition.getBBox(); int nearest = -1; diff --git a/vtm/src/org/oscim/map/Viewport.java b/vtm/src/org/oscim/map/Viewport.java index 24d010d4..d8c8f9bd 100644 --- a/vtm/src/org/oscim/map/Viewport.java +++ b/vtm/src/org/oscim/map/Viewport.java @@ -228,8 +228,8 @@ public class Viewport { * * @return BoundingBox containing view */ - public synchronized BoundingBox getViewBox() { - getViewBox(mMapBBox); + public synchronized BoundingBox getBBox() { + getBBox(mMapBBox); // scale map-pixel coordinates at current scale to // absolute coordinates and apply mercator projection. @@ -247,7 +247,7 @@ public class Viewport { * the visible part of the map. Sets box to map coordinates: * minX,minY,maxY,maxY */ - public synchronized void getViewBox(Box box) { + public synchronized void getBBox(Box box) { float[] coords = mViewCoords; getMapExtents(coords, 0);