From bb5c14239061f9472c131080a0f03c4a569177a2 Mon Sep 17 00:00:00 2001
From: Bartek Fabiszewski <github@fabiszewski.net>
Date: Fri, 5 Jun 2020 11:39:39 +0200
Subject: [PATCH] Change upload size unit to MB in config dialog

---
 js/src/configdialogmodel.js | 6 ++++--
 lang/en.php                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/src/configdialogmodel.js b/js/src/configdialogmodel.js
index aa67b8d..d71440f 100644
--- a/js/src/configdialogmodel.js
+++ b/js/src/configdialogmodel.js
@@ -55,7 +55,8 @@ export default class ConfigDialogModel extends ViewModel {
       strokeOpacity: config.strokeOpacity,
       strokeWeight: config.strokeWeight,
       units: config.units,
-      uploadMaxSize: config.uploadMaxSize
+      uploadMaxSize: config.uploadMaxSize,
+      uploadMaxSizeMB: config.uploadMaxSize / 1024 / 1024
     });
     this.model.onCancel = () => this.onCancel();
     this.model.onSave = () => this.onSave();
@@ -83,6 +84,7 @@ export default class ConfigDialogModel extends ViewModel {
       this.model.layerUrl = layer ? layer.url : '';
       this.toggleEditVisible();
     });
+    this.onChanged('uploadMaxSizeMB', (value) => { this.model.uploadMaxSize = value * 1024 * 1024;})
     this.onChanged('layers', (list) => this.layerSelect.setOptions(list));
     this.onChanged('requireAuth', (value) => {
       this.setPublicTracksActivity(value);
@@ -244,7 +246,7 @@ export default class ConfigDialogModel extends ViewModel {
           <option value="3"${this.model.passStrength === 3 ? ' selected' : ''}>paSsword1#</option>
         </select></label>
         <label><b>${$._('uploadmaxsize')}</b>
-        <input type="number" data-bind="uploadMaxSize" min="0" value="${this.model.uploadMaxSize}" required></label>
+        <input type="number" data-bind="uploadMaxSizeMB" min="0.1" step="0.1" value="${this.model.uploadMaxSizeMB}" required></label>
         <label><b>${$._('requireauth')}</b>
         <input type="checkbox" data-bind="requireAuth"${this.model.requireAuth ? ' checked' : ''}></label>
         <label><b>${$._('publictracks')}</b>
diff --git a/lang/en.php b/lang/en.php
index 23fd653..ed6b78d 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -161,7 +161,7 @@ $lang["colorstart"] = "Start marker color";
 $lang["colorstop"] = "Stop marker color";
 $lang["colorextra"] = "Extra marker color";
 $lang["colorhilite"] = "Hilite marker color";
-$lang["uploadmaxsize"] = "Maximum upload size (B)";
+$lang["uploadmaxsize"] = "Maximum upload size (MB)";
 $lang["ollayers"] = "OpenLayers layer";
 $lang["layername"] = "Layer name";
 $lang["layerurl"] = "Layer URL";