}
+ */
+ static update(data) {
+ return uAjax.post('utils/handleposition.php', data);
+ }
+
+ /**
+ * Calculate distance to target point using haversine formula
+ * @param {uPosition} target
+ * @return {number} Distance in meters
+ */
+ distanceTo(target) {
+ const lat1 = uUtils.deg2rad(this.latitude);
+ const lon1 = uUtils.deg2rad(this.longitude);
+ const lat2 = uUtils.deg2rad(target.latitude);
+ const lon2 = uUtils.deg2rad(target.longitude);
+ const latD = lat2 - lat1;
+ const lonD = lon2 - lon1;
+ const bearing = 2 * Math.asin(Math.sqrt((Math.sin(latD / 2) ** 2) + Math.cos(lat1) * Math.cos(lat2) * (Math.sin(lonD / 2) ** 2)));
+ return bearing * 6371000;
+ }
+
+ /**
+ * Calculate time elapsed since target point
+ * @param {uPosition} target
+ * @return {number} Number of seconds
+ */
+ secondsTo(target) {
+ return this.timestamp - target.timestamp;
+ }
+
}
diff --git a/js/src/positiondialogmodel.js b/js/src/positiondialogmodel.js
new file mode 100644
index 0000000..8fcd7c6
--- /dev/null
+++ b/js/src/positiondialogmodel.js
@@ -0,0 +1,114 @@
+/*
+ * μlogger
+ *
+ * Copyright(C) 2020 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 { lang as $ } from './initializer.js';
+import ViewModel from './viewmodel.js';
+import uDialog from './dialog.js';
+import uObserve from './observe.js';
+import uUtils from './utils.js';
+
+/**
+ * @class PositionDialogModel
+ */
+export default class PositionDialogModel extends ViewModel {
+
+ /**
+ * @param {uState} state
+ * @param {number} positionIndex
+ */
+ constructor(state, positionIndex) {
+ super({
+ onPositionDelete: null,
+ onPositionUpdate: null,
+ onCancel: null,
+ comment: ''
+ });
+ this.state = state;
+ this.positionIndex = positionIndex;
+ this.position = this.state.currentTrack.positions[positionIndex];
+ this.model.onPositionDelete = () => this.onPositionDelete();
+ this.model.onPositionUpdate = () => this.onPositionUpdate();
+ this.model.onCancel = () => this.onCancel();
+ }
+
+ init() {
+ const html = this.getHtml();
+ this.dialog = new uDialog(html);
+ this.dialog.show();
+ this.bindAll(this.dialog.element);
+ }
+
+ /**
+ * @return {string}
+ */
+ getHtml() {
+ return `${$._('editingposition', this.positionIndex + 1, `${uUtils.htmlEncode(this.position.trackname)}`)}
+
+
+ `;
+ }
+
+ onPositionDelete() {
+ if (uDialog.isConfirmed($._('positiondelwarn', this.positionIndex + 1, uUtils.htmlEncode(this.position.trackname)))) {
+ this.position.delete()
+ .then(() => {
+ const track = this.state.currentTrack;
+ this.state.currentTrack = null;
+ track.positions.splice(this.positionIndex, 1);
+ track.recalculatePositions();
+ this.state.currentTrack = track;
+ this.dialog.destroy();
+ }).catch((e) => { uUtils.error(e, `${$._('actionfailure')}\n${e.message}`); });
+ }
+ }
+
+ onPositionUpdate() {
+ if (this.validate()) {
+ this.position.comment = this.model.comment;
+ this.position.save()
+ .then(() => {
+ uObserve.forceUpdate(this.state, 'currentTrack');
+ this.dialog.destroy()
+ })
+ .catch((e) => { uUtils.error(e, `${$._('actionfailure')}\n${e.message}`); });
+ }
+ }
+
+ onCancel() {
+ this.dialog.destroy();
+ }
+
+ /**
+ * Validate form
+ * @return {boolean} True if valid
+ */
+ validate() {
+ if (this.model.comment === this.position.comment) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/js/src/track.js b/js/src/track.js
index 96f2971..1b20830 100644
--- a/js/src/track.js
+++ b/js/src/track.js
@@ -49,6 +49,8 @@ export default class uTrack extends uPositionSet {
this.user = user;
this.plotData = [];
this.maxId = 0;
+ this.totalMeters = 0;
+ this.totalSeconds = 0;
this.listItem(id, name);
}
@@ -59,8 +61,14 @@ export default class uTrack extends uPositionSet {
clear() {
super.clear();
+ this.clearTrackCounters();
+ }
+
+ clearTrackCounters() {
this.maxId = 0;
this.plotData.length = 0;
+ this.totalMeters = 0;
+ this.totalSeconds = 0;
}
/**
@@ -84,30 +92,16 @@ export default class uTrack extends uPositionSet {
* @param {boolean=} isUpdate If true append to old data
*/
fromJson(posArr, isUpdate = false) {
- let totalMeters = 0;
- let totalSeconds = 0;
let positions = [];
if (isUpdate && this.hasPositions) {
positions = this.positions;
- const last = positions[this.length - 1];
- totalMeters = last.totalMeters;
- totalSeconds = last.totalSeconds;
} else {
this.clear();
}
for (const pos of posArr) {
const position = uPosition.fromJson(pos);
- totalMeters += position.meters;
- totalSeconds += position.seconds;
- position.totalMeters = totalMeters;
- position.totalSeconds = totalSeconds;
+ this.calculatePosition(position);
positions.push(position);
- if (position.altitude != null) {
- this.plotData.push({ x: position.totalMeters, y: position.altitude });
- }
- if (position.id > this.maxId) {
- this.maxId = position.id;
- }
}
// update at the end to avoid observers update invidual points
this.positions = positions;
@@ -243,4 +237,31 @@ export default class uTrack extends uPositionSet {
return uAjax.post('utils/handletrack.php', data);
}
+ recalculatePositions() {
+ this.clearTrackCounters();
+ let previous = null;
+ for (const position of this.positions) {
+ position.meters = previous ? position.distanceTo(previous) : 0;
+ position.seconds = previous ? position.secondsTo(previous) : 0;
+ this.calculatePosition(position);
+ previous = position;
+ }
+ }
+
+ /**
+ * Calculate position total counters and plot data
+ * @param {uPosition} position
+ */
+ calculatePosition(position) {
+ this.totalMeters += position.meters;
+ this.totalSeconds += position.seconds;
+ position.totalMeters = this.totalMeters;
+ position.totalSeconds = this.totalSeconds;
+ if (position.altitude != null) {
+ this.plotData.push({ x: position.totalMeters, y: position.altitude });
+ }
+ if (position.id > this.maxId) {
+ this.maxId = position.id;
+ }
+ }
}
diff --git a/js/src/utils.js b/js/src/utils.js
index cc03fa1..cf6b497 100644
--- a/js/src/utils.js
+++ b/js/src/utils.js
@@ -317,4 +317,13 @@ export default class uUtils {
console.error(details);
alert(message);
}
+
+ /**
+ * Degrees to radians
+ * @param {number} degrees
+ * @return {number}
+ */
+ static deg2rad(degrees) {
+ return degrees * Math.PI / 180;
+ }
}
diff --git a/js/src/viewmodel.js b/js/src/viewmodel.js
index 9c2cc02..41e2629 100644
--- a/js/src/viewmodel.js
+++ b/js/src/viewmodel.js
@@ -65,9 +65,12 @@ export default class ViewModel {
observers.forEach(/** @param {HTMLElement} element */ (element) => {
const name = element.dataset[dataProp];
if (name === key) {
- if (element instanceof HTMLInputElement || element instanceof HTMLSelectElement) {
+ if (element instanceof HTMLInputElement ||
+ element instanceof HTMLSelectElement ||
+ element instanceof HTMLTextAreaElement) {
this.onChangeBind(element, key);
- } else if (element instanceof HTMLAnchorElement || element instanceof HTMLButtonElement) {
+ } else if (element instanceof HTMLAnchorElement ||
+ element instanceof HTMLButtonElement) {
this.onClickBind(element, key);
} else {
this.viewUpdateBind(element, key);
diff --git a/lang/en.php b/lang/en.php
index d6e2ec4..1f7adcc 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -111,6 +111,11 @@ $lang["editingtrack"] = "You are editing track %s"; // substitutes track name
$lang["deltrack"] = "Remove track";
$lang["trackname"] = "Track name";
$lang["edittrack"] = "Edit track";
+$lang["positiondelwarn"] = "Warning!\n\nYou are going to permanently delete position %d of track %s.\n\nAre you sure?"; // substitutes position index and track name
+$lang["editingposition"] = "You are editing position #%d of track %s"; // substitutes position index and track name
+$lang["delposition"] = "Remove position";
+$lang["comment"] = "Comment";
+$lang["editposition"] = "Edit position";
$lang["passlenmin"] = "Password must be at least %d characters"; // substitutes password minimum length
$lang["passrules_1"] = "It should contain at least one lower case letter, one upper case letter";
$lang["passrules_2"] = "It should contain at least one lower case letter, one upper case letter and one digit";
diff --git a/utils/handleposition.php b/utils/handleposition.php
new file mode 100644
index 0000000..19bbdae
--- /dev/null
+++ b/utils/handleposition.php
@@ -0,0 +1,65 @@
+.
+ */
+
+ require_once(dirname(__DIR__) . "/helpers/auth.php");
+ require_once(ROOT_DIR . "/helpers/lang.php");
+ require_once(ROOT_DIR . "/helpers/track.php");
+ require_once(ROOT_DIR . "/helpers/utils.php");
+ require_once(ROOT_DIR . "/helpers/config.php");
+
+ $auth = new uAuth();
+
+ $action = uUtils::postString('action');
+ $positionId = uUtils::postInt('posid');
+ $comment = uUtils::postString('comment');
+
+ $lang = (new uLang(uConfig::$lang))->getStrings();
+
+ if (empty($action) || empty($positionId)) {
+ uUtils::exitWithError($lang["servererror"]);
+ }
+ $position = new uPosition($positionId);
+ if (!$position->isValid ||
+ (!$auth->isAuthenticated() || (!$auth->isAdmin() && $auth->user->id !== $position->userId))) {
+ uUtils::exitWithError($lang["servererror"]);
+ }
+
+ switch ($action) {
+
+ case 'update':
+ $position->comment = $comment;
+ if ($position->update() === false) {
+ uUtils::exitWithError($lang["servererror"]);
+ }
+ break;
+
+ case 'delete':
+ if ($position->delete() === false) {
+ uUtils::exitWithError($lang["servererror"]);
+ }
+ break;
+
+ default:
+ uUtils::exitWithError($lang["servererror"]);
+ break;
+ }
+
+ uUtils::exitWithSuccess();
+
+?>
\ No newline at end of file
`;
}
+ let editLink = '';
+ if (isEditable) {
+ editLink = `${$._('editposition')}`;
+ }
let stats = '';
if (!this.state.showLatest) {
stats =
@@ -182,7 +189,7 @@ export default class MapViewModel extends ViewModel {
${(pos.altitude !== null) ? `
${$.getLocaleAltitude(pos.altitude, true)}
${$.getLocaleAccuracy(pos.accuracy, true)}${provider}