X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fui.js;h=352f7e78b6448a0fd4f5ef4ed0c677282ec90d6f;hp=9c97cd600891127443be8b07c66d8b686113cd42;hb=003d56f8a1eee6825cc6c800f135e13df753770d;hpb=8e901dce32e1d203d8400a0be806dc0c36b67665

diff --git a/js/ui.js b/js/ui.js
index 9c97cd6..352f7e7 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://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,41 +37,88 @@ 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.
     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();
+}
+
+function postInit(aEvent) {
+  gAction.removeEventListener(aEvent.type, postInit, false);
+  console.log("init done, draw map.");
+  gMapPrefsLoaded = true;
   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;
+    }
+  });
+  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();
 }
 
-function initDB() {
+function initDB(aEvent) {
   // Open DB.
-  var request = iDB.open("MainDB", 1);
+  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:
     // 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;
+    var throwEv = new CustomEvent("dbinit-done");
+    gAction.dispatchEvent(throwEv);
   };
   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;
@@ -144,6 +197,22 @@ function toggleFullscreen() {
   }
 }
 
+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 cancelDialog() {
+  document.getElementById("dialogArea").classList.add("hidden");
+  document.getElementById("uploadTrackButton").disabled = false;
+}
+
 var uiEvHandler = {
   handleEvent: function(aEvent) {
     var touchEvent = aEvent.type.indexOf('touch') != -1;
@@ -155,12 +224,25 @@ var uiEvHandler = {
       case "touchmove":
       case "mouseup":
       case "touchend":
+      case "keydown":
         showUI();
         break;
     }
   }
 };
 
+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);
+      break;
+  }
+}
+
 function makeISOString(aTimestamp) {
   // ISO time format is YYYY-MM-DDTHH:mm:ssZ
   var tsDate = new Date(aTimestamp);
@@ -172,41 +254,144 @@ function makeISOString(aTimestamp) {
          (tsDate.getUTCSeconds() < 10 ? "0" : "") + tsDate.getUTCSeconds() + "Z";
 }
 
-function saveTrack() {
-  if (gTrack.length) {
-    var out = '<?xml version="1.0" encoding="UTF-8" ?>' + "\n\n";
-    out += '<gpx version="1.0" creator="Lantea" xmlns="http://www.topografix.com/GPX/1/0">' + "\n";
-    out += '  <trk>' + "\n";
-    out += '    <trkseg>' + "\n";
-    for (var i = 0; i < gTrack.length; i++) {
-      if (gTrack[i].beginSegment && i > 0) {
-        out += '    </trkseg>' + "\n";
+function convertTrack(aTargetFormat) {
+  var out = "";
+  switch (aTargetFormat) {
+    case "gpx":
+      out += '<?xml version="1.0" encoding="UTF-8" ?>' + "\n\n";
+      out += '<gpx version="1.0" creator="Lantea" xmlns="http://www.topografix.com/GPX/1/0">' + "\n";
+      if (gTrack.length) {
+        out += '  <trk>' + "\n";
         out += '    <trkseg>' + "\n";
+        for (var i = 0; i < gTrack.length; i++) {
+          if (gTrack[i].beginSegment && i > 0) {
+            out += '    </trkseg>' + "\n";
+            out += '    <trkseg>' + "\n";
+          }
+          out += '      <trkpt lat="' + gTrack[i].coords.latitude + '" lon="' +
+                                        gTrack[i].coords.longitude + '">' + "\n";
+          if (gTrack[i].coords.altitude) {
+            out += '        <ele>' + gTrack[i].coords.altitude + '</ele>' + "\n";
+          }
+          out += '        <time>' + makeISOString(gTrack[i].time) + '</time>' + "\n";
+          out += '      </trkpt>' + "\n";
+        }
+        out += '    </trkseg>' + "\n";
+        out += '  </trk>' + "\n";
       }
-      out += '      <trkpt lat="' + gTrack[i].coords.latitude + '" lon="' +
-                                    gTrack[i].coords.longitude + '">' + "\n";
-      if (gTrack[i].coords.altitude) {
-        out += '        <ele>' + gTrack[i].coords.altitude + '</ele>' + "\n";
-      }
-      out += '        <time>' + makeISOString(gTrack[i].time) + '</time>' + "\n";
-      out += '      </trkpt>' + "\n";
-    }
-    out += '    </trkseg>' + "\n";
-    out += '  </trk>' + "\n";
-    out += '</gpx>' + "\n";
-    var outDataURI = "data:application/gpx+xml," + encodeURIComponent(out);
+      out += '</gpx>' + "\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() {
+  // 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("uploadErrorMsg").textContent = "";
+  document.getElementById("uploadError").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" });
+  var formData = new FormData();
+  formData.append("file", trackBlob);
+  var desc = document.getElementById("uploadDesc").value;
+  formData.append("description",
+                  desc.length ? desc : "Track recorded via Lantea Maps");
+  //formData.append("tags", "");
+  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 && (XHR.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) {
+  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 = {
   objStore: "prefs",
 
@@ -290,6 +475,24 @@ var gTrackStore = {
     }
   },
 
+  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;