running-tools

commit 63ba00886d2981b6287cf7ed6ef66df3401e9cb4
parent b20593e4b112365acd9426dd663c087b05e61b5e
Author: ashermorgan <59518073+ashermorgan@users.noreply.github.com>
Date:   Sun, 19 Sep 2021 12:42:29 -0700

Merge branch 'dev'

Version 1.1.1

Diffstat:
M
CHANGELOG.md
 | 
7
+++++++
M
package-lock.json
 | 
4
++--
M
package.json
 | 
2
+-
M
src/utils/units.js
 | 
4
++--
M
src/views/PaceCalculator.vue
 | 
2
+-
M
src/views/RaceCalculator.vue
 | 
2
+-
M
tests/unit/views/PaceCalculator.spec.js
 | 
5
+++--
M
tests/unit/views/RaceCalculator.spec.js
 | 
5
+++--

8 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.1.1] - 2021-09-19
+
+### Fixed
+- Bug in how default units were chosen
+- Issue that caused all pace and race calculator results to be NaN
+
 ## [1.1.0] - 2021-09-16
 
 ### Added
@@ -34,6 +40,7 @@
 ### Added
 - Basic app structure
 
+[1.1.1]: https://github.com/ashermorgan/running-tools/releases/tag/1.1.1
 [1.1.0]: https://github.com/ashermorgan/running-tools/releases/tag/1.1.0
 [1.0.0]: https://github.com/ashermorgan/running-tools/releases/tag/1.0.0
 [0.2.0]: https://github.com/ashermorgan/running-tools/releases/tag/0.2.0
diff --git a/package-lock.json b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "running-tools",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "running-tools",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "dependencies": {
         "core-js": "^3.6.5",
         "register-service-worker": "^1.7.1",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "running-tools",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A collection of tools for runners and their coaches that calculate splits, predict race times, convert units, and more",
   "private": true,
   "scripts": {
diff --git a/src/utils/units.js b/src/utils/units.js
@@ -220,8 +220,8 @@ function formatDuration(value, padding = 6, digits = 2) {
  * @returns {String} The default unit system
  */
 function getDefaultUnitSystem() {
-  const language = navigator.language || navigator.userLanguage;
-  if (language.endsWith('-US') || language.endsWith('-MM')) {
+  const language = (navigator.language || navigator.userLanguage).toLowerCase();
+  if (language.endsWith('-us') || language.endsWith('-mm')) {
     return 'imperial';
   }
   return 'metric';
diff --git a/src/views/PaceCalculator.vue b/src/views/PaceCalculator.vue
@@ -21,7 +21,7 @@
     <h2>Equivalent Paces</h2>
 
     <target-table class="output" :calculate-result="calculatePace" :default-targets="defaultTargets"
-      storage-key="pace-calculator-targets"/>
+      storage-key="pace-calculator-targets-v2"/>
   </div>
 </template>
 
diff --git a/src/views/RaceCalculator.vue b/src/views/RaceCalculator.vue
@@ -55,7 +55,7 @@
     <h2>Equivalent Race Results</h2>
 
     <target-table class="output" :calculate-result="predictResult" :default-targets="defaultTargets"
-      storage-key="race-calculator-targets" show-pace/>
+      storage-key="race-calculator-targets-v2" show-pace/>
   </div>
 </template>
 
diff --git a/tests/unit/views/PaceCalculator.spec.js b/tests/unit/views/PaceCalculator.spec.js
@@ -3,6 +3,7 @@
 import { expect } from 'chai';
 import { shallowMount } from '@vue/test-utils';
 import PaceCalculator from '@/views/PaceCalculator.vue';
+import unitUtils from '@/utils/units';
 
 describe('views/PaceCalculator.vue', () => {
   it('should correctly calculate times', async () => {
@@ -51,8 +52,8 @@ describe('views/PaceCalculator.vue', () => {
 
     // Assert result is correct
     expect(result).to.deep.equal({
-      distanceValue: 2,
-      distanceUnit: 'miles',
+      distanceValue: unitUtils.convertDistance(2, 'miles', unitUtils.getDefaultDistanceUnit()),
+      distanceUnit: unitUtils.getDefaultDistanceUnit(),
       time: 200,
       result: 'distance',
     });
diff --git a/tests/unit/views/RaceCalculator.spec.js b/tests/unit/views/RaceCalculator.spec.js
@@ -55,8 +55,9 @@ describe('views/RaceCalculator.vue', () => {
     // Assert result is correct
     const prediction = raceUtils.AverageModel.predictDistance(1200, 5000, 2460);
     expect(result).to.deep.equal({
-      distanceValue: unitUtils.convertDistance(prediction, 'meters', 'miles'),
-      distanceUnit: 'miles',
+      distanceValue: unitUtils.convertDistance(prediction, 'meters',
+        unitUtils.getDefaultDistanceUnit()),
+      distanceUnit: unitUtils.getDefaultDistanceUnit(),
       time: 2460,
       result: 'distance',
     });