MERGE

f6cfdc33 · Ray Liu · 3d0208a7 · f6cfdc33 · f6cfdc33 · f6cfdc33
Commit f6cfdc33 authored 7 years ago by Ray Liu
--- a/tomcat/webapps/Trawl/WEB-INF/web.xml
+++ b/tomcat/webapps/Trawl/WEB-INF/web.xml
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
         version="2.4">
    <servlet>
        <servlet-name>Trawl</servlet-name>
        <servlet-class>web.Director</servlet-class>
    </servlet>
    <servlet-mapping>
        <servlet-name>Trawl</servlet-name>
        <url-pattern>/doBioLookup.do</url-pattern>
        <url-pattern>/doHist.do</url-pattern>
        <url-pattern>/doMap.do</url-pattern>
    </servlet-mapping>
 </web-app>
\ No newline at end of file
--- a/tomcat/webapps/Trawl/index.jsp
+++ b/tomcat/webapps/Trawl/index.jsp
 <%@ page import="java.util.*" %>
 <!--
 Double Handle Slider Modified from: http://jqueryui.com/slider/#range
 -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="keywords" content="insert, some, keywords"> <!--TODO-->
    <meta name="description" content="insert a description"> <!--TODO-->
    <title>TrawlExpert</title>
    <link rel="stylesheet" type="text/css" href="style.css">
    <!--JQuery-->
    <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
    <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
    <script src="histogram.js"></script>
    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyA9xCYy2Co-0GWfHT8e1smTjIneNbWSfPgY&libraries=visualization"></script>
    <script src="map.js"></script>
    <script src="infoWindow.js"></script>
    <script src="infoGenerator.js"></script>
    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
    <!-- MUST load JQuery Library before loading this-->
    <script src="script.js"></script>
    <!--Fonts-->
    <!--Open Sans Rg-400/Semi-600/Bd-700-->
    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
    <!--Plugins-->
 </head>
 <body>
    <header>
        <div class="headerWrapper">
            <a href="index.jsp" >TrawlExpert</a>
            <span class="nav-bar">
                <a href="about.html">About</a> |
                <a href="index.html" target="_blank">GitHub</a>
            </span>
        </div>
    </header>
    <section id="main">
        <section id="formWrapper">
            <section id="pickSciRanks">
                Phylum:
                <select name="pickSciR" id="pickPhylum" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
                Class:
                <select name="pickSciR" id="pickClass" size="1" onChange="callUpdateSci(this)"><%--<option value="00">Arthropoda</option>--%></select>
                Order:
                <select name="pickSciR" id="pickOrder" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
                Family:
                <select name="pickSciR" id="pickFamily" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
                Genus:
                <select name="pickSciR" id="pickGenus" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
                Species:
                <select name="pickSciR" id="pickSpecies" size="1"><!--Dynamically Filled--></select>
            </section>
            <section id="yearIn">
                Year Range:
                <span id="fromtoYear"></span>
                <form>
                    <div id="slider-range"></div>
                </form>
            </section>
            <section id="outputIn">
                <%--Map and Histogram must have the same name for default checkbox to function correctly--%>
                <input type="radio" name="pickOutput" value="map"> Map
                <input type="radio" name="pickOutput" value="heat"> Heatmap
                <input type="radio" name="pickOutput" value="histogram" checked> Histogram
                <button type="button" onClick="callOutput()">Load</button>
                <button type="button" onClick="">View Individual Records</button> <!--To records.html-->
            </section>
        </section>
        <section id="outputWrapper">
            <section id="outputDetails">
                <!--  Stuff like population count, entries found, etc. go here -->
            </section>
            <section id="outputBox"><!--  Map, Histogram Box. Histogram selected by default but we might want to have a loading screen instead.-->
                <div display="none" id="histogram"></div>
                <div display="none" id="map"></div>
                <div display="none" id="heat"></div>
                <%--<div id="console">~~~ PSEUDO-CONSOLE ~~~<br></div>--%>
            </section>
        </section>
    </section>
 </body>
 </html>
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -5,7 +5,7 @@
 // When the user clicks the marker, an info window opens
 function initInfo(lati, longi,info) {
-	for(int i=0; i < lati.length; i++){
+	for(var i=0; i < lati.length; i++){
 		// Generate map centred at Great Lakes
 		  var map = new google.maps.Map(document.getElementById('map'), {

--- a/tomcat/webapps/Trawl/map.js
+++ b/tomcat/webapps/Trawl/map.js
@@ -61,7 +61,7 @@ function changeOpacity() {
 // Input latitude and longitude into map points
 function getPoints(latitude, longitude) {
 	var result = [];
-	for (int i = 0 ; i < latitude.length ; i++) {
+	for (var i = 0 ; i < latitude.length ; i++) {
 		result.push( new google.maps.LatLng(latitude[i], longitude[i]));
 	}

--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js