Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-07-28 11:35:43 +02:00
commit 16badd7f63

View file

@ -283,9 +283,17 @@ public class TrackSegmentFragment extends OsmAndListFragment {
LatLon location = new LatLon(pointToShow.getLatitude(), LatLon location = new LatLon(pointToShow.getLatitude(),
pointToShow.getLongitude()); pointToShow.getLongitude());
final OsmandSettings settings = app.getSettings(); final OsmandSettings settings = app.getSettings();
String typeName = "";
if (getGpx().showCurrentTrack) {
typeName = getString(R.string.shared_string_currently_recording_track);
} else if (getGpxDataItem() != null) {
typeName = getGpxDataItem().getFile().getName();
} else if (getGpx() != null) {
typeName = getGpx().path;
}
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(), settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
settings.getLastKnownMapZoom(), settings.getLastKnownMapZoom(),
new PointDescription(PointDescription.POINT_TYPE_WPT, getGpxDataItem().getFile().getName()), new PointDescription(PointDescription.POINT_TYPE_WPT, typeName),
false, false,
getRect() getRect()
); );