Merge branch 'master' of https://www.github.com/cyoung/stratux

cyoung · Oct 21, 2015 · 293d0e7 · 293d0e7
2 parents 3e042a8 + 865ba68
commit 293d0e7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/web/css/main.css b/web/css/main.css
@@ -28,6 +28,7 @@
 	top: 0;
 	left: 0;
 	font-size: 18px;
+	color: white;
 }
 
 .section_invisible {

diff --git a/web/img/world.png b/web/img/world.png
diff --git a/web/plates/gps.html b/web/plates/gps.html
@@ -8,7 +8,7 @@
 						<div class="map-container">
 							<div id="map_display" class="world-map" ng-attr-style="background-position:{{map_pos_x + 'px ' + map_pos_y + 'px'}}; width:{{map_width}}px; height:{{map_height}}px;">
 								<div class="mark-position" ng-style="{left: map_mark_x+'px', top: map_mark_y+'px'}">
-									<span class="fa fa-crosshairs icon-white"></span>
+									<span class="fa fa-crosshairs"></span>
 								</div>
 							</div>
 						</div>

diff --git a/web/plates/js/gps.js b/web/plates/js/gps.js
@@ -23,10 +23,10 @@ function GPSCtrl($rootScope, $scope, $state, $http, $interval) {
 	function setGeoReferenceMap(la, lo) {
 		// Mercator projection
 		// var map = "img/world.png";
-		var map_width = 3929;
-		var map_height = 2184;
-		var map_zero_x = 1868;
-		var map_zero_y = 1412;
+		var map_width = 2530;
+		var map_height = 1603;
+		var map_zero_x = 1192;
+		var map_zero_y = 1124;
 		var font_size = 18; // size of font used for marker
 
 		sizeMap();