Skip to content

[fix] Prevent Overlapping of Clusters in netjsongraph.js #171 #349

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.

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 115 commits into
base: stramlining-map-rendering
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
38a34d4
Refactor CSS for consistency and clarity
cestercian Mar 1, 2025
5ad2983
Merge branch 'master' into master
cestercian Mar 5, 2025
f314caa
Create netjson-cluster-overlap.html
cestercian Mar 12, 2025
09005af
Update netjsongraph.util.js
cestercian Mar 12, 2025
02682ae
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Mar 12, 2025
c02b4ad
Revert "Create netjson-cluster-overlap.html"
cestercian Mar 12, 2025
659b2d6
Reapply "Create netjson-cluster-overlap.html"
cestercian Mar 12, 2025
61fe412
Revert "Reapply "Create netjson-cluster-overlap.html""
cestercian Mar 12, 2025
ff949d7
Reapply "Reapply "Create netjson-cluster-overlap.html""
cestercian Mar 19, 2025
d62d97b
Update index.html
cestercian Mar 19, 2025
a84b1fe
Create netjson-cluster-overlap.html
cestercian Mar 19, 2025
cc0722d
Update netjson-cluster-overlap.html
cestercian Mar 20, 2025
ffc2a0c
Update index.html
cestercian Mar 20, 2025
61a9d91
Update index.html
cestercian Mar 22, 2025
87e82af
Merge branch 'master' into master
cestercian Mar 22, 2025
d3c5c82
Update netjson-cluster-overlap.html
cestercian Mar 22, 2025
882b22c
Update netjson-cluster-overlap.html
cestercian Mar 22, 2025
4579f8b
Update netjson-cluster-overlap.html
cestercian Mar 22, 2025
fc182c7
Update netjson-cluster-overlap.html
cestercian Mar 22, 2025
3f38efd
Update netjson-cluster-overlap.html
cestercian Mar 23, 2025
09f2814
Merge branch 'master' into master
nemesifier Mar 24, 2025
3c0e099
Update netjson-cluster-overlap.html
cestercian Mar 25, 2025
4deeb11
Update netjson-cluster-overlap.html
cestercian Mar 26, 2025
9a23460
Update netjson-cluster-overlap.html
cestercian Mar 26, 2025
9477fe2
Create clusterUtils.js
cestercian Mar 26, 2025
7c2359a
Update netjson-cluster-overlap.html
cestercian Mar 26, 2025
68d9cf9
Update README.md
cestercian Mar 26, 2025
662f6f8
Update README.md
cestercian Mar 26, 2025
52592f6
Update netjson-cluster-overlap.html
cestercian Mar 27, 2025
04679a3
Update .gitignore
cestercian Mar 27, 2025
1ac4463
Update netjson-cluster-overlap.html
cestercian Mar 27, 2025
f445098
Update netjsongraph.config.js
cestercian Mar 27, 2025
20ff2fa
Update netjson-cluster-overlap.html
cestercian Mar 27, 2025
0370da1
Merge branch 'master' into master
cestercian Apr 2, 2025
2206e70
[fix] Netjsongraph.js
cestercian Apr 3, 2025
47213da
[fix] Formatting
cestercian Apr 3, 2025
baa2a04
[fix] netjson-cluster-overlap.html
cestercian Apr 10, 2025
4d70d61
[fix] Netjson cluster overlap.html
cestercian Apr 10, 2025
1b42afd
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Apr 10, 2025
3db782c
[fix] Netjson-cluster-overlap.html
cestercian Apr 10, 2025
1bbc178
Merge branch 'master' into master
cestercian Apr 11, 2025
3b1ad94
Update netjson-clustering.html
cestercian Apr 11, 2025
a287629
[fix] Clustering.html
cestercian Apr 11, 2025
8f8a394
[fix] Index.html
cestercian Apr 11, 2025
73d96c5
[fix] Gitignore
cestercian Apr 11, 2025
ce4313d
[fix] Readme.md
cestercian Apr 11, 2025
32d052c
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Apr 11, 2025
9986a39
[fix] Merge master into feature-branch
cestercian Apr 11, 2025
26e5f67
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Apr 11, 2025
3077a5c
[fix] Readme
cestercian Apr 11, 2025
664e8d4
[fix] Readme
cestercian Apr 12, 2025
8106dbd
[fix] Readme
cestercian Apr 12, 2025
63aaa20
[fix] Netjson-clustering.html
cestercian Apr 12, 2025
455aeb1
Merge branch 'master' into master
cestercian Apr 15, 2025
f4451e8
[fix] Netjson-clustering.html
cestercian Apr 17, 2025
737e393
Update netjsongraph.render.js
cestercian Apr 22, 2025
1656537
Update netjsongraph.config.js
cestercian Apr 22, 2025
c60ad0a
[fix] Netjsongraph.render.js
cestercian Apr 22, 2025
f9a5441
[fix] Netjsongraph.js
cestercian Apr 22, 2025
ce05edf
[fix] Netjsongraph.js
cestercian Apr 22, 2025
81a44b5
[fix] Netjsongraph.spec.js
cestercian Apr 22, 2025
6b6a604
[fix] Netjsongraph.spec.js
cestercian Apr 22, 2025
122fc12
[fix] Netjsongraph.js
cestercian Apr 22, 2025
71e004d
[fix] Netjsongraph.render.js
cestercian Apr 23, 2025
be2e4c6
Revert "[fix] Netjsongraph.render.js"
cestercian Apr 23, 2025
572155f
[fix] Netjsongraph.render.js
cestercian Apr 23, 2025
fd5b529
[change] Netjsongraph.js
cestercian Apr 23, 2025
46390b0
[fix] Formatting
cestercian Apr 23, 2025
d8e7ec6
[fix] Netjson-clustering.html
cestercian Apr 24, 2025
6b60948
[fix] Netjson-clustering.html
cestercian Apr 24, 2025
ab8af74
[change] Removed Comments
cestercian Apr 24, 2025
3a8fd56
[fix] Prettier
cestercian Apr 24, 2025
401de7f
[fix] Netjsongraph.config.js
cestercian Apr 26, 2025
09bc435
[fix] Prettier
cestercian Apr 26, 2025
f7acfcc
[fix] Netjsongraph.render.test.js
cestercian Apr 26, 2025
273f5ac
[fix] Netjsongraph.render.test.js
cestercian Apr 26, 2025
fd0e1bb
Revert "[fix] Netjsongraph.render.test.js"
cestercian Apr 26, 2025
8369683
[fix] Netjsongraph.render.test.js
cestercian Apr 26, 2025
f37ac79
[fix] Eslint
cestercian Apr 26, 2025
08681ff
Merge branch 'master' into master
cestercian May 3, 2025
a79eeec
[fix] Cluster-utlis.js
cestercian May 5, 2025
12b3437
[fix] Netjsongraph.render.js
cestercian May 5, 2025
250a437
[fix] Netjsongraph.render.js
cestercian May 10, 2025
0faba71
Merge branch 'master' into master
nemesifier May 16, 2025
a53f590
[change] Netjsongraph.util.js
cestercian May 26, 2025
cf06552
[change] Revert changes in Netjsongraph.util.js
cestercian May 27, 2025
c76b2d8
Merge branch 'master' into master
cestercian May 30, 2025
200d9f2
[fix] Cluster Overlap
cestercian Jun 2, 2025
c3146ef
Merge branch 'master' into master
cestercian Jun 3, 2025
52ddb86
[change] Refine Changes
cestercian Jun 3, 2025
036c042
[fix] Updated Test cases
cestercian Jun 4, 2025
3a05bc2
[fix] Prettier format
cestercian Jun 4, 2025
53188d8
[fix] Updated clustering logic
cestercian Jun 5, 2025
8c2a572
[fix] Update netjson-clustering.html
cestercian Jun 12, 2025
c8d82dd
[fix] Netjsongraph.util.js
cestercian Jun 12, 2025
ed6a30c
[fix] Zoom function on clicking clusters
cestercian Jun 16, 2025
41cfb93
[fix] Prettier
cestercian Jun 16, 2025
cd8c16d
[chores] Added inline comments
cestercian Jun 18, 2025
dd0cc05
[fix] Clustering logic
cestercian Jun 24, 2025
6b2c070
[change] Updated test cases for the new clustering logic
cestercian Jun 24, 2025
88b7d95
[fix] Qa-checks
cestercian Jun 24, 2025
7df045b
[fix] Qa-checks
cestercian Jun 24, 2025
96abea3
Merge branch 'master' into master
cestercian Jul 2, 2025
d84c9c0
[fix] Created JSON file for exteranl data
cestercian Jul 4, 2025
57fa156
[fix] Updated netjson-clustering.html
cestercian Jul 4, 2025
26cff99
[change] Streamlined map rendering logic
cestercian Jul 9, 2025
0fb5372
Revert "[change] Streamlined map rendering logic"
cestercian Jul 9, 2025
761e8a2
[fix] Streamlining map rendering logic
cestercian Jul 10, 2025
4aaecad
feat: Add node clustering in map view
cestercian Jul 17, 2025
7b2fb66
Merge branch 'stramlining-map-rendering' into master
cestercian Jul 17, 2025
7adb7a1
Merge branch 'stramlining-map-rendering' into master
cestercian Jul 18, 2025
03628ca
Merge branch 'stramlining-map-rendering' into master
cestercian Jul 22, 2025
c7c21be
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Jul 22, 2025
1d1baa3
Merge branch 'stramlining-map-rendering' into master
cestercian Jul 22, 2025
746143b
Merge branch 'master' of https://github.com/cestercian/netjsongraph.js
cestercian Jul 22, 2025
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
20 changes: 5 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,23 +407,13 @@ const netjson = geojsonToNetjson(myGeoJSON);
No action is required for most users; these changes simply make the internal
flow clearer and easier to maintain.

