Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make coordinates clickable everywhere
  • Loading branch information
argilo committed Oct 15, 2024
commit 4b950a3b501d794c5995f2be8d0ad56a2c376d4a
25 changes: 19 additions & 6 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,25 @@ var format_time_friendly = function(start, end) {
}
};

var format_coordinates = function(lat, lon, name) {
var coords_text;
var ua = navigator.userAgent.toLowerCase();

// determine how to link the coordinates to a native app, if on a mobile device
if(ua.indexOf('iphone') > -1) {
coords_text = '<a href="maps://?q='+lat+','+lon+'">' +
roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
} else if(ua.indexOf('android') > -1) {
coords_text = '<a href="geo:'+lat+','+lon+'?q='+lat+','+lon+'('+name+')">' +
roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
} else {
coords_text = '<a href="https://www.google.com/maps/search/?api=1&query='+lat+','+lon+'" target="_blank" rel="noopener noreferrer">' +
roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
}

return coords_text;
};

// runs every second
var updateTime = function(date) {
// update timebox
Expand Down Expand Up @@ -558,12 +577,6 @@ $(window).ready(function() {
$("#main").removeClass("drag");
});

// confirm dialog when launchnig a native map app with coordinates
//$('#main').on('click', '#launch_mapapp', function() {
// var answer = confirm("Launch your maps app?");
// return answer;
//});

// follow vehicle by clicking on data
$('#main').on('click', '.row .data', function() {
var e = $(this).parent();
Expand Down
33 changes: 3 additions & 30 deletions js/tracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -1378,21 +1378,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
hrate_text = imp ? (vehicle.horizontal_rate * 196.850394).toFixed(1) + ' ft/min' : vehicle.horizontal_rate.toFixed(1) + ' m/s';
}

var coords_text;
var ua = navigator.userAgent.toLowerCase();

// determine how to link the vehicle coordinates to a native app, if on a mobile device
if(ua.indexOf('iphone') > -1) {
coords_text = '<a id="launch_mapapp" href="maps://?q='+newPosition.gps_lat+','+newPosition.gps_lon+'">' +
roundNumber(newPosition.gps_lat, 5) + ', ' + roundNumber(newPosition.gps_lon, 5) +'</a>' +
' <i class="icon-location"></i>';
} else if(ua.indexOf('android') > -1) {
coords_text = '<a id="launch_mapapp" href="geo:'+newPosition.gps_lat+','+newPosition.gps_lon+'?q='+newPosition.gps_lat+','+newPosition.gps_lon+'('+vcallsign+')">' +
roundNumber(newPosition.gps_lat, 5) + ', ' + roundNumber(newPosition.gps_lon, 5) +'</a>' +
' <i class="icon-location"></i>';
} else {
coords_text = roundNumber(newPosition.gps_lat, 5) + ', ' + roundNumber(newPosition.gps_lon, 5);
}
var coords_text = format_coordinates(newPosition.gps_lat, newPosition.gps_lon, vcallsign) + ' <i class="icon-location"></i>';

// format altitude strings
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(newPosition.gps_alt)) : parseInt(newPosition.gps_alt)).toLocaleString("us");
Expand Down Expand Up @@ -2246,7 +2232,7 @@ function mapInfoBox_handle_path_new(data, vehicle, date) {
html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.vehicle+" <span style=''>("+date+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(data.gps_lat, 5) + ',&nbsp;' + roundNumber(data.gps_lon, 5)+"</div>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+format_coordinates(data.gps_lat, data.gps_lon, data.vehicle)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.gps_alt)) : parseInt(data.gps_alt)).toLocaleString("us");
Expand Down Expand Up @@ -2345,20 +2331,7 @@ function mapInfoBox_handle_prediction(event) {
altitude = Math.round(data.alt) + " m";
}

var coords_text;
var ua = navigator.userAgent.toLowerCase();

// determine how to link the vehicle coordinates to a native app, if on a mobile device
if(ua.indexOf('iphone') > -1) {
coords_text = '<a href="maps://?q='+data.lat+','+data.lon+'">' +
roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) + '</a>';
} else if(ua.indexOf('android') > -1) {
coords_text = '<a href="geo:'+data.lat+','+data.lon+'?q='+data.lat+','+data.lon+'(Prediction)">' +
roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) +'</a>';
} else {
coords_text = '<a href="https://www.google.com/maps/search/?api=1&query='+data.lat+','+data.lon+'" target="_blank" rel="noopener noreferrer">' +
roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5) +'</a>';
}
var coords_text = format_coordinates(data.lat, data.lon, "Prediction");

mapInfoBox.setContent("<pre>" +
formatDate(new Date(parseInt(data.time) * 1000), true) + "\n\n" +
Expand Down