Merge pull request #130 from clburlison/add-cluster-options

feat: More cluster options

Author: versx

src/config.example.json

@@ -14,7 +14,10 @@
         "minZoom": 10,
         "maxZoom": 18,
         "clusters": {
-            "pokemon": true
+            "pokemon": true,
+            "gyms": true,
+            "pokestops": true,
+            "zoomLevel": 13
         },
         "filters": {
             "gyms": true,

src/data/default.js

@@ -12,6 +12,9 @@ data.pokemon_count = config.map.maxPokemonId;
 data.google_analytics_id = config.google.analytics;
 data.google_adsense_id = config.google.adsense;
 data.cluster_pokemon = config.map.clusters.pokemon;
+data.cluster_gyms = config.map.clusters.gyms;
+data.cluster_pokestops = config.map.clusters.pokestops;
+data.cluster_zoom_level = config.map.clusters.zoomLevel;
 data.scouting = config.scouting.enabled;
 data.scouting_url = config.scouting.url;
 data.scouting_count = config.scouting.maxScouts;
@@ -34,4 +37,4 @@ data.default_show_scanareas = config.map.filters.scanAreas;
 data.default_show_devices = config.map.filters.devices;
 data.pokemon_rarity_json = JSON.stringify(rarity);
 
-module.exports = data;
+module.exports = data;

src/views/index-js.mustache

@@ -102,11 +102,13 @@ let deviceOnlineIcon;
 let deviceOfflineIcon;
 
 let clusterPokemon = '{{cluster_pokemon}}' === 'true';
+let clusterGyms = '{{cluster_gyms}}' === 'true';
+let clusterPokestops = '{{cluster_pokestops}}' === 'true';
 let tileLayer;
 let nestLayer = new L.LayerGroup();
 let scanAreaLayer = new L.LayerGroup();
 let clusters = L.markerClusterGroup({
-    disableClusteringAtZoom: 13,
+    disableClusteringAtZoom: '{{cluster_zoom_level}}',
     removeOutsideVisibleBounds: true
 });
 
@@ -1116,33 +1118,43 @@ function initMap () {
                 if (newShowRaids && gym.raid_end_timestamp >= ts) {
                     newGymMarkers.push(gym);
                 } else {
-                    map.removeLayer(gym.marker);
+                    if (clusterGyms) {
+                        clusters.removeLayer(gym.marker);
+                    } else {
+                        map.removeLayer(gym.marker);
+                    }
                 }
             });
 
             gymMarkers = newGymMarkers;
         }
         if (newShowPokemon !== showPokemon) {
-            if (clusterPokemon) {
-                $.each(pokemonMarkers, function (index, pokemon) {
+            $.each(pokemonMarkers, function (index, pokemon) {
+                if (clusterPokemon) {
                     clusters.removeLayer(pokemon.marker);
-                });
-            } else {
-                $.each(pokemonMarkers, function (index, pokemon) {
+                } else {
                     map.removeLayer(pokemon.marker);
-                });
-            }
+                }
+            });
             pokemonMarkers = [];
         }
         if (newShowRaids !== showRaids) {
             $.each(gymMarkers, function (index, gym) {
-                map.removeLayer(gym.marker);
+                if (clusterGyms) {
+                    clusters.removeLayer(gym.marker);
+                } else {
+                    map.removeLayer(gym.marker);
+                }
             });
             gymMarkers = [];
         }
         if (newShowPokestops !== showPokestops && newShowPokestops === false) {
             $.each(pokestopMarkers, function (index, pokestop) {
-                map.removeLayer(pokestop.marker);
+                if (clusterPokestops) {
+                    clusters.removeLayer(pokestop.marker);
+                } else {
+                    map.removeLayer(pokestop.marker);
+                }
             });
             pokestopMarkers = [];
         }
@@ -1211,21 +1223,23 @@ function initMap () {
 
         pokemonFilter = pokemonFilterNew;
         const newPokemonMarkers = [];
-        if (clusterPokemon) {
-            $.each(pokemonMarkers, function (index, pokemon) {
+        $.each(pokemonMarkers, function (index, pokemon) {
+            if (clusterPokemon) {
                 clusters.removeLayer(pokemon.marker);
-            });
-        } else {
-            $.each(pokemonMarkers, function (index, pokemon) {
+            } else {
                 map.removeLayer(pokemon.marker);
-            });
-        }
+            }
+        });
         pokemonMarkers = newPokemonMarkers;
 
         questFilter = questFilterNew;
         const newPokestopMarkers = [];
         $.each(pokestopMarkers, function (index, pokestop) {
-            map.removeLayer(pokestop.marker);
+            if (clusterPokestops) {
+                clusters.removeLayer(pokestop.marker);
+            } else {
+                map.removeLayer(pokestop.marker);
+            }
         });
         pokestopMarkers = newPokestopMarkers;
 
@@ -1246,7 +1260,11 @@ function initMap () {
 
         const newGymMarkers = [];
         $.each(gymMarkers, function (index, gym) {
-            map.removeLayer(gym.marker);
+            if (clusterGyms) {
+                clusters.removeLayer(gym.marker);
+            } else {
+                map.removeLayer(gym.marker);
+            }
         });
         gymMarkers = newGymMarkers;
 
@@ -1836,7 +1854,11 @@ function loadData () {
                         const marker = getGymMarker(gym, ts);
                         gym.marker = marker;
                         gymMarkers.push(gym);
-                        gym.marker.addTo(map);
+                        if (clusterGyms) {
+                            clusters.addLayer(gym.marker);
+                        } else {
+                            gym.marker.addTo(map);
+                        }
                         if (gym.raid_end_timestamp >= ts) {
                             startRaidTimer(gym, ts);
                             gym.raidTimerSet = true;
@@ -1913,7 +1935,11 @@ function loadData () {
                     if (oldPokestop === undefined) {
                         pokestop.marker = getPokestopMarker(pokestop, ts);
                         pokestopMarkers.push(pokestop);
-                        pokestop.marker.addTo(map);
+                        if (clusterPokestops) {
+                            clusters.addLayer(pokestop.marker);
+                        } else {
+                            pokestop.marker.addTo(map);
+                        }
                         if (pokestop.lure_expire_timestamp >= ts) {
                             pokestop.willUpdate = true;
                             startPokestopTimer(pokestop, pokestop.lure_expire_timestamp, ts);
@@ -2424,7 +2450,11 @@ function startRaidTimer (gym, ts) {
                 gymMarkers = gymMarkers.filter(function (obj) {
                     return obj.id !== realGym.id;
                 });
-                map.removeLayer(realGym.marker);
+                if (clusterGyms) {
+                    clusters.removeLayer(realGym.marker);
+                } else {
+                    map.removeLayer(realGym.marker);
+                }
             } else {
                 realGym.marker.setIcon(getGymMarkerIcon(realGym, ts2 + 1));
             }