DefaultClusterRenderer, check for mAnimate done sooner #337
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a bug where if a cluster already has a marker on the map when
a cluster operation occurs, the cluster would add a new marker without
reusing the existing marker. The new marker would update the mapping to
mClusterToMarker, adding a new mapping in mMarkerToCluster, while
leaving the old marker mapped in mMarkerToCluster. When the old marker
is then removed, it also removes the new marker's mapping in
mClusterToMarker.
This results in there no longer existing a mapping for the cluster in
mClusterToMarker and getMarker() returns null. If
OnClusterClickListener.onClusterClick() wants to do something like this:
public boolean onClusterClick(Cluster<ClusterItem> cluster) {
Marker marker = mClusterRenderer.getMarker(cluster);
marker.showInfoWindow(); <-- NullPointerException
}
it is unable.
This is easily reproducible by zooming on the map such that the clusters
don't change at all but a new cluster operation occurs. All of the
clusters that did not change at all will have the described issue.
The change uses the same pattern as cluster item uses to reuse an
existing marker for a cluster if it already exists, rather than creating
a new one and removing the old one. This ensures mClusterToMarker and
mMarkerToCluster are always the same size.
Also removed the OnInfoWindowClickListeners in onRemove() the same as
OnMarkerClickListeners. Both are added in onAdd().
Also, as mMap.getProjection() is annotated as @nonnull, the check for
projection == null was unneccesary.
This avoids redundantly finding clusters that are close by when they're not needed for animation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This avoids redundantly finding clusters that are close by when they're not needed for animation.