Skip to content

Flickering clusters #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Flickering clusters #76

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c71fe4
Merge pull request #1 from lpetka/fix-clusteredmapview-getters
Mar 8, 2019
f17b5cf
Fixed accessor in onCluisterPress
lpetka Mar 11, 2019
8ff2370
Merge pull request #2 from lpetka/accessor-fix
Mar 11, 2019
8df90e9
Added method that preserves old cluster keys in order to stop rerende…
lpetka Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions ClusteredMapView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,32 @@ export default class ClusteredMapView extends PureComponent {
getClusteringEngine() {
return this.index
}

clustersComparator = ({
geometry: { coordinates: c1 },
properties: { point_count: pc1 }
}) => ({
geometry: { coordinates: c2 },
properties: { point_count: pc2 }
}) => {
return (
pc1 === pc2 &&
Math.abs(c1[0] - c2[0]) < Number.EPSILON &&
Math.abs(c1[1] - c2[1]) < Number.EPSILON
);
};

preserveUnchangedClusterIds(data) {
const prevClusters = this.state.data.filter(d => d.properties.cluster);
data.filter(d => d.properties.cluster).forEach(cluster => {
const comparator = this.clustersComparator(cluster);
const item = prevClusters.find(comparator);
if (item) {
cluster.properties.cluster_id = item.properties.cluster_id;
}
});
return data;
}

clusterize(dataset) {
this.index = new SuperCluster({ // eslint-disable-line new-cap
Expand All @@ -78,7 +104,7 @@ export default class ClusteredMapView extends PureComponent {
// load geopoints into SuperCluster
this.index.load(rawData)

const data = this.getClusters(this.state.region)
const data = this.preserveUnchangedClusterIds(this.getClusters(this.state.region));
this.setState({ data })
}

Expand All @@ -87,7 +113,7 @@ export default class ClusteredMapView extends PureComponent {
}

onRegionChangeComplete(region) {
let data = this.getClusters(region)
let data = this.preserveUnchangedClusterIds(this.getClusters(region));
this.setState({ region, data }, () => {
this.props.onRegionChangeComplete && this.props.onRegionChangeComplete(region, data)
})
Expand Down Expand Up @@ -116,7 +142,7 @@ export default class ClusteredMapView extends PureComponent {
markers = children.map(c => c.properties.item)

// fit right around them, considering edge padding
this.mapview.fitToCoordinates(markers.map(m => m.location), { edgePadding: this.props.edgePadding })
this.mapview.fitToCoordinates(markers.map(m => m[this.props.accessor]), { edgePadding: this.props.edgePadding })

this.props.onClusterPress && this.props.onClusterPress(cluster.properties.cluster_id, markers)
}
Expand Down