sven/ulogger-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide chart link when altitudes not available

Browse Source
This commit is contained in:
Bartek Fabiszewski 2017-05-23 11:32:50 +02:00
parent 090c86a62a
commit 67f407635b
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -154,7 +154,7 @@
<div id="summary"></div> <div id="summary"></div>
<div id="other"> <div id="other">
<a href="javascript:void(0);" onclick="toggleChart();"><?= $lang["chart"] ?></a> <a id="altitudes" href="javascript:void(0);" onclick="toggleChart();"><?= $lang["chart"] ?></a>
</div> </div>
<div id="api"> <div id="api">

2
js/api_gmaps.js
View File

@ -65,8 +65,6 @@ function displayTrack(xml, update) {
// update polyline // update polyline
path.push(p.coordinates); path.push(p.coordinates);
latlngbounds.extend(p.coordinates); latlngbounds.extend(p.coordinates);
// save altitudes for chart
altitudes[i] = p.altitude;
} }
if (update) { if (update) {
map.fitBounds(latlngbounds); map.fitBounds(latlngbounds);

2
js/api_openlayers.js
View File

@ -104,8 +104,6 @@ function displayTrack(xml, update) {
var point = new OpenLayers.Geometry.Point(p.longitude, p.latitude).transform(wgs84, mercator); var point = new OpenLayers.Geometry.Point(p.longitude, p.latitude).transform(wgs84, mercator);
latlngbounds.extend(point); latlngbounds.extend(point);
points.push(point); points.push(point);
// save altitudes for chart
altitudes[i] = p.altitude;
} }
var lineString = new OpenLayers.Geometry.LineString(points); var lineString = new OpenLayers.Geometry.LineString(points);
var lineFeature = new OpenLayers.Feature.Vector(lineString, null, lineStyle); var lineFeature = new OpenLayers.Feature.Vector(lineString, null, lineStyle);

23
js/main.js
View File

@ -46,9 +46,7 @@ function displayChart() {
data.addColumn('number', 'altitude'); data.addColumn('number', 'altitude');
var altLen = altitudes.length; var altLen = altitudes.length;
for (var i = 0; i < altLen; i++) { for (var i = 0; i < altLen; i++) {
if (altitudes[i]!=null){ data.addRow([(i + 1), Math.round((altitudes[i] * factor_m))]);
data.addRow([(i + 1), Math.round((altitudes[i] * factor_m))]);
}
} }
var options = { var options = {
@ -74,13 +72,21 @@ function toggleChart(i) {
if (i == 0) { if (i == 0) {
chart.clearChart(); chart.clearChart();
e.style.display = 'none'; e.style.display = 'none';
} } else {
else {
e.style.display = 'block'; e.style.display = 'block';
displayChart(); displayChart();
} }
} }
function toggleChartLink() {
var link = document.getElementById('altitudes');
if (altitudes.length > 1) {
link.style.visibility = 'visible';
} else {
link.style.visibility = 'hidden';
}
}
function toggleMenu(i) { function toggleMenu(i) {
var emenu = document.getElementById('menu'); var emenu = document.getElementById('menu');
var emain = document.getElementById('main'); var emain = document.getElementById('main');
@ -127,6 +133,7 @@ function loadTrack(userid, trackid, update) {
if (positions.length > 0) { if (positions.length > 0) {
clearMap(); clearMap();
displayTrack(xml, update); displayTrack(xml, update);
toggleChartLink();
} }
} }
xhr = null; xhr = null;
@ -143,7 +150,11 @@ function parsePosition(p) {
var latitude = getNode(p, 'latitude'); var latitude = getNode(p, 'latitude');
var longitude = getNode(p, 'longitude'); var longitude = getNode(p, 'longitude');
var altitude = getNode(p, 'altitude'); // may be null var altitude = getNode(p, 'altitude'); // may be null
if (altitude != null) { altitude = parseInt(altitude); } if (altitude != null) {
altitude = parseInt(altitude);
// save altitudes for chart
altitudes.push(altitude);
}
var speed = getNode(p, 'speed'); // may be null var speed = getNode(p, 'speed'); // may be null
if (speed != null) { speed = parseInt(speed); } if (speed != null) { speed = parseInt(speed); }
var bearing = getNode(p, 'bearing'); // may be null var bearing = getNode(p, 'bearing'); // may be null