Merge pull request #1 from jeffdgr8/conditional-screen-based-algorithm-wrap

zamesilyasa · web-flow · commit 42e8df3752fa · 2017-02-03T18:55:01.000+02:00
Don't wrap Algorithm if already implements ScreenBasedAlgorithm
diff --git a/library/src/com/google/maps/android/clustering/ClusterManager.java b/library/src/com/google/maps/android/clustering/ClusterManager.java
@@ -111,7 +111,11 @@ public void setRenderer(ClusterRenderer<T> view) {
     }
 
     public void setAlgorithm(Algorithm<T> algorithm) {
-        setAlgorithm(new ScreenBasedAlgorithmAdapter<T>(algorithm));
+        if (algorithm instanceof ScreenBasedAlgorithm) {
+            setAlgorithm((ScreenBasedAlgorithm) algorithm);
+        } else {
+            setAlgorithm(new ScreenBasedAlgorithmAdapter<T>(algorithm));
+        }
     }
 
     public void setAlgorithm(ScreenBasedAlgorithm<T> algorithm) {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,11 @@ public void setRenderer(ClusterRenderer<T> view) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public void setAlgorithm(Algorithm<T> algorithm) {`
`114`		`- setAlgorithm(new ScreenBasedAlgorithmAdapter<T>(algorithm));`
	`114`	`+ if (algorithm instanceof ScreenBasedAlgorithm) {`
	`115`	`+ setAlgorithm((ScreenBasedAlgorithm) algorithm);`
	`116`	`+ } else {`
	`117`	`+ setAlgorithm(new ScreenBasedAlgorithmAdapter<T>(algorithm));`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`public void setAlgorithm(ScreenBasedAlgorithm<T> algorithm) {`