From 5e2d02117d5a99418c02359a8d91f1708bcd7c03 Mon Sep 17 00:00:00 2001
From: Winnie <liang15@mcmaster.ca>
Date: Tue, 3 Apr 2018 16:27:35 -0400
Subject: [PATCH] Fix all merge conflicts and other errors
- missing semi colon
- missing lines
---
tomcat/webapps/Trawl/WEB-INF/web.xml | 18 ------------------
tomcat/webapps/Trawl/infoWindow.js | 7 -------
tomcat/webapps/Trawl/script.js | 2 ++
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/tomcat/webapps/Trawl/WEB-INF/web.xml b/tomcat/webapps/Trawl/WEB-INF/web.xml
index 168be25..dc7d6ca 100644
--- a/tomcat/webapps/Trawl/WEB-INF/web.xml
+++ b/tomcat/webapps/Trawl/WEB-INF/web.xml
@@ -9,24 +9,6 @@
<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>
-=======
-<?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>
diff --git a/tomcat/webapps/Trawl/infoWindow.js b/tomcat/webapps/Trawl/infoWindow.js
index 69cb16c..279f95a 100644
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -5,14 +5,7 @@
// When the user clicks the marker, an info window opens
var openWindow;
-<<<<<<< HEAD
function initInfo(lati, longi,name, date, individualCount) {
-=======
-
-
-function initInfo(lati, longi,name, date, count ) {
- console.log("Trying to gen. info map");
->>>>>>> origin/web
// Generate map centred at Great Lakes
var map = new google.maps.Map(document.getElementById('map'), {
zoom: 5.5,
diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js
index f725ea4..7361e42 100644
--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js
@@ -1,5 +1,6 @@
// Initialization
function init() {
+ console.log("trying to init");
callUpdateSci({id:"pickAnimalia", value:2}); // Propagate Dropdowns on Startup
reqHistogram(2);
}
@@ -280,3 +281,4 @@ $( function() {
$( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
} );
+window.onload = init;
\ No newline at end of file
--
GitLab