#57 Added clustering toggle

ScaDS · May 18, 2016 · 77e2ee4 · 77e2ee4
1 parent f280dce
commit 77e2ee4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/rest_service/src/main/resources/static/scripts/controllers/controller.map.js b/rest_service/src/main/resources/static/scripts/controllers/controller.map.js
@@ -80,6 +80,7 @@
         var updateQueued = false;
         $scope.search.updateFilters = function () {
             if (!httpService.getLoading()) {
+                httpService.setLoading(true);
                 /**
                  * Pass the filters to the httpService
                  */
@@ -222,7 +223,7 @@
             /**
              * Reset all markers
              */
-            $scope.markers = {}
+            $scope.markers = {};
 
             /**
              * Iterate through tweets
@@ -241,16 +242,28 @@
                      * Create new marker then add to marker array
                      * @type {{id: *, lat: *, lng: *, focus: boolean, draggable: boolean, message: *, icon: {}}}
                      */
-                    var newMarker = {
-                        id: tweet.id,
-                        layer: 'cluster',
-                        lat: tweet.coordinates.coordinates[1],
-                        lng: tweet.coordinates.coordinates[0],
-                        focus: false,
-                        draggable: false,
-                        message: "@" + tweet.user.screen_name + ": " + tweet.text,
-                        // icon: $scope.icons.red
-                    };
+                    var newMarker = {}
+                    if($scope.clusteringEnabled) {
+                        newMarker = {
+                            id: tweet.id,
+                            layer: 'cluster',
+                            lat: tweet.coordinates.coordinates[1],
+                            lng: tweet.coordinates.coordinates[0],
+                            focus: false,
+                            draggable: false,
+                            message: "@" + tweet.user.screen_name + ": " + tweet.text,
+                        };
+                    } else {
+                        newMarker = {
+                            id: tweet.id,
+                            lat: tweet.coordinates.coordinates[1],
+                            lng: tweet.coordinates.coordinates[0],
+                            focus: false,
+                            draggable: false,
+                            message: "@" + tweet.user.screen_name + ": " + tweet.text,
+                            icon: $scope.icons.red
+                        };
+                    }
                     // $scope.markers.push(newMarker)
                     // $scope.markers.push(tweet.id + ": " +  newMarker)
                     $scope.markers[tweet.id] = newMarker;

diff --git a/rest_service/src/main/resources/static/views/mapView.html b/rest_service/src/main/resources/static/views/mapView.html
@@ -56,7 +56,8 @@
         </div>
     </div>
 
-    <div class="row alert alert-danger" uib-collapse="clickOnce = true" role="alert">
+    <div class="row alert alert-danger" uib-collapse="clickOnce" role="alert">
+        <label class="btn btn-danger btn-lsmg" ng-model="clusteringEnabled" uib-btn-checkbox btn-checkbox-true=true btn-checkbox-false=false ng-click="populateMarkers();">Clustering</label>
         <strong>[DEBUG]</strong>
         <button class="btn btn-danger btn-sm" ng-click="clickOnce = true;">Hide</button>
         <br>