ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Read time/energy calc variables from profile

Browse source 
and ensure profile text is loaded before updating route and straight line stats
This commit is contained in:
Norbert Renner 2022-02-15 19:30:49 +01:00
parent 9abf4b94c4
commit 4d44153316
5 changed files with 57 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/control/Profile.js
View file

@ -38,11 +38,12 @@ BR.Profile = L.Evented.extend({
button.blur();
},
update: function (options) {
update: function (options, cb) {
var profileName = options.profile,
profileUrl,
empty = !this.editor.getValue(),
clean = this.editor.isClean();
clean = this.editor.isClean(),
loading = false;
if (profileName && BR.conf.profilesUrl) {
// only synchronize profile editor/parameters with selection if no manual changes in full editor,
@ -51,11 +52,13 @@ BR.Profile = L.Evented.extend({
this.profileName = profileName;
if (!(profileName in this.cache)) {
profileUrl = BR.conf.profilesUrl + profileName + '.brf';
loading = true;
BR.Util.get(
profileUrl,
L.bind(function (err, profileText) {
if (err) {
console.warn('Error getting profile from "' + profileUrl + '": ' + err);
if (cb) cb();
return;
}
@ -65,6 +68,7 @@ BR.Profile = L.Evented.extend({
if (!this.profileName || this.profileName === profileName) {
this._setValue(profileText);
}
if (cb) cb();
}, this)
);
} else {
@ -80,6 +84,8 @@ BR.Profile = L.Evented.extend({
}
}
}
if (cb && !loading) cb();
},
show: function () {