Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-09-01 10:24:23 +02:00
commit f400df6d6e

View file

@ -8,6 +8,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.data.RotatedTileBox; import net.osmand.data.RotatedTileBox;
import net.osmand.data.PointDescription;
import net.osmand.plus.IconsCache; import net.osmand.plus.IconsCache;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
@ -47,7 +48,8 @@ public class MoveMarkerBottomSheetHelper {
PointF point = mContextMenuLayer.getMovableCenterPoint(rt); PointF point = mContextMenuLayer.getMovableCenterPoint(rt);
double lat = rt.getLatFromPixel(point.x, point.y); double lat = rt.getLatFromPixel(point.x, point.y);
double lon = rt.getLonFromPixel(point.x, point.y); double lon = rt.getLonFromPixel(point.x, point.y);
mDescription.setText(mContext.getString(R.string.lat_lon_pattern, lat, lon)); //mDescription.setText(mContext.getString(R.string.lat_lon_pattern, lat, lon));
mDescription.setText(PointDescription.getLocationName(mContext, lat, lon, true));
} }
public boolean isVisible() { public boolean isVisible() {