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

Tiny fix AIDL layer

Browse source
This commit is contained in:
crimean 2018-06-14 21:14:06 +03:00
parent 0d89b958ce
commit 67401ac2fa
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java
View file

@ -115,6 +115,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
int x = (int) tileBox.getPixXFromLatLon(l.getLatitude(), l.getLongitude());
int y = (int) tileBox.getPixYFromLatLon(l.getLatitude(), l.getLongitude());
if (tileBox.containsPoint(x, y, maxRadius)) {
boolean hasBitmap = false;
Map<String, String> params = point.getParams();
String imageUriStr = params.get(AMapPoint.POINT_IMAGE_URI_PARAM);
if (!TextUtils.isEmpty(imageUriStr)) {
@ -122,10 +123,12 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
if (bitmap == null) {
imageRequests.add(imageUriStr);
} else {
hasBitmap = true;
canvas.drawBitmap(bitmap, x - bitmap.getHeight() / 2, y - bitmap.getWidth() / 2, bitmapPaint);
canvas.drawText(point.getShortName(), x, y + maxRadius * 0.9f, paintTextIcon);
}
} else {
}
if (!hasBitmap) {
pointInnerCircle.setColor(point.getColor());
pointOuter.setColor(POINT_OUTER_COLOR);
canvas.drawCircle(x, y, radius + density, pointOuter);
@ -233,10 +236,10 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
@Override
protected Void doInBackground(String... imageUriStrs) {
for (String imageUriStr : imageUriStrs) {
Uri fileUri = Uri.parse(imageUriStr);
try {
AidlMapLayer layer = layerRef.get();
if (layer != null) {
Uri fileUri = Uri.parse(imageUriStr);
if (layer != null && fileUri != null) {
try {
InputStream ims = layer.map.getContentResolver().openInputStream(fileUri);
if (ims != null) {