Merge branch 'web' of git@gitlab.cas.mcmaster.ca:schankuc/2XB3.git into

web

Conflicts:
	src/search/BasicSearchResult.java

src/search/BasicSearchResult.java

@@ -3,7 +3,11 @@ package search;
 import java.util.ArrayList;
 
 import data.Record;
+<<<<<<< HEAD
 import sort.GeneralRange;
+=======
+import java.lang.Math;
+>>>>>>> branch 'web' of git@gitlab.cas.mcmaster.ca:schankuc/2XB3.git
 
 public class BasicSearchResult {
 	private ArrayList<Record> results;
@@ -12,13 +16,18 @@ public class BasicSearchResult {
 	private Integer sum;
 	private 
 	
+	public static void main(String[] args) {
+		
+		//Graph g = new Graph();
+	}
+	
 	public BasicSearchResult(ArrayList<Record> results, double time) {
 		this.results = results;
 		this.time = time;
 	}
 
 	public Iterable<Record> results() {
-		return (Iterable<Record>) results;
+		return (Iterable<Record>) results; 
 	}
 	
 	public int n() {
@@ -44,6 +53,7 @@ public class BasicSearchResult {
 		return this.sum;
 	}
 	
+<<<<<<< HEAD
 	/**
 	 * 
 	 * @param area
@@ -55,4 +65,14 @@ public class BasicSearchResult {
 	private ArrayList<GeneralRange> ranges(double lat, double lon, double area){
 		ArrayList<GeneralRange>()
 	}
+=======
+	private double lngRange(double dist, double lat){
+		return dist/(Math.cos(lat)*222);
+	}
+	
+	private double latRange(double dist){
+		return (dist/111)/2;
+	}
+	
+>>>>>>> branch 'web' of git@gitlab.cas.mcmaster.ca:schankuc/2XB3.git
 }

src/search/Graph.java

@@ -8,13 +8,7 @@ public class Graph {
 	
 	public static void main(String[] args) {
 		
-		Graph g = new Graph(5);
-		g.addEdge(4, 3);
-		g.addEdge(2, 3);
-		g.addEdge(1, 2);
-		g.addEdge(0, 2);
-		for(int i = 0; i < 5; i++)
-			System.out.println(g.adj(i));
+		
 	}
 	
 	public Graph(int V){

tomcat/webapps/Trawl/script.js

@@ -33,11 +33,18 @@ function callUpdateSci(object){
 
 function populateDropdown(childTagID, nodeList, subnode){
     var x, y, content="";
-    for (var i in nodeList[subnode]["taxonName"]){
-        x = nodeList[subnode]["taxonId"][i];
-        y = nodeList[subnode]["taxonName"][i];
-        content += '"<option value="' + x + '">' + y + '</option>';
+    console.log(nodeList[subnode]);
+    if(nodeList[subnode] != null){
+        for (var i in nodeList[subnode]["taxonName"]){
+            x = nodeList[subnode]["taxonId"][i];
+            y = nodeList[subnode]["taxonName"][i];
+            content += '"<option value="' + x + '">' + y + '</option>';
+        }
     }
+    // else {
+    //     content
+    // }
+
     document.getElementById(childTagID).innerHTML = content;
 }