From ac564ac01a6c043d65d2a109a7f63a5faf0f12ea Mon Sep 17 00:00:00 2001
From: Haley Glavina <HaleyGlavina@Haleys-MacBook-Pro.local>
Date: Mon, 2 Apr 2018 17:18:05 -0400
Subject: [PATCH] Commented map js/jsp files
---
tomcat/webapps/Trawl/infoWindow.js | 11 +++++------
tomcat/webapps/Trawl/map.js | 7 ++++++-
tomcat/webapps/Trawl/map.jsp | 6 ++++--
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/tomcat/webapps/Trawl/infoWindow.js b/tomcat/webapps/Trawl/infoWindow.js
index 2cfdbf1..66e5876 100644
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -1,26 +1,25 @@
//*This code references the info window google maps API
//https://developers.google.com/maps/documentation/javascript/infowindows
-// This example displays a marker at the center of Australia.
-// When the user clicks the marker, an info window opens.
+// Displays markers on a map centred at the Laurentian Great Lakes
+// When the user clicks the marker, an info window opens
function initMap(lati, longi,info) {
for(int 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};
});
-
+ // Set info window contents to input string
var contentString = info[i];
-
var infowindow = new google.maps.InfoWindow({
content: contentString
});
+ // Plot points
var marker = new google.maps.Marker({
position: {lat: lati[i], lng: longi[i]} ,
map: map,
diff --git a/tomcat/webapps/Trawl/map.js b/tomcat/webapps/Trawl/map.js
index 10016f9..e128b9d 100644
--- a/tomcat/webapps/Trawl/map.js
+++ b/tomcat/webapps/Trawl/map.js
@@ -7,6 +7,7 @@
var map, heatmap;
+// Generate map
function initMap(longi,lati) {
map = new google.maps.Map(document.getElementById('map'), {
zoom: 13,
@@ -20,10 +21,12 @@ function initMap(longi,lati) {
});
}
+// Check if a heatmap already exists
function toggleHeatmap() {
heatmap.setMap(heatmap.getMap() ? null : map);
}
+// Initialize colour scheme for heatmap gradient
function changeGradient() {
var gradient = [
‘rgba(0, 255, 255, 0)’,
@@ -44,16 +47,18 @@ function changeGradient() {
heatmap.set('gradient', heatmap.get('gradient') ? null : gradient);
}
+// Set heatmap radius about each point
function changeRadius() {
heatmap.set('radius', heatmap.get('radius') ? null : 20);
}
+// Set opacity of colours
function changeOpacity() {
heatmap.set('opacity', heatmap.get('opacity') ? null : 0.2);
}
-// Heatmap data
+// Input latitude and longitude into map points
function getPoints(latitude, longitude) {
var result = [];
for (int i = 0 ; i < latitude.length ; i++) {
diff --git a/tomcat/webapps/Trawl/map.jsp b/tomcat/webapps/Trawl/map.jsp
index 80c8f0d..ab0c63e 100644
--- a/tomcat/webapps/Trawl/map.jsp
+++ b/tomcat/webapps/Trawl/map.jsp
@@ -4,6 +4,7 @@
<%@page import="org.json.simple.parser.JSONParser"%>
<%
+ // Sample result data containing an iterable of records
TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
BasicSearchResult result = te.rangeSearch(2, 1960, 2016);
@@ -11,7 +12,7 @@
JSONParser parser = new JSONParser();
-
+ // Initialize JSON Object and Arrays
JSONObject js = new JSONObject();
JSONArray longitude = new JSONArray();
JSONArray latitude = new JSONArray();
@@ -20,7 +21,7 @@
JSONArray count = new JSONArray();
-
+ // Update value of each JSON Object/Array at the same index as the corresponding Record in Result input
for (Record r: result.results()){
longitude.add(r.getLongitude());
latitude.add(r.getLatitude());
@@ -33,6 +34,7 @@
count.add(r.getCount());
}
+ // Insert JSON Array and Objects into main Object
js.put("latitude", latitude);
js.put("longitude", longitude);
js.put("name", name);
--
GitLab