api stuff

drewtu2 · Apr 23, 2017 · 1ddf8c5 · 1ddf8c5
1 parent 644e1a9
commit 1ddf8c5
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 22 deletions.
diff --git a/static/css/mystyle.css b/static/css/mystyle.css
@@ -2,9 +2,15 @@
 body,html {
 	height:100%;
 }
+
 /*removes google logo from maps*/
-a[href^="http://maps.google.com/maps"]{display:none !important}
-a[href^="https://maps.google.com/maps"]{display:none !important}
+a[href^="http://maps.google.com/maps"]{
+	display:none !important
+	}
+
+a[href^="https://maps.google.com/maps"]{
+	display:none !important
+	}
 
 .gmnoprint a, .gmnoprint span, .gm-style-cc {
     display:none;

diff --git a/static/js/Heatmap.js b/static/js/Heatmap.js
@@ -6,7 +6,10 @@
 	*/
 
   var map;
-  var myLatLng
+  var myLatLng;
+
+  // Global Map only to be used in special occasions
+  var SuperSecretMap;
 
   /*
    * List of Friends
@@ -82,9 +85,9 @@
         mapTypeId: google.maps.MapTypeId.ROADMAP
       }
       map = new google.maps.Map(document.getElementById("map_box"), myOptions);
-
+      SuperSecretMap = map;
       addHeatmap(map);
-      setListMarkers(map, recList, "../images/wine.png");
+      //setListMarkers(map, recList, "../images/wine.png");
       setListMarkers(map, friendList, "../images/friend.png");
       //setMarker(map, testObj, "../images/friend.png")
       }
@@ -135,6 +138,10 @@
 	  }
   }
 
+  function apiDropMarker(inObj) {
+	  return setMarker(SuperSecretMap, inObj, "../images/wine.png");
+  }
+
   function setMarker(map, inObj, imageUrl) {
 	  console.log(inObj)
 	  var markerPlace = {
@@ -146,6 +153,7 @@
 			  position: inObj.location,
 			  place: markerPlace,
 	    	  map: map,
+	    	  animation: google.maps.Animation.DROP,
 	    	  icon: imageUrl
 	  }
       var marker = new google.maps.Marker(markerOptions)
@@ -160,6 +168,6 @@
 	  marker.addListener('click', function() {
 		    infoWindow.open(map, marker);
 		  });
-
+	  return marker
   }
 
diff --git a/static/js/notificationEvents.js b/static/js/notificationEvents.js
@@ -0,0 +1,33 @@
+var recList = [{name:"Toscis", location:new google.maps.LatLng(42.363424, -71.099379)},
+                 {name:"Ben and Jerys", location:new google.maps.LatLng(42.348133, -71.084497)},
+                 {name:"JP Licks", location:new google.maps.LatLng(42.346997, -71.088657)}];
+var count = 0;
+var recMarkerList= []
+
+function handleNotification(message){
+
+
+	if (message == "displayOn") {
+
+    } else if (message == "displayOff") {
+
+    } else if (message == "dropLocation") {
+    	index = count
+    	recMarkerList.push(apiDropMarker(recList[index]))
+
+    	if (count == recList.length - 1){
+    		count = 0; 
+    	} else{
+    		count = count + 1;	
+    	}
+    } else if (message == "removeMarkers") {
+    	setMapOnAll(null);
+    	recMarkerList= []
+    }
+}
+
+function setMapOnAll(map) {
+    for (var i = 0; i < recList.length; i++) {
+      recMarkerList[i].setMap(map);
+    }
+  }
diff --git a/templates/index.html b/templates/index.html
@@ -1,16 +1,15 @@
+<script type="text/javascript"
+		src="https://maps.googleapis.com/maps/api/js?&libraries=visualization">
+		</script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.6/socket.io.min.js"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/notificationEvents.js') }}"></script>
 <script type="text/javascript" charset="utf-8">
-    console.log("HERE WE ARE");
-    var socket = io.connect('http://' + document.domain + ':' + location.port);
-    socket.on('channel-a', function(message) {
-        if (message == "displayOn") {
-
-        } else if (message == "displayOff") {
-
-        }
-    });
+	console.log("HERE WE ARE");
+	var socket = io.connect('http://' + document.domain + ':' + location.port);
+	socket.on('channel-a', function(message) {
+	    handleNotification(message)
+	});
 </script>
-
 <!--
 
  -->
@@ -35,13 +34,10 @@
 
 	<link rel="stylesheet"
 		href="{{ url_for('static', filename='css/mystyle.css') }}">
-
-	<script type="text/javascript"
-		src="https://maps.googleapis.com/maps/api/js?&libraries=visualization">
-		</script>
 	<script
 		src="{{ url_for('static', filename='data/filteredCrimeData.json') }}"></script>
 	<script src="{{ url_for('static', filename='js/Heatmap.js') }}"></script>
+
 </head>
 
 <body onload="javascript:initGeolocation()">
@@ -57,8 +53,8 @@
 
 	<div id="video">
 		<!-- Uncomment to allow background to be set -->
-		<img id="stream"
-			 src="http://192.168.1.9:88/cgi-bin/CGIStream.cgi?cmd=GetMJStream&usr=nuvision&pwd=nuvision"></img>
+		<!--<img id="stream"
+			 src="http://192.168.1.9:88/cgi-bin/CGIStream.cgi?cmd=GetMJStream&usr=nuvision&pwd=nuvision"></img>-->
 	</div>
 
 	<div class="container no-margin content full-height">