var gUIHideCountdown = 0;
var gWaitCounter = 0;
var gAction, gActionLabel;
-var gOSMAPIURL = "http://api06.dev.openstreetmap.org/"; // "http://api.openstreetmap.org/";
+var gOSMAPIURL = "http://api.openstreetmap.org/";
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);
document.getElementById("saveTrackButton").classList.add("debugHide");
}
+ // Without OAuth, the login data is useless
+ //document.getElementById("uploadSettingsArea").classList.remove("debugHide");
+ // As login data is useless for now, always enable upload button
+ document.getElementById("uploadTrackButton").disabled = false;
+
+ if (gDebug) {
+ // Note that GPX upload returns an error 500 on the dev API right now.
+ gOSMAPIURL = "http://api06.dev.openstreetmap.org/";
+ }
+
+ gAction.addEventListener("dbinit-done", initMap, false);
+ gAction.addEventListener("mapinit-done", postInit, false);
+ console.log("starting DB init...");
initDB();
- initMap();
-
- var loopCnt = 0;
- var waitForInitAndDraw = function() {
- if ((gWaitCounter <= 0) || (loopCnt > 100)) {
- if (gWaitCounter <= 0)
- gWaitCounter = 0;
- else
- console.log("Loading failed (waiting for init).");
-
- gMapPrefsLoaded = true;
- resizeAndDraw();
- gActionLabel.textContent = "";
- gAction.style.display = "none";
- setTracking(document.getElementById("trackCheckbox"));
- gPrefs.get("osm_user", function(aValue) {
- if (aValue) {
- document.getElementById("uploadUser").value = aValue;
- document.getElementById("uploadTrackButton").disabled = false;
- }
- });
- gPrefs.get("osm_pwd", function(aValue) {
- var upwd = document.getElementById("uploadPwd");
- if (aValue)
- document.getElementById("uploadPwd").value = aValue;
- });
+}
+
+function postInit(aEvent) {
+ gAction.removeEventListener(aEvent.type, postInit, false);
+ console.log("init done, draw map.");
+ gMapPrefsLoaded = true;
+ gMap.resizeAndDraw();
+ gActionLabel.textContent = "";
+ gAction.style.display = "none";
+ setTracking(document.getElementById("trackCheckbox"));
+ gPrefs.get(gDebug ? "osm_dev_user" : "osm_user", function(aValue) {
+ if (aValue) {
+ document.getElementById("uploadUser").value = aValue;
+ document.getElementById("uploadTrackButton").disabled = false;
}
- else
- setTimeout(waitForInitAndDraw, 100);
- loopCnt++;
- };
- waitForInitAndDraw();
+ });
+ gPrefs.get(gDebug ? "osm_dev_pwd" : "osm_pwd", function(aValue) {
+ var upwd = document.getElementById("uploadPwd");
+ if (aValue)
+ document.getElementById("uploadPwd").value = aValue;
+ });
}
window.onresize = function() {
- resizeAndDraw();
+ gMap.resizeAndDraw();
}
-function initDB() {
+function initDB(aEvent) {
// Open DB.
+ if (aEvent)
+ gAction.removeEventListener(aEvent.type, initDB, false);
var request = window.indexedDB.open("MainDB-lantea", 2);
request.onerror = function(event) {
// Errors can be handled here. Error codes explain in:
};
request.onsuccess = function(event) {
mainDB = request.result;
+ var throwEv = new CustomEvent("dbinit-done");
+ gAction.dispatchEvent(throwEv);
};
request.onupgradeneeded = function(event) {
mainDB = request.result;
}
}
+function showUploadDialog() {
+ 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("uploadDialog").style.display = "block";
+ document.getElementById("uploadTrackButton").disabled = true;
+ 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;
+}
+
var uiEvHandler = {
handleEvent: function(aEvent) {
var touchEvent = aEvent.type.indexOf('touch') != -1;
function setUploadField(aField) {
switch (aField.id) {
case "uploadUser":
- gPrefs.set("osm_user", aField.value);
+ gPrefs.set(gDebug ? "osm_dev_user" : "osm_user", aField.value);
document.getElementById("uploadTrackButton").disabled = !aField.value.length;
break;
case "uploadPwd":
- gPrefs.set("osm_pwd", aField.value);
+ gPrefs.set(gDebug ? "osm_dev_pwd" : "osm_pwd", aField.value);
break;
}
}
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() + ":" +
}
function uploadTrack() {
+ // Hide all areas in the dialog.
+ var dia = document.getElementById("dialogArea");
+ var areas = dia.children;
+ for (var i = 0; i <= areas.length - 1; i++) {
+ areas[i].style.display = "none";
+ }
+ // Reset all the fields in the status area.
+ document.getElementById("uploadStatusCloseButton").disabled = true;
+ document.getElementById("uploadInProgress").style.display = "block";
+ document.getElementById("uploadSuccess").style.display = "none";
+ 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";
+
// See http://wiki.openstreetmap.org/wiki/Api06#Uploading_traces
- var trackBlob = new Blob([convertTrack("gpx")], { "type" : "application/gpx+xml" });
+ var trackBlob = new Blob([convertTrack("gpx")],
+ { "type" : "application/gpx+xml" });
var formData = new FormData();
formData.append("file", trackBlob);
- formData.append("description", "Track recorded via Lantea Maps");
+ var desc = document.getElementById("uploadDesc").value;
+ formData.append("description",
+ desc.length ? desc : "Track recorded via Lantea Maps");
//formData.append("tags", "");
- formData.append("visibility", "private");
- var XHR = new XMLHttpRequest();
- XHR.onreadystatechange = function() {
- if (XHR.readyState == 4) {/*
- gLog.appendChild(document.createElement("li"))
- .appendChild(document.createTextNode(aURL + " - " + XHR.status +
- " " + XHR.statusText));*/
- }
- 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...
+ formData.append("visibility",
+ document.getElementById("uploadVisibility").value);
+ // 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,
- document.getElementById("uploadUser").value,
- document.getElementById("uploadPwd").value);
+ 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.
+ hXHR.withCredentials = true;
try {
- XHR.send(formData);
+ hXHR.send(); // Empty request, see above.
}
catch (e) {
reportUploadStatus(false, e);
}
function reportUploadStatus(aSuccess, aMessage) {
- alert(aMessage ? aMessage : (aSuccess ? "success" : "failure"));
+ document.getElementById("uploadStatusCloseButton").disabled = false;
+ document.getElementById("uploadInProgress").style.display = "none";
+ if (aSuccess) {
+ document.getElementById("uploadSuccess").style.display = "block";
+ }
+ else if (aMessage) {
+ document.getElementById("uploadErrorMsg").textContent = aMessage;
+ document.getElementById("uploadError").style.display = "block";
+ }
+ else {
+ document.getElementById("uploadFailed").style.display = "block";
+ }
}
var gPrefs = {
}
},
+ getListStepped: function(aCallback) {
+ if (!mainDB)
+ return;
+ var transaction = mainDB.transaction([this.objStore]);
+ var objStore = transaction.objectStore(this.objStore);
+ // Use cursor in reverse direction (so we get the most recent position first)
+ objStore.openCursor(null, "prev").onsuccess = function(event) {
+ var cursor = event.target.result;
+ if (cursor) {
+ aCallback(cursor.value);
+ cursor.continue();
+ }
+ else {
+ aCallback(null);
+ }
+ };
+ },
+
push: function(aValue, aCallback) {
if (!mainDB)
return;
projects / lantea.git / blobdiff