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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-12-01 09:46:21 +01:00
commit 1d9c4fab7a
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,6 @@ public class GeocodingUtilities {
public static final float THRESHOLD_MULTIPLIER_SKIP_STREETS_AFTER = 3; public static final float THRESHOLD_MULTIPLIER_SKIP_STREETS_AFTER = 3;
public static final float DISTANCE_STREET_NAME_PROXIMITY_BY_NAME = 20000; public static final float DISTANCE_STREET_NAME_PROXIMITY_BY_NAME = 20000;
public static final float DISTANCE_BULDING_PROXIMITY = 100; public static final float DISTANCE_BULDING_PROXIMITY = 100;
public static final float THRESHOLD_STREET_CHANGE_CONNECTION_POINT = 400; // not important
public static final Comparator<GeocodingResult> DISTANCE_COMPARATOR = new Comparator<GeocodingResult>() { public static final Comparator<GeocodingResult> DISTANCE_COMPARATOR = new Comparator<GeocodingResult>() {
@Override @Override
@ -138,7 +137,6 @@ public class GeocodingUtilities {
sr.searchPoint = new LatLon(lat, lon); sr.searchPoint = new LatLon(lat, lon);
sr.streetName = Algorithms.isEmpty(road.getName())? road.getRef() : road.getName(); sr.streetName = Algorithms.isEmpty(road.getName())? road.getRef() : road.getName();
sr.point = p; sr.point = p;
sr.connectionPoint = new LatLon(MapUtils.get31LatitudeY(p.preciseY), MapUtils.get31LongitudeX(p.preciseX)); sr.connectionPoint = new LatLon(MapUtils.get31LatitudeY(p.preciseY), MapUtils.get31LongitudeX(p.preciseX));
sr.regionFP = road.region.getFilePointer(); sr.regionFP = road.region.getFilePointer();
sr.regionLen = road.region.getLength(); sr.regionLen = road.region.getLength();
@ -172,9 +170,6 @@ public class GeocodingUtilities {
GeocodingResult rs = new GeocodingResult(r); GeocodingResult rs = new GeocodingResult(r);
rs.street = (Street) object; rs.street = (Street) object;
rs.city = rs.street.getCity(); rs.city = rs.street.getCity();
if(d < THRESHOLD_STREET_CHANGE_CONNECTION_POINT) {
rs.connectionPoint = rs.street.getLocation();
}
streetsList.add(rs); streetsList.add(rs);
return true; return true;
} }