### API Introduction
## Automatic Cluster Overlap Prevention

#### Core
When multiple clusters of different categories share identical coordinates, NetJSONGraph now **automatically** offsets them in a circular pattern (pixel-space repulsion). No extra utilities or configuration flags are required—simply enable clustering with a `clusteringAttribute`, and the library handles overlap for you.

- `setConfig`
See the [Cluster Overlap Example](./examples/netjson-clustering.html) to view the result.

Method to set the configuration of the graph. You can use this function to add, update or modify the configuration of the graph.

- `setUtils`

Method to set the utils of the graph. You can use this function to add, update the utils.

- `render`

Method to render the graph.

#### Realtime Update
## Realtime Update

We use [socket.io](https://socket.io/) to monitor data changes which supports WebSockets and Polling. You can call `JSONDataUpdate` when the data change event occurs and pass the data to update the view.

Expand Down Expand Up @@ -830,7 +820,7 @@ Using array files to append data step by step at start.
Similiar to the first method, but easier.
[ Append data using arrays demo](https://openwisp.github.io/netjsongraph.js/examples/netjsonmap-appendData2.html)

The demo shows the clustering of nodes.
The demo shows how to handle overlapping clusters with different statuses.
[ Clustering demo](https://openwisp.github.io/netjsongraph.js/examples/netjson-clustering.html)

### Upgrading from 0.1.x versions to 0.2.x
Expand Down
Loading