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

Update search

Browse source
This commit is contained in:
Victor Shcherb 2015-11-29 15:57:46 +01:00
parent c2363f8dd4
commit 71ef807f56
1 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -173,7 +173,7 @@ public class GeocodingUtilities {
GeocodingResult rs = new GeocodingResult(r);
rs.street = (Street) object;
rs.city = rs.street.getCity();
if(d > THRESHOLD_STREET_CHANGE_CONNECTION_POINT) {
if(d < THRESHOLD_STREET_CHANGE_CONNECTION_POINT) {
rs.connectionPoint = rs.street.getLocation();
}
streetsList.add(rs);
@ -192,6 +192,9 @@ public class GeocodingUtilities {
final List<GeocodingResult> res = new ArrayList<GeocodingResult>();
// FIXME interpolation
if(streetsList.size() == 0) {
res.add(r);
} else {
for (GeocodingResult s : streetsList) {
final List<GeocodingResult> streetBuildings = new ArrayList<GeocodingResult>();
reader.preloadBuildings(s.street, null);
@ -214,7 +217,8 @@ public class GeocodingUtilities {
}
while (it.hasNext()) {
GeocodingResult nextBld = it.next();
if(nextBld.getDistance() > knownMinBuidlingDistance * THRESHOLD_MULTIPLIER_SKIP_BUILDINGS_AFTER) {
if (nextBld.getDistance() > knownMinBuidlingDistance
* THRESHOLD_MULTIPLIER_SKIP_BUILDINGS_AFTER) {
break;
}
res.add(nextBld);
@ -222,6 +226,7 @@ public class GeocodingUtilities {
}
res.add(s);
}
}
Collections.sort(res, DISTANCE_COMPARATOR);
return res;
}