eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

change order in auto-zoom to first panTo(), second setZoom() to keep focus of interest in visible area;

Browse Source
This commit is contained in:
Christopher Ronnewinkel (D036654) committed 2014-08-07 17:31:01 +02:00
1 parent dc649d4dcd
commit 00be42ab3e
1 file changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+10 -7
View File
@@ -282,7 +282,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
private int currentZoomLevel;
private boolean autoZooming = false;
private LatLngBounds newLatLngBounds;
private int autoZoomLevel;
private WindStreamletsRaceboardOverlay streamletOverlay;
private final boolean showViewStreamlets;
@@ -372,9 +372,11 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
map.addZoomChangeHandler(new ZoomChangeMapHandler() {
@Override
public void onEvent(ZoomChangeMapEvent event) {
// stop automatic zoom after a manual zoom event; automatic zoom in zoomMapToNewBounds will restore old settings
final List<RaceMapZoomSettings.ZoomTypes> emptyList = Collections.emptyList();
settings.getZoomSettings().setTypesToConsiderOnZoom(emptyList);
if (!autoZooming) {
// stop automatic zoom after a manual zoom event; automatic zoom in zoomMapToNewBounds will restore old settings
final List<RaceMapZoomSettings.ZoomTypes> emptyList = Collections.emptyList();
settings.getZoomSettings().setTypesToConsiderOnZoom(emptyList);
}
}
});
map.addDragEndHandler(new DragEndMapHandler() {
@@ -389,7 +391,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
@Override
public void onEvent(IdleMapEvent event) {
if (autoZooming) {
map.panTo(newLatLngBounds.getCenter());
map.setZoom(autoZoomLevel);
autoZooming = false;
}
}
@@ -1224,7 +1226,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
// only change bounds if the new bounds don't fit into the current map zoom
List<ZoomTypes> oldZoomSettings = settings.getZoomSettings().getTypesToConsiderOnZoom();
setAutoZoomInProgress(true);
newLatLngBounds = BoundsUtil.getAsLatLngBounds(newBounds);
LatLngBounds newLatLngBounds = BoundsUtil.getAsLatLngBounds(newBounds);
int newZoomLevel = getZoomLevel(newLatLngBounds);
if (newZoomLevel != map.getZoom()) {
// remove the canvas animations for boats
@@ -1236,7 +1238,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
infoOverlay.removeCanvasPositionAndRotationTransition();
}
autoZooming = true;
map.setZoom(newZoomLevel);
autoZoomLevel = newZoomLevel;
map.panTo(newLatLngBounds.getCenter());
} else {
map.panTo(newLatLngBounds.getCenter());
}