From 9516253cbda819ce4aa6376fac99e83d9854b497 Mon Sep 17 00:00:00 2001
From: Ray Liu <rayliu109@gmail.com>
Date: Mon, 2 Apr 2018 23:17:46 -0400
Subject: [PATCH] Fixed merge conflicts
---
tomcat/webapps/Trawl/index.jsp | 101 -----------------------------
tomcat/webapps/Trawl/infoWindow.js | 5 +-
tomcat/webapps/Trawl/script.js | 4 +-
3 files changed, 3 insertions(+), 107 deletions(-)
diff --git a/tomcat/webapps/Trawl/index.jsp b/tomcat/webapps/Trawl/index.jsp
index 6b44f59..098cd5e 100644
--- a/tomcat/webapps/Trawl/index.jsp
+++ b/tomcat/webapps/Trawl/index.jsp
@@ -99,105 +99,4 @@ Double Handle Slider Modified from: http://jqueryui.com/slider/#range
</body>
</html>
-=======
-<%@ 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=AIzaSyBmfzgAfA1sXItGVdGiC5txAieu8VYXcZM&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" checked> Map
- <input type="radio" name="pickOutput" value="heat"> Heatmap
- <input type="radio" name="pickOutput" value="histogram"> 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 id="histogram"></div>--%>
- <%--<div id="map"></div>--%>
- <%--<div id="heat"></div>--%>
- <%--<div id="console">~~~ PSEUDO-CONSOLE ~~~<br></div>--%>
- </section>
- </section>
- </section>
-</body>
-</html>
-
->>>>>>> d1f7464b4ffda020ccd6a1dc06a4f3b8386384ee
diff --git a/tomcat/webapps/Trawl/infoWindow.js b/tomcat/webapps/Trawl/infoWindow.js
index 5f48cdb..a5d3e5a 100644
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -4,7 +4,6 @@
// Displays markers on a map centred at the Laurentian Great Lakes
// When the user clicks the marker, an info window opens
-<<<<<<< HEAD
function initInfo(lati, longi,info) {
for(var i=0; i < lati.length; i++){
@@ -14,7 +13,7 @@ function initInfo(lati, longi,info) {
center: {lat: 45.0349575, lng: -88.6941305};
});
-=======
+
function initInfo(lati, longi,name, date, count ) {
console.log("Trying to gen. info map");
// Generate map centred at Great Lakes
@@ -25,7 +24,7 @@ function initInfo(lati, longi,name, date, count ) {
console.log("Gened info map");
->>>>>>> d1f7464b4ffda020ccd6a1dc06a4f3b8386384ee
+
// Set info window contents to input string
var infowindow = new google.maps.InfoWindow();
diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js
index 7f90879..20b7f43 100644
--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
// Initialization
function init() {
callUpdateSci({id:"pickAnimalia", value:2}); // Propagate Dropdowns on Startup
@@ -564,5 +564,3 @@ $( function() {
$( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
} );
->>>>>>> d1f7464b4ffda020ccd6a1dc06a4f3b8386384ee
-window.onload=init;
\ No newline at end of file
--
GitLab