From 27f665b326abf3341f477faa4b82cae021c499fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Fri, 20 May 2022 00:54:01 -0700
Subject: [PATCH] Ignore invalid units in field input

---
 modules/ui/fields/roadheight.js | 7 ++++++-
 modules/ui/fields/roadspeed.js  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/ui/fields/roadheight.js b/modules/ui/fields/roadheight.js
index 0544b41c3..023219db4 100644
--- a/modules/ui/fields/roadheight.js
+++ b/modules/ui/fields/roadheight.js
@@ -101,7 +101,12 @@ export function uiFieldRoadheight(field, context) {
 
 
         function changeUnits() {
-            _isImperial = utilGetSetValue(primaryUnitInput) === 'ft';
+            var primaryUnit = utilGetSetValue(primaryUnitInput);
+            if (primaryUnit === 'm') {
+                _isImperial = false;
+            } else if (primaryUnit === 'ft') {
+                _isImperial = true;
+            }
             utilGetSetValue(primaryUnitInput, _isImperial ? 'ft' : 'm');
             setUnitSuggestions();
             change();
diff --git a/modules/ui/fields/roadspeed.js b/modules/ui/fields/roadspeed.js
index a671e7e9a..b4c277f3a 100644
--- a/modules/ui/fields/roadspeed.js
+++ b/modules/ui/fields/roadspeed.js
@@ -70,7 +70,12 @@ export function uiFieldRoadspeed(field, context) {
 
 
         function changeUnits() {
-            _isImperial = utilGetSetValue(unitInput) === 'mph';
+            var unit = utilGetSetValue(unitInput);
+            if (unit === 'km/h') {
+                _isImperial = false;
+            } else if (unit === 'mph') {
+                _isImperial = true;
+            }
             utilGetSetValue(unitInput, _isImperial ? 'mph' : 'km/h');
             setUnitSuggestions();
             change();