diff --git a/tomcat/webapps/Trawl/index.jsp b/tomcat/webapps/Trawl/index.jsp index b16f880191df12c9723c1795fc100a66071fa9a9..8dc7e388a2a90d93d602077fa2a3146e8006fde7 100644 --- a/tomcat/webapps/Trawl/index.jsp +++ b/tomcat/webapps/Trawl/index.jsp @@ -18,7 +18,7 @@ Double Handle Slider Modified from: http://jqueryui.com/slider/#range <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="https://maps.googleapis.com/maps/api/js?key=AIzaSyA9xCYy2Co-0GWfHT8e1smTjIneNbWSfPgY&libraries=visualization&callback=initMap"></script> <script src="map.js"></script> <script src="infoWindow.js"></script> diff --git a/tomcat/webapps/Trawl/map.jsp b/tomcat/webapps/Trawl/map.jsp index ab0c63eb64b4b2a1bb9a49de3fe24bc1d8d27cfd..271867384d4cfe91a65509385c089bb8050e60d8 100644 --- a/tomcat/webapps/Trawl/map.jsp +++ b/tomcat/webapps/Trawl/map.jsp @@ -30,7 +30,7 @@ dateobj.put("year",r.getDate().getYear()); dateobj.put("month",r.getDate().getMonth()); dateobj.put("day",r.getDate().getDay()); - date.add(r.getDate()); + date.add(dateobj); count.add(r.getCount()); } diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js index 7e0c419dec04c9b8dfda45c50e8012db1d3a1655..4046906729bb04c74614e22d4729fcc8c6e3c435 100644 --- a/tomcat/webapps/Trawl/script.js +++ b/tomcat/webapps/Trawl/script.js @@ -193,6 +193,7 @@ function reqMap(params){ 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) { + console.log(this.responseText); 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"];