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

Fix #7305

Browse source
This commit is contained in:
Chumva 2019-10-21 12:36:01 +03:00
parent e25fc71f82
commit ed698a6b3f
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -38,8 +38,8 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.poi.PoiUIFilter; import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.IRouteInformationListener; import net.osmand.plus.routing.IRouteInformationListener;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.MapTextLayer.MapTextProvider; import net.osmand.plus.views.MapTextLayer.MapTextProvider;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -149,7 +149,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
if (objects != null) { if (objects != null) {
int ex = (int) point.x; int ex = (int) point.x;
int ey = (int) point.y; int ey = (int) point.y;
final int rp = getRadiusPoi(tb); final int rp = getRadiusPoi(null, tb);
int compare = rp; int compare = rp;
int radius = rp * 3 / 2; int radius = rp * 3 / 2;
try { try {
@ -185,8 +185,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
mapTextLayer = view.getLayerByClass(MapTextLayer.class); mapTextLayer = view.getLayerByClass(MapTextLayer.class);
} }
public int getRadiusPoi(Amenity amenity, RotatedTileBox tb) {
public int getRadiusPoi(RotatedTileBox tb) {
int r; int r;
final double zoom = tb.getZoom(); final double zoom = tb.getZoom();
if (zoom < startZoom) { if (zoom < startZoom) {
@ -200,7 +199,12 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
} else { } else {
r = 18; r = 18;
} }
return (int) (r * view.getScaleCoefficient());
int radiusPoi = (int) (r * view.getScaleCoefficient());
if (amenity != null && isPresentInFullObjects(amenity.getLocation())) {
radiusPoi += poiBackground.getHeight() / 2 - poiBackgroundSmall.getHeight() / 2;
}
return radiusPoi;
} }
@Override @Override
@ -406,7 +410,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
@Override @Override
public int getTextShift(Amenity o, RotatedTileBox rb) { public int getTextShift(Amenity o, RotatedTileBox rb) {
return getRadiusPoi(rb); return getRadiusPoi(o, rb);
} }
@Override @Override