From 144cc2923e9a0ea5566898a34e58488c9ae9bf74 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Fri, 26 Mar 2021 18:00:00 +0000
Subject: [PATCH 1/7] Add more exceptions to .prettierignore

This allows `yarn prettier` to run successfully.
---
 .prettierignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.prettierignore b/.prettierignore
index 66446235..041daf37 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,11 +1,14 @@
 LICENSE
+Dockerfile
 dist/
 *.zip
 yarn.lock
 .idea
 .gitignore
+.eslintignore
 .prettierignore
 .tx/
 layers/
 locales/*.json
 resources/boundaries/
+resources/standalone/*.sh

From f31c379369e82b241e0181a7f40ae80dd6c891be Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Sat, 27 Mar 2021 18:00:00 +0000
Subject: [PATCH 2/7] Fix broken Return key in export route dialog

2a431932 made it possible to press `Return` to confirm the export dialog.
After 5b52abc1 this stopped working though, even when the text input had focus.

This is due to moving the `<input>` out of the `<form>` and referencing the
form's `name` attribute instead. However "The value of [the form] attribute
must be the id of a <form> in the same document" according to
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button.

Adding such an `id` restores the `Return` key to working properly.

The same change is done for the no-go form, where the same issue would otherwise
affect a later patch adding similar `Return` key handling.

Test Plan:
- Create Route, open "Export route" dialog.
- Move focus to an input field.
- Press `Return`.
- The file dialog for saving should open.
---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 7c691b71..03efa897 100644
--- a/index.html
+++ b/index.html
@@ -427,7 +427,7 @@ <h4 class="modal-title" data-i18n="export.title">Export route</h4>
                         </button>
                     </div>
                     <div class="modal-body">
-                        <form name="export">
+                        <form name="export" id="exportForm">
                             <div class="form-group row">
                                 <label class="col-form-label col-sm-2" data-i18n="export.trackname">Name</label>
                                 <div class="col-sm-10">
@@ -519,7 +519,7 @@ <h4 class="modal-title" data-i18n="export.title">Export route</h4>
                             type="submit"
                             class="btn btn-primary"
                             data-i18n="export.title"
-                            form="export"
+                            form="exportForm"
                             id="submitExport"
                         >
                             Export route
@@ -712,7 +712,7 @@ <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
                     </div>
                     <div class="modal-body">
                         <p id="nogoError" class="invalid-feedback" style="display: none"></p>
-                        <form name="loadNogosForm">
+                        <form name="loadNogosForm" id="loadNogosForm">
                             <fieldset>
                                 <legend data-i18n="loadNogos.source">Source</legend>
                                 <div>

From ef37b65c7597c79ada06a13fa324c5ac8122dc89 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Sun, 28 Mar 2021 18:00:00 +0000
Subject: [PATCH 3/7] Fix loading no-go areas

5b52abc1 broke importing no-go areas, in particular after choosing a file
and clicking on "Load" nothing would happen.

This is due to renaming the `<input>`'s `<id>` which is still referenced
in `NogoAreas.js` by its old name.

Undoing the rename resolves the issue.

Test Plan:
- Open "Load no-go areas" dialog.
- Click on "Browse" and select GeoJSON file (e.g. as referenced in #161).
- Click on "Load".
- The no-go areas should be added to the map.
---
 index.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 03efa897..86256541 100644
--- a/index.html
+++ b/index.html
@@ -727,10 +727,7 @@ <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
                                     </div>
                                     <p data-i18n="modal.or">or</p>
                                     <div class="form-group row">
-                                        <label
-                                            class="col-form-label col-sm-3"
-                                            for="loadNogosFile"
-                                            data-i18n="loadNogos.file"
+                                        <label class="col-form-label col-sm-3" for="nogoFile" data-i18n="loadNogos.file"
                                             >File (.geojson)</label
                                         >
                                         <div class="col-sm-9">
@@ -738,12 +735,12 @@ <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
                                                 <input
                                                     type="file"
                                                     accept=".geojson"
-                                                    name="loadNogosFile"
-                                                    id="loadNogosFile"
+                                                    name="nogoFile"
+                                                    id="nogoFile"
                                                     class="custom-file-input"
                                                 />
                                                 <label
-                                                    for="loadNogosFile"
+                                                    for="nogoFile"
                                                     class="custom-file-label"
                                                     data-i18n="[data-browse]trackasroute.browse"
                                                     style="

From 8b9fda47adb55f073167877751fef4ea46019ce5 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Mon, 29 Mar 2021 18:00:00 +0000
Subject: [PATCH 4/7] Show missing filename in load no-go areas dialog

5b52abc1 copied `<label>` and `<input>` from the `loadedittrackForm` for
consistency, but missed to add some corresponding code to `NoGoAreas.js`.

After completing the implementation, the filename for loading no-go areas is now
displayed after selecting a file just like in the "Load track as route" dialog.

Test Plan:
- Open "Load no-go areas" dialog.
- Browse and select file.
- The filename should now be shown next to "Browse".
---
 js/plugin/NogoAreas.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/plugin/NogoAreas.js b/js/plugin/NogoAreas.js
index af3dac1a..5f18e9c0 100644
--- a/js/plugin/NogoAreas.js
+++ b/js/plugin/NogoAreas.js
@@ -98,6 +98,8 @@ BR.NogoAreas = L.Control.extend({
 
         L.DomEvent.addListener(document, 'keydown', this._keydownListener, this);
 
+        L.DomUtil.get('nogoFile').onchange = L.bind(this.onFileChanged, this);
+
         this.editTools.on(
             'editable:drawing:end',
             function (e) {
@@ -170,6 +172,11 @@ BR.NogoAreas = L.Control.extend({
         $('#nogoError').css('display', message ? 'block' : 'none');
     },
 
+    onFileChanged: function (e) {
+        if (!e.target.files[0]) return;
+        $(e.target).next('label').text(e.target.files[0].name);
+    },
+
     uploadNogos: function () {
         var self = this;
 

From eb8a7a9d3674340bd59bf21b853430463b9afdc0 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Tue, 30 Mar 2021 18:00:00 +0000
Subject: [PATCH 5/7] Allow Return key to accept dialog when loading no-go
 areas or track as route

After ca53080e added Return key handling to the "Delete route" dialog, only
the "Load no-go areas" and "Load track as route" dialogs were still missing
similar functionality.

The implementation is based on 2a431932.

Test Plan:
- Open "Load no-go areas" or "Load track as route" dialog.
- Press Space or Return to open file dialog, choose file,
  Tab out of file input and press Return to confirm modal.
- Notice not having to Tab to the respective confirmation button.
---
 index.html                        | 4 ++--
 js/plugin/RouteLoaderConverter.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 86256541..88dc7e3e 100644
--- a/index.html
+++ b/index.html
@@ -680,7 +680,7 @@ <h4 class="modal-title" data-i18n="trackasroute.title">Load Track as Route</h4>
                             Close
                         </button>
                         <button
-                            type="button"
+                            type="submit"
                             class="btn btn-primary"
                             form="loadedittrackForm"
                             data-i18n="trackasroute.title"
@@ -800,7 +800,7 @@ <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
                         </button>
 
                         <button
-                            type="button"
+                            type="submit"
                             class="btn btn-primary"
                             form="loadNogosForm"
                             data-i18n="loadNogos.load"
diff --git a/js/plugin/RouteLoaderConverter.js b/js/plugin/RouteLoaderConverter.js
index d7198531..53967c75 100644
--- a/js/plugin/RouteLoaderConverter.js
+++ b/js/plugin/RouteLoaderConverter.js
@@ -191,7 +191,8 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                 }.bind(this)
             );
 
-            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function () {
+            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function (e) {
+                e.preventDefault(); // prevent page reload on form submission
                 this._closeCanceled = false;
                 this.onBusyChanged(true);
                 if (this._testLayer.getLayers().length > 0) {

From 13794c3df36e3f7a2d3a1a3a9aa817347f3992d8 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Wed, 31 Mar 2021 18:00:00 +0000
Subject: [PATCH 6/7] Set focus in modals to first input field by default

After invoking a shortcut, some dialogs required pressing `Tab`
or using the mouse until focus was moved to the primary input field.

By moving the focus automatically, users can start typing right away.
This is particularly useful in conjunction with the `Return` key for
confirming the dialog.

Test Plan:
- Press `X` to open "Export" dialog:
  "Name" field has focus.
- Press `Shift+O` to open "Load track as route":
  "Trackfile" is focussed, file dialog opens with `Space`.
- Check "Load no-go area" dialog.
- Check "POI name" dialog.
---
 js/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/index.js b/js/index.js
index 2ef465b2..7444ac4e 100644
--- a/js/index.js
+++ b/js/index.js
@@ -457,6 +457,10 @@
         );
 
         BR.WhatsNew.init();
+
+        $('.modal').on('shown.bs.modal', function (e) {
+            $('input:visible:enabled:first', e.target).focus();
+        });
     }
 
     i18next.on('languageChanged', function (detectedLanguage) {

From 7edae911dcc0d4e2a28b96d8a363431b2d0f68a7 Mon Sep 17 00:00:00 2001
From: Henrik Fehlauer <rkflx@lab12.net>
Date: Thu, 1 Apr 2021 18:00:00 +0000
Subject: [PATCH 7/7] Select parts of trackname in export dialog for easier
 overwriting

Users might want to assign custom tracknames, which requires deleting the
default name either entirely or parts of it.

By pre-selecting parts of the trackname, users can start typing right away
after opening the dialog. `Ctrl+A` to select everything is still possible,
but keeping the distance in the filename by default comes in handy,
e.g. when using a file manager not displaying the track length.

NB: Might need adaptation once trackname validation becomes less strict,
i.e. currently "(" and "->" as specified in the message catalog are replaced
with ' - ' by the validator before being inserted into the dialog.

Test Plan:
- Open "Export" dialog ("Location - Other Location - 2km")
- Open "Export" dialog for roundtrip ("Location - 1km")
- In both cases the complete trackname except for the distance
  information (including separator) should be selected.
- No unwanted behaviour even if Nominatim is slow or down.
---
 js/control/Export.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/control/Export.js b/js/control/Export.js
index 3740c8b5..e66d87a3 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -71,6 +71,10 @@ BR.Export = L.Class.extend({
         }
     },
 
+    _selectTrackname: function () {
+        trackname.setSelectionRange(0, trackname.value.lastIndexOf(' - '));
+    },
+
     _generateTrackname: function () {
         var trackname = this.trackname;
         this._getCityAtPosition(
@@ -103,6 +107,8 @@ BR.Export = L.Class.extend({
                             trackname.value = trackname.value.replace(/[>)]/g, '').replace(/ \(/g, ' - ');
                             this._validationMessage();
                         }
+
+                        this._selectTrackname();
                     }, this)
                 );
             }, this)