Added Google Maps RichMarker library to web interface

sailbot-vt · Jun 8, 2015 · 4483489 · 4483489
1 parent 4be76f4
commit 4483489
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/src/web/index.html b/src/web/index.html
@@ -8,7 +8,7 @@
 <script type="text/javascript"
 	src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBCvKCMy7h_YhBhH7oSl1lXKuWjS-jPhbg">
 	    </script>
-<script type="text/javascript" src="{{ static_url("js/lib/custom-marker.js") }}"></script>
+<script type="text/javascript" src="{{ static_url("js/richmarker.js") }}"></script>
 <script type="text/javascript" src="{{ static_url("js/map.js") }}"></script>
 <script type="text/javascript" src="{{ static_url("js/websocket-client.js") }}">
         </script>

diff --git a/src/web/js/map.js b/src/web/js/map.js
@@ -68,7 +68,7 @@ function initialize() {
 
 	map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);
 
-	boat_marker = new CustomMarker({
+	boat_marker = new RichMarker({
 		position : map.getCenter(),
 		map : map,
 		content : '<div class="boat"></div>',
@@ -86,7 +86,7 @@ function update_boat_marker(lat, long) {
 function add_marker(type, lat, long) {
 	var location = new google.maps.LatLng(lat, long);
 
-	var marker = new CustomMarker({
+	var marker = new RichMarker({
 		position : location,
 		map : map,
 		content : '<div class="' + type + '"></div>',

diff --git a/src/web/js/richmarker.js b/src/web/js/richmarker.js