From 95ba8acb0d4c3efee65c097646a6b78399552273 Mon Sep 17 00:00:00 2001
From: Ray Liu <rayliu109@gmail.com>
Date: Mon, 2 Apr 2018 23:20:21 -0400
Subject: [PATCH] Fixed merge conflicts
---
tomcat/webapps/Trawl/infoWindow.js | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/tomcat/webapps/Trawl/infoWindow.js b/tomcat/webapps/Trawl/infoWindow.js
index a5d3e5a..8ae4c6f 100644
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -4,15 +4,7 @@
// Displays markers on a map centred at the Laurentian Great Lakes
// When the user clicks the marker, an info window opens
-function initInfo(lati, longi,info) {
- for(var i=0; i < lati.length; i++){
-
- // Generate map centred at Great Lakes
- var map = new google.maps.Map(document.getElementById('map'), {
- zoom: 5.5,
- center: {lat: 45.0349575, lng: -88.6941305};
- });
-
+
function initInfo(lati, longi,name, date, count ) {
console.log("Trying to gen. info map");
--
GitLab