zoom coordinate calculation based on previous zoom

oedemis · Nov 10, 2013 · 4c198cb · 4c198cb
1 parent 7d6828d
commit 4c198cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/jfxtras/labs/map/CoordinatesConverter.java b/src/main/java/jfxtras/labs/map/CoordinatesConverter.java
@@ -50,6 +50,7 @@ private static int getZoom(Zoomable zoomable){
 		return zoomable.zoomProperty().get();
 	}
 
+	@Deprecated
 	public static Coordinate toCoordinate(Point mapPoint, Moveable controller) {
 		Dimension dim = new Dimension(controller.getMapWidth(), controller.getMapHeight());
 		Point center = controller.getCenter();

diff --git a/src/main/java/jfxtras/labs/map/MapPane.java b/src/main/java/jfxtras/labs/map/MapPane.java
@@ -433,6 +433,11 @@ private boolean isEdgeVisible() {
 	private Coordinate getCoordinate(Point p) {
 		return toCoordinate(p, this);
 	}
+
+	private Coordinate getCoordinate(Point p, int zoom) {
+		Dimension dim = new Dimension(getMapWidth(), getMapHeight());
+		return toCoordinate(p, center, dim, zoom);
+	}
 
 	public void setMapMarkerVisible(boolean mapMarkersVisible) {
 		this.mapMarkersVisible.set(mapMarkersVisible);
@@ -644,13 +649,17 @@ private class ZoomCoordinateCache{
 		private Coordinate zoomCoordinate;
 
 		Coordinate getZoomCoordinate(){
-//			if (zoomCoordinate == null) {
+			if (zoomCoordinate == null) {
 				Point p = createMapCenterPoint();
 				zoomCoordinate = getCoordinate(p);
-//			}
+			}
 			return zoomCoordinate;
 		}
 
+		void setZoomCoordinate(Coordinate coordinate){
+			this.zoomCoordinate = coordinate;
+		}
+
 		void clear() {
 			zoomCoordinate = null;
 		}
@@ -662,7 +671,11 @@ private class ZoomChangeListener implements ChangeListener<Number>{
 		@Override
 		public void changed(ObservableValue<? extends Number> ov,
 				Number oldVal, Number newVal) {
-			updateZoom(newVal.intValue());
+			if(oldVal != null){
+				Coordinate c = getCoordinate(createMapCenterPoint(), oldVal.intValue());
+				zoomCoordinateCache.setZoomCoordinate(c);
+				updateZoom(newVal.intValue());
+			}
 		}
 
 	}