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 2018-02-03 12:12:46 +01:00
commit 1806cba413
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -1572,7 +1572,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
int zoom = getZoom() + dZoom; int zoom = getZoom() + dZoom;
LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center, zoom); LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center, zoom);
if (map.getLatitude() == latlon.getLatitude() && map.getLongitude() == latlon.getLongitude() && dZoom == 0) { if (map.hasCustomMapRatio()
|| (map.getLatitude() == latlon.getLatitude() && map.getLongitude() == latlon.getLongitude() && dZoom == 0)) {
return; return;
} }

15
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -130,7 +130,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private float mapRatioX; private float mapRatioX;
private float mapRatioY; private float mapRatioY;
private LatLon originalRatioCenterLatLon;
private boolean showMapPosition = true; private boolean showMapPosition = true;
@ -496,16 +495,20 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
public void setCustomMapRatio(float ratioX, float ratioY) { public void setCustomMapRatio(float ratioX, float ratioY) {
this.mapRatioX = ratioX; this.mapRatioX = ratioX;
this.mapRatioY = ratioY; this.mapRatioY = ratioY;
originalRatioCenterLatLon = currentViewport.getCenterLatLon();
} }
public void restoreMapRatio() { public void restoreMapRatio() {
RotatedTileBox box = currentViewport.copy();
float rx = (float)box.getCenterPixelX() / box.getPixWidth();
float ry = (float)box.getCenterPixelY() / box.getPixHeight();
if (mapPosition == OsmandSettings.BOTTOM_CONSTANT) {
ry -= 0.35;
}
box.setCenterLocation(rx, ry);
LatLon screenCenter = box.getLatLonFromPixel(box.getPixWidth() / 2, box.getPixHeight() / 2);
mapRatioX = 0; mapRatioX = 0;
mapRatioY = 0; mapRatioY = 0;
if (originalRatioCenterLatLon != null) { setLatLon(screenCenter.getLatitude(), screenCenter.getLongitude());
setLatLon(originalRatioCenterLatLon.getLatitude(), originalRatioCenterLatLon.getLongitude());
originalRatioCenterLatLon = null;
}
} }
public boolean hasCustomMapRatio() { public boolean hasCustomMapRatio() {