Working notifications

drewtu2 · Apr 23, 2017 · a23aa1d · a23aa1d
1 parent 1d14a23
commit a23aa1d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/static/js/Heatmap.js b/static/js/Heatmap.js
@@ -109,7 +109,7 @@
   function genHeatMapData() {
 	  listOfLat = filteredData.LAT
 	  listOfLong = filteredData.LONG
-	  console.log(listOfLat)
+	  //console.log(listOfLat)
 	  mapData = []
 	  for(var key in listOfLat) {
 		  if(listOfLat.hasOwnProperty(key) && listOfLong.hasOwnProperty(key)){
@@ -132,18 +132,19 @@
   }
 
   function setListMarkers(map, listOfStuff, url){
-	  console.log(listOfStuff)
+	  //console.log(listOfStuff)
 	  for(index in listOfStuff){
 		setMarker(map, listOfStuff[index], url)  
 	  }
   }
 
   function apiDropMarker(inObj) {
+	  moveMap(inObj.location)
 	  return setMarker(SuperSecretMap, inObj, "../images/wine.png");
   }
 
   function setMarker(map, inObj, imageUrl) {
-	  console.log(inObj)
+	  //console.log(inObj)
 	  var markerPlace = {
 			  location: inObj.location,
 			  query: inObj.name 
@@ -171,3 +172,16 @@
 	  return marker
   }
 
+  function moveMap(location) {
+	  if(location == "home"){
+		  SuperSecretMap.setCenter(myLatLng)  
+	  } else {
+		  SuperSecretMap.setCenter(location)
+	  }
+  }
+
+  function setMapOnAll(map) {
+	    for (var i = 0; i < recList.length; i++) {
+	      recMarkerList[i].setMap(map);
+	    }
+	  }
diff --git a/static/js/notificationEvents.js b/static/js/notificationEvents.js
@@ -5,12 +5,11 @@ var count = 0;
 var recMarkerList= []
 
 function handleNotification(message){
-
-
-	if (message == "displayOn") {
-
-    } else if (message == "displayOff") {
-
+	activateDog()
+	if (message == "center") {
+    	moveMap("home");
+    } else if (message == "danger") {
+		// Alert to Danger!
     } else if (message == "dropLocation") {
     	index = count
     	recMarkerList.push(apiDropMarker(recList[index]))
@@ -26,8 +25,12 @@ function handleNotification(message){
     }
 }
 
-function setMapOnAll(map) {
-    for (var i = 0; i < recList.length; i++) {
-      recMarkerList[i].setMap(map);
-    }
-  }
+function activateDog(){
+	document.getElementById("dog").src="../images/dogmoving.gif";
+	window.setTimeout(deactivateDog, 5000);
+}
+
+function deactivateDog(){
+	document.getElementById("dog").src="../images/dogstatic.png";
+}
+