Skip to content

Make coordinates clickable everywhere #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darksidelemm merged 3 commits into from
Oct 4, 2024
Merged

Make coordinates clickable everywhere #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b243005
Remove obsolete code
argilo Oct 3, 2024
b2941f6
Move coordinate formatting into a function
argilo Oct 3, 2024
7cfb4e7
Use format_coordinates everywhere
argilo Oct 3, 2024
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
25 changes: 19 additions & 6 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,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 @@ -553,12 +572,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
2 changes: 1 addition & 1 deletion js/station.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function drawHistorical (data, station) {
html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+serial+" <span style=''>("+time+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div><b>Last Position:&nbsp;</b>"+roundNumber(landing.lat, 5) + ',&nbsp;' + roundNumber(landing.lon, 5)+"</div>";
html += "<div><b>Last Position:&nbsp;</b>"+format_coordinates(landing.lat, landing.lon, serial)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(landing.alt)) : parseInt(landing.alt)).toLocaleString("us");
Expand Down
41 changes: 6 additions & 35 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,23 +1799,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 = '<a id="launch_mapapp" href="https://www.google.com/maps/search/?api=1&query='+newPosition.gps_lat+','+newPosition.gps_lon+'" target="_blank" rel="noopener noreferrer">' +
roundNumber(newPosition.gps_lat, 5) + ', ' + roundNumber(newPosition.gps_lon, 5) +'</a>' +
' <i class="icon-location"></i>';
}
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 @@ -2722,7 +2706,7 @@ function mapInfoBox_handle_path_old(vehicle, id) {
html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.serial+" <span style=''>("+data.datetime+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(data.lat, 5) + ',&nbsp;' + roundNumber(data.lon, 5)+"</div>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+format_coordinates(data.lat, data.lon, data.serial)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
Expand Down Expand Up @@ -2797,7 +2781,7 @@ function mapInfoBox_handle_path_new(data, vehicle, date) {
html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.serial+" <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.lat, 5) + ',&nbsp;' + roundNumber(data.lon, 5)+"</div>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+format_coordinates(data.lat, data.lon, data.serial)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
Expand Down Expand Up @@ -2931,20 +2915,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 Expand Up @@ -4665,7 +4636,7 @@ function updateRecoveryMarker(recovery) {
html = "<div style='line-height:16px;position:relative;'>";
html += "<div><b>"+recovery.serial+(recovery.recovered ? " Recovered" : " Not Recovered")+"</b></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(recovery.lat, 5) + ',&nbsp;' + roundNumber(recovery.lon, 5)+"</div>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+format_coordinates(recovery.lat, recovery.lon, recovery.serial)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(recovery.alt)) : parseInt(recovery.alt)).toLocaleString("us");
Expand Down Expand Up @@ -4777,7 +4748,7 @@ function updateRecoveryPane(r){

html += "<div style='line-height:16px;position:relative;'>";
html += "<div><b><u>"+r[i].serial+(r[i].recovered ? " Recovered by " : " Not Recovered by ")+r[i].recovered_by+"</u></b></div>";
html += "<div style='margin-bottom:5px;'><b><button style='margin-bottom:0px;' onclick='panToRecovery(\"" + r[i].serial + "\")'><i class='icon-location'></i></button>&nbsp;</b>"+roundNumber(lat, 5) + ',&nbsp;' + roundNumber(lon, 5)+"</div>";
html += "<div style='margin-bottom:5px;'><b><button style='margin-bottom:0px;' onclick='panToRecovery(\"" + r[i].serial + "\")'><i class='icon-location'></i></button>&nbsp;</b>"+format_coordinates(lat, lon, r[i].serial)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(alt)) : parseInt(alt)).toLocaleString("us");
Expand Down