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

Fix AIDL layer clickable bitmap bounds

Browse source
This commit is contained in:
crimean 2018-06-16 16:02:51 +03:00
parent 1e9ffd63fc
commit 9886e733d2
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,7 +213,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
int ex = (int) point.x;
int ey = (int) point.y;
final int rp = getRadiusPoi(tb);
final int bitmapRadius = (int) (POINT_IMAGE_SIZE_PX / tb.getDensity());
final int bitmapRadius = (int) ((POINT_IMAGE_SIZE_PX / tb.getDensity()) * 3 / 2);
int compare;
int radius = rp * 3 / 2;
for (AMapPoint p : aidlLayer.getPoints()) {
@ -230,7 +230,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
}
}
private static class PointImageReaderTask extends AsyncTask<String, Void, Void> {
private static class PointImageReaderTask extends AsyncTask<String, Void, Boolean> {
private WeakReference<AidlMapLayer> layerRef;
private CropCircleTransformation circleTransformation = new CropCircleTransformation();
@ -240,7 +240,8 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
}
@Override
protected Void doInBackground(String... imageUriStrs) {
protected Boolean doInBackground(String... imageUriStrs) {
boolean res = false;
for (String imageUriStr : imageUriStrs) {
try {
AidlMapLayer layer = layerRef.get();
@ -256,6 +257,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
bitmap = AndroidUtils.scaleBitmap(bitmap, POINT_IMAGE_SIZE_PX, POINT_IMAGE_SIZE_PX, false);
}
layer.pointImages.put(imageUriStr, bitmap);
res = true;
}
ims.close();
}
@ -269,7 +271,15 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
// ignore
}
}
return null;
return res;
}
@Override
protected void onPostExecute(Boolean res) {
AidlMapLayer layer = layerRef.get();
if (layer != null && res) {
layer.refresh();
}
}
}
}