var mainDB;
var gAppInitDone = false;
+var firstRun = false;
var gUIHideCountdown = 0;
var gWaitCounter = 0;
var gTrackUpdateInterval;
var gAction, gActionLabel;
-var gBackendURL = "https://backend.lantea.kairo.at";
+var authData = null, userData = null;
+var gBackendURL = "https://backend.lantea.kairo.at/";
var gAuthClientID = "lantea";
-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() {
- if (/\/login\.html/.test(window.location)) {
- // If we are in the login window, call a function to complete the process and don't do anything else here.
- completeLoginWindow();
- return;
- }
gAction = document.getElementById("action");
gActionLabel = document.getElementById("actionlabel");
mSel.add(opt, null);
}
- var areas = document.getElementsByClassName("overlayArea");
+ var areas = document.getElementsByClassName("autoFade");
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].addEventListener("mouseup", uiEvHandler, false);
areas[i].addEventListener("mousemove", uiEvHandler, false);
gAuthClientID += "-dev";
}
+ document.getElementById("libCloseButton").onclick = hideLibrary;
+
// Set up the login area.
document.getElementById("loginbtn").onclick = startLogin;
document.getElementById("logoutbtn").onclick = doLogout;
- prepareLoginButton(function() {
- // Anything that needs the backend should only be triggered from in here.
- // That makes sure that the first call the the backend is oauth_state and no other is running in parallel.
- // If we call multiple backend methods at once and no session is open, we create multiple sessions, which calls for confusion later on.
-
- // Call any UI preparation that needs the backend.
- });
-
- if (gDebug) {
- // Note that GPX upload returns an error 500 on the dev API right now.
- gOSMAPIURL = "http://api06.dev.openstreetmap.org/";
- }
+ // Put in a logged-out state by default.
+ // Opening the track drawer will update this correctly.
+ displayLogout();
gAction.addEventListener("dbinit-done", initMap, false);
gAction.addEventListener("mapinit-done", postInit, false);
gActionLabel.textContent = "";
gAction.style.display = "none";
setTracking(document.getElementById("trackCheckbox"));
- gPrefs.get(gDebug ? "osm_dev_user" : "osm_user", function(aValue) {
+ gPrefs.get("devicename", function(aValue) {
if (aValue) {
- document.getElementById("uploadUser").value = aValue;
- document.getElementById("uploadTrackButton").disabled = false;
+ document.getElementById("uploadDevName").value = aValue;
}
});
- gPrefs.get(gDebug ? "osm_dev_pwd" : "osm_pwd", function(aValue) {
- var upwd = document.getElementById("uploadPwd");
- if (aValue)
- document.getElementById("uploadPwd").value = aValue;
- });
+ if (firstRun) {
+ showFirstRunDialog();
+ }
+ else {
+ gPrefs.get("lastInfoShown", function(aValue) {
+ if (!aValue || !parseInt(aValue) || parseInt(aValue) < 1) {
+ showInfoDialog();
+ }
+ });
+ }
+ gPrefs.set("lastInfoShown", 1);
}
window.onresize = function() {
}
function startLogin() {
+ var logerr = document.getElementById("loginerror");
+ logerr.classList.add("hidden");
+ logerr.title = "";
+ if (!authData || !authData["state"]) {
+ // We have no oAuth state, try to fetch it and call ourselves again if it worked.
+ prepareLoginButton(function() {
+ if (authData && authData["state"]) {
+ startLogin();
+ }
+ else if (!userData) {
+ // Only warn if we didn't actually end up being logged in.
+ console.log("No OAuth state and fetching fails, client or server may be offline.");
+ logerr.classList.remove("hidden");
+ logerr.title = "Client or server may be offline.";
+ }
+ });
+ return;
+ }
var authURL = authData["url"] + "authorize?response_type=code&client_id=" + gAuthClientID + "&scope=email" +
"&state=" + authData["state"] + "&redirect_uri=" + encodeURIComponent(getRedirectURI());
if (window.open(authURL, "KaiRoAuth", 'height=450,width=600')) {
}
else {
console.log("Opening Sign In window failed.");
+ logerr.classList.remove("hidden");
+ logerr.title = "Opening Sign-In window failed.";
}
}
function getRedirectURI() {
- return window.location.protocol + '//' + window.location.host + window.location.pathname + "login.html";
+ return window.location.protocol + '//' + window.location.host + window.location.pathname.replace("index.html", "") + "login.html";
}
function doLogout() {
);
}
-function completeLoginWindow() {
- if (window.opener) {
- window.opener.finishLogin(getParameterByName("code"), getParameterByName("state"));
- window.close();
- }
- else {
- document.getElementById("logininfo").textContent = "You have called this document outside of the login flow, which is not supported.";
- }
-}
-
function finishLogin(aCode, aState) {
if (aState == authData["state"]) {
fetchBackend("login?code=" + aCode + "&state=" + aState + "&redirect_uri=" + encodeURIComponent(getRedirectURI()), "GET", null,
document.getElementById("username").classList.remove("hidden");
document.getElementById("username").textContent = userData.email;
document.getElementById("uploadTrackButton").disabled = false;
+ document.getElementById("libraryShowLine").classList.remove("hidden");
document.getElementById("logoutbtn").classList.remove("hidden");
}
document.getElementById("username").classList.add("hidden");
document.getElementById("username").textContent = "";
document.getElementById("uploadTrackButton").disabled = true;
+ document.getElementById("libraryShowLine").classList.add("hidden");
document.getElementById("loginbtn").classList.remove("hidden");
document.getElementById("logindesc").classList.remove("hidden");
}
if (!mainDB.objectStoreNames.contains("prefs")) {
// Create a "prefs" objectStore.
var prefsStore = mainDB.createObjectStore("prefs");
+ firstRun = true;
}
if (!mainDB.objectStoreNames.contains("track")) {
// Create a "track" objectStore.
function showUI() {
if (gUIHideCountdown <= 0) {
- var areas = document.getElementsByClassName('overlayArea');
+ var areas = document.getElementsByClassName('autoFade');
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].classList.remove("hidden");
}
function maybeHideUI() {
gUIHideCountdown--;
if (gUIHideCountdown <= 0) {
- var areas = document.getElementsByClassName('overlayArea');
+ var areas = document.getElementsByClassName('autoFade');
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].classList.add("hidden");
}
function toggleTrackArea() {
var fs = document.getElementById("trackArea");
if (fs.classList.contains("hidden")) {
+ prepareLoginButton();
fs.classList.remove("hidden");
showUI();
gTrackUpdateInterval = setInterval(updateTrackInfo, 1000);
}
function showUploadDialog() {
- var dia = document.getElementById("dialogArea");
+ var dia = document.getElementById("trackDialogArea");
var areas = dia.children;
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].style.display = "none";
dia.classList.remove("hidden");
}
+function cancelTrackDialog() {
+ document.getElementById("trackDialogArea").classList.add("hidden");
+ document.getElementById("uploadTrackButton").disabled = false;
+}
+
function showGLWarningDialog() {
var dia = document.getElementById("dialogArea");
var areas = dia.children;
dia.classList.remove("hidden");
}
-function cancelDialog() {
+function showFirstRunDialog() {
+ 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("firstRunIntro").style.display = "block";
+ dia.classList.remove("hidden");
+}
+
+function closeDialog() {
document.getElementById("dialogArea").classList.add("hidden");
- document.getElementById("uploadTrackButton").disabled = false;
+}
+
+function showInfoDialog() {
+ 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("infoDialog").style.display = "block";
+ dia.classList.remove("hidden");
}
var uiEvHandler = {
function setUploadField(aField) {
switch (aField.id) {
- case "uploadUser":
- gPrefs.set(gDebug ? "osm_dev_user" : "osm_user", aField.value);
- document.getElementById("uploadTrackButton").disabled = !aField.value.length;
- break;
- case "uploadPwd":
- gPrefs.set(gDebug ? "osm_dev_pwd" : "osm_pwd", aField.value);
+ case "uploadDevName":
+ gPrefs.set("devicename", aField.value);
break;
}
}
function uploadTrack() {
// Hide all areas in the dialog.
- var dia = document.getElementById("dialogArea");
+ var dia = document.getElementById("trackDialogArea");
var areas = dia.children;
for (var i = 0; i <= areas.length - 1; i++) {
areas[i].style.display = "none";
// 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" });
+ // Assemble field to post to the backend.
var formData = new FormData();
- formData.append("file", trackBlob);
+ formData.append("jsondata", convertTrack("json"));
var desc = document.getElementById("uploadDesc").value;
- formData.append("description",
+ formData.append("comment",
desc.length ? desc : "Track recorded via Lantea Maps");
- //formData.append("tags", "");
- formData.append("visibility",
- document.getElementById("uploadVisibility").value);
-
-/* 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);
+ formData.append("devicename",
+ document.getElementById("uploadDevName").value);
+ formData.append("public",
+ document.getElementById("uploadPublic").value);
+
+ fetchBackend("save_track", "POST", formData,
+ function(aResult, aStatusCode) {
+ if (aStatusCode >= 400) {
+ reportUploadStatus(false, aResult);
}
- else {
+ else if (aResult["id"]) {
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) {
+ else { // If no ID is returned, we assume a general error.
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);
- }
- };
- 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 {
- hXHR.send(); // Empty request, see above.
- }
- catch (e) {
- reportUploadStatus(false, e);
- }
}
-function reportUploadStatus(aSuccess, aMessage) {
+function reportUploadStatus(aSuccess, aResponse) {
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;
+ else if (aResponse && aResponse["message"]) {
+ document.getElementById("uploadErrorMsg").textContent = aResponse["message"];
+ if (aResponse["errortype"]) {
+ document.getElementById("uploadErrorMsg").textContent += " (" + aResponse["errortype"] + ")";
+ }
+ document.getElementById("uploadError").style.display = "block";
+ }
+ else if (aResponse) {
+ document.getElementById("uploadErrorMsg").textContent = aResponse;
document.getElementById("uploadError").style.display = "block";
}
else {
var result = {};
if (XHR.getResponseHeader("Content-Type") == "application/json") {
// Got a JSON object, see if we have success.
- result = JSON.parse(XHR.responseText);
+ try {
+ result = JSON.parse(XHR.responseText);
+ }
+ catch (e) {
+ console.log(e);
+ result = {"error": e,
+ "message": XHR.responseText};
+ }
}
else {
result = XHR.responseText;
}
};
XHR.open(aMethod, gBackendURL + aEndpoint, true);
+ XHR.withCredentials = "true";
//XHR.setRequestHeader("Accept", "application/json");
try {
XHR.send(aSendData); // Send actual form data.
aCallback(e, 500, aCallbackForwards);
}
}
-
-function getParameterByName(aName) {
- // from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
- name = aName.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
- results = regex.exec(location.search);
- return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}
projects / lantea.git / blobdiff