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-04 13:27:55 +01:00
commit b46ad14c18
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,6 @@ public class GeocodingUtilities {
this.building = r.building; this.building = r.building;
this.city = r.city; this.city = r.city;
this.street = r.street; this.street = r.street;
this.streetName = r.streetName;
} }
// input // input

1
OsmAnd/res/values/strings.xml
View file

@ -10,6 +10,7 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="shared_string_near">Near</string>
<string name="shared_string_hide">Hide</string> <string name="shared_string_hide">Hide</string>
<string name="av_video_quality_low">Lowest resolution</string> <string name="av_video_quality_low">Lowest resolution</string>
<string name="av_video_quality_high">Highest resolution</string> <string name="av_video_quality_high">Highest resolution</string>

5
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
View file

@ -171,6 +171,11 @@ public abstract class MenuTitleController {
} }
streetStr = geocodingResult; streetStr = geocodingResult;
if (!Algorithms.isEmpty(streetStr) && object.getDistance() > 100) {
streetStr = getMapActivity().getString(R.string.shared_string_near)+" " +streetStr
}
if (!Algorithms.isEmpty(streetStr)) { if (!Algorithms.isEmpty(streetStr)) {
MenuController menuController = getMenuController(); MenuController menuController = getMenuController();
if (menuController == null || menuController.displayStreetNameInTitle()) { if (menuController == null || menuController.displayStreetNameInTitle()) {