profile upload (requires server update)

This commit is contained in:
Norbert Renner 2014-05-22 11:20:22 +02:00
parent 136a182539
commit 973d8bab75
8 changed files with 129 additions and 27 deletions

View file

@ -1,11 +1,23 @@
BR.Profile = BR.Control.extend({
options: {
heading: ''
options: {
heading: 'Profile',
divId: 'profile_div'
},
onAdd: function (map) {
var container = BR.Control.prototype.onAdd.call(this, map);
container.innerHTML = " ";
return container;
L.DomUtil.get('profile_upload').onsubmit = L.bind(this._submit, this)
return BR.Control.prototype.onAdd.call(this, map);
},
_submit: function(evt) {
var form = evt.target || evt.srcElement,
profile = document.profile_upload.profile.value;
evt.preventDefault();
this.fire('update', { profileText: profile });
}
});
BR.Profile.include(L.Mixin.Events);

View file

@ -19,14 +19,39 @@ BR.RoutingOptions = BR.Control.extend({
},
setOptions: function(options) {
if (options.profile) {
L.DomUtil.get('profile').value = options.profile;
var select,
profile = options.profile;
if (profile) {
select = L.DomUtil.get('profile');
select.value = profile;
// profile got not selected = not in option values -> custom profile passed with permalink
if (select.value != profile) {
this.setCustomProfile(profile, true);
}
}
if (options.alternative) {
L.DomUtil.get('alternative').value = options.alternative;
}
},
setCustomProfile: function(profile, noUpdate) {
var select,
option;
select = L.DomUtil.get('profile');
option = select.options[0]
option.value = profile;
select.value = profile;
option.disabled = false;
if (!noUpdate) {
this.fire('update', {options: this.getOptions()});
}
},
_getChangeHandler: function() {
return L.bind(function(evt) {
this.fire('update', {options: this.getOptions()});

View file

@ -103,7 +103,7 @@
routingOptions.on('update', updateRoute);
nogos = new BR.NogoAreas();
nogos.on('update', updateRoute);
nogos.on('update', updateRoute);
// initial option settings
router.setOptions(nogos.getOptions());
@ -113,6 +113,11 @@
download = new BR.Download();
elevation = new BR.Elevation();
profile = new BR.Profile();
profile.on('update', function(evt) {
router.uploadProfile(evt.profileText, function(profile) {
routingOptions.setCustomProfile(profile);
});
});
routing = new BR.Routing({routing: {
router: L.bind(router.getRouteSegment, router)

View file

@ -46,7 +46,6 @@ L.Control.Permalink.include({
this.options.routing.on('waypoint:click', function(evt) {
var r = evt.marker._routing;
if (!r.prevMarker && ! r.nextMarker) {
console.log('delete last');
this._update_routing(evt);
}
}, this);

View file

@ -1,7 +1,11 @@
BR.HOST = 'http://localhost:17777';
L.BRouter = L.Class.extend({
statics: {
// http://localhost:17777/brouter?lonlats=1.1,1.2|2.1,2.2|3.1,3.2|4.1,4.2&nogos=-1.1,-1.2,1|-2.1,-2.2,2&profile=shortest&alternativeidx=1&format=kml
URL_TEMPLATE: 'http://localhost:17777/brouter?lonlats={lonlats}&nogos={nogos}&profile={profile}&alternativeidx={alternativeidx}&format={format}',
// /brouter?lonlats=1.1,1.2|2.1,2.2|3.1,3.2|4.1,4.2&nogos=-1.1,-1.2,1|-2.1,-2.2,2&profile=shortest&alternativeidx=1&format=kml
URL_TEMPLATE: BR.HOST + '/brouter?lonlats={lonlats}&nogos={nogos}&profile={profile}&alternativeidx={alternativeidx}&format={format}',
URL_PROFILE_UPLOAD: BR.HOST + '/brouter/profile',
PRECISION: 6,
NUMBER_SEPARATOR: ',',
GROUP_SEPARATOR: '|'
@ -88,6 +92,26 @@ L.BRouter = L.Class.extend({
return this.getRoute([l1, l2], cb);
},
uploadProfile: function(profileText, cb) {
var xhr = new XMLHttpRequest();
xhr.open('POST', L.BRouter.URL_PROFILE_UPLOAD, true);
xhr.onload = L.bind(this._handleProfileResponse, this, xhr, cb);
// send profile text only, as text/plain;charset=UTF-8
xhr.send(profileText);
},
_handleProfileResponse: function(xhr, cb) {
var profile;
if (xhr.status === 200 && xhr.responseText && xhr.responseText.length > 0) {
// e.g. profileid=1400498280259
profile = xhr.responseText.split('=')[1];
cb(profile);
}
},
_getLonLatsString: function(latLngs) {
var s = '';
for (var i = 0; i < latLngs.length; i++) {