mattburchett/webglmapview
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Visual changes and readability improvements

Browse Source
This commit is contained in:
Rob L 2016-07-29 10:01:32 -04:00
parent 77a26bf1f6
commit 1d683f6a3a
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/GUI.Utils.js
View File

@ -20,6 +20,7 @@ $(document).ready(function() {
removeEntity('arrow'); removeEntity('arrow');
lastInputBox = null; lastInputBox = null;
$('#route_output').html("No route calculated");
var speed = {'speed': $('#speed').val(), 'unit':$ ('#speedunit option:selected').val() }; var speed = {'speed': $('#speed').val(), 'unit':$ ('#speedunit option:selected').val() };
populateRoutePlan( $('#pointa option:selected').text() , $('#pointb option:selected').text(),speed ); populateRoutePlan( $('#pointa option:selected').text() , $('#pointb option:selected').text(),speed );
@ -151,12 +152,11 @@ function populateRoutePlan(pointa,pointb,speed) {
routeplan += '<optgroup label="' + waypoint.name + '">'; routeplan += '<optgroup label="' + waypoint.name + '">';
if(typeof self[index+1] != 'undefined' ) { if(typeof self[index+1] != 'undefined' ) {
if(waypoint.gate && self[index+1].gate) {routeplan += '<option>^---- Gate From</option>'; } if(waypoint.gate && self[index+1].gate) {routeplan += '<option>^---- Gate From</option>'; }
console.log(waypoint.gate)
} }
if(waypoint.gate && lastWaypoint.gate) {routeplan += '<option>^---- Gate Exit</option>'; } if(waypoint.gate && lastWaypoint.gate) {routeplan += '<option>^---- Gate Exit</option>'; }
if(!waypoint.gate || (!lastWaypoint.gate && waypoint.gate)) { if(!waypoint.gate || (!lastWaypoint.gate && waypoint.gate)) {
routeplan += '<option>Distance:' + calcDist(lastWaypoint.name,waypoint.name) + '</option>' routeplan += '<option>Distance:' + calcDist(lastWaypoint.name,waypoint.name).toFixed(2) + '</option>'
routeplan += '<option>ETA: ' + timeformat(calcETA(speed,calcDist(lastWaypoint.name,waypoint.name))) + '</option>'; routeplan += '<option>ETA: ' + timeformat(calcETA(speed,calcDist(lastWaypoint.name,waypoint.name))) + '</option>';
drawline(grabPositionByName(lastWaypoint.name),grabPositionByName(waypoint.name)); drawline(grabPositionByName(lastWaypoint.name),grabPositionByName(waypoint.name));
} }

24
webviewgl.htm
View File

@ -8,7 +8,7 @@
<script src="js/three-text2d.js"></script> <script src="js/three-text2d.js"></script>
<script src="js/Detector.js"></script> <script src="js/Detector.js"></script>
<script src="js/mapviewgl.js"></script> <script src="js/mapviewgl.js"></script>
<link href="https://fonts.googleapis.com/css?family=Space+Mono" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Open+Sans|Raleway:400,700,700i" rel="stylesheet">
<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
<script src="js/GUI.Utils.js"></script> <script src="js/GUI.Utils.js"></script>
<script> <script>
@ -24,12 +24,12 @@
<style type="text/css"> <style type="text/css">
body { margin: 0; overflow:hidden;} body { margin: 0; overflow:hidden;}
canvas { width: 75%; height: 100% ;} canvas { width: 75%; height: 100% ;}
.reset-button {margin: 0; padding: 0; padding: 3px 3px; color: #AAA; } .reset-button {margin: 0; padding: 0; padding: 0.5vh 0.5vh; color: #AAA; font-size: 1.75vh;}
.menu-button { float: right; position: absolute; right: 0.1vw; top: 0; z-index: 5; color:white; background-color:#003133; padding: 0px; font-weight: bold; font-size:2.5vh; } .menu-button { float: right; position: absolute; right: 0.1vw; top: 0; z-index: 5; color:white; background-color:#003133; padding: 0px; font-weight: bold; font-size:2.5vh; }
.reset-container { margin: 0; padding: 10px; font-weight: bold; text-align: center; font-family: 'Space Mono', monospace; color:#67989A; background-color: maroon; width: 100%; height: 2.5vh; float:bottom; } .reset-container { margin: 0; padding: 1vh; font-weight: bold; text-align: center; font-family: 'Open Sans', sans-serif; color:#67989A; background-color: maroon; width: 100%; height: 2.5vh; float:bottom; }
.wvg-controls { position: fixed; left: 85%; height: 96%; width: 15%; margin: 0; display: none;} .wvg-controls { position: fixed; left: 85%; height: 96%; width: 15%; margin: 0; display: none;}
ul.wvg-navbar { height: 3vh; width: 100%; background-color: #003133; list-style-type: none; overflow: hidden; padding: 0; margin: 0; border: 0; } ul.wvg-navbar { height: 3vh; width: 100%; background-color: #003133; list-style-type: none; overflow: hidden; padding: 0; margin: 0; border: 0; }
ul.wvg-navbar li { width:auto; height: 100%; float: left; padding: 0; margin: 0; border: 0; } .wvg-tablink { height: 100%; border: 0; margin: 0; padding: 0; padding: 8px 10px; font-weight: bold; text-align: center; font-family: 'Space Mono', monospace; color:#67989A; font-size: 1.25vh; } ul.wvg-navbar li { width:auto; height: 100%; float: left; padding: 0; margin: 0; border: 0; } .wvg-tablink { height: 100%; border: 0; margin: 0; padding: 0; padding: 8px 10px; font-weight: bold; text-align: center; font-family: 'Raleway', sans-serif; color:#67989A; font-size: 1.25vh; }
.wvg-tab-active { background-color: #0D4A4D; color: #003133; } .wvg-tab-active { background-color: #0D4A4D; color: #003133; }
.wvg-tools { width: 100%; height: 98%; background: #333; display: none; color: #AAA; padding-top: 2vh; padding-left:1vw; padding-right: 2.5vw;} .wvg-tools { width: 100%; height: 98%; background: #333; display: none; color: #AAA; padding-top: 2vh; padding-left:1vw; padding-right: 2.5vw;}
.wvg-tools select, .wvg-tools input { .wvg-tools select, .wvg-tools input {
@ -47,7 +47,7 @@
} }
.wvg-tools input { background: #333; width: 11.4vw; } .wvg-tools input { background: #333; width: 11.4vw; }
.wvg-tools span { text-align: center; color: #FFF; font-family: 'Space Mono', monospace; display: block; padding-right: 3vw; } .wvg-tools span { text-align: center; color: #FFF; font-family: 'Raleway', sans-serif; display: block; padding-right: 3vw; }
.wvg-first { display: block; } .wvg-first { display: block; }
#wrapper { height: inherit; width: 100%; } #wrapper { height: inherit; width: 100%; }
.active { display: block; } .active { display: block; }
@ -87,7 +87,7 @@
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0px; border-radius: 0px;
font-family: 'Space Mono', monospace; font-family: 'Raleway', sans-serif;
color: #003133; color: #003133;
font-size: 14px; font-size: 14px;
font-weight: bolder; font-weight: bolder;
@ -103,9 +103,9 @@
text-decoration: none; text-decoration: none;
} }
.tool-header { font-weight: bold; padding-top: 5vh; display: block; } .tool-header { font-weight: bold; padding-top: 5vh; display: block; }
#route_output {font-size: 0.9vh; height: 25%; padding-top: 2.5vh;} #route_output {font-size: 1.25vh; height: 30%; padding-top: 1vh;}
.toolsep { margin-right: 1vw; padding:0; padding-top: 1vh; padding-bottom: 2.5vh; border-bottom: 1px #AAA solid; height: 1vh; display: block; width: 64%;} .toolsep { margin-right: 1vw; padding:0; padding-top: 1vh; padding-bottom: 2.5vh; border-bottom: 1px #AAA solid; height: 1vh; display: block; width: 64%;}
.calc_data { padding-top: 2.5vh; font-size: 0.9em; } .calc_data { padding-top: 2.5vh; font-size: 1.5vh; font-family: 'Open Sans', sans-serif;}
</style> </style>
</head> </head>
<body> <body>
@ -160,10 +160,10 @@
</select> </select>
<span class="calc_data"><br /> <span class="calc_data"><br />
From: <u><i id="cal_start">Empty</i></u> <br /> From: <b id="cal_start">Empty</b> <br />
To: <u><i id="cal_end">Empty</i></u><br /> To: <b id="cal_end">Empty</b><br />
Distance: <u><i id="cal_dist">Unknown</i></u><br /> Distance: <b id="cal_dist">Unknown</b><br />
ETA @ <u><i id="cal_speed">Unknown</i></u> : <u><i id="cal_eta">Unknown</i></u> ETA @ <b id="cal_speed">Unknown</b> : <b id="cal_eta">Unknown</b>
</span> </span>
</div> </div>
<div class="wvg-tools" id="Info"> <div class="wvg-tools" id="Info">