diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js
index 35aa1c52040c0073b194f77d0564b39e74bde88a..f725ea469d6b102c8d95dfe7cd5bcf32afca93c0 100644
--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js
@@ -1,287 +1,3 @@
-
-// Initialization
-function init() {
- callUpdateSci({id:"pickAnimalia", value:2}); // Propagate Dropdowns on Startup
- reqHistogram(2);
-}
-
-function resolveAny(obj) {
- if(obj.id === "pickPhylum"){
- return {id:"pickAnimalia", value:2};
- }
- else {
- if (Number(obj.previousElementSibling.value) === -1) {
- return resolveAny(obj.previousElementSibling);
- }
- else {
- return {id: obj.previousElementSibling.id, value: obj.previousElementSibling.value};
- }
- }
-}
-
-function callUpdateSci(object){
- var tagID = object.id;
- var taxID = Number(object.value);
-
- // Resolve "Any" option
- if (taxID === -1){
- var obj2 = resolveAny(object);
- tagID = obj2.id;
- taxID = Number(obj2.value);
- }
- reqBioLookup(tagID, taxID);
-}
-
-function populateDropdown(childTagID, nodeList, subnode){
- var x, y, content="";
- 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;
-}
-
-function updateSci(tagID, nodeList) {
- while (tagID !== "END"){
- switch (tagID){
- case "pickAnimalia":
- populateDropdown("pickPhylum", nodeList, "phylum");
- tagID = "pickPhylum";
- break;
-
- case "pickPhylum":
- populateDropdown("pickClass", nodeList, "class");
- tagID = "pickClass";
- break;
-
- case "pickClass":
- populateDropdown("pickOrder", nodeList, "order");
- tagID = "pickOrder";
- break;
-
- case "pickOrder":
- populateDropdown("pickFamily", nodeList, "family");
- tagID = "pickFamily";
- break;
-
- case "pickFamily":
- populateDropdown("pickGenus", nodeList, "genus");
- tagID = "pickGenus";
- break;
-
- case "pickGenus":
- populateDropdown("pickSpecies", nodeList, "species");
- tagID = "pickSpecies";
- break;
-
- case "pickSpecies":
- tagID = "END";
- break;
- }
- }
-}
-
-// This function will get the new nodelist from the server.
-// ParentId is the taxId of the node that holds the list of children we want.
-function reqBioLookup(tagID, parentId){
- var path = 'doBioLookup.do';
- var params = {taxId: Number(parentId)};
- var xhr = new XMLHttpRequest();
- xhr.open("POST", path);
- xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); //Send the proper header info
-
- xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
- // Update the dropdown when response is ready
- if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
- var nodeList = JSON.parse(this.responseText);
- updateSci(tagID, nodeList);
- }
- else{
- console.log("Server Response: Error"); //RME
- }
- };
-
- var jsonString= JSON.stringify(params); //generate JSON string
- xhr.send(jsonString); //send request to server
- // document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //RME
-}
-
-//This function will get the new nodelist from the server.
-//ParentId is the taxId of the node that holds the list of children we want.
-function reqHistogram(params){
- var path = 'doHist.do';
- var xhr = new XMLHttpRequest();
- xhr.open("POST", path);
- xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); //Send the proper header info
-
- xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
- // Update the dropdown when response is ready
- if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
- var nodeList = JSON.parse(this.responseText);
- histogram(nodeList["x"], nodeList["y"]);
- document.getElementById("outputDetails").innerHTML = "Found " + nodeList["n"] + " results " + "(" + nodeList["time"] + " seconds)<br> Total Population: " + nodeList["individualCount"];
- }
- else {
- console.log("Server Response: Error"); //RME
- }
- };
- xhr.send(params); //send request to server
- // document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //RME
- }
-
- //Returns the most general taxon group (leftmost)
-function getTaxGroup() {
- var tagID = "pickSpecies"
- var taxGroup = document.getElementById(tagID);
-
- while (true){
- console.log(taxGroup.value);
- if(taxGroup.value !== null && taxGroup.value !== "-1"){
- console.log("returning Animalia");
- return Number(taxGroup.value);
- }
- else if(tagID === "pickAnimalia"){
- console.log("in pick Animalia");
- return 2;
- }
- else{
- taxGroup = document.getElementById(tagID);
- console.log("Switching: " + tagID);
- switch (tagID){
- case "pickPhylum":
- tagID = "pickAnimalia";
- break;
-
- case "pickClass":
- tagID = "pickPhylum";
- break;
-
- case "pickOrder":
- tagID = "pickClass";
- break;
-
- case "pickFamily":
- tagID = "pickOrder";
- break;
-
- case "pickGenus":
- tagID = "pickFamily";
- break;
-
- case "pickSpecies":
- tagID = "pickGenus";
- break;
- }
- }
- }
-}
-
-
-function reqMap(params){
- var path = 'doMap.do';
- var xhr = new XMLHttpRequest();
- xhr.open("POST", path);
- xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); //Send the proper header info
-
- xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
- // Update the dropdown when response is ready
- if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
- var nodeList = JSON.parse(this.responseText);
- initMap(nodeList["latitude"], nodeList["longitude"]);
- // document.getElementById("outputDetails").innerHTML = "Found " + nodeList["n"] + " results " + "(" + nodeList["time"] + " seconds)<br> Total Population: " + nodeList["individualCount"];
- }
- else {
- console.log("Server Response: Error"); //RME
- }
- };
- xhr.send(params); //send request to server
- // document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //RME
-}
-
-// function reqHeat(params){
-// var path = 'doMap.do';
-// var xhr = new XMLHttpRequest();
-// xhr.open("POST", path);
-// xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); //Send the proper header info
-//
-// xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
-// // Update the dropdown when response is ready
-// if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
-// var nodeList = JSON.parse(this.responseText);
-// // initMap(nodeList["latitude"], nodeList["longitude"]);
-// document.getElementById("outputDetails").innerHTML = "Found " + nodeList["n"] + " results " + "(" + nodeList["time"] + " seconds)<br> Total Population: " + nodeList["individualCount"];
-// }
-// else {
-// console.log("Server Response: Error"); //RME
-// }
-// };
-// xhr.send(params); //send request to server
-// // document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //RME
-// }
-
-function callOutput(){
- var pickOutputType = document.getElementsByName('pickOutput');
- var outType, taxGroup, yearFrom, yearTo;
- // Get output selection: Map/Histogram
- for(var i = 0; i < pickOutputType.length; i++){
- if(pickOutputType[i].checked){
- console.log(pickOutputType[i].value); //RME
- outType = pickOutputType[i].value;
- }
- }
- taxGroup = getTaxGroup();
- yearFrom = $( "#slider-range" ).slider( "values", 0 );
- yearTo = $( "#slider-range" ).slider( "values", 1 );
-
- var params= JSON.stringify({taxId: Number(taxGroup), yearF: Number(yearFrom), yearT: Number(yearTo)});
-
- //Switch Output Display
- document.getElementById("histogram").style.display = "none";
- document.getElementById("map").style.display = "none";
- document.getElementById("heat").style.display = "none";
-
- if(outType === "histogram"){
- reqHistogram(params);
- document.getElementById("histogram").style.display = "block";
- }
- else if(outType === "map"){
- reqMap(params);
- document.getElementById("map").style.display = "block";
- }
- // else if(outType === "heat"){
- // reqHeat(params);
- // document.getElementById("heat").style.display = "block";
- // }
- // else{
- // console.log("Heatmap/Cluster")
- // }
-}
-
-
-
-// JQuery for Range Slider
-$( function() {
- $( "#slider-range" ).slider({
- range: true,
- min: 1960,
- max: 2016,
- values: [ 1960, 2016 ],
- slide: function( event, ui ) {
- $( "#fromtoYear" ).html(ui.values[ 0 ] + " - " + ui.values[ 1 ] )
- }
- });
- $( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
-} );
-
-=======
// Initialization
function init() {
callUpdateSci({id:"pickAnimalia", value:2}); // Propagate Dropdowns on Startup
@@ -422,7 +138,7 @@ function reqHistogram(params){
//Returns the most general taxon group (leftmost)
function getTaxGroup() {
- var tagID = "pickSpecies"
+ var tagID = "pickSpecies";
var taxGroup = document.getElementById(tagID);
while (true){