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

Fix regions layer

Browse source
This commit is contained in:
max-klaus 2019-08-07 14:10:40 +03:00
parent d198b596fc
commit e838582187
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
View file

@ -268,7 +268,7 @@ public class OsmandRegions {
return Math.abs(area); return Math.abs(area);
} }
private List<BinaryMapDataObject> getCountries(int lx, int rx, int ty, int by) throws IOException { private List<BinaryMapDataObject> getCountries(int lx, int rx, int ty, int by, final boolean checkCenter) throws IOException {
HashSet<String> set = new HashSet<String>(quadTree.queryInBox(new QuadRect(lx, ty, rx, by), HashSet<String> set = new HashSet<String>(quadTree.queryInBox(new QuadRect(lx, ty, rx, by),
new ArrayList<String>())); new ArrayList<String>()));
List<BinaryMapDataObject> result = new ArrayList<BinaryMapDataObject>(); List<BinaryMapDataObject> result = new ArrayList<BinaryMapDataObject>();
@ -280,7 +280,7 @@ public class OsmandRegions {
BinaryMapDataObject container = null; BinaryMapDataObject container = null;
int count = 0; int count = 0;
for (BinaryMapDataObject bo : countriesByDownloadName.get(cname)) { for (BinaryMapDataObject bo : countriesByDownloadName.get(cname)) {
if (contain(bo, mx, my)) { if (!checkCenter || contain(bo, mx, my)) {
count++; count++;
container = bo; container = bo;
break; break;
@ -314,24 +314,27 @@ public class OsmandRegions {
return null; return null;
} }
public List<BinaryMapDataObject> query(int lx, int rx, int ty, int by) throws IOException { public List<BinaryMapDataObject> query(int lx, int rx, int ty, int by) throws IOException {
return queryBboxNoInit(lx, rx, ty, by, true);
}
public List<BinaryMapDataObject> query(int lx, int rx, int ty, int by, boolean checkCenter) throws IOException {
if (quadTree != null) { if (quadTree != null) {
return getCountries(lx, rx, ty, by); return getCountries(lx, rx, ty, by, checkCenter);
} }
return queryBboxNoInit(lx, rx, ty, by); return queryBboxNoInit(lx, rx, ty, by, checkCenter);
} }
public List<BinaryMapDataObject> query(final int tile31x, final int tile31y) throws IOException { public List<BinaryMapDataObject> query(final int tile31x, final int tile31y) throws IOException {
if (quadTree != null) { if (quadTree != null) {
return getCountries(tile31x, tile31x, tile31y, tile31y); return getCountries(tile31x, tile31x, tile31y, tile31y, true);
} }
return queryBboxNoInit(tile31x, tile31x, tile31y, tile31y); return queryBboxNoInit(tile31x, tile31x, tile31y, tile31y, true);
} }
private synchronized List<BinaryMapDataObject> queryBboxNoInit(int lx, int rx, int ty, int by) throws IOException { private synchronized List<BinaryMapDataObject> queryBboxNoInit(int lx, int rx, int ty, int by, final boolean checkCenter) throws IOException {
final List<BinaryMapDataObject> result = new ArrayList<BinaryMapDataObject>(); final List<BinaryMapDataObject> result = new ArrayList<BinaryMapDataObject>();
final int mx = lx / 2 + rx / 2; final int mx = lx / 2 + rx / 2;
final int my = ty / 2 + by / 2; final int my = ty / 2 + by / 2;
@ -349,7 +352,7 @@ public class OsmandRegions {
return false; return false;
} }
initTypes(object); initTypes(object);
if (contain(object, mx, my)) { if (!checkCenter || contain(object, mx, my)) {
result.add(object); result.add(object);
} }
return false; return false;
@ -725,7 +728,7 @@ public class OsmandRegions {
List<BinaryMapDataObject> mapDataObjects; List<BinaryMapDataObject> mapDataObjects;
try { try {
mapDataObjects = queryBboxNoInit(point31x, point31x, point31y, point31y); mapDataObjects = queryBboxNoInit(point31x, point31x, point31y, point31y, true);
} catch (IOException e) { } catch (IOException e) {
throw new IOException("Error while calling queryBbox"); throw new IOException("Error while calling queryBbox");
} }

2
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -281,7 +281,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
int bottom = MapUtils.get31TileNumberY(rb.getLatitude()); int bottom = MapUtils.get31TileNumberY(rb.getLatitude());
try { try {
result = osmandRegions.query(left, right, top, bottom); result = osmandRegions.query(left, right, top, bottom, false);
} catch (IOException e) { } catch (IOException e) {
return result; return result;
} }