final draft of working clustering on the website!

src/search/RecordCluster.java

@@ -18,7 +18,7 @@ public class RecordCluster {
 	
 	public void addRecord(Record r) {
 		records.add(r);
-		individualCount++;
+		individualCount+=r.getCount();
 	}
 	
 	public Iterable<Record> records(){
@@ -30,7 +30,7 @@ public class RecordCluster {
 	}
 	
 	public int getCount() {
-		return records.size();
+		return individualCount;
 	}
 	
 	public Point centroid() {

tomcat/webapps/Trawl/cluster.js

@@ -23,9 +23,9 @@ function setCluster(map, lati, longi,n, individualCount) {
         var marker = new google.maps.Marker({position: new google.maps.LatLng(lati[i], longi[i]), map: map});
         // var content = "point numero" + i;
         var content = '<div>' +
-			'Name:' + name[i] +
-            '<br>Cluster Count: ' + n[i]+
-            '<br>Individual Count:' + individualCount[i] + '</div></div>';
+			'<b>Cluster #</b>' + i +
+            '<br><b>Record Count</b>: ' + n[i]+
+            '<br><b>Individual Count</b>: ' + individualCount[i] + '</div></div>';
 		var infowindow = new google.maps.InfoWindow();
 
         google.maps.event.addListener(marker,'click', (function(marker,content,infowindow){
@@ -38,7 +38,6 @@ function setCluster(map, lati, longi,n, individualCount) {
                 infowindow.open(map,marker);
             };
         })(marker,content,infowindow));
-        console.log(i);
 	}
 }
 

tomcat/webapps/Trawl/cluster.jsp

@@ -22,23 +22,27 @@
 		JSONObject js = new JSONObject();
 		JSONArray longitude = new JSONArray();
 		JSONArray latitude = new JSONArray();
-		JSONArray count = new JSONArray();
+		JSONArray individualCount = new JSONArray();
+		JSONArray recordCount = new JSONArray();
 		
 		// Update value of each JSON Object/Array at the same index as the corresponding Record in Result input
 		for (RecordCluster rc: clusters){
-			Point centroid = rc.centroid();
-			
-			longitude.add(centroid.getX());
-			latitude.add(centroid.getY());
-			JSONObject dateobj = new JSONObject();
-			count.add(rc.getCount());
+			if (rc.N() > 1){
+				Point centroid = rc.centroid();
+				
+				longitude.add(centroid.getX());
+				latitude.add(centroid.getY());
+				JSONObject dateobj = new JSONObject();
+				individualCount.add(rc.getCount());
+				recordCount.add(rc.N());
+			}
 		}
 	
 		// Insert JSON Array and Objects into main Object
 		js.put("latitude", latitude);
 		js.put("longitude", longitude);
-		js.put("n", count);
-		js.put("individualCount", result.sum());
+		js.put("n", recordCount);
+		js.put("individualCount", individualCount);
 		js.put("time", result.time());
 
 		out.print(js.toJSONString());

tomcat/webapps/Trawl/infoWindow.js

@@ -37,7 +37,6 @@ function setMarkers(map, lati, longi,name, date, individualCount) {
                 infowindow.open(map,marker);
             };
         })(marker,content,infowindow));
-        console.log(i);
 	}
 }