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

Fix strange problems with empty set

Browse source
This commit is contained in:
Victor Shcherb 2020-08-13 14:18:15 +02:00
parent 7e2dfb4344
commit 56bc3a14c2
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
View file

@ -556,6 +556,9 @@ public class OsmMapUtils {
// take centroid as the first best guess // take centroid as the first best guess
Cell bestCell = getCentroidCell(rings); Cell bestCell = getCentroidCell(rings);
if(bestCell == null) {
return new LatLon(minX, minY);
}
// special case for rectangular polygons // special case for rectangular polygons
Cell bboxCell = new Cell(minX + width / 2, minY + height / 2, 0, rings); Cell bboxCell = new Cell(minX + width / 2, minY + height / 2, 0, rings);
@ -606,10 +609,13 @@ public class OsmMapUtils {
area += f * 3; area += f * 3;
} }
if (area == 0) { if (area == 0) {
LatLon p = points.get(0); if (points.size() == 0) {
return new Cell(p.getLatitude(), p.getLongitude(), 0, rings); return null;
} }
LatLon p = points.get(0);
return new Cell(p.getLatitude(), p.getLongitude(), 0, rings);
}
return new Cell(x / area, y / area, 0, rings); return new Cell(x / area, y / area, 0, rings);
} }