From e9268bfc49daddb65aa3a23322e230383c217d3f Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 18 Dec 2023 01:58:58 +0100
Subject: [PATCH] Move Orientation into sensors directory, attempt to fix 'NaN'
 in slope input

---
 src/{Logic/Web => Sensors}/Orientation.ts     |  2 +-
 .../BigComponents/GeolocationControl.svelte   |  1 -
 src/UI/Debug/OrientationDebugPanel.svelte     |  2 +-
 src/UI/InputElement/Helpers/SlopeInput.svelte |  2 +-
 .../InputElement/Validators/SlopeValidator.ts | 27 ++++++++++++++++++-
 src/UI/ThemeViewGUI.svelte                    |  2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)
 rename src/{Logic/Web => Sensors}/Orientation.ts (98%)

diff --git a/src/Logic/Web/Orientation.ts b/src/Sensors/Orientation.ts
similarity index 98%
rename from src/Logic/Web/Orientation.ts
rename to src/Sensors/Orientation.ts
index 9177f93a2..149fdfeb8 100644
--- a/src/Logic/Web/Orientation.ts
+++ b/src/Sensors/Orientation.ts
@@ -1,4 +1,4 @@
-import { Stores, UIEventSource } from "../UIEventSource"
+import { UIEventSource, Stores } from "../Logic/UIEventSource"
 
 /**
  * Exports the device orientation as UIEventSources and detects 'shakes'
diff --git a/src/UI/BigComponents/GeolocationControl.svelte b/src/UI/BigComponents/GeolocationControl.svelte
index f323f263b..8e4f27a13 100644
--- a/src/UI/BigComponents/GeolocationControl.svelte
+++ b/src/UI/BigComponents/GeolocationControl.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Crosshair from "../../assets/svg/Crosshair.svelte"
   import Location_refused from "../../assets/svg/Location_refused.svelte"
   import { Store } from "../../Logic/UIEventSource.js"
   import type { GeolocationPermissionState } from "../../Logic/State/GeoLocationState.js"
diff --git a/src/UI/Debug/OrientationDebugPanel.svelte b/src/UI/Debug/OrientationDebugPanel.svelte
index c935a3fae..578b2c1e7 100644
--- a/src/UI/Debug/OrientationDebugPanel.svelte
+++ b/src/UI/Debug/OrientationDebugPanel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Orientation } from "../../Logic/Web/Orientation"
+  import { Orientation } from "../../Sensors/Orientation"
 
   const o = Orientation.singleton
   let alpha = o.alpha
diff --git a/src/UI/InputElement/Helpers/SlopeInput.svelte b/src/UI/InputElement/Helpers/SlopeInput.svelte
index 835baddcc..662de7ce0 100644
--- a/src/UI/InputElement/Helpers/SlopeInput.svelte
+++ b/src/UI/InputElement/Helpers/SlopeInput.svelte
@@ -2,7 +2,7 @@
   import { ImmutableStore, UIEventSource } from "../../../Logic/UIEventSource"
   import Translations from "../../i18n/Translations"
   import Tr from "../../Base/Tr.svelte"
-  import { Orientation } from "../../../Logic/Web/Orientation"
+  import { Orientation } from "../../../Sensors/Orientation"
   import type { Feature } from "geojson"
   import { GeoOperations } from "../../../Logic/GeoOperations"
   import If from "../../Base/If.svelte"
diff --git a/src/UI/InputElement/Validators/SlopeValidator.ts b/src/UI/InputElement/Validators/SlopeValidator.ts
index 69cb6784e..8409fa49b 100644
--- a/src/UI/InputElement/Validators/SlopeValidator.ts
+++ b/src/UI/InputElement/Validators/SlopeValidator.ts
@@ -1,4 +1,3 @@
-import NatValidator from "./NatValidator"
 import FloatValidator from "./FloatValidator"
 
 export default class SlopeValidator extends FloatValidator {
@@ -9,10 +8,36 @@ export default class SlopeValidator extends FloatValidator {
                 "The accompanying input element uses the gyroscope and the compass to determine the correct incline. The sign of the incline will be set automatically. The bearing of the way is compared to the bearing of the compass, as such, the device knows if it is measuring in the forward or backward direction."
         )
     }
+
     isValid(str: string): boolean {
         if (str.endsWith("%") || str.endsWith("°")) {
             str = str.substring(0, str.length - 1)
         }
         return super.isValid(str)
     }
+
+    /**
+     *
+     * const v = new SlopeValidator()
+     * v.reformat("5%") // => "5%"
+     * v.reformat("5 %") // => "5%"
+     * v.reformat(" 5 %") // => "5%"
+     * v.reformat(" 5.0 %") // => "5%"
+     * v.reformat(" 5.0 % ") // => "5%"
+     * v.reformat(" -5.0 % ") // => "-5%"
+     * v.reformat("5") // => "5"
+     * v.reformat("5°") // => "5°"
+     *
+     *
+     *
+     */
+    reformat(str: string): string {
+        str = str.trim()
+        let lastChar = ""
+        if (str.endsWith("%") || str.endsWith("°")) {
+            lastChar = str.substring(str.length - 1)
+            str = str.substring(0, str.length - 1)
+        }
+        return super.reformat(str) + lastChar
+    }
 }
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 43acb1a66..9fde988e7 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -63,7 +63,7 @@
   import Favourites from "./Favourites/Favourites.svelte"
   import ImageOperations from "./Image/ImageOperations.svelte"
   import VisualFeedbackPanel from "./BigComponents/VisualFeedbackPanel.svelte"
-  import { Orientation } from "../Logic/Web/Orientation"
+  import { Orientation } from "../Sensors/Orientation"
   import GeolocationControl from "./BigComponents/GeolocationControl.svelte"
   import Compass_arrow from "../assets/svg/Compass_arrow.svelte"