`;
+ }
+ }
+
+}
diff --git a/js/src/utils.js b/js/src/utils.js
index f362b9b..218ab58 100644
--- a/js/src/utils.js
+++ b/js/src/utils.js
@@ -296,11 +296,18 @@ export default class uUtils {
}
/**
- * @param {Error} e
- * @param {string} message
+ * @param {(Error|string)} e
+ * @param {string=} message
*/
static error(e, message) {
- console.error(`${e.name}: ${e.message} (${e.stack})`);
+ let details;
+ if (e instanceof Error) {
+ details = `${e.name}: ${e.message} (${e.stack})`;
+ } else {
+ details = e;
+ message = e;
+ }
+ console.error(details);
alert(message);
}
}
diff --git a/js/test/helpers/trackfactory.js b/js/test/helpers/trackfactory.js
index dd42cc8..7d120be 100644
--- a/js/test/helpers/trackfactory.js
+++ b/js/test/helpers/trackfactory.js
@@ -40,14 +40,15 @@ export default class TrackFactory {
track = new uPositionSet();
}
if (length) {
- track.positions = [];
+ const positions = [];
let lat = 21.01;
let lon = 52.23;
for (let i = 0; i < length; i++) {
- track.positions.push(this.getPosition(i + 1, lat, lon));
+ positions.push(this.getPosition(i + 1, lat, lon));
lat += 0.5;
lon += 0.5;
}
+ track.fromJson(positions, true);
}
return track;
}
diff --git a/js/test/trackviewmodel.test.js b/js/test/trackviewmodel.test.js
new file mode 100644
index 0000000..5616b0a
--- /dev/null
+++ b/js/test/trackviewmodel.test.js
@@ -0,0 +1,753 @@
+/*
+ * μlogger
+ *
+ * Copyright(C) 2019 Bartek Fabiszewski (www.fabiszewski.net)
+ *
+ * This is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see .
+ */
+
+import { config, lang } from '../src/initializer.js';
+import TrackFactory from './helpers/trackfactory.js';
+import TrackViewModel from '../src/trackviewmodel.js';
+import ViewModel from '../src/viewmodel.js';
+import uObserve from '../src/observe.js';
+import uPositionSet from '../src/positionset.js';
+import uState from '../src/state.js';
+import uTrack from '../src/track.js';
+import uUser from '../src/user.js';
+import uUtils from '../src/utils.js';
+
+describe('TrackViewModel tests', () => {
+
+ let vm;
+ let state;
+ /** @type {HTMLSelectElement} */
+ let trackEl;
+ /** @type {HTMLDivElement} */
+ let summaryEl;
+ /** @type {HTMLInputElement} */
+ let latestEl;
+ /** @type {HTMLAnchorElement} */
+ let exportKmlEl;
+ /** @type {HTMLAnchorElement} */
+ let exportGpxEl;
+ /** @type {HTMLAnchorElement} */
+ let importGpxEl;
+ /** @type {HTMLAnchorElement} */
+ let forceReloadEl;
+ /** @type {HTMLInputElement} */
+ let autoReloadEl;
+ /** @type {HTMLInputElement} */
+ let inputFileEl;
+ /** @type {HTMLSpanElement} */
+ let intervalEl;
+ /** @type {HTMLAnchorElement} */
+ let setIntervalEl;
+ let tracks;
+ let track1;
+ let track2;
+ let positions;
+ let user;
+ const interval = 10;
+ const MAX_FILE_SIZE = 10;
+
+ beforeEach(() => {
+ const fixture = `
![${lang.strings['tdistance']}](images/distance.svg "${lang.strings['tdistance']}")
${lang.getLocaleDistanceMajor(last.totalMeters, true)}![${lang.strings['ttime']}](images/time.svg "${lang.strings['ttime']}")
${lang.getLocaleDuration(last.totalSeconds)}