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

Merge pull request #8477 from alrega/fix_next_street_name

Browse source 
Fix #8476 Missing some street names in the detailed route
This commit is contained in:
vshcherb 2020-02-24 12:32:28 +01:00 committed by GitHub
commit b0a7b61b92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
View file

@ -34,6 +34,15 @@ import static net.osmand.binary.RouteDataObject.HEIGHT_UNDEFINED;
public class RouteCalculationResult { public class RouteCalculationResult {
private final static Log log = PlatformUtil.getLog(RouteCalculationResult.class); private final static Log log = PlatformUtil.getLog(RouteCalculationResult.class);
/**
* When generating list of directions from segments, algorithm attempts to evaluate street names
* that follow the route after turn. It's quite often segments follow roundabout exit refer to
* unnamed road, so algorithm scans several segments following the exit to find out the street
* name.
* Maximum distance to scan in meter is specified by this parameter.
*/
private static float distanceSeekStreetName = 150;
private static double distanceClosestToIntermediate = 3000; private static double distanceClosestToIntermediate = 3000;
private static double distanceThresholdToIntermediate = 25; private static double distanceThresholdToIntermediate = 25;
private static double DISTANCE_THRESHOLD_TO_INTRODUCE_FIRST_AND_LAST_POINTS = 50; private static double DISTANCE_THRESHOLD_TO_INTRODUCE_FIRST_AND_LAST_POINTS = 50;
@ -366,8 +375,26 @@ public class RouteCalculationResult {
String ref = next.getObject().getRef(ctx.getSettings().MAP_PREFERRED_LOCALE.get(), String ref = next.getObject().getRef(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), next.isForwardDirection()); ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), next.isForwardDirection());
info.setRef(ref); info.setRef(ref);
info.setStreetName(next.getObject().getName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(), String streetName = next.getObject().getName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
ctx.getSettings().MAP_TRANSLITERATE_NAMES.get())); ctx.getSettings().MAP_TRANSLITERATE_NAMES.get());
if(Algorithms.isEmpty(streetName)) {
// try to get street names from following segments
float distanceFromTurn = next.getDistance();
for(int n = lind+1; n+1 < list.size(); n++) {
RouteSegmentResult s1 = list.get(n);
if(s1.getTurnType() != null)
break; // scan the list only until the next turn
streetName = s1.getObject().getName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
ctx.getSettings().MAP_TRANSLITERATE_NAMES.get());
if(!Algorithms.isEmpty(streetName))
break;
if(0 < s1.getDistance())
distanceFromTurn += s1.getDistance();
if(distanceFromTurn > distanceSeekStreetName)
break;
}
}
info.setStreetName(streetName);
info.setDestinationName(next.getObject().getDestinationName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(), info.setDestinationName(next.getObject().getDestinationName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), next.isForwardDirection())); ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), next.isForwardDirection()));
if (s.getObject().isExitPoint() && next.getObject().getHighway().equals("motorway_link")) { if (s.getObject().isExitPoint() && next.getObject().getHighway().equals("motorway_link")) {