diff --git a/library/src/main/java/com/onlylemi/mapview/library/MapView.java b/library/src/main/java/com/onlylemi/mapview/library/MapView.java index 1e48601c7ee458c42db4faf787dc84c1dd7ad130..1d3d8d88cb97f8ac7e536671c1fdd08281941e7c 100644 --- a/library/src/main/java/com/onlylemi/mapview/library/MapView.java +++ b/library/src/main/java/com/onlylemi/mapview/library/MapView.java @@ -365,8 +365,8 @@ public class MapView extends SurfaceProvider implements SurfaceOps.Callback, Com float[] goal = {x, y}; currentMatrix.mapPoints(goal); - float deltaX = getWidth() / 2 - goal[0]; - float deltaY = getHeight() / 2 - goal[1]; + float deltaX = (float) getWidth() / 2 - goal[0]; + float deltaY = (float) getHeight() / 2 - goal[1]; currentMatrix.postTranslate(deltaX, deltaY); } @@ -381,7 +381,7 @@ public class MapView extends SurfaceProvider implements SurfaceOps.Callback, Com */ public void setCurrentRotateDegrees(float degrees) { mapCenterWithPoint(getMapWidth() / 2, getMapHeight() / 2); - setCurrentRotateDegrees(degrees, getWidth() / 2, getHeight() / 2); + setCurrentRotateDegrees(degrees, (float) getWidth() / 2, (float) getHeight() / 2); } /** @@ -450,7 +450,7 @@ public class MapView extends SurfaceProvider implements SurfaceOps.Callback, Com * @param zoom */ public void setCurrentZoom(float zoom) { - setCurrentZoom(zoom, getWidth() / 2, getHeight() / 2); + setCurrentZoom(zoom, (float) getWidth() / 2, (float) getHeight() / 2); } /** diff --git a/library/src/main/java/com/onlylemi/mapview/library/layer/BitmapLayer.java b/library/src/main/java/com/onlylemi/mapview/library/layer/BitmapLayer.java index f1e9f1ebf3c2fddd4f92b01e584041dee0002d02..c00700262c2c1d612b60561dd89b90688daf48de 100644 --- a/library/src/main/java/com/onlylemi/mapview/library/layer/BitmapLayer.java +++ b/library/src/main/java/com/onlylemi/mapview/library/layer/BitmapLayer.java @@ -41,10 +41,10 @@ public class BitmapLayer extends MapBaseLayer { if (onBitmapClickListener != null) { float[] goal = mapView.convertMapXYToScreenXY( event.getPointerPosition(0).getX(), event.getPointerPosition(0).getY()); - if (goal[0] > location.getPointX() - bitmap.getImageInfo().size.width / 2 - && goal[0] < location.getPointX() + bitmap.getImageInfo().size.width / 2 - && goal[1] > location.getPointY() - bitmap.getImageInfo().size.height / 2 - && goal[1] < location.getPointY() + bitmap.getImageInfo().size.height / 2) { + if (goal[0] > location.getPointX() - (float) bitmap.getImageInfo().size.width / 2 + && goal[0] < location.getPointX() + (float) bitmap.getImageInfo().size.width / 2 + && goal[1] > location.getPointY() - (float) bitmap.getImageInfo().size.height / 2 + && goal[1] < location.getPointY() + (float) bitmap.getImageInfo().size.height / 2) { onBitmapClickListener.onBitmapClick(this); } } @@ -61,8 +61,8 @@ public class BitmapLayer extends MapBaseLayer { } else { canvas.setMatrix(currentMatrix); } - canvas.drawPixelMapHolder(new PixelMapHolder(bitmap), goal[0] - bitmap.getImageInfo().size.width / 2, - goal[1] - bitmap.getImageInfo().size.width / 2, paint); + canvas.drawPixelMapHolder(new PixelMapHolder(bitmap), goal[0] - (float) bitmap.getImageInfo().size.width / 2, + goal[1] - (float) bitmap.getImageInfo().size.width / 2, paint); canvas.restore(); } } diff --git a/library/src/main/java/com/onlylemi/mapview/library/layer/LocationLayer.java b/library/src/main/java/com/onlylemi/mapview/library/layer/LocationLayer.java index 8b7bea3c0ad6c7d1ae31b89f5765e6b81ff06d18..450e96e90a937d6c7cc6d623427dbd0988fd50c8 100644 --- a/library/src/main/java/com/onlylemi/mapview/library/layer/LocationLayer.java +++ b/library/src/main/java/com/onlylemi/mapview/library/layer/LocationLayer.java @@ -144,7 +144,7 @@ public class LocationLayer extends MapBaseLayer { canvas.rotate(this.compassIndicatorArrowRotateDegree, goal[0], goal[1]); canvas.drawPixelMapHolder(new PixelMapHolder(compassIndicatorArrowBitmap), goal[0] - - compassIndicatorArrowBitmap.getImageInfo().size.width / 2, + - (float) compassIndicatorArrowBitmap.getImageInfo().size.width / 2, goal[1] - defaultLocationCircleRadius - compassIndicatorGap, new Paint()); canvas.restore(); diff --git a/library/src/main/java/com/onlylemi/mapview/library/layer/MarkLayer.java b/library/src/main/java/com/onlylemi/mapview/library/layer/MarkLayer.java index 05b560333688df49b5e84597e4dc29d49be29fea..df04c2c9de8e1f429b60d26dfaa735fda0b28c0f 100644 --- a/library/src/main/java/com/onlylemi/mapview/library/layer/MarkLayer.java +++ b/library/src/main/java/com/onlylemi/mapview/library/layer/MarkLayer.java @@ -67,8 +67,8 @@ public class MarkLayer extends MapBaseLayer { event.getPointerPosition(0).getY()); for (int i = 0; i < marks.size(); i++) { if (MapMath.getDistanceBetweenTwoPoints(goal[0], goal[1], - marks.get(i).getPointX() - bmpMark.getImageInfo().size.width / 2, - marks.get(i).getPointY() - bmpMark.getImageInfo().size.height / 2) <= 50) { + marks.get(i).getPointX() - (float) bmpMark.getImageInfo().size.width / 2, + marks.get(i).getPointY() - (float) bmpMark.getImageInfo().size.height / 2) <= 50) { num = i; isClickMark = true; break; @@ -110,11 +110,11 @@ public class MarkLayer extends MapBaseLayer { //mark ico canvas.drawPixelMapHolder(new PixelMapHolder(bmpMark), - goal[0] - bmpMark.getImageInfo().size.width / 2, - goal[1] - bmpMark.getImageInfo().size.height / 2, paint); + goal[0] - (float) bmpMark.getImageInfo().size.width / 2, + goal[1] - (float) bmpMark.getImageInfo().size.height / 2, paint); if (i == num && isClickMark) { canvas.drawPixelMapHolder(new PixelMapHolder(bmpMarkTouch), - goal[0] - bmpMarkTouch.getImageInfo().size.width / 2, + goal[0] - (float) bmpMarkTouch.getImageInfo().size.width / 2, goal[1] - bmpMarkTouch.getImageInfo().size.height, paint); } } diff --git a/library/src/main/java/com/onlylemi/mapview/library/layer/RouteLayer.java b/library/src/main/java/com/onlylemi/mapview/library/layer/RouteLayer.java index 5b7d12b996e8610dc1acfa66f479fdc51e767e92..acf5ce6233e4af873d0e0dd6cc1409f130a36146 100644 --- a/library/src/main/java/com/onlylemi/mapview/library/layer/RouteLayer.java +++ b/library/src/main/java/com/onlylemi/mapview/library/layer/RouteLayer.java @@ -100,10 +100,10 @@ public class RouteLayer extends MapBaseLayer { currentMatrix.mapPoints(goal1); currentMatrix.mapPoints(goal2); canvas.drawPixelMapHolder(new PixelMapHolder(routeStartBmp), - goal1[0] - routeStartBmp.getImageInfo().size.width / 2, goal1[1] + goal1[0] - (float) routeStartBmp.getImageInfo().size.width / 2, goal1[1] - routeStartBmp.getImageInfo().size.height, paint); canvas.drawPixelMapHolder(new PixelMapHolder(routeEndBmp), - goal2[0] - routeEndBmp.getImageInfo().size.width / 2, goal2[1] + goal2[0] - (float) routeEndBmp.getImageInfo().size.width / 2, goal2[1] - routeEndBmp.getImageInfo().size.height, paint); }