move track upload dialogs into drawer and make upload work with new backend

diff --git a/index.html b/index.html
index 53ace7dc36866523373db9f498b9c64a4bc16025..5cb6382f538451c7506be35bcc57b361bf5e3135 100644 (file)
--- a/index.html
+++ b/index.html
@@ -39,6 +39,36 @@
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();">
 </p>
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();">
 </p>

+<div id="trackDialogArea" class="hidden">
+<div id="uploadDialog">
+<p class="dialogTitle">Upload Track to Lantea Maps Server:</p>
+<label for="uploadPublic">Visibility:</label>
+<select id="uploadPublic">
+<option value="true">Public Domain</option>
+<option value="false">Private</option>
+</select>
+<p class="dialogHelp">Public Domain tracks can be forwarded by the server
+operator to any other services, e.g. OpenStreetMap.</p>
+<label for="uploadDesc">Description:</label>
+<input type="text" id="uploadDesc" maxlength="255" size="25"
+       value="Lantea Maps">
+<input type="button" id="uploadDialogUploadButton" value="Upload Track"
+       onclick="uploadTrack();">
+<input type="button" id="uploadDialogCancelButton" value="Cancel"
+       onclick="cancelTrackDialog();">
+</div>
+<div id="uploadStatus">
+<p class="dialogTitle">Track Upload to Lantea Maps Server</p>
+<p id="uploadInProgress"><img id="actionimg" src="style/loading_action.png">
+  Upload in progress&hellip;</p>
+<p id="uploadSuccess" style="display:none;">Track upload successful!</p>
+<p id="uploadFailed" style="display:none;">Track upload failed.</p>
+<p id="uploadError" style="display:none;">Error:<br>
+  <span id="uploadErrorMsg"></span></p>
+<input type="button" id="uploadStatusCloseButton" value="Close"
+       onclick="cancelTrackDialog();" disabled="true">
+</div>
+</div>

 <p class="loginbox">
 <button type="button" id="loginbtn" class="hidden">Sign in</button>
 <span id="logindesc" class="hidden">to enable uploads</span>
 <p class="loginbox">
 <button type="button" id="loginbtn" class="hidden">Sign in</button>
 <span id="logindesc" class="hidden">to enable uploads</span>


@@ -104,34 +134,6 @@
 </div>
 
 <div id="dialogArea" class="hidden">
 </div>
 
 <div id="dialogArea" class="hidden">

-<div id="uploadDialog">
-<p class="dialogTitle">Upload Track to OpenStreetMap:</p>
-<label for="uploadVisibility">Visibility:</label>
-<select id="uploadVisibility">
-<option value="identifiable">Identifiable</option>
-<option value="private">Private</option>
-</select><br>
-<label for="uploadDesc">Description:</label>
-<input type="text" id="uploadDesc" maxlength="255" size="25"
-       value="Lantea Maps">
-<p class="dialogHelp">You will be asked for your OSM user name and password
-  when clicking "Upload Track".</p>
-<input type="button" id="uploadDialogUploadButton" value="Upload Track"
-       onclick="uploadTrack();">
-<input type="button" id="uploadDialogCancelButton" value="Cancel"
-       onclick="cancelDialog();">
-</div>
-<div id="uploadStatus">
-<p class="dialogTitle">Track Upload to OpenStreetMap</p>
-<p id="uploadInProgress"><img id="actionimg" src="style/loading_action.png">
-  Upload in progress&hellip;</p>
-<p id="uploadSuccess" style="display:none;">Track upload successful!</p>
-<p id="uploadFailed" style="display:none;">Track upload failed.</p>
-<p id="uploadError" style="display:none;">Error:<br>
-  <span id="uploadErrorMsg"></span></p>
-<input type="button" id="uploadStatusCloseButton" value="Close"
-       onclick="cancelDialog();" disabled="true">
-</div>

 <div id="noGLwarning">
   Unable to initialize WebGL. You need a browser that supports it.
 </div>
 <div id="noGLwarning">
   Unable to initialize WebGL. You need a browser that supports it.
 </div>

diff --git a/js/ui.js b/js/ui.js
index 02e294735001bdd228469e4bdd450f137d60b7d4..a44a4625ee1f9b8ae1e64213795da61642d637a2 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -355,7 +355,7 @@ function toggleFullscreen() {
 }
 
 function showUploadDialog() {
 }
 
 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";
   var areas = dia.children;
   for (var i = 0; i <= areas.length - 1; i++) {
     areas[i].style.display = "none";


@@ -375,8 +375,8 @@ function showGLWarningDialog() {
   dia.classList.remove("hidden");
 }
 
   dia.classList.remove("hidden");
 }
 

-function cancelDialog() {
-  document.getElementById("dialogArea").classList.add("hidden");
+function cancelTrackDialog() {
+  document.getElementById("trackDialogArea").classList.add("hidden");

   document.getElementById("uploadTrackButton").disabled = false;
 }
 
   document.getElementById("uploadTrackButton").disabled = false;
 }
 


@@ -476,7 +476,7 @@ function saveTrackDump() {
 
 function uploadTrack() {
   // Hide all areas in the dialog.
 
 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";
   var areas = dia.children;
   for (var i = 0; i <= areas.length - 1; i++) {
     areas[i].style.display = "none";


@@ -491,104 +491,26 @@ function uploadTrack() {
   // Now show the status area.
   document.getElementById("uploadStatus").style.display = "block";
 
   // 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();
   var formData = new FormData();

-  formData.append("file", trackBlob);
+  formData.append("jsondata", convertTrack("json"));

   var desc = document.getElementById("uploadDesc").value;
   var desc = document.getElementById("uploadDesc").value;

-  formData.append("description",
+  formData.append("comment",

                   desc.length ? desc : "Track recorded via Lantea Maps");
                   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);
-      }
-      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);
+  //formData.append("devicename", "");
+  formData.append("public",
+                  document.getElementById("uploadPublic").value);
+
+  fetchBackend("save_track", "POST", formData,
+    function(aResult, aStatusCode) {
+      if (aStatusCode >= 400) {
+        reportUploadStatus(false, aResult);

       }
       else {
         reportUploadStatus(true);
       }
     }
   );
       }
       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, aMessage) {