fix set rotate

jiahuanyu · jiahuanyu · commit 134c0c865c16 · 2015-04-02T21:23:57.000+08:00
diff --git a/library/src/main/java/com/jiahuan/svgmapview/library/SVGMapController.java b/library/src/main/java/com/jiahuan/svgmapview/library/SVGMapController.java
@@ -115,7 +115,12 @@ public void setCurrentZoomValue(float zoom)
      */
     public void setCurrentRotationDegrees(float degrees)
     {
-        this.mapMainView.setCurrentRotationDegrees(degrees);
+        setCurrentRotationDegrees(degrees, mapMainView.getWidth() / 2, mapMainView.getHeight() / 2);
+    }
+
+    public void setCurrentRotationDegrees(float degrees, float pivotX, float pivotY)
+    {
+        this.mapMainView.setCurrentRotationDegrees(degrees, pivotX, pivotY);
     }
 
 
diff --git a/library/src/main/java/com/jiahuan/svgmapview/library/core/componet/MapMainView.java b/library/src/main/java/com/jiahuan/svgmapview/library/core/componet/MapMainView.java
@@ -402,13 +402,16 @@ public float getCurrentRotateDegrees()
         return this.currentRotateDegrees;
     }
 
-    public void setCurrentRotationDegrees(float degrees)
+    public void setCurrentRotationDegrees(float degrees, float pivotX, float pivotY)
     {
-        this.matrix.postRotate(-currentRotateDegrees + degrees);
-        this.rotateDegrees = this.currentRotateDegrees = degrees;
-        setCurrentRotateDegreesWithRule();
-        refresh();
-        mapCenter(true, true);
+        if (isRotationGestureEnabled)
+        {
+            this.matrix.postRotate(-currentRotateDegrees + degrees, pivotX, pivotY);
+            this.rotateDegrees = this.currentRotateDegrees = degrees;
+            setCurrentRotateDegreesWithRule();
+            refresh();
+            mapCenter(true, true);
+        }
     }
 
     public float getCurrentZoomValue()
@@ -453,41 +456,6 @@ public void setMinZoomValue(float minZoomValue)
         this.minZoomValue = minZoomValue;
     }
 
-    public void zoomBy(float zoomRatio, float pivotX, float pivotY)
-    {
-        float zoom = getCurrentZoomValue();
-        float zoomdis = zoomRatio;
-        if (zoomRatio > 1)
-        {
-            if (zoomRatio * zoom > maxZoomValue)
-            {
-                zoomdis = maxZoomValue / zoom;
-                zoom = maxZoomValue;
-            }
-            else
-            {
-                zoom *= zoomRatio;
-                zoomdis = zoomRatio;
-            }
-        }
-        else if (zoomRatio < 1)
-        {
-            if (zoom * zoomRatio < minZoomValue)
-            {
-                zoomdis = minZoomValue / zoom;
-                zoom = minZoomValue;
-            }
-            else
-            {
-                zoom *= zoomRatio;
-                zoomdis = zoomRatio;
-            }
-        }
-        this.zoom = this.currentZoom = zoom;
-        this.matrix.postScale(zoomdis, zoomdis, pivotX, pivotY);
-        this.refresh();
-    }
-
 
     public float[] getMapCoordinateWithScreenCoordinate(float x, float y)
     {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,12 @@ public void setCurrentZoomValue(float zoom)`
`115`	`115`	`*/`
`116`	`116`	`public void setCurrentRotationDegrees(float degrees)`
`117`	`117`	`{`
`118`		`- this.mapMainView.setCurrentRotationDegrees(degrees);`
	`118`	`+ setCurrentRotationDegrees(degrees, mapMainView.getWidth() / 2, mapMainView.getHeight() / 2);`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ public void setCurrentRotationDegrees(float degrees, float pivotX, float pivotY)`
	`122`	`+ {`
	`123`	`+ this.mapMainView.setCurrentRotationDegrees(degrees, pivotX, pivotY);`
`119`	`124`	`}`
`120`	`125`
`121`	`126`