Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid show ref is shields was created #21413

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Avoid show ref is shields was created #21413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c2a71
Avoid show ref is shields was created
ivanPyrohivskyi Nov 21, 2024
1aa790c
Avoid show ref is shields was created
ivanPyrohivskyi Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions OsmAnd/src/net/osmand/plus/routing/CurrentStreetName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,12 @@ public void setupCurrentName(@NonNull RoutingHelper routingHelper, @NonNull Next
RouteSegmentResult rs = routingHelper.getCurrentSegmentResult();
if (rs != null) {
text = getRouteSegmentStreetName(routingHelper, rs, false);
if (Algorithms.isEmpty(text)) {
text = getRouteSegmentStreetName(routingHelper, rs, true);
isSet = !Algorithms.isEmpty(text);
} else {
isSet = true;
}
showMarker = true;
shields = RoadShield.create(rs.getObject());
if (Algorithms.isEmpty(text) && shields.isEmpty()) {
text = getRouteSegmentStreetName(routingHelper, rs, true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like streets completely ignored

}
isSet = !Algorithms.isEmpty(text) || !shields.isEmpty();
}
}
// 3. display next road street name if this one empty
Expand Down
Loading