var gAction, gActionLabel;
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)) {
// 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/";
- }
-
gAction.addEventListener("dbinit-done", initMap, false);
gAction.addEventListener("mapinit-done", postInit, false);
console.log("starting DB init...");
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;
- });
}
window.onresize = function() {
}
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 cancelDialog() {
- document.getElementById("dialogArea").classList.add("hidden");
+function cancelTrackDialog() {
+ document.getElementById("trackDialogArea").classList.add("hidden");
document.getElementById("uploadTrackButton").disabled = false;
}
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);
- }
- 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",
+ 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 {
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) {
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;
projects / lantea.git / blobdiff