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

Fix null pointer

Browse source
This commit is contained in:
Victor Shcherb 2012-06-27 23:54:55 +02:00
parent 4653cf4c50
commit bbed3776a4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DataExtractionOSM/src/net/osmand/data/preparation/IndexAddressCreator.java
View file

@ -602,17 +602,20 @@ public class IndexAddressCreator extends AbstractIndexPartCreator{
boolean found = false;
Boundary cityBoundary = cityBoundaries.get(city);
if (cityBoundary != null) {
for(City subpart : boundariesToCities.get(cityBoundary)){
if(subpart != city){
List<City> subcities = boundariesToCities.get(cityBoundary);
if (subcities != null) {
for (City subpart : subcities) {
if (subpart != city) {
Boundary subBoundary = cityBoundaries.get(subpart);
if(cityBoundary != null && subBoundary != null && subBoundary.getAdminLevel() > cityBoundary.getAdminLevel()){
cityPart = findNearestCityOrSuburb(subBoundary, location); //subpart.getName();
if (cityBoundary != null && subBoundary != null && subBoundary.getAdminLevel() > cityBoundary.getAdminLevel()) {
cityPart = findNearestCityOrSuburb(subBoundary, location); // subpart.getName();
found = true;
break;
}
}
}
}
}
if (!found) {
Boundary b = cityBoundaries.get(city);
cityPart = findNearestCityOrSuburb(b, location);