* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-// Get the best-available indexedDB object.
+// Get the best-available objects for indexedDB and requestAnimationFrame.
window.indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.msIndexedDB;
-var mainDB;
+window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+var mainDB;
+var gAppInitDone = false;
var gUIHideCountdown = 0;
var gWaitCounter = 0;
+var gTrackUpdateInterval;
var gAction, gActionLabel;
-var gOSMAPIURL = "http://api.openstreetmap.org/";
+var gOSMAPIURL = "https://api.openstreetmap.org/";
+var gOSMOAuthData = {
+ oauth_consumer_key: "6jjWwlbhGqyYeCdlFE1lTGG6IRGOv1yKpFxkcq2z",
+ oauth_secret: "A21gUeDM6mdoQgbA9uF7zJ13sbUQrNG7QQ4oSrKA",
+ url: "https://www.openstreetmap.org",
+ landing: "auth-done.html",
+}
window.onload = function() {
gAction = document.getElementById("action");
mSel.add(opt, null);
}
- var areas = document.getElementsByClassName('overlayArea');
+ var areas = document.getElementsByClassName("overlayArea");
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].addEventListener("mouseup", uiEvHandler, false);
areas[i].addEventListener("mousemove", uiEvHandler, false);
gAction.removeEventListener(aEvent.type, postInit, false);
console.log("init done, draw map.");
gMapPrefsLoaded = true;
- resizeAndDraw();
+ gAppInitDone = true;
+ //gMap.resizeAndDraw(); <-- HACK: This triggers bug 1001853, work around with a delay.
+ window.setTimeout(gMap.resizeAndDraw, 100);
gActionLabel.textContent = "";
gAction.style.display = "none";
setTracking(document.getElementById("trackCheckbox"));
}
window.onresize = function() {
- resizeAndDraw();
+ gMap.resizeAndDraw();
}
function initDB(aEvent) {
}
}
+function updateTrackInfo() {
+ document.getElementById("trackLengthNum").textContent = calcTrackLength().toFixed(1);
+ var duration = calcTrackDuration();
+ var durationM = Math.round(duration/60);
+ var durationH = Math.floor(durationM/60); durationM = durationM - durationH * 60;
+ document.getElementById("trackDurationH").style.display = durationH ? "inline" : "none";
+ document.getElementById("trackDurationHNum").textContent = durationH;
+ document.getElementById("trackDurationMNum").textContent = durationM;
+}
+
function toggleTrackArea() {
var fs = document.getElementById("trackArea");
- if (fs.style.display != "block") {
- fs.style.display = "block";
+ if (fs.classList.contains("hidden")) {
+ fs.classList.remove("hidden");
showUI();
+ gTrackUpdateInterval = setInterval(updateTrackInfo, 1000);
}
else {
- fs.style.display = "none";
+ clearInterval(gTrackUpdateInterval);
+ fs.classList.add("hidden");
}
}
function toggleSettings() {
var fs = document.getElementById("settingsArea");
- if (fs.style.display != "block") {
- fs.style.display = "block";
+ if (fs.classList.contains("hidden")) {
+ fs.classList.remove("hidden");
showUI();
}
else {
- fs.style.display = "none";
+ fs.classList.add("hidden");
}
}
dia.classList.remove("hidden");
}
+function showGLWarningDialog() {
+ var dia = document.getElementById("dialogArea");
+ var areas = dia.children;
+ for (var i = 0; i <= areas.length - 1; i++) {
+ areas[i].style.display = "none";
+ }
+ document.getElementById("noGLwarning").style.display = "block";
+ dia.classList.remove("hidden");
+}
+
function cancelDialog() {
document.getElementById("dialogArea").classList.add("hidden");
document.getElementById("uploadTrackButton").disabled = false;
function makeISOString(aTimestamp) {
// ISO time format is YYYY-MM-DDTHH:mm:ssZ
var tsDate = new Date(aTimestamp);
+ // Note that .getUTCMonth() returns a number between 0 and 11 (0 for January)!
return tsDate.getUTCFullYear() + "-" +
- (tsDate.getUTCMonth() < 10 ? "0" : "") + tsDate.getUTCMonth() + "-" +
+ (tsDate.getUTCMonth() < 9 ? "0" : "") + (tsDate.getUTCMonth() + 1 ) + "-" +
(tsDate.getUTCDate() < 10 ? "0" : "") + tsDate.getUTCDate() + "T" +
(tsDate.getUTCHours() < 10 ? "0" : "") + tsDate.getUTCHours() + ":" +
(tsDate.getUTCMinutes() < 10 ? "0" : "") + tsDate.getUTCMinutes() + ":" +
document.getElementById("uploadStatusCloseButton").disabled = true;
document.getElementById("uploadInProgress").style.display = "block";
document.getElementById("uploadSuccess").style.display = "none";
- document.getElementById("uploadErrorMsg").textContent = "";
+ document.getElementById("uploadFailed").style.display = "none";
document.getElementById("uploadError").style.display = "none";
+ document.getElementById("uploadErrorMsg").textContent = "";
// Now show the status area.
document.getElementById("uploadStatus").style.display = "block";
//formData.append("tags", "");
formData.append("visibility",
document.getElementById("uploadVisibility").value);
- var XHR = new XMLHttpRequest();
- XHR.onreadystatechange = function() {
- if (XHR.readyState == 4 && XHR.status == 200) {
- // so far so good
- reportUploadStatus(true);
- } else if (XHR.readyState == 4 && XHR.status != 200) {
- // fetched the wrong page or network error...
+
+/* GPS trace upload API still only supports HTTP Basic Auth. This below would be OAuth code to try.
+ // Init OSM Auth, see https://github.com/osmlab/osm-auth
+ var auth = osmAuth({
+ oauth_consumer_key: gOSMOAuthData.oauth_consumer_key,
+ oauth_secret: gOSMOAuthData.oauth_secret,
+ url: gOSMOAuthData.url,
+ landing: gOSMOAuthData.landing,
+ auto: true // show a login form if the user is not authenticated and
+ // you try to do a call
+ });
+
+ // Do an authenticate request first, so that we actuall do the login.
+ if (!auth.authenticated) {
+ auth.authenticate(function(err, xhrresponse) {
+ if (err) {
+ reportUploadStatus(false);
+ }
+ else {
+ reportUploadStatus(true);
+ }
+ });
+ }
+ if (!auth.authenticated) {
+ reportUploadStatus(false);
+ return;
+ }
+ // Only now do the actual upload.
+ auth.xhr({
+ method: "POST",
+ path: "/api/0.6/gpx/create",
+ content: formData,
+ options: {"header": {"Content-Type": "multipart/form-data"}},
+ },
+ function(err, xhrresponse) {
+ if (err) {
+ reportUploadStatus(false);
+ }
+ else {
+ reportUploadStatus(true);
+ }
+ }
+ );
+*/
+
+ // Do an empty POST request first, so that we don't send everything,
+ // then ask for credentials, and then send again.
+ var hXHR = new XMLHttpRequest();
+ hXHR.onreadystatechange = function() {
+ if (hXHR.readyState == 4 && (hXHR.status == 200 || hXHR.status == 400)) {
+ // 400 is Bad Request, but that's expected as this was empty.
+ // So far so good, init actual upload.
+ var XHR = new XMLHttpRequest();
+ XHR.onreadystatechange = function() {
+ if (XHR.readyState == 4 && XHR.status == 200) {
+ // Everthing looks fine.
+ reportUploadStatus(true);
+ } else if (XHR.readyState == 4 && XHR.status != 200) {
+ // Fetched the wrong page or network error...
+ reportUploadStatus(false);
+ }
+ };
+ XHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
+ // Cross-Origin XHR doesn't allow username/password (HTTP Auth).
+ // So, we'll ask the user for entering credentials with rather ugly UI.
+ XHR.withCredentials = true;
+ try {
+ XHR.send(formData); // Send actual form data.
+ }
+ catch (e) {
+ reportUploadStatus(false, e);
+ }
+ } else if (hXHR.readyState == 4 && hXHR.status != 200) {
+ // Fetched the wrong page or network error...
reportUploadStatus(false);
}
};
- XHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
+ hXHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
// Cross-Origin XHR doesn't allow username/password (HTTP Auth).
// So, we'll ask the user for entering credentials with rather ugly UI.
- XHR.withCredentials = true;
+ hXHR.withCredentials = true;
try {
- XHR.send(formData);
+ hXHR.send(); // Empty request, see above.
}
catch (e) {
reportUploadStatus(false, e);
projects / lantea.git / blobdiff