X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fui.js;h=f8a45b1d6278ce230a6fb58b261951d6726bb09e;hp=9c97cd600891127443be8b07c66d8b686113cd42;hb=8389557a642218382b7294fde519389b72551388;hpb=8e901dce32e1d203d8400a0be806dc0c36b67665 diff --git a/js/ui.js b/js/ui.js index 9c97cd6..f8a45b1 100644 --- a/js/ui.js +++ b/js/ui.js @@ -3,12 +3,18 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ // Get the best-available indexedDB object. -var iDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.msIndexedDB; +window.indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.msIndexedDB; var mainDB; var gUIHideCountdown = 0; +var gWaitCounter = 0; +var gAction, gActionLabel; +var gOSMAPIURL = "http://api06.dev.openstreetmap.org/"; // "http://api.openstreetmap.org/"; window.onload = function() { + gAction = document.getElementById("action"); + gActionLabel = document.getElementById("actionlabel"); + var mSel = document.getElementById("mapSelector"); for (var mapStyle in gMapStyles) { var opt = document.createElement("option"); @@ -31,6 +37,8 @@ window.onload = function() { areas[i].addEventListener("touchleave", uiEvHandler, false); } + document.getElementById("body").addEventListener("keydown", uiEvHandler, false); + if (navigator.platform.length == "") { // For Firefox OS, don't display the "save" button. // Do this by setting the debugHide class for testing in debug mode. @@ -39,7 +47,37 @@ window.onload = function() { initDB(); initMap(); - resizeAndDraw(); + + 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; + }); + } + else + setTimeout(waitForInitAndDraw, 100); + loopCnt++; + }; + waitForInitAndDraw(); } window.onresize = function() { @@ -48,24 +86,33 @@ window.onresize = function() { function initDB() { // Open DB. - var request = iDB.open("MainDB", 1); + var request = window.indexedDB.open("MainDB-lantea", 2); request.onerror = function(event) { // Errors can be handled here. Error codes explain in: // https://developer.mozilla.org/en/IndexedDB/IDBDatabaseException#Constants - //document.getElementById("debug").textContent = - // "error opening mainDB: " + event.target.errorCode; + if (gDebug) + console.log("error opening mainDB: " + event.target.errorCode); }; request.onsuccess = function(event) { - //document.getElementById("debug").textContent = "mainDB opened."; mainDB = request.result; }; request.onupgradeneeded = function(event) { mainDB = request.result; - //document.getElementById("debug").textContent = "mainDB upgraded."; - // Create a "prefs" objectStore. - var prefsStore = mainDB.createObjectStore("prefs"); - // Create a "track" objectStore. - var trackStore = mainDB.createObjectStore("track", {autoIncrement: true}); + var ver = mainDB.version || 0; // version is empty string for a new DB + if (gDebug) + console.log("mainDB has version " + ver + ", upgrade needed."); + if (!mainDB.objectStoreNames.contains("prefs")) { + // Create a "prefs" objectStore. + var prefsStore = mainDB.createObjectStore("prefs"); + } + if (!mainDB.objectStoreNames.contains("track")) { + // Create a "track" objectStore. + var trackStore = mainDB.createObjectStore("track", {autoIncrement: true}); + } + if (!mainDB.objectStoreNames.contains("tilecache")) { + // Create a "tilecache" objectStore. + var tilecacheStore = mainDB.createObjectStore("tilecache"); + } mainDB.onversionchange = function(event) { mainDB.close(); mainDB = undefined; @@ -155,12 +202,25 @@ var uiEvHandler = { case "touchmove": case "mouseup": case "touchend": + case "keydown": showUI(); break; } } }; +function setUploadField(aField) { + switch (aField.id) { + case "uploadUser": + gPrefs.set("osm_user", aField.value); + document.getElementById("uploadTrackButton").disabled = !aField.value.length; + break; + case "uploadPwd": + gPrefs.set("osm_pwd", aField.value); + break; + } +} + function makeISOString(aTimestamp) { // ISO time format is YYYY-MM-DDTHH:mm:ssZ var tsDate = new Date(aTimestamp); @@ -172,41 +232,96 @@ function makeISOString(aTimestamp) { (tsDate.getUTCSeconds() < 10 ? "0" : "") + tsDate.getUTCSeconds() + "Z"; } -function saveTrack() { - if (gTrack.length) { - var out = '' + "\n\n"; - out += '' + "\n"; - out += ' ' + "\n"; - out += ' ' + "\n"; - for (var i = 0; i < gTrack.length; i++) { - if (gTrack[i].beginSegment && i > 0) { - out += ' ' + "\n"; +function convertTrack(aTargetFormat) { + var out = ""; + switch (aTargetFormat) { + case "gpx": + out += '' + "\n\n"; + out += '' + "\n"; + if (gTrack.length) { + out += ' ' + "\n"; out += ' ' + "\n"; + for (var i = 0; i < gTrack.length; i++) { + if (gTrack[i].beginSegment && i > 0) { + out += ' ' + "\n"; + out += ' ' + "\n"; + } + out += ' ' + "\n"; + if (gTrack[i].coords.altitude) { + out += ' ' + gTrack[i].coords.altitude + '' + "\n"; + } + out += ' ' + "\n"; + out += ' ' + "\n"; + } + out += ' ' + "\n"; + out += ' ' + "\n"; } - out += ' ' + "\n"; - if (gTrack[i].coords.altitude) { - out += ' ' + gTrack[i].coords.altitude + '' + "\n"; - } - out += ' ' + "\n"; - out += ' ' + "\n"; - } - out += ' ' + "\n"; - out += ' ' + "\n"; - out += '' + "\n"; - var outDataURI = "data:application/gpx+xml," + encodeURIComponent(out); + out += '' + "\n"; + break; + case "json": + out = JSON.stringify(gTrack); + break; + default: + break; + } + return out; +} + +function saveTrack() { + if (gTrack.length) { + var outDataURI = "data:application/gpx+xml," + + encodeURIComponent(convertTrack("gpx")); window.open(outDataURI, 'GPX Track'); } } function saveTrackDump() { if (gTrack.length) { - var out = JSON.stringify(gTrack); - var outDataURI = "data:application/json," + encodeURIComponent(out); + var outDataURI = "data:application/json," + + encodeURIComponent(convertTrack("json")); window.open(outDataURI, 'JSON dump'); } } +function uploadTrack() { + // See http://wiki.openstreetmap.org/wiki/Api06#Uploading_traces + 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"); + //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... + reportUploadStatus(false); + } + }; + XHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true, + document.getElementById("uploadUser").value, + document.getElementById("uploadPwd").value); + try { + XHR.send(formData); + } + catch (e) { + reportUploadStatus(false, e); + } +} + +function reportUploadStatus(aSuccess, aMessage) { + alert(aMessage ? aMessage : (aSuccess ? "success" : "failure")); +} + var gPrefs = { objStore: "prefs",