-/* This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/* This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
and is published under the AGPL license. */
+"use strict";
+
// avoid openlayers alerts
OpenLayers.Console.userError = function(error) {
SYJView.messenger.setMessage(error, "error");
};
+OpenLayers.Layer.Vector.prototype.renderers = ["SVG2", "VML", "Canvas"];
+
var SyjSaveUI = {
status: "unknown",
this.enableSubmit();
$("geom_title").disabled = false;
$("geom_title").activate();
- $("geomform").removeClassName("disabled");
+ $$("#geom_accept_container, #geom_title_container").invoke('removeClassName', "disabled");
this.status = "enabled";
return this;
},
this.disableSubmit();
$("geom_title").blur();
$("geom_title").disabled = true;
- $("geomform").addClassName("disabled");
+ $$("#geom_accept_container, #geom_title_container").invoke('addClassName', "disabled");
this.status = "disabled";
return this;
},
if (!infotoggler) {
infotoggler = new Toggler('path-infos-content');
$("path-infos-toggler").insert({bottom: infotoggler.element});
- $("path-infos-anchor").observe('click', function(evt) {
+ var anchor = $("path-infos-anchor");
+ var parent = anchor.up('.menu-item');
+ if (parent) {
+ anchor = parent;
+ }
+ anchor.observe('click', function(evt) {
evt.stop();
infotoggler.toggle(evt);
});
mode: 'view',
init: function() {
- var externalGraphic, baseURL, baseLayer, layerOptions, extent, hidemessenger;
+ var externalGraphic, baseURL, baseLayer, layerOptions, hidemessenger;
// is svg context, opera does not resolve links with base element is svg context
externalGraphic = styleMap.edit.styles.select.defaultStyle.externalGraphic;
theme: null
});
- baseLayer = new OpenLayers.Layer.OSM("OSM", null, { wrapDateLine: true , attribution: SyjStrings.osmAttribution });
+ baseLayer = new OpenLayers.Layer.OSM("OSM", [
+ 'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
+ 'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
+ 'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],
+ { attribution: SyjStrings.osmAttribution });
layerOptions = {format: OpenLayers.Format.WKT,
projection: WGS84,
if ($("edit-btn")) {
$("edit-btn").observe('click', function() {
$("geom_submit").value = SyjStrings.editAction;
- this.messenger.hide();
+ this.messenger.clearMessages();
this.editMode();
this.mode = 'edit';
}.bind(this));
if ($("create-btn")) {
$("create-btn").observe('click', function() {
$("geom_submit").value = SyjStrings.createAction;
- this.messenger.hide();
+ this.messenger.clearMessages();
this.editMode();
this.mode = 'create';
}.bind(this));
$("clone-btn").observe('click', function() {
$("geom_submit").value = SyjStrings.cloneAction;
$("geom_title").value = "";
- this.messenger.hide();
+ this.messenger.clearMessages();
this.editMode();
this.mode = 'create';
}.bind(this));
if (typeof gInitialGeom !== "undefined" && typeof gInitialGeom.data !== "undefined") {
this.viewLayer.addFeatures([this.wkt.read(gInitialGeom.data)]);
- extent = this.viewLayer.getDataExtent();
// XXX: ie has not guessed height of map main div yet during map
// initialisation. Now, it will read it correctly.
this.map.updateSize();
+ this.map.zoomToExtent(this.viewLayer.getDataExtent());
} else {
- extent = new OpenLayers.Bounds(gMaxExtent.minlon, gMaxExtent.minlat, gMaxExtent.maxlon, gMaxExtent.maxlat)
- .transform(WGS84, Mercator);
+ this.initMaPos(gInitialPos);
}
- this.map.zoomToExtent(extent);
- document.observe('simplebox:shown', this.observer.bindAsEventListener(this));
- SYJPathLength.update();
- if (window.FileList && window.FileReader) {
- $("map").observe("dragenter", function(evt) { evt.stop();});
- $("map").observe("dragover", function(evt) { evt.stop();});
- $("map").observe("drop", function(evt) {
- evt.stop();
- if (this.mode !== "view" || this.viewLayer.features.length) {
- return;
- }
- if (!evt.dataTransfer.files.length) {
- return;
- }
- var file = evt.dataTransfer.files[0];
- var reader = new FileReader();
- var readerror = function() {
- this.messenger.setMessage(SyjStrings.dragFileError, "warn");
+ $("map-overlay").hide();
+ $("geom_upload").observe('change', function(evt) {
+ var file = null, reader = null, readerror = null;
+ if (window.FileList && window.FileReader) {
+ file = evt.target.files[0];
+ reader = new FileReader();
+ readerror = function() {
+ this.messenger.setMessage(SyjStrings.uploadFileError, "warn");
}.bind(this);
reader.onload = function(evt) {
+ var data = null, results = null, engine = null, vector = null, i = 0, format = null, formats = ['KML', 'GPX', 'GeoJSON'];
+
+ $("geom_upload_container").removeClassName("disabled");
+ $("geom_upload").disabled = false;
if (evt.error) {
readerror();
return;
}
-
- var results = null;
- var content = evt.target.result;
-
- var engine, i;
- var formats = ['KML', 'GPX'];
+ data = evt.target.result;
for (i = 0; i < formats.length; i++) {
- engine = new OpenLayers.Format[formats[i]]({ internalProjection: Mercator, externalProjection: WGS84 });
+ format = formats[i];
+ engine = new OpenLayers.Format[format]({ internalProjection: Mercator, externalProjection: WGS84 });
try {
- results = engine.read(content);
+ results = engine.read(data);
} catch(e) {
}
- if (results || results.length) {
- continue;
+ if (results && results.length) {
+ break;
}
}
if (!results || !results.length) {
return;
}
-
- var vector = results[0];
+ vector = results[0];
if (vector.geometry.CLASS_NAME !== "OpenLayers.Geometry.LineString") {
readerror();
return;
}
+ // merge linestrings for gpx containting multiple trkseg elements.
+ if (format === 'GPX') {
+ for (i = 1; i < results.length; i++) {
+ vector.geometry.addComponents(results[i].geometry.components);
+ }
+ }
this.viewLayer.addFeatures([vector]);
this.map.zoomToExtent(this.viewLayer.getDataExtent());
if (this.editControl.handler.realPoints.length < 2) {
SyjSaveUI.disable();
} else {
- SyjSaveUI.enable();
+ SyjSaveUI.enable();
}
-
if (vector.data && vector.data.name) {
$("geom_title").value = vector.data.name;
}
- }.bind(this);
+ }.bind(this);
+ $("geom_upload_container").addClassName("disabled");
+ $("geom_upload").disabled = true;
reader.readAsText(file);
- }.bind(this));
+ return;
+ }
+ $("map-overlay").show();
+ SyjSaveUI.enable();
+ this.editControl.deactivate();
+ }.bind(this));
+
+ document.observe('simplebox:shown', this.observer.bindAsEventListener(this));
+ SYJPathLength.update();
+ },
+
+ initMaPos: function (aPos) {
+ var extent = null, center = null, zoom = 0;
+
+ if (aPos.hasOwnProperty('lon') && aPos.hasOwnProperty('lat') && aPos.hasOwnProperty('zoom')) {
+ center = new OpenLayers.LonLat(parseFloat(aPos.lon), parseFloat(aPos.lat)).transform(WGS84, Mercator);
+ zoom = parseInt(aPos.zoom, 10);
+ } else if (aPos.hasOwnProperty('minlon') && aPos.hasOwnProperty('minlat')
+ && aPos.hasOwnProperty('maxlon') && aPos.hasOwnProperty('maxlat')) {
+ extent = new OpenLayers.Bounds(aPos.minlon, aPos.minlat, aPos.maxlon, aPos.maxlat)
+ .transform(WGS84, Mercator);
+ } else {
+ extent = new OpenLayers.Bounds(-160, -70, 160, 70).transform(WGS84, Mercator);
+ }
+
+ if (extent) {
+ this.map.zoomToExtent(extent);
+ } else {
+ this.map.setCenter(center, zoom);
}
},
observer: function(evt) {
if (evt.eventName === "simplebox:shown" && evt.memo.element !== $("termsofusearea")) {
- this.messenger.hide();
+ this.messenger.clearMessages();
}
},
this.viewMode();
- $("geom_data").value = this.wkt.write(new OpenLayers.Feature.Vector(line));
+ if (line.components.length) {
+ $("geom_data").value = this.wkt.write(new OpenLayers.Feature.Vector(line));
+ } else {
+ $("geom_data").value = "";
+ }
+
if (this.mode === "edit" && typeof gLoggedInfo.pathid !== "undefined") {
$("geomform").setAttribute("action", "path/" + gLoggedInfo.pathid.toString() + '/update');
} else {
}
this.needsFormResubmit = false;
SyjSaveUI.disable.bind(SyjSaveUI).defer();
- this.messenger.hide();
+ this.messenger.clearMessages();
return true;
},
callbacks: {
modify: function(f, line) {
SYJPathLength.update();
- if (!SYJView.unsavedRoute) {
- SYJView.unsavedRoute = {};
+
+ var npoints = this.handler.realPoints.length;
+ if (npoints === 0) {
+ $("geom_upload_container").show();
+ SYJView.unsavedRoute = null;
+ } else {
+ if (!SYJView.unsavedRoute) {
+ SYJView.unsavedRoute = {};
+ }
}
- if (this.handler.realPoints.length < 2) {
+
+ if (npoints < 2) {
SyjSaveUI.disable();
} else {
SyjSaveUI.enable();
}
- }
+ },
+ create: function(f, line) {
+ this.messenger.clearMessages();
+ $("geom_upload_container").hide();
+ }.bind(this)
},
handlerOptions: {
},
saveSuccess: function(transport) {
- this.unsavedRoute = null;
+ // server sends and empty response on success. If we get a response, that
+ // probably means an error or warning has been printed by server.
+ if (!transport.responseJSON && transport.responseText.length) {
+ this.saveFailure(null, 500);
+ return;
+ }
+ this.unsavedRoute = null;
if (transport.responseJSON && (typeof transport.responseJSON.redirect === "string")) {
location = transport.responseJSON.redirect;
return;
document.title = $('geom_title').value;
},
- saveFailure: function(transport) {
- var httpCode = 0, message = "";
-
- if (transport) {
- httpCode = transport.getStatus();
+ saveFailure: function(transport, httpCode) {
+ var message = "";
+ if (typeof httpCode === "undefined") {
+ httpCode = transport? transport.getStatus(): 0;
}
+
switch (httpCode) {
case 0:
message = SyjStrings.notReachedError;
case 400:
case 404:
message = SyjStrings.requestError;
- if (transport.responseJSON) {
- switch (transport.responseJSON.message) {
- case "uniquepath":
- message = SyjStrings.uniquePathError;
- break;
- default:
- break;
- }
- }
break;
case 403:
message = "";
closeMethods: ["onescapekey", "onouterclick", "onbutton"]
});
- $(this.type + "_control_anchor").observe("click", function(evt) {
+ var anchor = $(this.type + '_control_anchor');
+ var parent = anchor.up('.menu-item');
+ if (parent) {
+ anchor = parent;
+ }
+ anchor.observe("click", function(evt) {
this.modalbox.show();
evt.stop();
}.bindAsEventListener(this));
input = this.area.select('input[type="text"]')[0];
(function () {
input.activate();
- }).defer();
+ }.defer());
} else {
this.modalbox.hide();
}
},
reset: function() {
- this.messenger.hide();
+ this.messenger.clearMessages();
this.area.select('.message').invoke('setMessageStatus', null);
}
});
$super();
$("termsofusearea").hide();
- $$("#user_termsofuse_anchor, #geom_termsofuse_anchor").invoke('observe', "click", function(evt) {
+ var touevt = (function(evt) {
+ if (evt.type === "keyup" && evt.keyCode !== 32) { // 32 = space
+ // allow opening box by pressing space
+ return;
+ }
if (!this.toubox) {
this.toubox = new SimpleBox($("termsofusearea"), {
closeMethods: ["onescapekey", "onouterclick", "onbutton"]
$("termsofuseiframe").setAttribute("src", evt.target.href);
}
evt.stop();
- }.bindAsEventListener(this));
+ }).bindAsEventListener(this);
+
+ ["click", "keyup"].each(function (evtName) {
+ $$("#user_termsofuse_anchor, #geom_termsofuse_anchor").invoke('observe', evtName, touevt);
+ })
$$("#login_area_create > a").invoke('observe', 'click',
function(evt) {
},
presubmit: function() {
- this.messenger.hide();
+ this.messenger.clearMessages();
PseudoChecker.reset();
if (!(this.checkNotEmpty("user_pseudo", SyjStrings.userEmptyWarn))) {
return false;
},
presubmit: function() {
- this.messenger.hide();
+ this.messenger.clearMessages();
if (!(this.checkNotEmpty("login_user", SyjStrings.userEmptyWarn))) {
return false;
}
projects / syj.git / blobdiff